In an instant of thinking out loud, I have the following musing.

I am thinking of adding "groups" of devices, so you could (for example) group all the devices in a specific room together. This will not affect the control of devices or anything, just enable a better presentation.