re-shuffled app structure