refactor manifests