diff --git a/packages/movimiento_habitacion_estudio.yaml b/packages/sensor/movimiento/movimiento_habitacion_estudio.yaml
similarity index 95%
rename from packages/movimiento_habitacion_estudio.yaml
rename to packages/sensor/movimiento/movimiento_habitacion_estudio.yaml
index 953f623..5d4c955 100644
--- a/packages/movimiento_habitacion_estudio.yaml
+++ b/packages/sensor/movimiento/movimiento_habitacion_estudio.yaml
@@ -9,4 +9,4 @@ binary_sensor:
       {% endif %}
     device_class: motion
     state_topic: "sonoffbridge/tele/RESULT"
-    off_delay: 10
+    off_delay: 5
diff --git a/packages/sensor/movimiento/movimiento_habitacion_mia.yaml b/packages/sensor/movimiento/movimiento_habitacion_mia.yaml
new file mode 100644
index 0000000..3d385fb
--- /dev/null
+++ b/packages/sensor/movimiento/movimiento_habitacion_mia.yaml
@@ -0,0 +1,12 @@
+binary_sensor:
+  - platform: mqtt
+    name: "Movimiento Habitación Mia"
+    value_template: >-
+      {% if value_json.RfReceived.Data == 'CBD19C' %}
+        {{'ON'}}
+      {% elif value_json.RfReceived.Data == 'CBD190' %}
+        {{'OFF'}}
+      {% endif %}
+    device_class: motion
+    state_topic: "sonoffbridge/tele/RESULT"
+    off_delay: 10
diff --git a/packages/sensor/movimiento/movimiento_habitacion_noha.yaml b/packages/sensor/movimiento/movimiento_habitacion_noha.yaml
new file mode 100644
index 0000000..87c9a5f
--- /dev/null
+++ b/packages/sensor/movimiento/movimiento_habitacion_noha.yaml
@@ -0,0 +1,12 @@
+binary_sensor:
+  - platform: mqtt
+    name: "Movimiento Habitación Noha"
+    value_template: >-
+      {% if value_json.RfReceived.Data == 'DFEF9C' %}
+        {{'ON'}}
+      {% elif value_json.RfReceived.Data == 'DFEF90' %}
+        {{'OFF'}}
+      {% endif %}
+    device_class: motion
+    state_topic: "sonoffbridge/tele/RESULT"
+    off_delay: 10
diff --git a/packages/movimiento_habitacion_principal.yaml b/packages/sensor/movimiento/movimiento_habitacion_principal.yaml
similarity index 74%
rename from packages/movimiento_habitacion_principal.yaml
rename to packages/sensor/movimiento/movimiento_habitacion_principal.yaml
index 4cc85c8..654f603 100644
--- a/packages/movimiento_habitacion_principal.yaml
+++ b/packages/sensor/movimiento/movimiento_habitacion_principal.yaml
@@ -4,8 +4,8 @@ binary_sensor:
     value_template: >-
       {% if value_json.RfReceived.Data == 'FDE2BC' %}
         {{'ON'}}
-      {% else %}
-        {{states('binary_sensor.movimiento_habitacion_principal') | upper}}
+      {% elif value_json.RfReceived.Data == 'FDE2B0' %}
+        {{'OFF'}}
       {% endif %}
     device_class: motion
     state_topic: "sonoffbridge/tele/RESULT"
diff --git a/packages/sensor/movimiento/movimiento_pasillo_entrada.yaml b/packages/sensor/movimiento/movimiento_pasillo_entrada.yaml
new file mode 100644
index 0000000..ca72419
--- /dev/null
+++ b/packages/sensor/movimiento/movimiento_pasillo_entrada.yaml
@@ -0,0 +1,12 @@
+binary_sensor:
+  - platform: mqtt
+    name: "Movimiento Pasillo Entrada"
+    value_template: >-
+      {% if value_json.RfReceived.Data == '4A3E9C' %}
+        {{'ON'}}
+      {% elif value_json.RfReceived.Data == '4A3E90' %}
+        {{'OFF'}}
+      {% endif %}
+    device_class: motion
+    state_topic: "sonoffbridge/tele/RESULT"
+    off_delay: 10
diff --git a/packages/movimiento_pasillo_habitaciones.yaml b/packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml
similarity index 74%
rename from packages/movimiento_pasillo_habitaciones.yaml
rename to packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml
index 81a392e..5ab20b5 100644
--- a/packages/movimiento_pasillo_habitaciones.yaml
+++ b/packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml
@@ -4,8 +4,8 @@ binary_sensor:
     value_template: >-
       {% if value_json.RfReceived.Data == '5D559C' %}
         {{'ON'}}
-      {% else %}
-        {{states('binary_sensor.movimiento_pasillo_habitaciones') | upper}}
+      {% elif value_json.RfReceived.Data == '5D5590' %}
+        {{'OFF'}}
       {% endif %}
     device_class: motion
     state_topic: "sonoffbridge/tele/RESULT"