Removed the classes which are no longer needed due to the lack of widget
Renamed the package
Changed the app name to be unique
Merge branch 'cleanup'