Restructure the application.