Refactoring the device module into iOS and android
Mergers
Finished decomposing device module
Merge branch 'refactoreb2' into rc1