Refactored structure of the app (front end)