Deleted old ChoreographyGenerator files, recopied version bdb990bb52