Reorg, added samples