re-structure the app removed bad parts