Reorganization to move all evaluators into Eval/