Client / ClientBuilder / Clients refactoring