From 02e1ea447c0fdf101d25d523ba41eac6c82bf6e6 Mon Sep 17 00:00:00 2001
From: sdeffaux <53090527+sdeffaux@users.noreply.github.com>
Date: Sun, 21 Jul 2019 16:43:14 +0200
Subject: [PATCH] reorganize

---
 .../interrupteur_differentiel.elmt            | 66 +++++++++++++
 .../03_contacts}/contact_relais.elmt          |  0
 .../03_contacts}/contact_relais_nf.elmt       |  0
 .../11_optical_signaling/lampe2.elmt          |  1 +
 .../commutateur-a-3-positions-a-m.elmt        | 41 ++++++++
 .../21_selector_switches/comut_pp1_pp2.elmt   | 47 ++++++++++
 .../10_engines/moteur_mono_2.elmt             | 26 +++++
 .../10_engines/moteur_tri_3.elmt}             |  0
 .../10_engines/moteur_tri_de_2.elmt}          |  0
 .../10_engines}/motor-mono-2.elmt             |  0
 .../10_engines/motor-mono-cond.elmt}          |  2 +-
 .../10_engines/motor2.elmt}                   |  0
 .../Siemens_rvl480.elmt                       | 94 +++++++++++++++++++
 .../80_building_management/siemens_sas31.elmt | 36 +++++++
 .../Electricosfrio/frio/lampe2.elmt           | 23 -----
 .../Electricosfrio/fuerza/moteur_mono.elmt    | 21 -----
 16 files changed, 312 insertions(+), 45 deletions(-)
 create mode 100644 elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio => 10_electric/10_allpole/310_relays_contactors&contacts/03_contacts}/contact_relais.elmt (100%)
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio => 10_electric/10_allpole/310_relays_contactors&contacts/03_contacts}/contact_relais_nf.elmt (100%)
 create mode 100644 elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
 create mode 100644 elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_pp1_pp2.elmt
 create mode 100644 elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri.elmt => 10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_3.elmt} (100%)
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri_de.elmt => 10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_de_2.elmt} (100%)
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza => 10_electric/10_allpole/391_consumers&actuators/10_engines}/motor-mono-2.elmt (100%)
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moor-mono-cond.elmt => 10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-cond.elmt} (97%)
 rename elements/{60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/motor1.elmt => 10_electric/10_allpole/391_consumers&actuators/10_engines/motor2.elmt} (100%)
 create mode 100644 elements/10_electric/20_manufacturers_articles/siemens/80_building_management/Siemens_rvl480.elmt
 create mode 100644 elements/10_electric/20_manufacturers_articles/siemens/80_building_management/siemens_sas31.elmt
 delete mode 100644 elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/lampe2.elmt
 delete mode 100644 elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_mono.elmt

