Completed CNPBayes reorganization