More work on the app structure.