Changed again folders hierarchy and added test for evaluator