more work on the app structure