Consolidate catalog. Split manifests