Fix androidmanifest.xml reference & change some more stuff around