Add more consistent arrangement of evolution operators' classes.