Reorganize the manifest

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