Reorganize Manifest