Refactor upload/fileset into Callable task objects