[fix refactor] More `director` related refactoring.