Cleaner app structure.