few changes to the structure of the app