diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/calentador-gas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/calentador-gas.elmt
deleted file mode 100644
index 5b884124e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/calentador-gas.elmt
+++ /dev/null
@@ -1,44 +0,0 @@
-<definition orientation="dyyy" link_type="simple" type="element" hotspot_x="24" hotspot_y="44" width="50" height="80" version="0.5">
-<uuid uuid="{D95B78E9-6185-441B-9A83-F871680AB794}"/><names>
-        <name lang="ca">Escalfador ACS cas</name>
-        <name lang="es">Calentador ACS de gas</name>
-        <name lang="en">DHW gas heater</name>
-        <name lang="it">Boiler a gas</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.9242" antialias="true" width="9.1049" height="7.21036" start="90" angle="-90" x="0.353766"/>
-        <line x2="12.3224" y2="25.697" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="26.1476" length2="1.5" x1="8.1886" length1="1.5" end1="none"/>
-        <line x2="-8.95617" y2="25.697" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="26.1476" length2="1.5" x1="-13.09" length1="1.5" end1="none"/>
-        <line x2="-5.09617" y2="27.9502" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="24.345" length2="1.5" x1="-5.09617" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-24.636" antialias="false" width="36.8829" height="43.7584" x="-18.4781"/>
-        <line x2="-5.09617" y2="28.4008" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="26.5983" length2="1.5" x1="-4.17754" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="22.5423" antialias="false" width="4.59314" height="5.85842" x="-13.09"/>
-        <line x2="-5.09617" y2="28.4008" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="26.5983" length2="1.5" x1="-6.0148" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:blue;color:black" y="22.5423" antialias="false" width="4.59314" height="5.85842" x="8.1886"/>
-        <line x2="-8.95617" y2="27.4996" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="27.9502" length2="1.5" x1="-13.09" length1="1.5" end1="none"/>
-        <line x2="12.3224" y2="27.4996" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="27.9502" length2="1.5" x1="8.1886" length1="1.5" end1="none"/>
-        <line x2="-8.95617" y2="26.5983" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="27.0489" length2="1.5" x1="-13.09" length1="1.5" end1="none"/>
-        <line x2="12.3224" y2="26.5983" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="27.0489" length2="1.5" x1="8.1886" length1="1.5" end1="none"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:red;color:black" y="12.5294" antialias="true" width="2.83726" height="2.35194" x="-11.2105"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="13.0788" antialias="false" width="0.918628" height="1.8026" x="-5.61731"/>
-        <line x2="17.0039" y2="27.9502" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="24.345" length2="1.5" x1="17.0039" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="19.3879" antialias="false" width="29.3961" height="3.15453" x="-14.3443"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="10.8255" antialias="true" width="6.43039" height="5.40777" x="2.65034"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.06584" antialias="false" width="9.64559" height="1.8026" x="-4.23937"/>
-        <line x2="8.1621" y2="11.7269" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="13.5294" length2="1.5" x1="5.86553" length1="1.5" end1="none"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.9242" antialias="true" width="8.26765" height="7.21036" start="90" angle="-90" x="1.73171"/>
-        <line x2="-4.23937" y2="-29.2821" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="-24.7757" length2="1.5" x1="-9.29182" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-37.7886" antialias="false" width="9.18628" height="8.50648" x="-4.23937"/>
-        <line x2="11.3773" y2="-24.7757" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="-29.2821" length2="1.5" x1="4.9469" length1="1.5" end1="none"/>
-        <line x2="16.8537" y2="24.0484" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="26.2994" length2="1.5" x1="15.7496" length1="1.5" end1="none"/>
-        <line x2="16.8537" y2="24.0484" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="26.2994" length2="1.5" x1="17.9579" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="23" antialias="false" width="2" height="1" x="-1"/>
-        <input size="4" text="Calentador" tagg="label" y="-15" rotate="true" x="-18"/>
-        <terminal orientation="s" y="30" x="10"/>
-        <terminal orientation="s" y="30" x="-10"/>
-        <terminal orientation="s" y="25" x="0"/>
-        <terminal orientation="n" y="-40" x="0"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/controlador-digital.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/controlador-digital.elmt
index 190cc15e9..6c01fc3ad 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/controlador-digital.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/controlador-digital.elmt
@@ -3,7 +3,7 @@
         <name lang="es">Indicador-controlador</name>
         <name lang="en">Indicador-controller</name>
         <name lang="ca">Indicador-controlador</name>
-        <name lang="fr">Controlleur-Indicateur</name>
+        <name lang="fr">Afficher digital</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/indicador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/indicador.elmt
deleted file mode 100644
index d5bee20b6..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/indicador.elmt
+++ /dev/null
@@ -1,44 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="22" hotspot_y="14" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{50FDAA74-E9C7-408E-8A21-647ADE59D861}"/><names>
-        <name lang="es">Indicador digital</name>
-        <name lang="en">Digital gauge</name>
-        <name lang="ca">Indicador digital</name>
-        <name lang="fr">Jauge digitale</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <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="14.3211" x1="-14.4" y2="14.3211" x2="14.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="-5" x1="-3.8737" y2="-5" x2="3.8632"/>
-        <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="4" y2="-7" x2="7"/>
-        <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="11.8128" x1="18" y2="0.107274" x2="18"/>
-        <polygon x4="-2.88" y5="10.1684" x5="-5.76" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.9767" x1="-4.8" y2="10.9767" x2="0.96" y3="1.27783" x3="3.84" y4="1.27783"/>
-        <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="-4" y2="-7" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12.8025" x1="-12.1962" y2="12.8025" x2="12.1542"/>
-        <polygon x4="5.76" y5="10.1684" x5="2.88" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.9767" x1="3.84" y2="10.9767" x2="9.6" y3="1.27783" x3="12.48" y4="1.27783"/>
-        <arc width="8.4" x="9.6" y="10.1406" antialias="true" height="4.18054" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="8.4" x="-18" y="-2.40105" antialias="true" height="4.18054" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="8.4" x="9.6" y="-2.40105" antialias="true" height="4.18054" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="8.4" x="-18" y="10.1406" antialias="true" height="4.18054" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.12726" x1="-2.88" y2="6.12726" x2="0.96"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.12726" x1="5.76" y2="6.12726" x2="9.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="-2.40105" x1="-14.4" y2="-2.40105" x2="14.4"/>
-        <arc width="7.1022" x="-15.24" y="9.48763" antialias="true" height="3.31491" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-90"/>
-        <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="11.8128" x1="-18" y2="0.107274" x2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10.8136" x1="15.198" y2="1.53184" x2="15.198"/>
-        <arc width="7.1022" x="-15.24" y="-0.457099" antialias="true" height="3.31491" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="7.1022" x="8.0958" y="9.48763" antialias="true" height="3.31491" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="7.1022" x="8.0958" y="-0.457099" antialias="true" height="3.31491" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-0.457099" x1="-12.1962" y2="-0.457099" x2="12.1542"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10.8136" x1="-15.24" y2="1.53184" x2="-15.24"/>
-        <polygon x4="-11.52" y5="10.1684" x5="-14.4" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.9767" x1="-13.44" y2="10.9767" x2="-7.68" y3="1.27783" x3="-4.8" y4="1.27783"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.12726" x1="-11.52" y2="6.12726" x2="-7.68"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="18" x2="23" x3="23" x4="22" antialias="false" x5="20" x6="-8" x7="-11" x8="-17" x9="-17" closed="false" y1="13" y2="9" y3="-5" y4="-6" y5="-7" y6="-7" y7="-6" y8="-2" y9="-2"/>
-        <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="8.12632" y2="-5" x2="15.8632"/>
-        <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="16" y2="-7" x2="19"/>
-        <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="8" y2="-7" x2="11"/>
-        <input x="-11" y="23.5" size="4" rotate="true" text="_" tagg="none"/>
-        <input x="-5" y="22" size="9" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-10" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/ballon_ecs_horizon_01.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_ecs_horizon_01.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/ballon_ecs_horizon_01.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_ecs_horizon_01.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/deposito500l.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito500l.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/deposito500l.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito500l.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum-der.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-der.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum-der.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-der.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum-vivienda.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-vivienda.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum-vivienda.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-vivienda.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum300-der.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/inter-acum300-der.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/interacum-acs.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-acs.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/interacum-acs.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-acs.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/interacum300l.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum1000l.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/interacum300l.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum1000l.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/interacumulador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacumulador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/interacumulador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacumulador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/sonda-deposito.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-deposito.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/sonda-deposito.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-deposito.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/sonda-temp.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-temp.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/sonda-temp.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-temp.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/grupo-llenado.elmt
deleted file mode 100644
index 996362312..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/grupo-llenado.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="20" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AA84BA1D-62BC-4964-8EB5-AD4218903154}"/><names>
-        <name lang="es">Grupo de llenado</name>
-        <name lang="ca">Grup de omplida</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="5" x="14" y="-3" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12" x="-14" y="-4" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="-10" y="-6" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="-8.41218" y2="-10" x2="-1.55347"/>
-        <rect width="5" x="-19" y="-3" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="-2" y="-3" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="3" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="6" y="4" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="5" y="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <text x="7" y="-8" size="5" text="P"/>
-        <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="8" y2="-4" x2="8"/>
-        <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="-7.52" y2="-6" x2="-7.52"/>
-        <input x="-9" y="-13.5" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="19" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.elmt
index c23c46e2a..36eb9b465 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.elmt	
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.elmt	
@@ -1,18 +1,23 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="42" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{57CA3EC4-013C-4CD1-AFD0-53EE18BC3810}"/><names>
+<definition orientation="dyyy" link_type="simple" height="50" version="0.70" type="element" width="30" hotspot_x="14" hotspot_y="42">
+    <uuid uuid="{e2dc029b-7bb9-4340-bbcb-b656d653021e}"/>
+    <names>
         <name lang="es">Caldera Mural ACS</name>
         <name lang="ca">Caldera Mural ACS</name>
         <name lang="fr">Chaudiére murale</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <rect width="24.75" x="-13" y="-30.091" antialias="false" height="27.5096" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="-30.091" x1="-6.8125" y2="-36.9684" x2="-0.625"/>
