Makes me assume you have something this in configuration.yaml right now right?sensor: !include_dir_merge_list sensorsSo just make subfolders I guess. Something like this could work:sensorsmqtttemplate…legacy_formatAnd then add this to configuration.yaml:mqtt: sensor: !include_dir_merge_list sensors/mqtt template: – sensor: !include_dir_merge_list sensors/templatesensor: !include_dir_merge_list sensors/legacy_formatI assume you also needed to do something similar for template right? Or

Source: MQTT breaking changes RC 2022.6 – Configuration – Home Assistant Community