re-organize samples