Refactor of deviceInfo
renamed
refactored and added sample app
Fix to sample app