Modified app structure