Use Runner in dir engine
Revert "Use Runner in dir engine"

This reverts commit e23d805cf7927bcdf25164526339c0c33ea635b5.