More cleanup... created a runner class
Including makefile....