Device Managing .. tags and/or folders

Very large device lists, not easy to navigate!
I'd like a way of categorizing in an ideal world with expandable trees (Yes I'm aware of Virtual Container, but its tricky to move existing devices into it)

Personally I would prefer a "tag" approach .. so I can tag a device as a "button" and also tag it as "living room" and also tag it as "tv".


+1 I'd love to see tags as well