I already had everything split out and really didn’t want to combine it again, so I did this…
configuration.yaml
---
mqtt:
binary_sensor: !include_dir_merge_list mqtt/binary_sensor/
button: !include_dir_merge_list mqtt/button/
cover: !include_dir_merge_list mqtt/cover/
fan: !include_dir_merge_list mqtt/fan/
light: !include_dir_merge_list mqtt/light/
lock: !include_dir_merge_list mqtt/lock/
sensor: !include_dir_merge_list mqtt/sensor/
switch: !include_dir_merge_list mqtt/switch/
Then tweaked the top of the files to remove platform, dropped the files into their folders where they fit from the prior integrations, and done.
I probably will adjust things with friendly names now that I can and make it all look the same, clean it up, but it’s working again and no broken entities or required name changes.
File Structure…
