single apps per room again based on services update

apps/rooms/kitchen.yaml

@@ -2,11 +2,12 @@ kitchen:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:10:00'
-  # ha_button: input_button.activate_kitchen
+  motion:
+    sensor: binary_sensor.kitchen_motion_occupancy
+    ref_entity: light.kitchen
+  button: Kitchen Button
+  # rich: DEBUG
   sleep: input_boolean.sleeping
   sleep_state:
     scene:
@@ -39,25 +40,3 @@ kitchen:
           state: on
           color_temp: 650
           brightness: 25
-  
-kitchen_button:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - kitchen
-  # rich: DEBUG
-  app: kitchen
-  button: Kitchen Button
-  ref_entity: light.kitchen
-
-kitchen_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - kitchen
-  # rich: DEBUG
-  app: kitchen
-  sensor: binary_sensor.kitchen_motion_occupancy
-  ref_entity: light.kitchen