diff --git a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt b/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt
new file mode 100644
index 000000000..7f50d66e7
--- /dev/null
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt
@@ -0,0 +1,66 @@
+<definition width="50" link_type="master" hotspot_x="27" height="80" hotspot_y="34" type="element" version="0.70" orientation="dyyy">
+    <uuid uuid="{daaec1a5-d463-4bb3-9a92-e26a13f5a0ec}"/>
+    <names>
+        <name lang="ar">مفتاح تفاضلي</name>
+        <name lang="de">Fehlerstromschutzschalter 2P</name>
+        <name lang="ru">УЗО</name>
+        <name lang="pt">Interruptor diferencial</name>
+        <name lang="en">Differential switch</name>
+        <name lang="it">Interruttore differenziale</name>
+        <name lang="fr">Interrupteur différentiel</name>
+        <name lang="pl">Rozłącznik różnicowoprądowy</name>
+        <name lang="es">Interruptor diferencial</name>
+        <name lang="cs">Rozdílový spínač</name>
+        <name lang="nl">Aardlekschakelaar</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
+    <elementInformations>
+        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <arc width="10" start="90" height="10" angle="180" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="-20"/>
+        <line y2="40" x2="-10" x1="-10" end2="none" y1="3" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="-10" x2="7" x1="-12" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <polygon x3="-15" y2="0" y3="-20" x2="-10" x1="-10" y1="3" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
+        <line y2="40" x2="10" x1="10" end2="none" y1="4" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <polygon x3="5" y2="0" y3="-20" x2="10" x1="10" y1="3" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
+        <dynamic_text uuid="{7c189aba-a86c-4286-964d-b437612ed744}" text_from="ElementInfo" z="6" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-17" frame="false" x="20" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y2="-20" x2="-10" x1="-10" end2="none" y1="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="-18" x2="-12" x1="-8" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
+        <line y2="-18" x2="-8" x1="-12" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
+        <line y2="-20" x2="10" x1="10" end2="none" y1="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="-18" x2="8" x1="12" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
+        <line y2="-18" x2="12" x1="8" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
+        <arc width="10" start="270" height="10" angle="180" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="10"/>
+        <line y2="20" x2="15" x1="-15" end2="none" y1="20" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="30" x2="15" x1="-15" end2="none" y1="30" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="25" x2="-25" x1="-25" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="25" x2="-20" x1="-25" end2="none" y1="25" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <line y2="-10" x2="-15" x1="-25" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+        <dynamic_text uuid="{1cb14ddb-caa4-45ed-92cd-1b59b3562cb9}" text_from="ElementInfo" z="25" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" y="20" frame="false" x="25" rotation="0">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <terminal orientation="n" y="-30" x="10"/>
+        <terminal orientation="s" y="40" x="10"/>
+        <terminal orientation="n" y="-30" x="-10"/>
+        <terminal orientation="s" y="40" x="-10"/>
+    </description>
+</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/contact_relais.elmt b/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/contact_relais.elmt
rename to elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/contact_relais_nf.elmt b/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais_nf.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/contact_relais_nf.elmt
rename to elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais_nf.elmt
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt
index 42df0e8c6..2662ca852 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt
@@ -13,6 +13,7 @@
         <name lang="en">Light</name>
         <name lang="pl">Lampa</name>
         <name lang="nl">Lamp</name>
