fix intergration issues and organize manifests.
1 file changed