changes to structure of app