restructuring
added for uploading KEY_WHILE_CHARGING_ONLY
moved upload helpers to UploadUtils