-        <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="-36.9684" x1="1.85" y2="-30.091" x2="6.8"/>
-        <rect width="6.1875" x="-4.75" y="-14.2041" antialias="false" height="2.75096" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="3.3" x="-3.1" y="-8.87355" antialias="true" height="3.3697" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-37.5" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="-9.2875" y="0.169453" orientation="s"/>
-        <terminal x="6.8" y="0.169453" orientation="s"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="27" x="-12" width="24" ry="0" y="-30" antialias="false"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30.091" length2="1.5" end2="none" y2="-37" length1="1.5" x1="-6.8125" end1="none" x2="-3" antialias="false"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37" length2="1.5" end2="none" y2="-30" length1="1.5" x1="4" end1="none" x2="7" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="3" x="-3" width="6" ry="0" y="-14" antialias="false"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.3" x="-1.65" y="-8.75" antialias="true"/>
+        <dynamic_text z="6" rotation="0" uuid="{6f5aa2b6-1507-4296-a4c3-36428866de85}" Halignment="AlignLeft" x="-10" y="-44" text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="ElementInfo" frame="false" Valignment="AlignTop">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="s" x="10" y="0"/>
+        <terminal orientation="s" x="-10" y="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-1.elmt
index 0c0431bef..172eddbb0 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-1.elmt	
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-1.elmt	
@@ -1,34 +1,39 @@
-<definition width="30" version="0.4" hotspot_x="11" hotspot_y="49" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7DB8EF93-12F9-4CFF-A61E-78416711486F}"/><names>
+<definition orientation="dyyy" link_type="simple" height="100" version="0.70" type="element" width="30" hotspot_x="10" hotspot_y="48">
+    <uuid uuid="{35230934-5390-40f0-b732-9782a2e6edd6}"/>
+    <names>
         <name lang="es">Colector vertical</name>
         <name lang="ca">Colector vertical</name>
         <name lang="fr">Collecteur vertical</name>
     </names>
+    <elementInformations/>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="2" x="9" y="-22" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="-12" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="9" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="-2" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="18" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="9" x="0" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" 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="41.9846" x1="9" y2="-40.9858" x2="9"/>
-        <rect width="2" x="9" y="-32" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="28" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="9" x="0" y="-44" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="41.9846" x1="0" y2="-40.9858" x2="0"/>
-        <rect width="2" x="-2" y="-2" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-11" y="25.5" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="-4" y="0" orientation="w"/>
-        <terminal x="12" y="-30" orientation="e"/>
-        <terminal x="4" y="46" orientation="s"/>
-        <terminal x="12" y="30" orientation="e"/>
-        <terminal x="12" y="-20" orientation="e"/>
-        <terminal x="12" y="-10" orientation="e"/>
-        <terminal x="12" y="0" orientation="e"/>
-        <terminal x="12" y="11" orientation="e"/>
-        <terminal x="12" y="20" orientation="e"/>
-        <terminal x="4" y="-44" orientation="n"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="-22" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="-12" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="-2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="18" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" x="0" width="9" y="40" start="0" antialias="true" angle="-180"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41.9846" length2="1.5" end2="none" y2="-40.9858" length1="1.5" x1="9" end1="none" x2="9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="-32" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="9" width="2" ry="0" y="28" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" x="0" width="9" y="-44" start="-180" antialias="true" angle="-180"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41.9846" length2="1.5" end2="none" y2="-40.9858" length1="1.5" x1="0" end1="none" x2="0" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="5" x="-2" width="2" ry="0" y="-2" antialias="false"/>
+        <dynamic_text z="13" rotation="0" uuid="{8fabe9b2-b74e-492e-8e1f-f6183b6b2f66}" Halignment="AlignLeft" x="-11" y="18.5" text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="ElementInfo" frame="false" Valignment="AlignTop">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="w" x="-4" y="0"/>
+        <terminal orientation="e" x="12" y="-30"/>
+        <terminal orientation="s" x="4" y="46"/>
+        <terminal orientation="e" x="12" y="30"/>
+        <terminal orientation="e" x="12" y="-20"/>
+        <terminal orientation="e" x="12" y="-10"/>
+        <terminal orientation="e" x="12" y="0"/>
+        <terminal orientation="e" x="12" y="11"/>
+        <terminal orientation="e" x="12" y="20"/>
+        <terminal orientation="n" x="5" y="-44"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-bajo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-bajo.elmt
deleted file mode 100644
index bc51a0469..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-bajo.elmt
+++ /dev/null
@@ -1,63 +0,0 @@
-<definition hotspot_x="44" hotspot_y="43" width="120" type="element" version="0.5" height="60" link_type="simple" orientation="dyyy">
-<uuid uuid="{B090FB83-FD22-4D81-B9D8-133F69764591}"/><names>
-        <name lang="ca">Fancoil habitació</name>
-        <name lang="es">Fancoil habitación</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29" y2="11" end1="none" x1="-21" y1="11" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="9" width="6" antialias="false" height="2" x="-38"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29" y2="1" end1="none" x1="-21" y1="1" length1="1.5"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-10.5998" antialias="true" height="0.942723" x="25.1575"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9" width="2" angle="-180" antialias="true" height="2" x="-21" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="53.7301" y2="-6.73647" end1="none" x1="51.2742" y1="-17.7281" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29.7714" y2="9" end1="none" x1="-20.2476" y1="9" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="51.2742" y2="-4.29389" end1="none" x1="48.8182" y1="-15.2855" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="63.5541" y2="-15.2855" end1="none" x1="61.0981" y1="-26.2772" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="58.6421" y2="-11.6216" end1="none" x1="56.1861" y1="-22.6133" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="61.0981" y2="-14.0642" end1="none" x1="58.6421" y1="-25.0559" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="56.1861" y2="-9.17906" end1="none" x1="53.7301" y1="-20.1707" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="48.8182" y2="-3.07259" end1="none" x1="46.3622" y1="-14.0642" length1="1.5"/>
-        <polygon y4="-8.73647" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="24.2584" y2="-11.1791" x5="32.8543" y3="-8.73647" y5="-11.1791" x4="29.1703" closed="false" x1="31.6263" y1="-11.1791" x3="20.5744"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.4004" width="3.68397" antialias="false" height="18.3194" x="37.7663"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="46.3622" y2="-0.630004" end1="none" x1="43.9062" y1="-11.6216" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="37.7663" y2="-12.8429" end1="none" x1="68.466" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="7.91905" end1="none" x1="72.15" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="37.9943" y2="-10.4004" end1="none" x1="68.694" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="-10.4004" end1="none" x1="72.15" y1="-37.2688" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.4004" width="3.68397" antialias="false" height="9.3194" x="-27.3172"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-23.6333" y2="-12.8429" end1="none" x1="7.0665" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-15.2855" end1="none" x1="37.7663" y1="11.5829" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-39.7114" end1="none" x1="7.0665" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-37.2688" end1="none" x1="68.466" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="72.15" y2="-37.2688" end1="none" x1="68.466" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="72.15" y2="-18.9494" end1="none" x1="72.15" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="67.6601" y2="-18.9494" end1="none" x1="71.9398" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="3.38252" y2="-37.2688" end1="none" x1="-27.3172" y1="-10.4004" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="3.03388" end1="none" x1="67.238" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="64.7821" y2="-29.9411" end1="none" x1="67.238" y1="-19.3551" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="64.7821" y2="-17.7281" end1="none" x1="62.3261" y1="-28.7198" length1="1.5"/>
-        <polygon y4="-8.73647" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-19.9493" y2="-11.1791" x5="-11.3534" y3="-8.73647" y5="-11.1791" x4="-15.0373" closed="false" x1="-12.5814" y1="-11.1791" x3="-23.6333"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.45598" y="7.91905" antialias="true" height="2.44259" x="-15.0373"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.13814" width="8.59593" antialias="false" height="4.88517" x="-11.8974"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-10.5998" antialias="true" height="0.94272" x="-19.8425"/>
-        <polygon y7="-4.89307" x4="0" y3="-9.78639" antialias="false" x3="-9" y4="-9.78639" x2="-12" x1="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-3" x7="0" y5="-7.33973" x5="-3" closed="false" y8="-8.97084" x9="0" y2="-7.33973" x8="0" y6="-2.44641" y1="-7.33973" y9="-9.78639"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1" width="2" angle="-180" antialias="true" height="2" x="-21" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29.7792" y2="-1" end1="none" x1="-20.2392" y1="-1" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="4" antialias="false" height="5" x="-33"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" width="2" antialias="false" height="13" x="-32"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1" width="6" antialias="false" height="2" x="-38"/>
-        <polygon y4="-13" x6="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-24" y2="12" x5="-24" y3="12" y5="-13" x4="38" y6="-1" closed="false" x1="-24" y1="6" x3="38"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-24" y2="6.32446" end1="none" x1="-24" y1="1.67554" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-29.5778" y2="-5" end1="none" x1="-32.4667" y1="-5" length1="1.5"/>
-        <polygon y4="-5" x6="-12" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="-23" y2="-6" x5="-12" y3="-7" y5="-5" x4="-17" y6="-5" closed="false" x1="-29" y1="-8" x3="-19"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-27" y2="8.81818" end1="none" x1="-27" y1="1.18182" length1="1.5"/>
-        <input rotate="true" text="fan-coil_" tagg="label" y="5" x="7" size="4"/>
-        <terminal y="-10" x="-8" orientation="n"/>
-        <terminal y="-16" x="55" orientation="e"/>
-        <terminal y="-25" x="-15" orientation="w"/>
-        <terminal y="10" x="-39" orientation="w"/>
-        <terminal y="0" x="-39" orientation="w"/>
-        <terminal y="11.5829" x="-13.8093" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/grupo-llenado.elmt
deleted file mode 100644
index 327c62e9a..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/grupo-llenado.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition orientation="dyyy" link_type="simple" ic="true" type="element" hotspot_x="24" hotspot_y="27" width="50" height="40" version="0.4">
-<uuid uuid="{8AF173DC-4579-4C70-917A-1DDD4421620F}"/><names>
-        <name lang="es">Grupo de llenado</name>
-        <name lang="ca">Grup d'ompliment</name>
-    </names>
-    <informations/>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="15.8"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.15008" width="12.6" height="8.99365" x="-13.6"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.7197" width="5.25" height="2.56961" x="-9.4"/>
-        <line x2="-0.531143" y2="-13.8589" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-13.8589" x1="-7.73279" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="-18.85"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="-1"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.15008" width="11.55" height="10.2785" x="4.25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="4.12838" width="5.25" height="2.56961" x="7.4"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-20.283" width="8.4" height="10.2785" x="6.35"/>
-        <text size="6" text="P" y="-11.2893" x="8.45"/>
-        <line x2="9.5" y2="-6.15008" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-10.0045" x1="9.5" length1="1.5" end1="none"/>
-        <line x2="-6.796" y2="-8.7197" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-13.8589" x1="-6.796" length1="1.5" end1="none"/>
-        <input size="5" text="Ø_" tagg="label" y="13.122" rotate="true" x="-6.25"/>
-        <terminal orientation="w" y="-1.01085" x="-19.9"/>
-        <terminal orientation="e" y="-1.01085" x="21.05"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/cpi.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/cpi.elmt
index d9e0ec1a4..384b217a3 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/cpi.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/cpi.elmt
@@ -1,6 +1,7 @@
 <definition width="40" version="0.4" hotspot_x="14" hotspot_y="25" height="50" link_type="simple" type="element" orientation="dyyy">
 <uuid uuid="{A6212537-A462-4274-816A-FAE39FC06C27}"/><names>
         <name lang="es">Reloj</name>
