Reorganize Manifest - Part 2