Moved uploader into it's own directory.