Check in code to handle update and delete of Devices.  Also include
refactoring of devices into Base Device Controller and Admin Device
Controller