Refactoring: Improving upload
Refactoring: renamed files