Restore full manifest, Switch TC to upstream CM, and organize

Change-Id: Ia71bcd037f6255b5060c85e08d34b7dac26cf422