Change the structure of the app