Refactoring PP manifests for Quantum-new-configuration

DO NOT MERGE!!!