Added notifications to the PW app plus some code refactoring

Why is there android/android/* at all?