Reorganized app structure into two distinct 'branches'