Reorganize uploader
Try uploading in a thread