improved the structure of the app