Rearrange ClassSubjects to group like fields together