Moved clients to own namespace