Added basic functionality

Removed device definition - is now represented as a raw json object
Added new devices to json definition