Refactor Move Upload helper to a separate file