Refactored out SRToolImpl code into a new class
Removed old code
Added Runner
Merge remote-tracking branch 'origin/master'