switched position of some functions in the classes
Evaluation.java newly added
packages reordered