refactoring site manifests