modified app structure