Improved app structure.