updated structure of app