Functionality Changes

Removed Device class functions
Added addtogroup functions