changes to app structure