Evaluator move to the main package, TODO list updated.