Reorganized manifest a little bit.