Reorganize samples