separating the client and CLI and updating some namespaces