Refactor FileUploadHandler module