Improved app structure