Code cleanup, rename uploader functions to GetX, add UploadX functions
Update version