Data reorg for more samples