simplify class structure

Just simplified the structure and killed `Runner` class