Revert "make *client internal"

This reverts commit f8d6ee32429dad4cd1ba17a12dc761d1bae4154c.