Restructure app.