Moved and fixed the similarityMeasureEvaluator