Updated app structure