Modified structure of the app