+        <name lang="en">Light</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
new file mode 100644
index 000000000..505ee91a5
--- /dev/null
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
@@ -0,0 +1,41 @@
+<definition type="element" orientation="dyyy" hotspot_y="29" version="0.70" hotspot_x="34" link_type="simple" height="60" width="90">
+    <uuid uuid="{fc765714-9cb7-4e29-ad0b-ab579d4e4ec8}"/>
+    <names>
+        <name lang="es">Interruptor de 3 posiciones</name>
+        <name lang="de">Drehschalter 2-polig 3 Positionen ein/aus</name>
+        <name lang="nl">keuzeschakelaar 3 pos (NO/NO)</name>
+        <name lang="en">3 position  switch</name>
+        <name lang="pl">Łącznik obrotowy przełączny z położeniem neutralnym</name>
+        <name lang="fr">Commutateur a 3 positions A/0/M </name>
+        <name lang="it">Commutatore a 3 posizioni </name>
+        <name lang="cs">Spínač - 3 polohy</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="23" end2="none" x1="47" y1="0" y2="0" length2="1.5"/>
+        <text font="Sans Serif,3,-1,5,50,0,0,0,0,0" x="-24" rotation="0" y="-7" text="Auto" color="#000000"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="50" x1="45" y3="20" y1="-10" y2="10" closed="false" x3="50"/>
+        <text font="Sans Serif,3,-1,5,50,0,0,0,0,0" x="-13" rotation="0" y="-7" text="man" color="#000000"/>
+        <line antialias="false" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="50" end2="none" x1="50" y1="-20" y2="-10" length2="1.5"/>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="-10" end2="none" x1="-15" y1="5" y2="-5" length2="1.5"/>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="-15" end2="none" x1="-20" y1="-5" y2="5" length2="1.5"/>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="-26.0136" end2="none" x1="18.9314" y1="0" y2="0" length2="1.5"/>
+        <text font="Sans Serif,3,-1,5,50,0,0,0,0,0" x="-16" rotation="0" y="-7" text="0" color="#000000"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-27" x1="-24" y3="5" y1="-5" y2="-5" closed="false" x3="-27" y4="5" x4="-30"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" x1="-5" y3="20" y1="-10" y2="10" closed="false" x3="0"/>
+        <line antialias="false" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" end2="none" x1="0" y1="-20" y2="-10" length2="1.5"/>
+        <dynamic_text frame="false" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="4" rotation="0" y="-26.5" text_from="ElementInfo" z="13" uuid="{f223e627-8712-4f6f-9c88-ec96bed2375e}" Valignment="AlignTop" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" x2="-15" end2="none" x1="-15" y1="5" y2="-6" length2="1.5"/>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="22" end2="none" x1="20" y1="0" y2="13" length2="1.5"/>
+        <line antialias="false" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x2="22" end2="none" x1="23" y1="0" y2="12" length2="1.5"/>
+        <terminal orientation="n" x="0" y="-21"/>
+        <terminal orientation="s" x="0" y="21"/>
+        <terminal orientation="s" x="50" y="21"/>
+        <terminal orientation="n" x="50" y="-21"/>
+    </description>
+</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_pp1_pp2.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_pp1_pp2.elmt
new file mode 100644
index 000000000..4349b5996
--- /dev/null
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_pp1_pp2.elmt
@@ -0,0 +1,47 @@
+<definition version="0.70" link_type="simple" hotspot_y="29" width="120" height="60" orientation="dyyy" type="element" hotspot_x="34">
+    <uuid uuid="{b3457a3e-28d4-4a20-885b-1bcf1eb0e740}"/>
+    <names>
+        <name lang="it">Commutatore a 3 posizioni </name>
+        <name lang="es">Interruptor de 3 posiciones</name>
+        <name lang="fr">Commutateur Ppe1/Ppe2 </name>
+        <name lang="cs">Spínač - 3 polohy</name>
+        <name lang="en">3 position  switch</name>
+        <name lang="de">Drehschalter 2-polig 3 Positionen ein/aus</name>
+        <name lang="nl">keuzeschakelaar 3 pos (NO/NO)</name>
+        <name lang="pl">Łącznik obrotowy przełączny z położeniem neutralnym</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line y2="0" x1="76" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="0" length1="1.5" antialias="false" x2="41" end1="none"/>
+        <text text="1" color="#000000" y="-7" x="-22" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <polygon y2="10" x1="75" x3="80" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y3="20" closed="false" antialias="true" x2="80"/>
+        <text text="2" color="#000000" y="-7" x="-12" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <line y2="-10" x1="80" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" end2="none" y1="-20" length1="1.5" antialias="false" x2="80" end1="none"/>
+        <line y2="-5" x1="-15" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="5" length1="1.5" antialias="false" x2="-10" end1="none"/>
+        <line y2="5" x1="-20" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="-5" length1="1.5" antialias="false" x2="-15" end1="none"/>
+        <line y2="0" x1="38" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="0" length1="1.5" antialias="false" x2="-26.0136" end1="none"/>
+        <text text="0" color="#000000" y="-7" x="-17" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <polygon y2="-5" x1="-24" x3="-27" style="line-style:normal;line-weight:thin;filling:none;color:black" x4="-30" y1="-5" y3="5" closed="false" antialias="false" x2="-27" y4="5"/>
+        <polygon y2="10" x1="-5" x3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y3="20" closed="false" antialias="true" x2="0"/>
+        <line y2="-10" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" end2="none" y1="-20" length1="1.5" antialias="false" x2="0" end1="none"/>
+        <dynamic_text Valignment="AlignTop" y="-26" text_width="-1" text_from="ElementInfo" x="4" uuid="{8421b800-f8e5-4f1f-b0a2-0f1e893c8b14}" frame="false" rotation="0" Halignment="AlignLeft" z="13" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y2="-6" x1="-15" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="5" length1="1.5" antialias="false" x2="-15" end1="none"/>
+        <line y2="13" x1="38" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="0" length1="1.5" antialias="false" x2="40" end1="none"/>
+        <line y2="12" x1="41" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" y1="0" length1="1.5" antialias="false" x2="40" end1="none"/>
+        <dynamic_text Valignment="AlignTop" y="15" text_width="-1" text_from="UserText" x="-30" uuid="{3aac8cf1-b07d-41a2-a3f7-57b19217324b}" frame="false" rotation="0" Halignment="AlignLeft" z="17" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal">
+            <text>PPE1</text>
+        </dynamic_text>
+        <dynamic_text Valignment="AlignTop" y="15" text_width="-1" text_from="UserText" x="80" uuid="{c9d3c9f8-041e-4d5b-96fd-357a38119021}" frame="false" rotation="0" Halignment="AlignLeft" z="18" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal">
+            <text>PPE2</text>
+        </dynamic_text>
+        <terminal y="-21" x="0" orientation="n"/>
+        <terminal y="21" x="0" orientation="s"/>
+        <terminal y="-20" x="80" orientation="n"/>
+        <terminal y="20" x="80" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt
new file mode 100644
index 000000000..8320bde22
--- /dev/null
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt
@@ -0,0 +1,26 @@
+<definition orientation="dyyy" type="element" height="50" width="40" link_type="simple" version="0.70" hotspot_x="14" hotspot_y="17">
+    <uuid uuid="{4c8df704-fb5c-4d79-b690-d178a6fdf5bc}"/>
+    <names>
+        <name lang="cs">Jednofázový motor</name>
+        <name lang="es">Motor monofásico</name>
+        <name lang="ru">Однофазный эл. мотор</name>
+        <name lang="pt">Motor monofásico</name>
+        <name lang="en">One-phase engine</name>
+        <name lang="fr">Moteur monophasé</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text font="Sans Serif,18,-1,5,50,0,0,0,0,0" y="21" x="-6" text="M" rotation="0" color="#000000"/>
+        <circle antialias="true" y="-3" diameter="30" x="-10.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x2="20" y2="6.75" end2="none" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-5" x1="20" length1="1.5"/>
+        <line x2="-10" y2="7" end2="none" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-7" x1="-10" length1="1.5"/>
+        <dynamic_text frame="false" font="Sans Serif,6,-1,5,50,0,0,0,0,0" y="7" uuid="{928dba5a-fd90-44a4-835b-b64f7fe1f6a9}" x="19" z="5" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" text_from="ElementInfo" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="n" y="-10" x="20"/>
+        <terminal orientation="n" y="-10" x="-10"/>
+    </description>
+</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri.elmt
rename to elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri_de.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_de_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_tri_de.elmt
rename to elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_de_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/motor-mono-2.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/motor-mono-2.elmt
rename to elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moor-mono-cond.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-cond.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moor-mono-cond.elmt
rename to elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-cond.elmt
index e777a7f1f..ebb13957d 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moor-mono-cond.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor-mono-cond.elmt
@@ -3,7 +3,7 @@
         <name lang="ru">Трёхфазный эл. мотор</name>
         <name lang="pt">Motor trifásico</name>
         <name lang="en">Three-phase engine</name>
