Updating repo to support both client and server.