Reorganization of ParsEval code