diff --git a/configuration.yaml b/configuration.yaml
index 9eed6c9..98694d8 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -19,30 +19,4 @@ http:
 #media_player:
 #  - platform: panasonic_bluray
 #    host: 10.0.1.150
-#media_player:
-#  - platform: universal
-#    name: livingroom_tv
-#    children:
-#      - media_player.living_room_tv
-#      - media_player.samsung_8_series_65
-#    commands:
-#      turn_on:
-#        action: media_player.turn_on
-#        target:
-#          entity_id: media_player.living_room_tv
-#      turn_off:
-#        action: media_player.turn_off
-#        target:
-#          entity_id: media_player.living_room_tv
-#      volume_up:
-#        action: media_player.volume_up
-#        target:
-#          entity_id: media_player.samsung_8_series_65
-#      volume_down:
-#        action: media_player.volume_down
-#        target:
-#          entity_id: media_player.samsung_8_series_65
-#      volume_mute:
-#        action: media_player.volume_mute
-#        target:
-#          entity_id: media_player.samsung_8_series_65
\ No newline at end of file
+media_player: !include media_players/livingroom.yaml
diff --git a/media_players/livingroom.yaml b/media_players/livingroom.yaml
new file mode 100644
index 0000000..56fc2ee
--- /dev/null
+++ b/media_players/livingroom.yaml
@@ -0,0 +1,27 @@
+- platform: universal
+  name: combined_livingroom_tv
+  children:
+    - media_player.living_room_tv
+    - media_player.samsung_8_series_65
+  commands:
+    turn_on:
+      action: media_player.turn_on
+      target:
+        entity_id: media_player.living_room_tv
+    turn_off:
+      action: media_player.turn_off
+      target:
+        entity_id: media_player.living_room_tv
+    volume_up:
+      action: media_player.volume_up
+      target:
+        entity_id: media_player.samsung_8_series_65
+    volume_down:
+      action: media_player.volume_down
+      target:
+        entity_id: media_player.samsung_8_series_65
+    volume_mute:
+      action: media_player.volume_mute
+      target:
+        entity_id: media_player.samsung_8_series_65
+