Refactor clients in buildout