Update to new model

Changed services and cloud code to the new model
Merge remote-tracking branch 'origin/dej-branch'