Reorganized and updated manifest to latest version of Android