Re-structure the app.