Refactor organization of Runner