app/util reorg