Refactor to 2 projects
Refactor part 2
Started some runner testing