Refactor all.Client, all.Director.