Samples update and reorg