single apps per room again based on services update

apps/rooms/bedroom.yaml

@@ -2,10 +2,14 @@ bedroom:
   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:05:00'
+  motion:
+    sensor: binary_sensor.bedroom_motion_occupancy
+    ref_entity: light.bedroom
+  button:
+    - Bedroom Button 1
+    - Bedroom Button 2
+  # rich: DEBUG
   states:
     - time: 'sunrise - 03:00:00'
       scene:
@@ -76,28 +80,3 @@ bedroom:
           color_name: blueviolet
           brightness: 255
   sleep: input_boolean.sleeping
-
-bedroom_buttons:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bedroom
-  # rich: DEBUG
-  app: bedroom
-  ref_entity: light.bedroom
-  button:
-    - Bedroom Button 1
-    - Bedroom Button 2
-
-bedroom_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bedroom
-  # rich: DEBUG
-  app: bedroom
-  sensor: binary_sensor.bedroom_motion_occupancy
-  off_duration: '00:05:00'
-  ref_entity: light.bedroom