Moved new samples to proper hierarchy