updates to app structure