Restructure the app.