Moved client to communication package