Cleaner architecture and Evaluation class
Implement cross-validation