+        <name lang="fr">Horloge</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/banera.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/banera2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/banera.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/banera2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/bide.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/bide2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/bide.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/bide2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/inodoro.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro3.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/inodoro.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro3.elmt
index f3e1c56d2..49b701fb8 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/inodoro.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro3.elmt
@@ -1,6 +1,7 @@
 <definition width="50" version="0.4" hotspot_x="31" hotspot_y="29" height="50" link_type="simple" type="element" orientation="dyyy">
 <uuid uuid="{898B604C-C4BE-48D3-8D27-E43D8ABE825F}"/><names>
         <name lang="es">Inodoro</name>
+        <name lang="fr">toilette</name>
     </names>
     <informations></informations>
     <description>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavabo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavabo2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavabo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavabo2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavadero.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavadero2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavadero.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavadero2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavadora.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavadora2.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavadora.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavadora2.elmt
index 714c16503..d4544cf6b 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavadora.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavadora2.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{E6F480BB-96C4-4E06-900E-C92752917EAA}"/><names>
         <name lang="es">Lavadora</name>
         <name lang="ca">Rentadora</name>
+        <name lang="fr">Machine à laver</name>
     </names>
     <informations></informations>
     <description>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavajillas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavajillas.elmt
similarity index 98%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavajillas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavajillas.elmt
index 6b421d5c6..49144f2dd 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/lavajillas.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/lavajillas.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{522BA24C-9EB1-4699-92AF-21585CA99C4E}"/><names>
         <name lang="es">lavavajillas</name>
         <name lang="ca">Renta escudells</name>
+        <name lang="fr">Lave-Vaisselle</name>
     </names>
     <informations></informations>
     <description>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/tubo-rosca1_1_2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1_1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/tubo-rosca1_1_2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1_1_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/tubo-rosca3_4.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/tubo-rosca3_4.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/arqueta-sep-grasas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/arqueta-sep-grasas.elmt
index 1bd12f33d..b3a998445 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/arqueta-sep-grasas.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/arqueta-sep-grasas.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{A4B63687-DB5D-4266-88BB-7FC17E957B14}"/><names>
         <name lang="es">Arqueta sep. grasas</name>
         <name lang="ca">Arqueta sep. greixos</name>
+        <name lang="fr">Séparateur à graisses</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/fosa-septica.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/fosa-septica.elmt
index 7a92062cb..39f759a38 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/fosa-septica.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/fosa-septica.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{A9E07CA0-D61D-4FDF-9CAE-EACAB1C971CF}"/><names>
         <name lang="es">Fosa Séptica</name>
         <name lang="ca">Fossa sèptica</name>
+        <name lang="ca">Fosse septique</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon-ducha.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon-ducha.elmt
index fc3987bb6..856b29c64 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon-ducha.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon-ducha.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{E83BD1E1-F296-4157-AC82-B2E5EFA33FFF}"/><names>
         <name lang="es">Sifón Ducha</name>
         <name lang="ca">Sifó dutxa</name>
+        <name lang="fr">Syphon de douche</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon.elmt
index 1217bd91c..cb51e33ce 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/sifon.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{66754AF3-4BB0-4B36-9085-F8B152267403}"/><names>
         <name lang="es">Sifón lavabo</name>
         <name lang="ca">Sifó pica</name>
+        <name lang="fr">Syphon lavabo</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/te-igual.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/te-igual.elmt
index bf41d3849..399503d85 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/te-igual.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-evacuacion/te-igual.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{00E4E699-BCA7-4698-8FC7-170FC557F77E}"/><names>
         <name lang="es">Te igual</name>
         <name lang="ca">Te igual</name>
+        <name lang="fr">Té égal</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/qet_directory
deleted file mode 100644
index 33c056206..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/qet_directory
+++ /dev/null
@@ -1,8 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="es">Compresores</name>
-        <name lang="ca">Compresors</name>
-        <name lang="en">Compressors</name>
-        <name lang="fr">Compresseurs</name>
-    </names>
-</qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/ballon_stock1000l.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/ballon_stock1000l.elmt
deleted file mode 100644
index fa0aacb21..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/ballon_stock1000l.elmt
+++ /dev/null
@@ -1,49 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="40" hotspot_y="70" height="150" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{C32DD38D-378C-44FF-97D1-3F9325C22A88}"/><names>
-        <name lang="ar">خزّان 1000ل</name>
-        <name lang="en">1000L Storage tank</name>
-        <name lang="it">Serbatoio 1000L</name>
-        <name lang="fr">Ballon Stockage 1000L</name>
-        <name lang="pl">Zasobnik 1000L</name>
-        <name lang="es">Depósito 1000L</name>
-        <name lang="nl">Opslagtank 1000L</name>
-        <name lang="ca">Dipòsit 1000L</name>
-        <name lang="cs">Zásobník 1000L</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <ellipse width="4.5" x="-32.25" y="-22.8483" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="72" x="-36" y="-55.1311" antialias="false" height="115.357" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="72" x="-36" y="50.1825" antialias="true" height="20.661" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <ellipse width="4.5" x="27.75" y="-51.5441" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4.5" x="27.75" y="23.065" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4.5" x="-32.25" y="23.065" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4.5" x="27.75" y="-22.8483" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4.5" x="27.75" y="51.7608" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="1.2" y5="71.1304" x5="1.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="71.1304" x1="-1.2" y2="72.8522" x2="-1.2" y3="72.8522" x3="1.2" y4="71.1304"/>
-        <arc width="72" x="-36" y="-65.4615" antialias="true" height="20.661" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <input x="-18.6" y="-15.5309" size="4" rotate="true" text="Depósito 1000L" tagg="label"/>
-        <ellipse width="4.5" x="-32.25" y="-51.5441" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.4" x="-1.2" y="-39.0614" antialias="true" height="2.29566" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="3.3" x="-1.65" y="-62.4485" antialias="true" height="3.15654" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="24" y5="67.6869" x5="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64.8173" x1="33" y2="73.4261" x2="33" y3="73.4261" x3="24" y4="67.6869"/>
-        <polygon x4="-24" y5="67.6869" x5="-24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64.8173" x1="-33" y2="73.4261" x2="-33" y3="73.4261" x3="-24" y4="67.6869"/>
-        <ellipse width="4.5" x="-32.25" y="51.7608" antialias="true" height="4.30437" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.4" x="-1.2" y="41.2868" antialias="true" height="2.29566" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.4" x="-1.2" y="1.11269" antialias="true" height="2.29566" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-30" y="-49.3919" orientation="w"/>
-        <terminal x="-30" y="53.9129" orientation="w"/>
-        <terminal x="0" y="-60.8702" orientation="n"/>
-        <terminal x="0" y="72.8522" orientation="s"/>
-        <terminal x="0" y="-37.9136" orientation="e"/>
-        <terminal x="0" y="2.26053" orientation="e"/>
-        <terminal x="0" y="42.4346" orientation="e"/>
-        <terminal x="30" y="53.9129" orientation="e"/>
-        <terminal x="30" y="-49.3919" orientation="e"/>
-        <terminal x="30" y="-20.6961" orientation="e"/>
-        <terminal x="30" y="25.2172" orientation="e"/>
-        <terminal x="-30" y="-20.6961" orientation="w"/>
-        <terminal x="-30" y="25.2172" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calefaccion-radiadores.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calefaccion-radiadores.elmt
index 4b0ee639a..a88d2d650 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calefaccion-radiadores.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calefaccion-radiadores.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Calefacción radiadores</name>
         <name lang="en">Radiator heating</name>
         <name lang="ca">Calefaccián radiadores</name>
+        <name lang="fr">Chauffage radiateur</name>
     </names>
     <informations></informations>
     <description>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calentador--instantaneo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calentador--instantaneo.elmt
index a7729398c..515455c92 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calentador--instantaneo.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/calentador--instantaneo.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Calentador instantáneo</name>
         <name lang="en">Instant heater</name>
         <name lang="ca">Escalfador instantàneo</name>
+        <name lang="fr">Chauffe eau instané</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/colectorsolarpiscina.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/colectorsolarpiscina.elmt
index f417eb643..551157e16 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/colectorsolarpiscina.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/colectorsolarpiscina.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Captador solar para piscina</name>
         <name lang="en">Pool solar capturator</name>
         <name lang="ca">Captador solar piscina</name>
+        <name lang="fr">Capteur solaire piscine</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/grupo-llenado.elmt
index 7ad8ce45f..5a62a402c 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/grupo-llenado.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/grupo-llenado.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Grupo de llenado</name>
         <name lang="en">Filled group</name>
         <name lang="ca">Grup de omplida</name>
+        <name lang="fr">Groupe de remplissage</name>
     </names>
     <informations></informations>
     <description>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/interacum-vert.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/interacum-vert.elmt
