Reorganized the Manifest