Fixing the package name back to its original for sample-app
#143 - Rectifying a bunch of lint-found errors to make the build work