Use packages not includes to prep for custom components

components/binary_sensor/day_night.yaml

@@ -1,3 +0,0 @@
-platform: homeassistant
-id: day_night
-entity_id: input_boolean.day_night

components/binary_sensor/status.yaml

@@ -1,2 +0,0 @@
-platform: status
-name: ${device_name} Status

components/sensor/uptime.yaml

@@ -1,2 +0,0 @@
-platform: uptime
-name: ${device_name} Uptime

components/sensor/wifi.yaml

@@ -1,2 +0,0 @@
-platform: wifi_signal
-name: ${device_name} WiFi Signal

components/switch/restart.yaml

@@ -1,3 +0,0 @@
-platform: restart
-id: reboot
-name: Restart ${device_name}

components/text_sensor/version.yaml

@@ -1,2 +0,0 @@
-platform: version
-name: ${device_name} Version

components/text_sensor/wifi.yaml

@@ -1,4 +0,0 @@
-platform: wifi_info
-ip_address:
-  name: ${device_name} IP Address
-  icon: mdi:ip-network

components/uart/tuya.yaml

@@ -1,3 +0,0 @@
-rx_pin: GPIO3
-tx_pin: GPIO1
-baud_rate: 9600

packages/binary_sensor/day_night.yaml

@@ -0,0 +1,4 @@
+binary_sensor:
+  - platform: homeassistant
+    id: day_night
+    entity_id: input_boolean.day_night

packages/binary_sensor/status.yaml

@@ -0,0 +1,3 @@
+binary_sensor:
+  - platform: status
+    name: ${device_name} Status

packages/device_base.yaml

@@ -12,24 +12,15 @@ esphome:
   arduino_version: latest
   build_path: ../build/${device_id}
 
-<<: !include ../components/wifi/wifi.yaml
+packages:
+  wifi:             !include wifi/wifi.yaml
+  api:              !include api/api.yaml
+  ota:              !include ota/ota.yaml
+  logger:           !include logger/logger.yaml
+  status_sensor:    !include binary_sensor/status.yaml
+  uptime_sensor:    !include sensor/uptime.yaml
+  wifi_sensor:      !include sensor/wifi.yaml
+  restart_switch:   !include switch/restart.yaml
+  version_sensor:   !include text_sensor/version.yaml
+  wifi_info_sensor: !include text_sensor/wifi_info.yaml
 
-<<: !include ../components/api/api.yaml
-
-<<: !include ../components/ota/ota.yaml
-
-<<: !include ../components/logger/logger.yaml
-
-binary_sensor:
-  - !include ../components/binary_sensor/status.yaml
-
-sensor:
-  - !include ../components/sensor/uptime.yaml
-  - !include ../components/sensor/wifi.yaml
-
-switch:
-  - !include ../components/switch/restart.yaml
-
-text_sensor:
-  - !include ../components/text_sensor/version.yaml
-  - !include ../components/text_sensor/wifi.yaml

packages/feit_dimmer.yaml

@@ -11,9 +11,9 @@ esphome:
       - script.execute: startup
 
 packages:
-  device_base: !include device_base.yaml
-
-<<: !include ../components/logger/logger_no_serial.yaml
+  base:   !include device_base.yaml
+  logger: !include logger/logger_no_serial.yaml
+  uart:   !include uart/tuya.yaml
 
 light:
   - platform: custom
@@ -41,6 +41,3 @@ light:
         default_transition_length: 0s
 
 tuya:
-
-uart:
-  - !include ../components/uart/tuya.yaml

packages/feit_dimmer_as_fan.yaml

@@ -7,9 +7,9 @@ esphome:
     - ../custom/tuya_dimmer_as_binary_fan_output.h
 
 packages:
-  device_base: !include device_base.yaml
-
-<<: !include ../components/logger/logger_no_serial.yaml
+  base:   !include device_base.yaml
+  logger: !include logger/logger_no_serial.yaml
+  uart:   !include uart/tuya.yaml
 
 fan:
   - platform: binary
@@ -33,6 +33,3 @@ output:
       id: tuya_fan_output
 
 tuya:
-
-uart:
-  - !include ../components/uart/tuya.yaml

packages/scripture_of_the_day.yaml

@@ -14,9 +14,9 @@ esphome:
   includes:
     - ../custom/scripture_of_the_day.h
 
-<<: !include ../components/wifi/wifi_dhcp.yaml
-
-<<: !include ../components/logger/logger.yaml
+packages:
+  wifi:   !include wifi/wifi_dhcp.yaml
+  logger: !include logger/logger.yaml
 
 custom_component:
 - lambda: |-

packages/sensor/uptime.yaml

@@ -0,0 +1,3 @@
+sensor:
+  - platform: uptime
+    name: ${device_name} Uptime

packages/sensor/wifi.yaml

@@ -0,0 +1,3 @@
+sensor:
+  - platform: wifi_signal
+    name: ${device_name} WiFi Signal

packages/switch/restart.yaml

@@ -0,0 +1,4 @@
+switch:
+  - platform: restart
+    id: reboot
+    name: Restart ${device_name}

packages/text_sensor/version.yaml

@@ -0,0 +1,3 @@
+text_sensor:
+  - platform: version
+    name: ${device_name} Version

packages/text_sensor/wifi_info.yaml

@@ -0,0 +1,5 @@
+text_sensor:
+  - platform: wifi_info
+    ip_address:
+      name: ${device_name} IP Address
+      icon: mdi:ip-network

packages/uart/tuya.yaml

@@ -0,0 +1,4 @@
+uart:
+  rx_pin: GPIO3
+  tx_pin: GPIO1
+  baud_rate: 9600