Feature/refactor runner

#25