Renamed app and changed package structure