Restructure the initial app