Refactored app package and a few changes to the manifest