updated app structure