Move AndroidManifest.xml to main
Remove comments