deleted file mode 100644
index 7e51e726b..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/interacum-vert.elmt
+++ /dev/null
@@ -1,59 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="43" hotspot_y="63" height="130" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{77A737CA-BD03-4932-AF5B-AAA41851828A}"/><names>
-        <name lang="ar">خزّان 1000ل</name>
-        <name lang="en">Storage tank 1000L</name>
-        <name lang="it">Serbatoio 1000L</name>
-        <name lang="fr">Ballon Stockage 1000L</name>
-        <name lang="pl">Zasobnik 1000L</name>
-        <name lang="es">Inter-acumulador 300L</name>
-        <name lang="nl">Opslagtank 1000L</name>
-        <name lang="ca">Inter-acumulador 300L</name>
-        <name lang="cs">Zásobník 1000L</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="0.885081" x1="-17.193" y2="0.885081" x2="21.5008"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-21.7454" x1="-31.8902" y2="-21.7454" x2="-24.644"/>
-        <text x="-29" y="26.3444" size="3" text="de placa"/>
-        <arc width="4.9" x="-19.2" y="0.885081" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="-90" angle="-180"/>
-        <rect width="2.8" x="-34.6" y="16.4436" antialias="false" height="2.82882" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="17.858" x1="-30.9636" y2="17.858" x2="21.2523"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-7.60136" x1="-15.1642" y2="-7.60136" x2="20.8779"/>
-        <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="-48.2729" x1="31.2" y2="47.7145" x2="31.2"/>
-        <arc width="4.9" x="20" y="-3.35814" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.37153" x1="-15.1642" y2="9.37153" x2="20.8779"/>
-        <arc width="4.9" x="-18.5" y="-7.60136" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-3.35814" x1="-15.1642" y2="-3.35814" x2="20.8779"/>
-        <arc width="4.9" x="20" y="13.6147" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-11.8446" x1="-17.2102" y2="-11.8446" x2="20.8193"/>
-        <arc width="4.9" x="-18.5" y="9.37153" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="13.6147" x1="-15.1642" y2="13.6147" x2="20.8779"/>
-        <arc width="5.6" x="19.3" y="-11.8446" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="90" angle="-180"/>
-        <arc width="63" x="-31.8" y="38.4484" antialias="true" height="17.1067" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <polygon x4="0.75" y5="55.7927" x5="0.75" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55.7927" x1="-1.35" y2="57.2182" x2="-1.35" y3="57.2182" x3="0.75" y4="55.7927"/>
-        <arc width="63" x="-31.8" y="-57.3015" antialias="true" height="17.1067" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <input x="-19.2" y="-42.2543" size="3" rotate="true" text="Interacumulador" tagg="label"/>
-        <ellipse width="2.1" x="-1.35" y="-35.4429" antialias="true" height="1.90074" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.8875" x="-1.74375" y="-54.8067" antialias="true" height="2.61352" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="20.7" y5="52.9416" x5="20.7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50.5657" x1="28.575" y2="57.6934" x2="28.575" y3="57.6934" x3="20.7" y4="52.9416"/>
-        <polygon x4="-21.3" y5="52.9416" x5="-21.3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50.5657" x1="-29.175" y2="57.6934" x2="-29.175" y3="57.6934" x3="-21.3" y4="52.9416"/>
-        <ellipse width="2.1" x="-1.35" y="-2.17996" antialias="true" height="1.90074" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="-48.5161" x1="-31.8" y2="47.4714" x2="-31.8"/>
-        <rect width="2.8" x="-34.6" y="-23.1598" antialias="false" height="2.82882" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="5.1283" x1="-16.5218" y2="5.1283" x2="20.8319"/>
-        <arc width="5.6" x="19.3" y="5.1283" antialias="true" height="4.24322" style="line-style:normal;line-weight:normal;filling:none;color:red" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-21.7454" x1="-24.1" y2="-12.5518" x2="-17.8"/>
-        <text x="-29.7" y="-30.2319" size="3" text="a placa"/>
-        <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="21.0724" x1="-28.4301" y2="21.0724" x2="-24.3591"/>
-        <polygon x4="-24.1306" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="19.5438" x1="-24.1306" y2="22.8084" x2="-24.1306" y3="21.4093" x3="-20.064" y4="19.5438"/>
-        <polygon x4="-29" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-26.5582" x1="-29" y2="-28.5422" x2="-25.724" y3="-24.5743" x3="-25.724" y4="-26.5582"/>
-        <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="-26.5582" x1="-25.724" y2="-26.5582" x2="-21.629"/>
-        <terminal x="-0.3" y="-53.5" orientation="n"/>
-        <terminal x="-0.3" y="57.2182" orientation="s"/>
-        <terminal x="-0.3" y="-34.4926" orientation="e"/>
-        <terminal x="-0.3" y="-1.22959" orientation="e"/>
-        <terminal x="-34.6" y="-21.7454" orientation="w"/>
-        <terminal x="-34.6" y="17.858" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercamb-tub.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercamb-tub.elmt
deleted file mode 100644
index 0e22a37a2..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercamb-tub.elmt
+++ /dev/null
@@ -1,34 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="38" hotspot_y="23" height="40" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{6BE960DF-79FD-46B5-AB38-0441D6277F10}"/><names>
-        <name lang="es">Intercambiador tubular</name>
-        <name lang="en">Tubular exchanger</name>
-        <name lang="ca">Intercamviador tubular</name>
-        <name lang="fr">Echangeur tubulaire</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="35" y2="9" x2="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-14" x1="16" y2="-14" x2="21.75"/>
-        <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="-12" x1="-28.4" y2="-12" x2="26.7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12.366" x1="-31.6" y2="10.3777" x2="-31.6"/>
-        <rect width="5" x="32" y="-9" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.75" x="16" y="-16.1719" antialias="false" height="4.17191" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="32" y="3" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.64129" x1="23.4" y2="8.67586" x2="23.4"/>
-        <rect width="4.6" x="26.7" y="-11.9876" antialias="false" height="22.9876" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.6" x="-34" y="-12.9876" antialias="false" height="24.9876" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="11" x1="-28.4" y2="11" x2="26.7"/>
-        <rect width="5.5" x="-24" y="-16.1719" antialias="false" height="4.17191" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-35" y="-11" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-35" y="-3" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-35" y="7" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9" x1="35" y2="-3" x2="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-14" x1="-24" y2="-14" x2="-18.5"/>
-        <input x="-11" y="2" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="-20.7" y="-16.1719" orientation="n"/>
-        <terminal x="19.45" y="-16.1719" orientation="n"/>
-        <terminal x="37" y="-6" orientation="e"/>
-        <terminal x="37" y="6" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercambiador1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercambiador1.elmt
deleted file mode 100644
index 576e0d112..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/intercambiador1.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition hotspot_x="25" hotspot_y="29" width="40" type="element" version="0.5" height="60" link_type="simple" orientation="dyyy">
-<uuid uuid="{E19BBB8F-3DC3-4120-B505-CE9216E7E77D}"/><names>
-        <name lang="ca">Intercamviador plaques</name>
-        <name lang="es">Intercambiador de placas</name>
-        <name lang="en">Plates exchanger</name>
-        <name lang="fr">Echangeur à plaques</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.8556" width="3.85" antialias="false" height="4.70608" x="5.24"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="17.3617" width="3.85" antialias="false" height="4.70608" x="-19.4"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="18.1461" width="3.85" antialias="false" height="4.70608" x="5.24"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-7.08" y2="24.4209" end1="none" x1="-7.08" y1="-24.2086" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-4.385" y2="24.4209" end1="none" x1="-4.385" y1="-24.2086" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-24.2086" width="3.08" antialias="false" height="48.6295" x="2.16"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-0.92" y2="24.4209" end1="none" x1="-0.92" y1="-24.2086" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-24.2086" width="3.08" antialias="false" height="48.6295" x="-15.55"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-10.16" y2="24.4209" end1="none" x1="-10.16" y1="-24.2086" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="1.39" y2="-21.8556" end1="none" x1="-11.7" y1="-21.8556" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="2.16" y2="22.0678" end1="none" x1="-12.47" y1="22.0678" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.8556" width="3.85" antialias="false" height="4.70608" x="-19.4"/>
-        <input rotate="true" text="_" tagg="label" y="-26.5" x="-11" size="4"/>
-        <terminal y="19.7148" x="-19.4" orientation="w"/>
-        <terminal y="-19.5025" x="9.09" orientation="e"/>
-        <terminal y="20.4991" x="9.09" orientation="e"/>
-        <terminal y="-19.5025" x="-19.4" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-solenoide.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-solenoide.elmt
deleted file mode 100644
index 670aa8a17..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-solenoide.elmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<definition hotspot_x="14" hotspot_y="12" width="40" type="element" version="0.5" height="30" link_type="simple" orientation="dyyy">
-<uuid uuid="{3A106F22-E69E-43B5-BBB6-DB408B1C740B}"/><names>
-        <name lang="ca">Valv Solenoide</name>
-        <name lang="es">Valv Solenoide</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="17.9923" y2="12.8187" end1="none" x1="17.9923" y1="5.85821" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="20" y2="7" end1="none" x1="18" y1="7" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="20" y2="12" end1="none" x1="18" y1="12" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-7.1725" y2="12.8187" end1="none" x1="-7.1725" y1="5.85821" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="13.3357" y2="-0.44051" end1="none" x1="13.3357" y1="-7.2936" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-2.35542" y2="-0.65227" end1="none" x1="-2.35542" y1="-6.8445" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.2233" width="15.6319" angle="-180" antialias="true" height="3.88275" x="-2.29618" start="-180"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-2.9312" y2="8.3385" end1="none" x1="-5.7587" y1="8.3385" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-4.345" y2="9.4986" end1="none" x1="-4.345" y1="7.1784" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.9582" width="3.75" antialias="false" height="2.44745" x="13.375"/>
-        <polygon x14="17.9" y7="13.36" x4="-10" y14="6.045" y3="5" antialias="false" x3="-7.3" y4="5" x2="-7.3" y12="5" x1="17.9" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-7.3" x7="-7.3" y5="14.405" x11="20.6" x5="-10" y10="14.405" closed="false" y8="13.36" x9="17.9" y11="14.405" y2="6.045" x8="0.8" x10="17.9" x13="17.9" y6="14.405" y1="6.045" y13="5" y9="13.36" x12="20.6"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="13.4452" y2="0" end1="none" x1="-2.35052" y1="0" length1="1.5"/>
-        <input rotate="true" text="_" tagg="label" y="-13" x="0" size="4"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-8" y2="7" end1="none" x1="-10" y1="7" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-8" y2="12" end1="none" x1="-10" y1="12" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="4" width="8" angle="180" antialias="true" height="2" x="2" start="-180"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="2" y2="0" end1="none" x1="2" y1="4" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="10" y2="1" end1="none" x1="10" y1="5" length1="1.5"/>
-        <terminal y="-4.7344" x="17.2954" orientation="e"/>
-        <terminal y="10" x="-10" orientation="w"/>
-        <terminal y="10" x="20" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-termostatica.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-termostatica.elmt
deleted file mode 100644
index 5da2c36a1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-termostatica.elmt
+++ /dev/null
@@ -1,35 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EEE177C0-91EB-474B-86E8-6483DD7D9DA7}"/><names>
-        <name lang="ar">خلاّط 03 ECS</name>
-        <name lang="en">Mixer 03 ECS</name>
-        <name lang="it">Valvola miscelatrice ACS 3</name>
-        <name lang="fr">Mitigeur 03 ECS</name>
-        <name lang="pl">Mieszacz CWU</name>
-        <name lang="es">Valv termostática 3vias</name>
-        <name lang="cs">Směšovač 03 ECS</name>
-    </names>
-    <informations></informations>
-    <description>
-        <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="-19" x1="-5" y2="-4" x2="-5"/>
-        <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="-19" x1="8" y2="-4" x2="8"/>
-        <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="-19" x1="0" y2="-4" 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="-19" x1="5" y2="-4" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.9393" x1="-4.2762" y2="15.9393" x2="4.20625"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0.85821" x1="14.1025" y2="7.8187" x2="14.1025"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0.85821" x1="-14.1725" y2="7.8187" x2="-14.1725"/>
-        <polygon y21="18.2595" x15="16.93" y22="18.2595" x16="14.1025" y23="18.2595" x17="14.1025" x18="4.20625" x19="4.20625" x20="5.62" x21="5.62" x22="-0.035" x23="-0.035" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-0.035" x2="-5.69" x3="-5.69" x4="-4.2762" x5="-4.2762" x6="-14.1725" x7="-14.1725" x8="-17" x9="-17" y1="18.2595" y2="18.2595" y3="15.9393" y4="15.9393" y5="7.8187" y6="7.8187" y7="8.9788" y8="8.9788" y10="-0.30188" y9="-0.30188" y11="0.85821" y12="0.85821" y13="-0.30188" y14="-0.30188" y15="8.9788" y16="8.9788" y17="7.8187" y18="7.8187" y19="15.9393" x10="-14.1725" x11="-14.1725" x12="14.1025" antialias="true" x13="14.1025" x14="16.93" y20="15.9393"/>
-        <rect width="19.7925" x="-9.9312" y="-19.6462" antialias="false" height="18.057" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.6192" x1="1.3788" y2="13.6192" x2="-1.4487"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.3385" x1="-12.7587" y2="4.3385" x2="-9.9312"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3.1784" x1="-11.345" y2="5.4986" x2="-11.345"/>
-        <rect width="9.75" x="-4.625" y="-1.6158" antialias="false" height="2.44745" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="4.5028" x1="8.125" y2="4.5028" x2="5.875"/>
-        <polygon x4="8.125" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="3.2791" x1="8.125" y2="5.7266" x2="8.125" y3="4.5028" x3="10.375" y4="3.2791"/>
-        <text x="-2" y="7" size="4" text="T"/>
-        <arc width="9.75" x="-4.625" y="0.21979" antialias="true" height="1.22373" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" 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="-19" x1="-8" y2="-4" x2="-8"/>
-        <terminal x="-17" y="4.3385" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="16.93" y="4.3385" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-0.035" y="18.2595" nameHidden="0" number="" name="" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/calentador-solar.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/calentador-solar.elmt
deleted file mode 100644
index f97120d2d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/calentador-solar.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="100" hotspot_y="34" hotspot_x="64" type="element" orientation="dyyy" version="0.5" link_type="simple" height="80">
-<uuid uuid="{698FD762-7BC4-4FBB-BE24-83B5CF0E2DDA}"/><names>
-        <name lang="es">Calentador solar1</name>
-        <name lang="ca">Escalfador solar-1</name>
-	<name lang="en">Solar heater-1</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <circle y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" x="18" antialias="true"/>
-        <polygon y1="5" x3="-0.4325" y4="5.85" x4="-0.4325" x1="-0.4325" closed="false" y3="38.15" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-40" antialias="false" y2="38.15"/>
-        <line y1="-18.2662" end1="none" x1="-39.1324" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-39.1324" antialias="false" y2="-11.3876" length2="1.5"/>
-        <line y1="-13.2636" end1="none" x1="-52.3111" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-47.6986" antialias="false" y2="-8.8864" length2="1.5"/>
-        <line y1="-2.63311" end1="none" x1="-58.2416" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-50.9933" antialias="false" y2="-2.63311" length2="1.5"/>
-        <line y1="7.99741" end1="none" x1="-51.6522" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-46.3807" antialias="false" y2="3.62014" length2="1.5"/>
-        <line y1="8.42138" end1="none" x1="20.5" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" x2="20.5" antialias="false" y2="-4.61978" length2="1.5"/>
-        <ellipse width="32.5" y="-29.306" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-3" antialias="true" height="31.306"/>
-        <text size="7" text="ACS" y="-16" x="-1"/>
-        <line y1="9.41797" end1="none" x1="10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="10" antialias="false" y2="-5.5397" length2="1.5"/>
-        <polygon y1="1" x3="1.55" y4="2" x4="1.55" x1="1.55" closed="false" y3="40" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-45" antialias="false" y2="40"/>
-        <circle y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" x="8" antialias="true"/>
-        <polygon y1="-1" x3="-49" y4="38" x5="0" x4="-46" x1="0" y5="-1" y3="35" style="line-style:normal;line-weight:normal;filling:red;color:black" x2="-3" antialias="false" y2="-4"/>
-        <ellipse width="9.22513" y="-6.3851" style="line-style:normal;line-weight:thin;filling:red;color:black" x="-43.7449" antialias="true" height="8.75454"/>
-        <line y1="-3.2584" end1="none" x1="-29.2483" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-22" antialias="false" y2="-3.2584" length2="1.5"/>
-        <line y1="6.12143" end1="none" x1="-39.7913" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-39.7913" antialias="false" y2="13" length2="1.5"/>
-        <line y1="4.24546" end1="none" x1="-33.8609" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-29.2483" antialias="false" y2="8.62273" length2="1.5"/>
-        <line y1="-8.261" end1="none" x1="-33.8609" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-28.5894" antialias="false" y2="-12.6383" length2="1.5"/>
-        <line y1="-2" end1="none" x1="-2" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0" antialias="false" y2="-4" length2="1.5"/>
-        <input size="4" text="_" y="47.5" tagg="label" x="-31" rotate="true"/>
-        <terminal y="10" orientation="s" x="10"/>
-        <terminal y="10" orientation="s" x="20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-agua.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-agua.elmt
index 46554e3d2..d1c6d11b9 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-agua.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-agua.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Contador de agua</name>
         <name lang="ca">Comtador aigua</name>
 	<name lang="en">Water meter</name>
