Reorganization of evaluation classes.