finally have the app structure right