-        <name lang="fr">Moteur triphasé</name>
+        <name lang="fr">Moteur monophase condensateur</name>
         <name lang="es">Motor mono cond.</name>
         <name lang="cs">Trojfázový motor</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/motor1.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/motor1.elmt
rename to elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor2.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/Siemens_rvl480.elmt b/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/Siemens_rvl480.elmt
new file mode 100644
index 000000000..eb9e6d0fa
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/Siemens_rvl480.elmt
@@ -0,0 +1,94 @@
+<definition orientation="dyyy" version="0.70" height="130" hotspot_x="255" hotspot_y="65" width="510" type="element" link_type="simple">
+    <uuid uuid="{d688bcfe-fea3-4ecc-82d4-2a86d4136fd4}"/>
+    <names>
+        <name lang="pl">RVL 480</name>
+        <name lang="it">RVL 480</name>
+        <name lang="es">RVL 480</name>
+        <name lang="en">RVL 480</name>
+        <name lang="nl">RVL 480</name>
+        <name lang="fr">Régulateur de chauffage RVL 480</name>
+        <name lang="el">RVL 480</name>
+        <name lang="pt">RVL 480</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1">Siemens</elementInformation>
+        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+    </elementInformations>
+    <informations>S.DEFFAUX</informations>
+    <description>
+        <text text="B71" x="130" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="M" x="214" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="M" x="55" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="H3" x="193.5" rotation="0" y="-40.25" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="H4" x="171.5" rotation="0" y="-40.25" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="M" x="116" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="B5" x="94" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="44" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="39" end2="none" x1="50" x2="70" length1="1.5"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="40" end2="none" x1="-50" x2="-30" length1="1.5"/>
+        <line y1="44" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="44" end2="none" x1="70" x2="80" length1="1.5"/>
+        <rect height="120" x="-250" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="500" antialias="false" y="-60" rx="0"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-30" x2="-20" length1="1.5"/>
+        <line y1="60" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-20" x2="-20" length1="1.5"/>
+        <text text="B1" x="-75" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="59" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="44" end2="none" x1="80" x2="80" length1="1.5"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-50" x2="-60" length1="1.5"/>
+        <line y1="44" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="44" end2="none" x1="50" x2="40" length1="1.5"/>
+        <text text="Ux" x="-4.5" rotation="0" y="-39.45" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="60" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-60" x2="-60" length1="1.5"/>
+        <line y1="59" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="44" end2="none" x1="40" x2="40" length1="1.5"/>
+        <text text="M" x="-55" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="B9" x="-100" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="B7" x="33" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="40" end2="none" x1="-150" x2="-130" length1="1.5"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-130" x2="-120" length1="1.5"/>
+        <line y1="60" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-120" x2="-120" length1="1.5"/>
+        <line y1="45" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-150" x2="-160" length1="1.5"/>
+        <line y1="60" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="45" end2="none" x1="-160" x2="-160" length1="1.5"/>
+        <text text="N" x="-235" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="L" x="-214" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="MB" x="-210" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="DM" x="-230" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="A6" x="-180" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="MD" x="-160" rotation="0" y="-40" color="#000000" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text text="F1" x="-180" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="Y1" x="-110" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="F2" x="-80" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="Y2" x="-15" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="F3" x="20" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="Q1" x="85" rotation="0" y="50" color="#000000" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+        <text text="RVL" x="-20" rotation="0" y="-5" color="#000000" font="Sans Serif,15,-1,5,50,0,0,0,0,0"/>
+        <terminal orientation="n" x="-220" y="-60"/>
+        <terminal orientation="n" x="140" y="-60"/>
+        <terminal orientation="n" x="177.5" y="-60.25"/>
+        <terminal orientation="s" x="40" y="60"/>
+        <terminal orientation="s" x="-20" y="60"/>
+        <terminal orientation="n" x="-70" y="-60"/>
+        <terminal orientation="n" x="-90" y="-60"/>
+        <terminal orientation="n" x="-150" y="-60"/>
+        <terminal orientation="s" x="-60" y="60"/>
+        <terminal orientation="n" x="197.5" y="-60.25"/>
+        <terminal orientation="s" x="-120" y="60"/>
+        <terminal orientation="n" x="60" y="-60"/>
+        <terminal orientation="s" x="-230" y="60"/>
+        <terminal orientation="n" x="0" y="-60"/>
+        <terminal orientation="n" x="100" y="-60"/>
+        <terminal orientation="s" x="-160" y="60"/>
+        <terminal orientation="n" x="-200" y="-60"/>
+        <terminal orientation="s" x="80" y="60"/>
+        <terminal orientation="n" x="217.5" y="-60.25"/>
+        <terminal orientation="s" x="-210" y="60"/>
+        <terminal orientation="n" x="-50" y="-60"/>
+        <terminal orientation="n" x="40" y="-60"/>
+        <terminal orientation="n" x="-170" y="-60"/>
+        <terminal orientation="n" x="120" y="-60"/>
+    </description>
+</definition>
diff --git a/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/siemens_sas31.elmt b/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/siemens_sas31.elmt
new file mode 100644
index 000000000..c1cc88326
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/siemens/80_building_management/siemens_sas31.elmt
@@ -0,0 +1,36 @@
+<definition hotspot_y="74" orientation="dyyy" hotspot_x="55" width="150" link_type="simple" type="element" height="90" version="0.70">
+    <uuid uuid="{c8136690-9561-437f-a1b3-ad6fa8adcff8}"/>
+    <names>
+        <name lang="fr">Servomoteur Siemens</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1">Siemens</elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <circle diameter="40" x="-30" y="-50" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="-50" y="-65" width="140" height="70" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="-35" y="-55" width="50" height="50" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-32" color="#000000" y="-56" rotation="0" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="Y1"/>
+        <text x="4" color="#000000" y="-56" rotation="0" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="Y2"/>
+        <text x="-8" color="#000000" y="6" rotation="0" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="N"/>
+        <text x="-17" color="#000000" y="-26" rotation="0" font="Sans Serif,14,-1,5,50,0,0,0,0,0" text="M"/>
+        <line end1="none" end2="none" y1="-20" length1="1.5" x2="0" y2="-20" length2="1.5" antialias="false" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end1="none" end2="none" y1="-60" length1="1.5" x2="-20" y2="-55" length2="1.5" antialias="false" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end1="none" end2="none" y1="-60" length1="1.5" x2="0" y2="-55" length2="1.5" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end1="none" end2="none" y1="0" length1="1.5" x2="-10" y2="-5" length2="1.5" antialias="false" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal orientation="n" x="-20" y="-65"/>
+        <terminal orientation="n" x="0" y="-65"/>
+        <terminal orientation="s" x="-10" y="5"/>
+    </description>
+</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/lampe2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/lampe2.elmt
deleted file mode 100644
index a5d32c9fb..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/frio/lampe2.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4DE0A932-90F7-4D0D-B775-7AB382199BAC}"/><names>
-        <name lang="ru">Лампа</name>
-        <name lang="pt">Lâmpada</name>
-        <name lang="en">Light</name>
-        <name lang="fr">Lampe</name>
-        <name lang="es">Lámpara</name>
-        <name lang="cs">Světlo</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <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="-7.03" x1="7.03" y2="7.03" x2="-7.03"/>
-        <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="-7.03" x1="-7.03" y2="7.03" x2="7.03"/>
-        <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="0" y2="20" x2="0"/>
-        <input x="15" y="3" size="9" text="" tagg="none"/>
-        <input x="7" y="4.5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_mono.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_mono.elmt
deleted file mode 100644
index 795724aa7..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos/Electricosfrio/fuerza/moteur_mono.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="16" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BFAD2FF1-4BB8-467E-82FA-BCD49AFB54FA}"/><names>
-        <name lang="ru">Однофазный эл. мотор</name>
-        <name lang="pt">Motor monofásico</name>
-        <name lang="en">One-phase engine</name>
-        <name lang="fr">Moteur monophasé</name>
-        <name lang="es">Motor monofásico</name>
-        <name lang="cs">Jednofázový motor</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text x="-6" y="21" size="18" text="M"/>
-        <circle x="-10.25" y="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="30"/>
-        <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="-5" x1="20" y2="6.75" x2="20"/>
-        <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="-7" x1="-9.75" y2="7" x2="-9.75"/>
-        <input x="19" y="16" size="6" rotate="true" text="_W" tagg="label"/>
-        <terminal x="-9.75" y="-10" orientation="n"/>
-        <terminal x="20" y="-10" orientation="n"/>
-    </description>
-</definition>