Rearrange sample structure so we can more than one