reorg figure locations.