Reorg of simplecv samples