Refactored file upload
Fixed bugs with file list
Finished file upload refactoring