diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/acometida-agua.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acometida-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/acometida-agua.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acometida-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/acs-retorno.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-retorno.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/acs-retorno.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-retorno.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/acs-viv-retorno.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-viv-retorno.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/acs-viv-retorno.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-viv-retorno.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/acs-vivienda.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-vivienda.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/acs-vivienda.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-vivienda.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/acs-vivienda.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-vivienda2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/acs-vivienda.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/acs-vivienda2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/aljibe.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/aljibe.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/aljibe.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/aljibe.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/aspersor-riego.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/aspersor-riego.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/aspersor-riego.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/aspersor-riego.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-completa.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-completa.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-completa.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-completa.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/bomba-doble.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-doble.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/bomba-doble.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-doble.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/bomba-simple.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-simple.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/bomba-simple.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba-simple.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-simple.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-simple.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/bomba.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie-mixta-acu.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie-mixta-acu.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie-mixta-acu.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie-mixta-acu.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie-mixta.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie-mixta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie-mixta.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie-mixta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/caldera-pie.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/caldera-pie.elmt
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/a-esquemas-agua/calderamural.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/calderamural.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.mixta.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/calderamural.mixta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/calderamural.mixta.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/calderamural.mixta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/calentador-acs.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/calentador-acs.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/calentador-acs.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/calentador-acs.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/codo-baja.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/codo-baja.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/codo-baja.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/codo-baja.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/codo-sube.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/codo-sube.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/codo-sube.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/codo-sube.elmt
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/a-esquemas-agua/colector-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-1.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-horiz-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-horiz-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-horiz-2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-horiz-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-horiz.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-horiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-horiz.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-horiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-unido.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-unido.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-unido.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-unido.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-vert-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-vert-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/colector-vert-2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector-vert-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/colector.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/colector.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colector2salidas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector2salidas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colector2salidas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/colector2salidas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colcator-4.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/collecator-4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colcator-4.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/collecator-4.elmt
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/Calefaccion/a-esquemas-agua/contador-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-agua.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/contador-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-calor.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/contador-calor.elmt
similarity index 94%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-calor.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/contador-calor.elmt
index 58792be4b..3450553af 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-calor.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/contador-calor.elmt
@@ -2,6 +2,8 @@
Contador Calor
Comptador Calor
+ Compteur de calories
+ Calorie counter
Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
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/Calefaccion/a-esquemas-agua/contador-divisionario.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/contador-divisionario.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/contador-divisionario.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/dep-expansion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dep-expansion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/dep-expansion.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dep-expansion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-gasoil-enterr.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dep-gasoil-enterr.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-gasoil-enterr.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dep-gasoil-enterr.elmt
index eb4d13acf..28e6467a4 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-gasoil-enterr.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dep-gasoil-enterr.elmt
@@ -2,6 +2,7 @@
Depósito gasoil enterrado
Dipòsit soterrat
+ Cuve à gazoil enterrée
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/deposito-agua.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-agua.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/deposito-agua.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-agua.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-horiz.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-horiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-horiz.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-horiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-rectang.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-rectang.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-rectang.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-rectang.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-vertical.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-vertical.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-vertical.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito-vertical.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/deposito.presion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito.presion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/deposito.presion.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/deposito.presion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/derivacion-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/derivacion-te.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/derivacion-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/dilatador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dilatador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/dilatador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/dilatador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/electrovalvula.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/electrovalvula.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/electrovalvula.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/electrovalvula.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/enlace-desmontable.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/enlace-desmontable.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/enlace-desmontable.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/enlace-desmontable.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/entrada-agua-fria.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/entrada-agua-fria.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/entrada-agua-fria.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/entrada-agua-fria.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/fan-coil-hoiz.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fan-coil-hoiz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/fan-coil-hoiz.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fan-coil-hoiz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/fancoil-suelo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fancoil-suelo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/fancoil-suelo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fancoil-suelo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/filtro.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/filtro.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/filtro.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/filtro.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/fitro-pisicna.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fitro-pisicna.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/fitro-pisicna.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fitro-pisicna.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/flexible-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/flexible-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/flexible-2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/flexible-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/flexible.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/flexible.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/flexible.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/flexible.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/fluxor.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fluxor.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/fluxor.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/fluxor.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/frupo-gasoil.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/frupo-gasoil.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/frupo-gasoil.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/frupo-gasoil.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grif-manguera.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grif-manguera.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grif-manguera.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grif-manguera.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-caliente.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-caliente.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-caliente.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-caliente.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-fria-caliente.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-fria-caliente.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-fria-caliente.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-fria-caliente.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-fria.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-fria.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-fria.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-fria.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-prueba.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-prueba.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grifo-prueba.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo-prueba.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/grifo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/grifo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grifo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-presion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grupo-presion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-presion.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grupo-presion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-seg-termo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grupo-seg-termo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-seg-termo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/grupo-seg-termo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/interacumulador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/interacumulador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/interacumulador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/interacumulador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/intercamb-placas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercamb-placas.elmt
similarity index 96%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/intercamb-placas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercamb-placas.elmt
index 788b15d30..9503c9c0b 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/intercamb-placas.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercamb-placas.elmt
@@ -2,6 +2,7 @@
Intercamviador Plaques
Intercambiador Placas
+ Echangeur à plaques
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/intercambiador-int.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercambiador-int.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/intercambiador-int.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercambiador-int.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/intercambiador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercambiador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/intercambiador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/intercambiador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/lira-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/lira-2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/lira-2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/lira-2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-acometida.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-acometida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-acometida.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-acometida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-de-compuerta.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-de-compuerta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-de-compuerta.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-de-compuerta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-de-globo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-de-globo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-de-globo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-de-globo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-equilibrado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-equilibrado.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-equilibrado.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-equilibrado.elmt
index b2aebadb0..433aafc75 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-equilibrado.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-equilibrado.elmt
@@ -2,7 +2,8 @@
Llave equilibrado
Clau equilibrat
- Balanced faucet
+ Balanced faucet
+ Vanne d'équilibrage
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-paso-regul.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-paso-regul.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-paso-regul.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-paso-regul.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-vivienda.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-vivienda.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llave-vivienda.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llave-vivienda.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llavepaso-nc.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llavepaso-nc.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llavepaso-nc.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llavepaso-nc.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llavepaso.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llavepaso.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llavepaso.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llavepaso.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llaves-cuarto.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llaves-cuarto.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llaves-cuarto.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llaves-cuarto.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llenado-desconectador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llenado-desconectador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/llenado-desconectador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/llenado-desconectador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/placa-solares.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/placa-solares.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/placa-solares.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/placa-solares.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/presostato.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/presostato.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/presostato.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/presostato.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/prosostato.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/prosostato.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/prosostato.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/prosostato.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/purgador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/purgador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/purgador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/purgador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/qet_directory
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/radiador-diagonal.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/radiador-diagonal.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/radiador-diagonal.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/radiador-diagonal.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/radiador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/radiador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/radiador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/radiador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/reductora.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/reductora.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/reductora.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/reductora.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/salto-tubo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/salto-tubo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/salto-tubo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/salto-tubo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/termostato.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/termostato.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/termostato.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/termostato.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/thermometre.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/thermometre.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/thermometre.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/thermometre.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/vaciado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vaciado.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/vaciado.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vaciado.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-2vias.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-2vias.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-2vias.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-2vias.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-retencion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-retencion.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-retencion.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-retencion.elmt
index 746895406..14d0e03e7 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-retencion.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-retencion.elmt
@@ -2,6 +2,7 @@
Válvula retención
Vàlvula retenció
+ Clapet anti-retour
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-termostatica.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-termostatica.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valv-termostatica.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valv-termostatica.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula-4vias.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-4vias.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula-4vias.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-4vias.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-boya.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-boya.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-boya.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-boya.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-pie.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-pie.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-pie.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-pie.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula-seguridad.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-seguridad.elmt
similarity index 98%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula-seguridad.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-seguridad.elmt
index 8fa99031c..48e111747 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula-seguridad.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula-seguridad.elmt
@@ -2,7 +2,7 @@
Válvula de seguridad
Vàlvula de seguretat
- Vanne de sécurité/name>
+ Vanne de sécurité
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula3vias.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula3vias.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/valvula3vias.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/valvula3vias.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/vent-helic.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vent-helic.elmt
similarity index 95%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/vent-helic.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vent-helic.elmt
index bbc0957ff..45ee5e7e7 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/vent-helic.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vent-helic.elmt
@@ -2,6 +2,7 @@
Ventilador Helicoidal
Ventilador Helicoidal
+ Ventilateur hélicoiale
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/ventilador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/ventilador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/ventilador.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/ventilador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/vertido-visto.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vertido-visto.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/vertido-visto.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/vertido-visto.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/qet_directory
deleted file mode 100644
index 70519dba3..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/qet_directory
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- ACS
- ACS
- DHW
- ECS
- ACS (Acqua Calda Sanitaria)
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
index 2a6c65211..f8d801b98 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
@@ -1,8 +1,9 @@
Bomba de agua vertical
- Vertical water pump
+ Vertical water pump
Bomba aigua vertical
+ Pompe à eau verticale
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-circul-bridas.elmt
similarity index 96%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-circul-bridas.elmt
index 8140f4139..83740e41d 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-circul-bridas.elmt
@@ -1,8 +1,9 @@
Bomba circuladora c/bridas
- Circulating w/flanges pump
+ Circulating w/flanges pump
Bomba circuladora brides
+ Pompe de circulation à brides
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
index 8fdb82b8b..5bdbfb189 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
@@ -1,8 +1,9 @@
Bomba agua horiz-1
- Horizontal pump 1
+ Horizontal pump 1
Bomba aigua horiz-1
+ Pompe horizontale
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
index 1dde1d2cd..9c12879c6 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
@@ -1,8 +1,9 @@
Bomba pozo sumergida
- Submerged waterhole pump
+ Submerged waterhole pump
Bomba pozo sumergida
+ Pompe immergée
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colector-vert-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colector-vert-2.elmt
deleted file mode 100644
index 78486b970..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/colector-vert-2.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- Colector 3 salidas
- 3 output collector
- Col.lector 3 eixides
- Collecteur 3 sorties
-
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/grupo-llenado.elmt
deleted file mode 100644
index 58393d855..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/grupo-llenado.elmt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- Grupo de llenado
- Filled group
- Grup d'ompliment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/3vias-fancoil.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/4vias-fancoil.elmt
similarity index 97%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/3vias-fancoil.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/4vias-fancoil.elmt
index 626ce79ec..c221f2115 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/3vias-fancoil.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/4vias-fancoil.elmt
@@ -1,7 +1,8 @@
- Clau 3V fancoil
- Llave 3V fancoil
+ Clau 4V fancoil
+ Llave 4V fancoil
+ Vanne 4 voies
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-izq.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-izq.elmt
index e532a660b..ad749f901 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-izq.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-izq.elmt
@@ -2,6 +2,7 @@
Colector sol rad.esq
Colector suelo rad.izq
+ Collecteur sol radiant gauche
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-suelo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-suelo.elmt
index 409a43230..e12d7a9ee 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-suelo.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-ida-suelo.elmt
@@ -2,6 +2,7 @@
Colector sol rad.
Colector suelo rad.
+ Collecteur sol radiant
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-suelo-rad.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-suelo-rad.elmt
index e3e48f86f..273004ef1 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-suelo-rad.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/colector-suelo-rad.elmt
@@ -2,6 +2,7 @@
Colector sol radiant
Colector suelo radiante
+ Collecteur sol radiant
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-bajo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-bajo.elmt
index c42acc5da..f2cca8d4a 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-bajo.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-bajo.elmt
@@ -2,6 +2,7 @@
Fancoil habitació
Fancoil habitación
+ ventiloconvecteur
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-conductos.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-conductos.elmt
index 0596fb59d..05bee03e5 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-conductos.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/fancoil-conductos.elmt
@@ -2,6 +2,8 @@
Fancoil conductes
Fancoil conductos
+ Fancoil
+ Ventiloconvecteur
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-detentor.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-detentor.elmt
index df6732c33..e81c7a2b3 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-detentor.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-detentor.elmt
@@ -2,6 +2,7 @@
Calu detentor
Llave detentor
+ Detendeur
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-rad-der.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-rad-der.elmt
index ef6f27514..ce8152fdd 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-rad-der.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-rad-der.elmt
@@ -2,6 +2,7 @@
Clau termotàtica
Llave termostatica
+ Vanne radiateur droite
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-radiador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-radiador.elmt
index f25370700..55ba23f40 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-radiador.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/llave-radiador.elmt
@@ -2,6 +2,7 @@
Clau radiador
Llave radiador
+ Vanne radiateur
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/suelo-radiante.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/suelo-radiante.elmt
index cd8ac5fd1..6180725d0 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/suelo-radiante.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/suelo-radiante.elmt
@@ -2,6 +2,7 @@
Sol radiant
Suelo radiante
+ Sol radiant
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/toallero.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/toallero.elmt
index 0a5d17375..0e499901f 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/toallero.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/toallero.elmt
@@ -2,6 +2,8 @@
Toaller
Toallero
+ Towel rack
+ Portes serviettes
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-doble.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-doble.elmt
deleted file mode 100644
index 280c37668..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/bomba-doble.elmt
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- مضخة
- Αντλία
- Pump
- Pompa
- Pompe
- Pompa
- Bomba doble
- Pomp
- Bomba doble
- Pumpa
-
- Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-agua.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-agua.elmt
deleted file mode 100644
index 2b216584c..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/contador-agua.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- Contador Agua
- Comptador aigua
-
- Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-expansion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-expansion.elmt
deleted file mode 100644
index 16c538e9c..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/dep-expansion.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- Depósito expansión
- Dipósit esxpansió
- Vase d'expansion
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/enlace-desmontable.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/enlace-desmontable.elmt
deleted file mode 100644
index 32a3edcd3..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/enlace-desmontable.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- Enlace desmontable
- Enllaç desmuntable
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/filtro.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/filtro.elmt
deleted file mode 100644
index f62ed032d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/filtro.elmt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- Filtro
- Filtre
- Filtre
- Filter
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/flexible.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/flexible.elmt
deleted file mode 100644
index c8f48eece..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/flexible.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- Flexible
- Flexible
- Flexible
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-equilibrado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-equilibrado.elmt
deleted file mode 100644
index 9e62e5443..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-equilibrado.elmt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- Llave equilibrado
- Clau equilibrat
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-paso-regul.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-paso-regul.elmt
deleted file mode 100644
index 3093ea6ae..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llave-paso-regul.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- Llave regulación
- Clau regulació
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llavepaso.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llavepaso.elmt
deleted file mode 100644
index d5a3c2d9c..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llavepaso.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- Llave corte rápido
- Clau tall ràpid
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llenado-desconectador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llenado-desconectador.elmt
deleted file mode 100644
index b7f56d56b..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/llenado-desconectador.elmt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- Grup d'ompliment-desconectador
- Grupo de llenado-desconectador
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/qet_directory
deleted file mode 100644
index c65ce9f04..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/qet_directory
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Esquemas Calefac-Clima
- Esquemes Calef-Clima
- Heating schemes
- Systèmes de chauffage
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-pn10-rosca1h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-pn10-rosca1h.elmt
deleted file mode 100644
index 7ddfe03f8..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-pn10-rosca1h.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Brida a rosca H
- Brida a rosca H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/capteur_tubes_01.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/capteur_tubes_01.elmt
deleted file mode 100644
index 702512b28..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/capteur_tubes_01.elmt
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
- مُجمّعات بأنابيب
- Σωλήνες συλλέκτη
- Vacumm tubes collector
- Pannello a tubi
- capteurs à tube
- Kolektory
- Colector de Tubos a vacío
- Buis collectors
- Col.lector Tubs buit
- Kolektory
-
- Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/entrada-agua-fria.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/entrada-agua-fria.elmt
deleted file mode 100644
index f35fb1b0f..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/entrada-agua-fria.elmt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- Entrada agua fría
- Cold water input
- Entrada aigua freda
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-3vias.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-3vias.elmt
deleted file mode 100644
index ff934198c..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/valv-3vias.elmt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- خلاّط 03 ECS
- Mixer 03 ECS
- Valvola miscelatrice ACS 3
- Mitigeur 03 ECS
- Mieszacz CWU
- Valvula de 3 Vías
- Směšovač 03 ECS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-llenado.elmt
deleted file mode 100644
index ea84c6687..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/grupo-llenado.elmt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- Grupo de llenado
- Grup d'ompliment
- Filling group
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-retencion.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-retencion.elmt
deleted file mode 100644
index 6530d9669..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-retencion.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Vàlvula de retenció
- Válvula retención
- Retention valve
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-termostatica.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-termostatica.elmt
deleted file mode 100644
index 4ad184b1d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valv-termostatica.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Termostatic valve
- Válvula termostática
- Vàlvula termostàtica
- Vanne thermostatique
-
- 24v et anti-bélier
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-seguridad.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-seguridad.elmt
deleted file mode 100644
index eec927588..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula-seguridad.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- Vàlvula de seguretat
- Safety valve
- Válvula de seguridad
- Soupape de sécurité
-
- Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula3vias.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula3vias.elmt
deleted file mode 100644
index 0e48dc5d9..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/valvula3vias.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- Elektrisch klep sanitair 3
- Elektrický uzávěr 3V
- Elettrovalvola 3vie acqua sanitaria
- Válvula3 vias-zona
- Vàlvula de zona 3V
- Solenoid 3V "health"
- Electro-vanne 3V "sanitaire"
- صمّام كهربائي 3V "صحي"
- Elektrozawór trójdrożny
-
- 24v et anti-bélier
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/vertido-visto.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/vertido-visto.elmt
deleted file mode 100644
index bbd434d75..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/vertido-visto.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- مجرى صرف
- Sewer drain
- Scarico
- Vidange égout
- Spust
- Vertido desagüe
- Afvoer
- Abocamente desguàs
- Kohoutek
-
- Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
index b09310724..cb498e1fd 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
@@ -1,9 +1,9 @@
- Tèrmiques-Fluids2 Rafa
- Thermal-Fluids2 Rafa
- Térmicas-Fluidos2 Rafa
- Thermique-fluide2 Rafa
+ Tèrmiques-Fluids
+ Thermal-Fluids
+ Térmicas-Fluidos
+ Thermique-fluide
Termica Fluidi
diff --git a/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt b/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/antielectrolisis.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/antielectrolisis.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/antielectrolisis.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/antielectrolisis.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/bridE-pn10-.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/bridE-pn10-.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-cuello.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-cuello.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-cuello.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-cuello.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-deslizante.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-deslizante.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-deslizante.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-deslizante.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/brida-pn10-rosca1h.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1h.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/brida-pn10-rosca1h.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1h.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-pn10-rosca1m.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/brida-pn10-rosca1m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/brida-pn10-rosca1m.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1m2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/brida-pn10-rosca1m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/brida-pn10-rosca1m2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete-toma-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete-toma-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete-toma-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete-toma-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete_desliz.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete_desliz.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/carrete_desliz.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/carrete_desliz.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-180-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-180-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-180-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-180-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-45-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-45-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-45-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-45-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-brida.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-brida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-brida.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-brida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-soldar.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-soldar.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo-soldar.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo-soldar.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo180.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo180.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/codo180.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/codo180.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/colector-salida.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/colector-salida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/colector-salida.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/colector-salida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/colector1.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/colector1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/colector1.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/colector1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/filtro-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/filtro-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/filtro-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/filtro-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion-exentr-rida.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion-exentr-rida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion-exentr-rida.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion-exentr-rida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion-recta.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion-recta.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion-recta.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion-recta.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/reduccion.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/reduccion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-bridas2.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-bridas2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-bridas2.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-bridas2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-reducida-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-reducida-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-reducida-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-reducida-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-reducida.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-reducida.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-reducida.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-reducida.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca-3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca-3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca-3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca1.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca1.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca1_2.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-rosca1_2.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-rosca1_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-soldar.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-soldar.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-soldar.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-soldar.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-y-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-y-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/te-y-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/te-y-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/toma-instrumento.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/toma-instrumento.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/toma-instrumento.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/toma-instrumento.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1_1_2.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca1_1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca1_1_2.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca1_1_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo-rosca3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo-rosca3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/tubo.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/tubo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valv-compuerta-bridas.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valv-compuerta-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valv-compuerta-bridas.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valv-compuerta-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valv-mariposa.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valv-mariposa.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valv-mariposa.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valv-mariposa.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valvula-bola.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valvula-bola.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valvula-bola.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valvula-bola.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valvula-mariposa.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valvula-mariposa.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/valvula-mariposa.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_fer/valvula-mariposa.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llave-latiguillo.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/llave-latiguillo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llave-latiguillo.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/llave-latiguillo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llave-latiguillo3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/llave-latiguillo3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llave-latiguillo3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/llave-latiguillo3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llavereg1.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/llavereg1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llavereg1.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/llavereg1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llavereg3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/llavereg3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/llavereg3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/llavereg3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1-m-m.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1-m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1-m-m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1-m-m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1_2h-h.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1_2h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1_2h-h.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1_2h-h.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1_2m-m.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1_2m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1_2m-m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1_2m-m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1h-h.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola1h-h.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola1h-h.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola3_4h-h.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola3_4h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola3_4h-h.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola3_4h-h.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola3_4m-m.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola3_4m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-bola3_4m-m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-bola3_4m-m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuert1m.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuert1m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuert1m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuert1m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuert34_m.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuert34_m.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuert34_m.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuert34_m.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuerta1_2.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuerta1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-compuerta1_2.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-compuerta1_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-pie3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valv-pie3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valv-pie3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valv-pie3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valvsegu3_4.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valvsegu3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valvsegu3_4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valvsegu3_4.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valvula-flotador.elmt b/elements/60_energy/11_water/plomberie_chauffage/vannes/valvula-flotador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/valv-roscar/valvula-flotador.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/vannes/valvula-flotador.elmt
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt
index 772ef8636..9e793e078 100644
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/capilar.elmt
@@ -2,6 +2,7 @@
Capilar
Capilar
+ Capilaire
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
index 49fac74e5..e82e57770 100644
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-1.elmt
@@ -1,6 +1,7 @@
Filtro secador-1
+ Filtre séparateur
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
index 40b8c60de..9457d41f9 100644
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/filtro-cartucho.elmt
@@ -2,6 +2,7 @@
Filtro de cartucho
Filtr -cartuxo
+ Filtre à cartouche
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
index 8e63973aa..bde48a97a 100644
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-1.elmt
@@ -1,6 +1,7 @@
Solenoide 1
+ Solenoide 1
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
index 8c40e5622..865053aea 100644
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/solenoide-2.elmt
@@ -1,6 +1,7 @@
Solenoide 2
+ Solenoide 2
Rafael Ferrando.
Mantenimiento de Instalaciones Térmicas
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt
deleted file mode 100644
index 1bff94751..000000000
--- a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separador-de-liquido.elmt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- Separador de líquido
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt
deleted file mode 100644
index 438953f71..000000000
--- a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/separadordeaceite.elmt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- Separador de aceite
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt
index c95b05d14..286a83cb6 100644
--- a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt
+++ b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/silenciador.elmt
@@ -1,6 +1,7 @@
Silenciador descarga
+ Silencieux
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtre_d.air.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtre_d.air.elmt
new file mode 100644
index 000000000..5ea00f9a4
--- /dev/null
+++ b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtre_d.air.elmt
@@ -0,0 +1,21 @@
+
+
+
+ Filtr vzduchu
+ Filtro aria
+ Filtr powietrza
+ Air filter
+ Luchtfilter
+ Filtre d'air
+ Φίλτρο αέρα
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+
+
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtro-cartucho.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-cartucho.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtro-cartucho.elmt
diff --git a/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt b/elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtro-deshidratador.elmt
similarity index 100%
rename from elements/60_energy/21_refrigeration/Frio/sinopticosfrio/accesorios/filtro-deshidratador.elmt
rename to elements/60_energy/21_refrigeration/Frio/sinopticosfrio/filtres/filtro-deshidratador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_ecs_horizon_01.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_02.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_ecs_horizon_01.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_02.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/e-c-s/ballon_ecs_mural.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_mural.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/e-c-s/ballon_ecs_mural.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_mural.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/e-c-s/ballon_ecs_stable.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_stable.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/e-c-s/ballon_ecs_stable.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_stable.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_stock1000l.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/ballon_stock1000l.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l_2.elmt
diff --git a/elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/cumuls_elec_01.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/cumuls_elec_01.elmt
diff --git a/elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/cumulus_elec_2.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/cumulus_elec_2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/dep-rectangular.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/dep-rectangular.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/dep-rectangular.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/dep-rectangular.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito-horizontal.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/deposito-horizontal.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito-horizontal.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/deposito-horizontal.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito500l.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/deposito500l.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/deposito500l.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/deposito500l.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/derivacion-te.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/derivacion-te.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/derivacion-te.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/derivacion-te.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/entrada-agua-fria.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/entrada-agua-fria.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/entrada-agua-fria.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/entrada-agua-fria.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-der.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum-der.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-der.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum-der.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-vivienda.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum-vivienda.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum-vivienda.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum-vivienda.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum300-der.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum300-der.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der2.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum300-der2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/inter-acum300-der2.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/inter-acum300-der2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-acs.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-acs.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-acs.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-acs.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-vert-2cir.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-vert-2cir.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-vert-2cir.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-vert-2cir.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-vert.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-vert.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum-vert.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacum-vert.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum1000l.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacum1000l.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum1000l.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacum1000l.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum300l.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacum300l.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacum300l.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacum300l.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacumulador.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/interacumulador.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/interacumulador.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/interacumulador.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercamb-inmersion.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/intercamb-inmersion.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercamb-inmersion.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/intercamb-inmersion.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercamb-tub.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/intercamb-tub.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercamb-tub.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/intercamb-tub.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercambiador1.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/intercambiador1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/intercambiador1.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/intercambiador1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-deposito.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/sonda-deposito.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-deposito.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/sonda-deposito.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-temp.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/sonda-temp.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/sonda-temp.elmt
rename to elements/60_energy/31_solar_thermal/ballon_echangeur/sonda-temp.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/entrada-agua-fria.elmt b/elements/60_energy/31_solar_thermal/eau_sanitaire/entrada-agua-fria.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/entrada-agua-fria.elmt
rename to elements/60_energy/31_solar_thermal/eau_sanitaire/entrada-agua-fria.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/termo-electrico.elmt b/elements/60_energy/31_solar_thermal/eau_sanitaire/termo-electrico.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/termo-electrico.elmt
rename to elements/60_energy/31_solar_thermal/eau_sanitaire/termo-electrico.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/termostato-legionella.elmt b/elements/60_energy/31_solar_thermal/eau_sanitaire/termostato-legionella.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/acs/termostato-legionella.elmt
rename to elements/60_energy/31_solar_thermal/eau_sanitaire/termostato-legionella.elmt
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt b/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_01d.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt
rename to elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_01d.elmt
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt b/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_03.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt
rename to elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_03.elmt
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt b/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_1g.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt
rename to elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_1g.elmt
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt b/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_3d.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt
rename to elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_3d.elmt
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt b/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_3g.elmt
similarity index 100%
rename from elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt
rename to elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle_3g.elmt