re-structure the apps