Refactoring evaluator into separate handler files and one core file.