Evaluation fror the M&W Corpus
Rename evaluation class
Fixes code