+	<name lang="fr">Compteur d'eau</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-divisionario.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-divisionario.elmt
index 5f569bb7a..d6a0bdc98 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-divisionario.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-divisionario.elmt
@@ -2,7 +2,8 @@
 <uuid uuid="{ADFC68E9-6478-4863-B783-176BA31536AE}"/><names>
         <name lang="es">Contador divisionario</name>
         <name lang="ca">Comptador divisionari</name>
-	<name lang="en">Day/night meter</name>
+	     <name lang="en">Day/night meter</name>
+	     <name lang="fr">Compteur divisionnaire</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/derivacion-te.elmt
deleted file mode 100644
index 5f83abffb..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/derivacion-te.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition link_type="simple" height="20" width="30" version="0.4" hotspot_y="14" type="element" hotspot_x="15" orientation="dyyy">
-<uuid uuid="{752BA1EA-1C33-4684-8093-C9EFC5038780}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-	<name lang="en">Derivation-T</name>
-    </names>
-    <informations/>
-    <description>
-        <input text="Te" x="-1" tagg="label" size="6" y="8" rotate="true"/>
-        <circle style="line-style:normal;line-weight:normal;filling:black;color:black" x="-3" diameter="6" antialias="false" y="-3"/>
-        <line length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" end2="none" x2="0" antialias="false" y1="-10" x1="0" length1="1.5"/>
-        <line length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" end2="none" x2="10" antialias="false" y1="0" x1="-10" length1="1.5"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="-10" y="0" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory
new file mode 100644
index 000000000..04dbeed9a
--- /dev/null
+++ b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory
@@ -0,0 +1,6 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Chaufferie</name>
+        <name lang="it">Locale caldaia</name>
+    </names>
+</qet-directory>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/polyethylene/pe_tube/qet_directory b/elements/60_energy/11_water/plomberie_chauffage/polyethylene/pe_tube/qet_directory
index b7432e638..424ca639b 100644
--- a/elements/60_energy/11_water/plomberie_chauffage/polyethylene/pe_tube/qet_directory
+++ b/elements/60_energy/11_water/plomberie_chauffage/polyethylene/pe_tube/qet_directory
@@ -1,6 +1,6 @@
 <qet-directory>
     <names>
