A few more updates for app structure.