Group Devices under Things

Unless he also wants to see them in the actual room they are in.

@Vinaygup will this work for you?