Does this class need to be a Provider? Can we move this under provider/file/... ?