Refactored code. Moved data upload file move