Move evaluation to separate module