Namespace refactor, add more api clients