Updated for IOT API re-structure

Jira issue: WP-1318
Updates for new IOT API structure

Jira issue: WP-1318
Merge pull request #1 from TobyEalden/driver-move

Driver move