added devices and macros to groups
added devices and macros to groups