renaming everything to be the uploader
renaming one more file
fixing tests