As far as grouping goes... groups can be added with any subject or name.
I'm thinking: Add group >>>Group Name (Company or whatever else you want to name your group) >>> drag existing or future devices under your named group.
Initially I would probably group according to "Company" but I could see different ones like...Home User, Business, Windows 7, 8 or 10...etc