Refactor uploader code into individual files
Making uploader refactor work