Reorganized eval setup.