Spec updates for cpp reorganization

+review REVIEW-5129