some clean up
merge *Runner into *Program