Removing unnecessary code
Refactoring. Domain is depend from Runner now