Re-organize the manifest and updates

Change-Id: I14a9dae24b3ce750ce5a3ef6990016316105d317
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>