-        <name lang="fr">Tubr PE</name>
+        <name lang="fr">Tube PE</name>
         <name lang="it">Tubi PE</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo-vuelta15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo-vuelta15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo-vuelta15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo-vuelta15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/codo45-22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/codo45-22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/derivacion-te.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/derivacion-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/derivacion-te.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/derivacion-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-15-22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-15-22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-15-22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-15-22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-18-22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-18-22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-18-22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-18-22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-codo1_2h-15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-codo1_2h-15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-codo1_2h-15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-codo1_2h-15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-placa1_2-15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-placa1_2-15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito-placa1_2-15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito-placa1_2-15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-1_2hembra.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-1_2hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-1_2hembra.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-1_2hembra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-1_2macho.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-1_2macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito15-1_2macho.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito15-1_2macho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18-1_2hembra.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18-1_2hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18-1_2hembra.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18-1_2hembra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18-1_2macho.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18-1_2macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18-1_2macho.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18-1_2macho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-1hembra.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-1hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-1hembra.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-1hembra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-1macho.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-1macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-1macho.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-1macho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-3_4hembra.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-3_4hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-3_4hembra.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-3_4hembra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-3_4macho.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-3_4macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22-3_4macho.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22-3_4macho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/manguito22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/manguito22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/racor15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/racor15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/racor15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/racor15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/racor22-3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/racor22-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/racor22-3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/racor22-3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/rcaor15-1_2.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/rcaor15-1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/rcaor15-1_2.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/rcaor15-1_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/sakto22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/sakto22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/sakto22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/sakto22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/salto15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/salto15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/salto15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/salto15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/salto18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/salto18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/salto18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/salto18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tapon22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tapon22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-18-18-15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-18-18-15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-18-18-15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-18-18-15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-15-22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-15-22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-15-22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-15-22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-18-22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-18-22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-18-22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-18-22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-22-18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-22-18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te-22-22-18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te-22-22-18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te18-15-18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te18-15-18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te18-15-18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te18-15-18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/te22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/te22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubo18.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubo18.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubo18.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubo18.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubo22.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubo22.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubo22.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubo22.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubocobre15.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubocobre15.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-cobre-soldar/tubocobre15.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_cu/tubocobre15.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/--1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/--1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/--1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/--1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/chiller-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/chiller-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/chiller-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/chiller-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/chiller-3.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/chiller-3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/chiller-3.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/chiller-3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/colector-ida.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/colector-ida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/colector-ida.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/colector-ida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/colector-unico.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/colector-unico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/colector-unico.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/colector-unico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/dep-inercia.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/dep-inercia.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/dep-inercia.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/dep-inercia.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-3.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-3.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-agua-agua.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-agua-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadora-agua-agua.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadora-agua-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadoras.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadoras.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/enfriadoras.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/enfriadoras.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-cassette.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-cassette.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-cassette.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-cassette.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-conductos.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-conductos.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-conductos.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-conductos.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-pared.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-pared.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-pared.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-pared.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-suelo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-suelo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/fancoil-suelo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/fancoil-suelo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/intercambiador1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/intercambiador1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/intercambiador1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/intercambiador1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/qet_directory b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/qet_directory
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/torre-refrig.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/torre-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/torre-refrig.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/torre-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/valv-equiibrado.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/valv-equiibrado.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aire-agua/valv-equiibrado.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aire-agua/valv-equiibrado.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aislamiento-tub.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/aislamiento-tub.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/aislamiento-tub.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/aislamiento-tub.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/bomba-condensados.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/bomba-condensados.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/bomba-condensados.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/bomba-condensados.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/canaleta.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/canaleta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/canaleta.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/canaleta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cassette-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/cassette-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cassette-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/cassette-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cassette.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/cassette.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cassette.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/cassette.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conducto-fibra-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/conducto-fibra-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conducto-fibra-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/conducto-fibra-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conductos-1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/conductos-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conductos-1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/conductos-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conductosfibra.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/conductosfibra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/conductosfibra.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/conductosfibra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cuadro-electrico.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/cuadro-electrico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/cuadro-electrico.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/cuadro-electrico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/curva-canaleta.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/curva-canaleta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/curva-canaleta.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/curva-canaleta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/desague.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/desague.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/desague.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/desague.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/horizontal-aire.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/horizontal-aire.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/horizontal-aire.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/horizontal-aire.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/horizontal-split.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/horizontal-split.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/horizontal-split.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/horizontal-split.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/indu-vert-evap.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/indu-vert-evap.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/indu-vert-evap.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/indu-vert-evap.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/indu-vertical-split.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/indu-vertical-split.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/indu-vertical-split.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/indu-vertical-split.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/industrial-vertical.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/industrial-vertical.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/industrial-vertical.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/industrial-vertical.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/mando-infrarrojos.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/mando-infrarrojos.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/mando-infrarrojos.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/mando-infrarrojos.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/mando-pared.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/mando-pared.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/mando-pared.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/mando-pared.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/qet_directory b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/qet_directory
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/recuperador-calor.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/recuperador-calor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/recuperador-calor.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/recuperador-calor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/roof-top-simple.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/roof-top-simple.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/roof-top-simple.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/roof-top-simple.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/soporte-ud-ext.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/soporte-ud-ext.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/soporte-ud-ext.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/soporte-ud-ext.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared-3.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared-3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared-3.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared-3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared-d.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared-d.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared-d.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared-d.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-pared.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-pared.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-suelo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-suelo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-suelo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-suelo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-techo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-techo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-techo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-techo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-torre.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-torre.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/split-torre.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/split-torre.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-ext-split3.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-ext-split3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-ext-split3.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-ext-split3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-ext-split4.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-ext-split4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-ext-split4.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-ext-split4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-exte-spli-2x1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-exte-spli-2x1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-exte-spli-2x1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-exte-spli-2x1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-exte-split.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-exte-split.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/ud-exte-split.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/ud-exte-split.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/unida-ext-split2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/unida-ext-split2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/unida-ext-split2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/unida-ext-split2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/vertido.elmt b/elements/60_energy/21_refrigeration/Climatizacion/autonomos/vertido.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/autonomos/vertido.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/autonomos/vertido.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/caja-reparto-vrv.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/caja-reparto-vrv.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/caja-reparto-vrv.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/caja-reparto-vrv.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/chiller-0.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/chiller-0.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/chiller-0.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/chiller-0.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/control-vrv.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/control-vrv.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/control-vrv.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/control-vrv.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/qet_directory b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/qet_directory
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/te-vrv-izq.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/te-vrv-izq.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/te-vrv-izq.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/te-vrv-izq.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/te-vrv.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/te-vrv.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/te-vrv.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/te-vrv.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/ud-ext-vrv-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/ud-ext-vrv-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/ud-ext-vrv-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/ud-ext-vrv-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/vrv-exterior.elmt b/elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/vrv-exterior.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/clima-vrv/vrv-exterior.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/clima-vrv/vrv-exterior.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/qet_directory b/elements/60_energy/21_refrigeration/Climatizacion/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/qet_directory
rename to elements/60_energy/21_refrigeration/Climatizacion/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/-.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/-.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/-.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/-.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/boca-aspiracion.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/boca-aspiracion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/boca-aspiracion.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/boca-aspiracion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/campanaextractora.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/campanaextractora.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/campanaextractora.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/campanaextractora.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/codo-recto-plano.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/codo-recto-plano.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/codo-recto-plano.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/codo-recto-plano.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/cond-recto.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/cond-recto.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/cond-recto.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/cond-recto.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-codo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-codo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-codo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-codo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-rectang.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-rectang.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-rectang.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-rectang.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-recto.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-recto.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-recto.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-recto.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-te.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-te.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-ventilacion.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-ventilacion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/condu-ventilacion.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/condu-ventilacion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/conducto-fibra-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/conducto-fibra-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/conducto-fibra-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/conducto-fibra-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/conductosfibra.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/conductosfibra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/conductosfibra.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/conductosfibra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/control-co2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/control-co2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/control-co2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/control-co2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/derivacion-te.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/derivacion-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/derivacion-te.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/derivacion-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/difusor-rot.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/difusor-rot.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/difusor-rot.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/difusor-rot.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/difusor.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/difusor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/difusor.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/difusor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-aseo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-aseo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-aseo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-aseo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-estatico.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-estatico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-estatico.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-estatico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-pulpo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-pulpo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-pulpo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-pulpo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-tejado.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-tejado.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-tejado.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-tejado.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-tubular.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-tubular.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor-tubular.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor-tubular.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/extractor.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/extractor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/flexible-codo.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/flexible-codo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/flexible-codo.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/flexible-codo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/flexible1.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/flexible1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/flexible1.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/flexible1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ondu-vent-2.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ondu-vent-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ondu-vent-2.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ondu-vent-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/qet_directory b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/qet_directory
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/recuperador-calor.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/recuperador-calor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/recuperador-calor.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/recuperador-calor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/reg-velocidad.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/reg-velocidad.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/reg-velocidad.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/reg-velocidad.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-caja.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-caja.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-caja.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-caja.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-ext.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-ext.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-ext.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-ext.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-sobrepresion.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/salida-vertical.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/salida-vertical.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/salida-vertical.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/salida-vertical.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/sonda-calidad-aire.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/sonda-calidad-aire.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/sonda-calidad-aire.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/sonda-calidad-aire.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/te-pantanlon.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/te-pantanlon.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/te-pantanlon.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/te-pantanlon.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/te-rectang.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/te-rectang.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/te-rectang.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/te-rectang.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/toberas.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/toberas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/toberas.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/toberas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ventilador-helicohidal.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ventilador-helicohidal.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ventilador-helicohidal.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ventilador-helicohidal.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ventilador-mural.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ventilador-mural.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/ventilacion/ventilador-mural.elmt
rename to elements/60_energy/21_refrigeration/Climatizacion/ventilacion/ventilador-mural.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/alarma-camara.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/alarma-camara.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/alarma-camara.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/alarma-camara.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/bomba-vacio.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/bomba-vacio.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/bomba-vacio.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/bomba-vacio.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/botella-refrig.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/botella-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/botella-refrig.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/botella-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/botella-refrig2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/botella-refrig2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/botella-refrig2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/botella-refrig2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/cortina-aire.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/cortina-aire.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/cortina-aire.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/cortina-aire.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/cortina-aire2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/cortina-aire2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/cortina-aire2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/cortina-aire2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/equilibrador-pres.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/equilibrador-pres.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/equilibrador-pres.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/equilibrador-pres.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/humidificador.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/humidificador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/humidificador.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/humidificador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/interruptorluz.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/interruptorluz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/interruptorluz.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/interruptorluz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/luzemergencia.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/luzemergencia.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/luzemergencia.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/luzemergencia.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/manometro.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/manometro.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/manometro.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/manometro.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/pluzcamara2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/pluzcamara2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/pluzcamara2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/pluzcamara2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puente-manometros.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puente-manometros.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puente-manometros.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puente-manometros.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puntoluz-camara1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puntoluz-camara1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puntoluz-camara1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puntoluz-camara1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puntouz-camara2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puntouz-camara2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/puntouz-camara2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/puntouz-camara2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/recuperador-refrig.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/recuperador-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/recuperador-refrig.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/recuperador-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/registrador-temp.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/registrador-temp.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/registrador-temp.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/registrador-temp.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/resist-suelo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/resist-suelo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/resist-suelo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/resist-suelo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/termometro-bulbo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/termometro-bulbo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/termometro-bulbo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/termometro-bulbo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/transf-puerta.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/transf-puerta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/accesorios-frio/transf-puerta.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/accesorios-frio/transf-puerta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/armario-frig.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/armario-frig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/armario-frig.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/armario-frig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/banco-frig.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/banco-frig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/banco-frig.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/banco-frig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/banco-frio-pescado.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/banco-frio-pescado.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/banco-frio-pescado.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/banco-frio-pescado.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/botellero-barra.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/botellero-barra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/botellero-barra.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/botellero-barra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-3.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-3.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-4.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/camara-4.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/camara-4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/cortina-lamas.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/cortina-lamas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/cortina-lamas.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/cortina-lamas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/cuarto-frio.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/cuarto-frio.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/cuarto-frio.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/cuarto-frio.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/expositor-vertical.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/expositor-vertical.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/expositor-vertical.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/expositor-vertical.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/isla-congelados.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/isla-congelados.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/isla-congelados.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/isla-congelados.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/muelle-carga.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/muelle-carga.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/muelle-carga.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/muelle-carga.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/mural.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/mural.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/mural.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/mural.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/puerta-90.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/puerta-90.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/puerta-90.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/puerta-90.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/puerta-doble-paso.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/puerta-doble-paso.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/puerta-doble-paso.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/puerta-doble-paso.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/vitrina-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/vitrina-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/camaras-muebles/vitrina-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/camaras-muebles/vitrina-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-2dig-scroll.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-2dig-scroll.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-2dig-scroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-2dig-scroll.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-3.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-3.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/central-3.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/central-3.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compacto-camara.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compacto-camara.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compacto-camara.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compacto-camara.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compacto-camara2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compacto-camara2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compacto-camara2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compacto-camara2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-dig-scroll.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-dig-scroll.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-dig-scroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-dig-scroll.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-semiher-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-semiher-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-semiher-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-semiher-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-tornillo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-tornillo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compr-tornillo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compr-tornillo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compre-rotativo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compre-rotativo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compre-rotativo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compre-rotativo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-hermetico.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-hermetico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-hermetico.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-hermetico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-hermetico2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-hermetico2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-hermetico2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-hermetico2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-scroll.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-scroll.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/compresor-scroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/compresor-scroll.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/condensadora-compacta.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/condensadora-compacta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/condensadora-compacta.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/condensadora-compacta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/reg-capacidad.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/reg-capacidad.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/reg-capacidad.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/reg-capacidad.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/resist-carter.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/resist-carter.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/resist-carter.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/resist-carter.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/salidaflexible.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/salidaflexible.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/salidaflexible.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/salidaflexible.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/semihermetico1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/semihermetico1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/semihermetico1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/semihermetico1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/sensor-presion.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/sensor-presion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/sensor-presion.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/sensor-presion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-cond-iso-her.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-cond-iso-her.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-cond-iso-her.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-cond-iso-her.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-cond-iso.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-cond-iso.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-cond-iso.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-cond-iso.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-conden-agua.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-conden-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-conden-agua.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-conden-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-conden-scroll.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-conden-scroll.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-conden-scroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-conden-scroll.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-condesndaora-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-condesndaora-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/ud-condesndaora-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/ud-condesndaora-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/unidad-cond-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/unidad-cond-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/compresores/unidad-cond-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/compresores/unidad-cond-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cotrolador-camara2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cotrolador-camara2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cotrolador-camara2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cotrolador-camara2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cuadro-camara-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cuadro-camara-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cuadro-camara-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cuadro-camara-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cuadro-camara2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cuadro-camara2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/cuadro-camara2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/cuadro-camara2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/preostato-alta.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/preostato-alta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/preostato-alta.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/preostato-alta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/pres-dif-aceite.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/pres-dif-aceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/pres-dif-aceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/pres-dif-aceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presostato-baja.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presostato-baja.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presostato-baja.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presostato-baja.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presostato-disco.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presostato-disco.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presostato-disco.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presostato-disco.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presotato-altaybaja.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presotato-altaybaja.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/presotato-altaybaja.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/presotato-altaybaja.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/sonda-ptc.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/sonda-ptc.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/sonda-ptc.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/controles/sonda-ptc.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/calderin-horiz.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/calderin-horiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/calderin-horiz.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/calderin-horiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/calderin-vert.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/calderin-vert.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/calderin-vert.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/calderin-vert.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-centrifugo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-centrifugo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-centrifugo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-centrifugo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-evap.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-evap.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-evap.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-evap.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-terraza.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-terraza.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condens-terraza.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condens-terraza.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-1v.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-1v.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-1v.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-1v.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-2v.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-2v.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-2v.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-2v.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-agua.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-agua.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-horiz.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-horiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/condensador-horiz.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/condensador-horiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-centrifugo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-centrifugo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-centrifugo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-centrifugo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-cubico-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-cubico-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-cubico-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-cubico-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-estatico.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-estatico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-estatico.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-estatico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-pared.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-pared.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evap-pared.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evap-pared.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evapo-iso.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evapo-iso.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evapo-iso.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evapo-iso.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador-esquina.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador-esquina.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador-esquina.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador-esquina.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador-techo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador-techo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador-techo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador-techo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/evaporador1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/evaporador1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/evap-conden/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/evap-conden/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/antiretorno.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/antiretorno.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/antiretorno.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/antiretorno.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/boya-niv-aceite.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/boya-niv-aceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/boya-niv-aceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/boya-niv-aceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/bulbo.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/bulbo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/bulbo.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/bulbo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/calderin-refrig.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/calderin-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/calderin-refrig.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/calderin-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/capilar.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/capilar.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/deposito-aceite.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/deposito-aceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/deposito-aceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/deposito-aceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expans-electr-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expans-electr-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expans-electr-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expans-electr-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expans-electronica.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expans-electronica.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expans-electronica.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expans-electronica.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expansion-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expansion-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expansion-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expansion-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expansion-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expansion-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/expansion-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/expansion-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/filtro-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/intercam-calor.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/intercam-calor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/intercam-calor.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/intercam-calor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/llave-rotalock.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/llave-rotalock.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/llave-rotalock.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/llave-rotalock.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/qet_directory b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/reg-nivelaceite.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/reg-nivelaceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/reg-nivelaceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/reg-nivelaceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/secador-0.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/secador-0.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/secador-0.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/secador-0.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/sep-aceite.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/sep-aceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/sep-aceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/sep-aceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/sep-liquid.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/sep-liquid.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/sep-liquid.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/sep-liquid.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/v-solenoide-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/v-solenoide-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/v-solenoide-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/v-solenoide-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/val-rotalock-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/val-rotalock-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/val-rotalock-2.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/val-rotalock-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/valv-bola.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/valv-bola.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/valv-bola.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/valv-bola.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/valv-presion-cte.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/valv-presion-cte.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/valv-presion-cte.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/valv-presion-cte.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/visor.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/visor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/valvulas/visor.elmt
rename to elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/visor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/qet_directory b/elements/60_energy/21_refrigeration/Frio/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/botella-refrig.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/botella-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/botella-refrig.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/botella-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/capilar.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/capilar.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/capilar.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/capilar.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/distrib-liqui.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/distrib-liqui.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/distrib-liqui.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/distrib-liqui.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/esist-evap.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/esist-evap.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/esist-evap.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/esist-evap.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/manometros.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/manometros.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/manometros.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/manometros.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/recuperador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/recuperador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/recuperador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/recuperador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/silenciador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/silenciador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/visor-liquido.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/visor-liquido.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/visor-liquido.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/visor-liquido.elmt
diff --git a/elements/60_energy/21_refrigeration/capteurs/debitmetre.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/debitmetre.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/capteurs/debitmetre.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/debitmetre.elmt
diff --git a/elements/60_energy/21_refrigeration/capteurs/pressostathp.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/pressostathp.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/capteurs/pressostathp.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/pressostathp.elmt
diff --git a/elements/60_energy/21_refrigeration/capteurs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/capteurs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/qet_directory
diff --git a/elements/60_energy/21_refrigeration/capteurs/thermostat.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/thermostat.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/capteurs/thermostat.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/capteurs/thermostat.elmt
diff --git a/elements/60_energy/21_refrigeration/clapetsdenonretour/clapetantiretour.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/clapetsdenonretour/clapetantiretour.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/clapetsdenonretour/clapetantiretour.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/clapetsdenonretour/clapetantiretour.elmt
diff --git a/elements/60_energy/21_refrigeration/clapetsdenonretour/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/clapetsdenonretour/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/clapetsdenonretour/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/clapetsdenonretour/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/bomba-electrica.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/bomba-electrica.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/bomba-electrica.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/bomba-electrica.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/bomba.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/bomba.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/bomba.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/bomba.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/comp-alternativo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/comp-alternativo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/comp-alternativo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/comp-alternativo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-rotativo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-rotativo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-rotativo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-rotativo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-scroll.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-scroll.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-scroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-scroll.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-tornillo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-tornillo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor-tornillo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor-tornillo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/compresor.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresor.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseur-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseur-general.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseur-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseur-general.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurpalettes.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurpalettes.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurpalettes.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurpalettes.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurpiston.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurpiston.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurpiston.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurpiston.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurrotatif.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurrotatif.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurrotatif.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurrotatif.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurscroll.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurscroll.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurscroll.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurscroll.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurturbo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurturbo.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurturbo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurturbo.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurvis.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurvis.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/compresseurvis.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/compresseurvis.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/llineas-gen-central.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/llineas-gen-central.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/llineas-gen-central.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/llineas-gen-central.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/unidad-condensadora.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/unidad-condensadora.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/compresores/unidad-condensadora.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/unidad-condensadora.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/ventilador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/accesorios/ventilador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilador.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateur-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateur-general.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateur-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateur-general.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateuraxial.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateuraxial.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateuraxial.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateuraxial.elmt
diff --git a/elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateurcentrifuge.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateurcentrifuge.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/compresseursetventilateurs/ventilateurcentrifuge.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/compresseursetventilateurs/ventilateurcentrifuge.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/clixon.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/clixon.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/clixon.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/clixon.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/control-condensacion.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/control-condensacion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/control-condensacion.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/control-condensacion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/cuadro-elec.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/cuadro-elec.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/cuadro-elec.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/cuadro-elec.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/flujostato.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/flujostato.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/flujostato.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/flujostato.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/humidistato.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/humidistato.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/humidistato.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/humidistato.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presost-dif-aceite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presost-dif-aceite.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presost-dif-aceite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presost-dif-aceite.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-ab.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-ab.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-ab.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-ab.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-alta.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-alta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-alta.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-alta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-baja.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-baja.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-baja.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-baja.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-mini.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-mini.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/presostato-mini.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/presostato-mini.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/re-hermetico.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/re-hermetico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/re-hermetico.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/re-hermetico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-ambiente.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-ambiente.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-ambiente.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-ambiente.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-bulbo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-bulbo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-bulbo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-bulbo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-ntc-ptc.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-ntc-ptc.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/controles/termostato-ntc-ptc.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/controles/termostato-ntc-ptc.elmt
diff --git a/elements/60_energy/21_refrigeration/echangeurs/echangeuraair.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/echangeurs/echangeuraair.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/echangeurs/echangeuraair.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/echangeurs/echangeuraair.elmt
diff --git a/elements/60_energy/21_refrigeration/echangeurs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/echangeurs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/echangeurs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/echangeurs/qet_directory
diff --git a/elements/60_energy/21_refrigeration/filtres/filtreacartouche.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtreacartouche.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/filtres/filtreacartouche.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtreacartouche.elmt
diff --git a/elements/60_energy/21_refrigeration/filtres/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/filtres/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/condensador-evap.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/condensador-evap.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/condensador-evap.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/condensador-evap.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercam-doble-tubo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercam-doble-tubo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercam-doble-tubo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercam-doble-tubo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercam-tubular.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercam-tubular.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercam-tubular.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercam-tubular.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercamb-aire-vent.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercamb-aire-vent.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercamb-aire-vent.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercamb-aire-vent.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercamb-placas.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercamb-placas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/intercamb-placas.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/intercamb-placas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/recipiente-horiz.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/recipiente-horiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/recipiente-horiz.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/recipiente-horiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/recipiente-vertl.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/recipiente-vertl.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/recipiente-vertl.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/recipiente-vertl.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/torre-refrig.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/torre-refrig.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/torre-refrig.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/torre-refrig.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/ventilador-axial.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/ventilador-axial.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/ventilador-axial.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/ventilador-axial.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/ventilador-centrifugo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/ventilador-centrifugo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/intercambiadores/ventilador-centrifugo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/intercambiadores/ventilador-centrifugo.elmt
diff --git a/elements/60_energy/21_refrigeration/pompes/pompe-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompe-general.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/pompes/pompe-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompe-general.elmt
diff --git a/elements/60_energy/21_refrigeration/pompes/pompealternative.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompealternative.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/pompes/pompealternative.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompealternative.elmt
diff --git a/elements/60_energy/21_refrigeration/pompes/pompecentrifuge.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompecentrifuge.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/pompes/pompecentrifuge.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompecentrifuge.elmt
diff --git a/elements/60_energy/21_refrigeration/pompes/pompevis.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompevis.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/pompes/pompevis.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/pompevis.elmt
diff --git a/elements/60_energy/21_refrigeration/pompes/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/pompes/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/pompes/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/qet_directory
diff --git a/elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillegrande.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillegrande.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillegrande.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillegrande.elmt
diff --git a/elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillemoyenne.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillemoyenne.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillemoyenne.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillemoyenne.elmt
diff --git a/elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillepetite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillepetite.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/recipientsetreservoirs/bouteillepetite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/bouteillepetite.elmt
diff --git a/elements/60_energy/21_refrigeration/recipientsetreservoirs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/recipientsetreservoirs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/recipientsetreservoirs/qet_directory
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurelectronique.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurelectronique.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurelectronique.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurelectronique.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurthermoexterne.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurthermoexterne.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurthermoexterne.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurthermoexterne.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurthermointerne.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurthermointerne.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/detendeurthermointerne.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/detendeurthermointerne.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/electrovanne.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/electrovanne.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/electrovanne.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/electrovanne.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/qet_directory
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/robinetaflotteur.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/robinetaflotteur.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/robinetaflotteur.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/robinetaflotteur.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/vannepressionconstantedroite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/vannepressionconstantedroite.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/vannepressionconstantedroite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/vannepressionconstantedroite.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsactionneurs/vannepressionconstantegauche.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/vannepressionconstantegauche.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsactionneurs/vannepressionconstantegauche.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsactionneurs/vannepressionconstantegauche.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsdesecurite/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdesecurite/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdesecurite/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdesecurite/qet_directory
diff --git a/elements/60_energy/21_refrigeration/robinetsdesecurite/vannesecurite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdesecurite/vannesecurite.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdesecurite/vannesecurite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdesecurite/vannesecurite.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsdisolement/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdisolement/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/qet_directory
diff --git a/elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolement.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolement.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolement.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolement.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementboisseau.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementboisseau.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementboisseau.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementboisseau.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementetservicedroite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementetservicedroite.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementetservicedroite.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementetservicedroite.elmt
diff --git a/elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementetservicegauche.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementetservicegauche.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/robinetsdisolement/vanneisolementetservicegauche.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/robinetsdisolement/vanneisolementetservicegauche.elmt
diff --git a/elements/60_energy/21_refrigeration/separateurs/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/separateurs/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/qet_directory
diff --git a/elements/60_energy/21_refrigeration/separateurs/separateur.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/separateur.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/separateurs/separateur.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/separateur.elmt
diff --git a/elements/60_energy/21_refrigeration/separateurs/separateurdhuile.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/separateurdhuile.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/separateurs/separateurdhuile.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/separateurs/separateurdhuile.elmt
diff --git a/elements/60_energy/21_refrigeration/tuyauteries/capillaire.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/capillaire.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/tuyauteries/capillaire.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/capillaire.elmt
diff --git a/elements/60_energy/21_refrigeration/tuyauteries/connexion01.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/connexion01.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/tuyauteries/connexion01.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/connexion01.elmt
diff --git a/elements/60_energy/21_refrigeration/tuyauteries/connexion3.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/connexion3.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/tuyauteries/connexion3.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/connexion3.elmt
diff --git a/elements/60_energy/21_refrigeration/tuyauteries/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/tuyauteries/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/qet_directory
diff --git a/elements/60_energy/21_refrigeration/tuyauteries/tuyauteriesouple.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/tuyauteriesouple.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/tuyauteries/tuyauteriesouple.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/tuyauteries/tuyauteriesouple.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/bulbo-sensor-temp.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/bulbo-sensor-temp.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/bulbo-sensor-temp.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/bulbo-sensor-temp.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/disco-rotura.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/disco-rotura.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/disco-rotura.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/disco-rotura.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-3vias-gen.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-3vias-gen.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-3vias-gen.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-3vias-gen.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-bola.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-bola.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-bola.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-bola.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-compuerta.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-compuerta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-compuerta.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-compuerta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-general.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-general.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-globo.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-globo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-paso-globo.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-paso-globo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-retencion-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-retencion-general.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-retencion-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-retencion-general.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-toma.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-toma.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/llave-toma.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/llave-toma.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-4vias.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-4vias.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-4vias.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-4vias.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-cierre-rapido.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-cierre-rapido.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-cierre-rapido.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-cierre-rapido.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-caudal.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-caudal.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-caudal.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-caudal.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-diafragma.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-diafragma.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-diafragma.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-diafragma.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-flotador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-flotador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-flotador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-flotador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-general.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-general.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-motor.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-motor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-motor.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-motor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-piston.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-piston.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-piston.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-piston.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-presion.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-presion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-presion.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-presion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-solenoide.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-solenoide.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-solenoide.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-solenoide.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-termostatica.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-termostatica.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-control-termostatica.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-control-termostatica.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-exp-electr.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-exp-electr.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-exp-electr.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-exp-electr.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-exp-term.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-exp-term.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-exp-term.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-exp-term.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-pres-cte.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-pres-cte.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-pres-cte.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-pres-cte.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-escuadra.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-escuadra.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-escuadra.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-escuadra.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-general.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-general.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-general.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-general.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-resorte.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-resorte.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/sinopticosfrio/valvulas/valv-seg-resorte.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/valvulas/valv-seg-resorte.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/admission_d.air.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/admission_d.air.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/admission_d.air.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/admission_d.air.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/chauffe.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/chauffe.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/chauffe.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/chauffe.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/echappement.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/echappement.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/echappement.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/echappement.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/filtre_d.air.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/filtre_d.air.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/filtre_d.air.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/filtre_d.air.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/malaxage.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/malaxage.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/malaxage.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/malaxage.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/qet_directory b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/qet_directory
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/qet_directory
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/qet_directory
diff --git a/elements/60_energy/21_refrigeration/ventilation/ventilateur.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/ventilateur.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/ventilateur.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/ventilateur.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/volet_d.air-1.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/volet_d.air-1.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/volet_d.air-1.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/volet_d.air-1.elmt
diff --git a/elements/60_energy/21_refrigeration/ventilation/volet_d.air-3.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/volet_d.air-3.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/ventilation/volet_d.air-3.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/ventilation/volet_d.air-3.elmt