Reorganize the manifest a bit

Change-Id: I8313ec4c7016e267d7d8d1290a711ecd59656e73