Updated to app structure