Refactor install & runner scripts