Work on, refactoring of test running and evaluation process
Refactoring on code, file structure level