reorg of flavor data