more app structure changes