Client Builder and moved Nonce related classes