Refactor

still TODO:
- Rearrange properties/methods order in all .h
- Delete DeviceInfo, DeviceInfoState (??), uplatformBuilder