new layout in manifest, one pp per class