diff --git a/config/packages/devices/bathroom_switch.yaml b/config/packages/devices/bathroom/bathroom_switch.yaml similarity index 100% rename from config/packages/devices/bathroom_switch.yaml rename to config/packages/devices/bathroom/bathroom_switch.yaml diff --git a/config/packages/devices/brita_filter.yaml b/config/packages/devices/kitchen/brita_filter.yaml similarity index 100% rename from config/packages/devices/brita_filter.yaml rename to config/packages/devices/kitchen/brita_filter.yaml