#2 Start of refactoring of pitrunner module