Updated structure of app