diff --git a/Makefile b/Makefile
index 7de4890..7134cea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,5 @@
 drand-relay-gossip:
 	go build -o drand-relay-gossip ./gossip-relay/main.go
+
+client-tool:
+	go build -o drand-cli ./main.go
diff --git a/client/aggregator_test.go b/client/aggregator_test.go
index 3878793..7853240 100644
--- a/client/aggregator_test.go
+++ b/client/aggregator_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	clientMock "github.com/drand/drand-cli/client/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
+	clientMock "github.com/drand/go-clients/client/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 func TestAggregatorClose(t *testing.T) {
diff --git a/client/cache_test.go b/client/cache_test.go
index e9e8c06..bbf9a23 100644
--- a/client/cache_test.go
+++ b/client/cache_test.go
@@ -5,10 +5,10 @@ import (
 	"sync"
 	"testing"
 
-	clientMock "github.com/drand/drand-cli/client/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
+	clientMock "github.com/drand/go-clients/client/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 func TestCacheGet(t *testing.T) {
diff --git a/client/client_test.go b/client/client_test.go
index 5152dda..330703a 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -12,14 +12,14 @@ import (
 	clock "github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
 
-	client2 "github.com/drand/drand-cli/client"
-	"github.com/drand/drand-cli/client/http"
-	clientMock "github.com/drand/drand-cli/client/mock"
-	httpmock "github.com/drand/drand-cli/client/test/http/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/crypto"
+	client2 "github.com/drand/go-clients/client"
+	"github.com/drand/go-clients/client/http"
+	clientMock "github.com/drand/go-clients/client/mock"
+	httpmock "github.com/drand/go-clients/client/test/http/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 func TestClientConstraints(t *testing.T) {
diff --git a/client/doc.go b/client/doc.go
index c4a5fca..c03aca0 100644
--- a/client/doc.go
+++ b/client/doc.go
@@ -35,9 +35,9 @@ Example:
 
 The "From" option allows you to specify clients that work over particular
 transports. HTTP, gRPC and libp2p PubSub clients are provided as
-subpackages https://pkg.go.dev/github.com/drand/drand-cli/internal/client/http,
-https://pkg.go.dev/github.com/drand/drand-cli/internal/client/grpc and
-https://pkg.go.dev/github.com/drand/drand-cli/internal/lp2p/clientlp2p/client
+subpackages https://pkg.go.dev/github.com/drand/go-clients/internal/client/http,
+https://pkg.go.dev/github.com/drand/go-clients/internal/client/grpc and
+https://pkg.go.dev/github.com/drand/go-clients/internal/lp2p/clientlp2p/client
 respectively. Note that you are not restricted to just one client. You can use
 multiple clients of the same type or of different types. The base client will
 periodically "speed test" it's clients, failover, cache results and aggregate
diff --git a/client/http/example_test.go b/client/http/example_test.go
index c9daa76..fd17bfb 100644
--- a/client/http/example_test.go
+++ b/client/http/example_test.go
@@ -5,9 +5,9 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	client2 "github.com/drand/drand-cli/client"
-	"github.com/drand/drand-cli/client/http"
 	"github.com/drand/drand/v2/crypto"
+	client2 "github.com/drand/go-clients/client"
+	"github.com/drand/go-clients/client/http"
 )
 
 func Example_http_New() {
diff --git a/client/http/http.go b/client/http/http.go
index 2970466..56a5d11 100644
--- a/client/http/http.go
+++ b/client/http/http.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	client2 "github.com/drand/drand-cli/client"
 	"github.com/drand/drand/v2/crypto"
+	client2 "github.com/drand/go-clients/client"
 
 	json "github.com/nikkolasg/hexjson"
 
diff --git a/client/http/http_test.go b/client/http/http_test.go
index d168462..051fb20 100644
--- a/client/http/http_test.go
+++ b/client/http/http_test.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/drand/drand/v2/common/log"
 
-	"github.com/drand/drand-cli/client"
-	"github.com/drand/drand-cli/client/test/http/mock"
 	"github.com/drand/drand/v2/crypto"
+	"github.com/drand/go-clients/client"
+	"github.com/drand/go-clients/client/test/http/mock"
 )
 
 func TestHTTPClient(t *testing.T) {
diff --git a/client/http/metric.go b/client/http/metric.go
index 63cadaf..82fabd9 100644
--- a/client/http/metric.go
+++ b/client/http/metric.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/drand/drand-cli/internal/metrics"
 	"github.com/drand/drand/v2/common"
+	"github.com/drand/go-clients/internal/metrics"
 
 	chain2 "github.com/drand/drand/v2/common/client"
 )
diff --git a/client/lp2p/client.go b/client/lp2p/client.go
index b2c0178..82ea9b4 100644
--- a/client/lp2p/client.go
+++ b/client/lp2p/client.go
@@ -15,12 +15,12 @@ import (
 	dnsaddr "github.com/multiformats/go-multiaddr-dns"
 	"google.golang.org/protobuf/proto"
 
-	client2 "github.com/drand/drand-cli/client"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/crypto"
 	"github.com/drand/drand/v2/protobuf/drand"
+	client2 "github.com/drand/go-clients/client"
 )
 
 // Client is a concrete pubsub client implementation
diff --git a/client/lp2p/client_test.go b/client/lp2p/client_test.go
index 7186701..ec67420 100644
--- a/client/lp2p/client_test.go
+++ b/client/lp2p/client_test.go
@@ -16,13 +16,13 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
 
-	dhttp "github.com/drand/drand-cli/client/http"
-	httpmock "github.com/drand/drand-cli/client/test/http/mock"
-	"github.com/drand/drand-cli/internal/lp2p"
 	chain2 "github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/crypto"
+	dhttp "github.com/drand/go-clients/client/http"
+	httpmock "github.com/drand/go-clients/client/test/http/mock"
+	"github.com/drand/go-clients/internal/lp2p"
 )
 
 //
diff --git a/client/lp2p/example_test.go b/client/lp2p/example_test.go
index 07a8f29..676b938 100644
--- a/client/lp2p/example_test.go
+++ b/client/lp2p/example_test.go
@@ -8,10 +8,10 @@ import (
 
 	clock "github.com/jonboulle/clockwork"
 
-	gclient "github.com/drand/drand-cli/client/lp2p"
 	"github.com/drand/drand/v2/common"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/log"
+	gclient "github.com/drand/go-clients/client/lp2p"
 )
 
 const (
diff --git a/client/lp2p/validator.go b/client/lp2p/validator.go
index 8a6b99b..db4119e 100644
--- a/client/lp2p/validator.go
+++ b/client/lp2p/validator.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/drand/drand-cli/client"
 	commonutils "github.com/drand/drand/v2/common"
+	"github.com/drand/go-clients/client"
 
 	clock "github.com/jonboulle/clockwork"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
diff --git a/client/lp2p/validator_test.go b/client/lp2p/validator_test.go
index fad4caa..109fa42 100644
--- a/client/lp2p/validator_test.go
+++ b/client/lp2p/validator_test.go
@@ -20,11 +20,11 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/drand/drand-cli/client"
-	"github.com/drand/drand-cli/client/test/cache"
 	chain2 "github.com/drand/drand/v2/common/chain"
 	dcrypto "github.com/drand/drand/v2/crypto"
 	"github.com/drand/drand/v2/protobuf/drand"
+	"github.com/drand/go-clients/client"
+	"github.com/drand/go-clients/client/test/cache"
 )
 
 type randomDataWrapper struct {
diff --git a/client/mock/mock.go b/client/mock/mock.go
index 26ea8ea..e09fd12 100644
--- a/client/mock/mock.go
+++ b/client/mock/mock.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/drand/drand-cli/client/test/result/mock"
 	commonutils "github.com/drand/drand/v2/common"
 	chain2 "github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 var _ client.Client = &Client{}
diff --git a/client/optimizing_test.go b/client/optimizing_test.go
index 69566d4..e16a16f 100644
--- a/client/optimizing_test.go
+++ b/client/optimizing_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	clientMock "github.com/drand/drand-cli/client/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
+	clientMock "github.com/drand/go-clients/client/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 // waitForSpeedTest waits until all clients have had their initial speed test.
diff --git a/client/test/http/mock/httpserver.go b/client/test/http/mock/httpserver.go
index dd00c65..4372b4b 100644
--- a/client/test/http/mock/httpserver.go
+++ b/client/test/http/mock/httpserver.go
@@ -11,13 +11,13 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
 
-	localClient "github.com/drand/drand-cli/client"
 	"github.com/drand/drand/v2/common"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	dhttp "github.com/drand/drand/v2/handler/http"
 	"github.com/drand/drand/v2/protobuf/drand"
 	"github.com/drand/drand/v2/test/mock"
+	localClient "github.com/drand/go-clients/client"
 
 	"github.com/drand/drand/v2/crypto"
 )
diff --git a/client/verify_test.go b/client/verify_test.go
index cb2dec0..500399d 100644
--- a/client/verify_test.go
+++ b/client/verify_test.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	client2 "github.com/drand/drand-cli/client"
-	clientMock "github.com/drand/drand-cli/client/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/crypto"
+	client2 "github.com/drand/go-clients/client"
+	clientMock "github.com/drand/go-clients/client/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 func mockClientWithVerifiableResults(ctx context.Context, t *testing.T, l log.Logger, n int, strictRounds bool) (client.Client, []mock.Result) {
diff --git a/client/watcher_test.go b/client/watcher_test.go
index 6b47640..d6cd6a2 100644
--- a/client/watcher_test.go
+++ b/client/watcher_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	clientMock "github.com/drand/drand-cli/client/mock"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/client"
+	clientMock "github.com/drand/go-clients/client/mock"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 func TestWatcherWatch(t *testing.T) {
diff --git a/go.mod b/go.mod
index 024a907..16ac2ed 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/drand/drand-cli
+module github.com/drand/go-clients
 
 go 1.22
 
diff --git a/go.sum b/go.sum
index afd8860..af2b256 100644
--- a/go.sum
+++ b/go.sum
@@ -29,7 +29,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
@@ -102,7 +101,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -286,7 +284,6 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nikkolasg/hexjson v0.1.0 h1:Cgi1MSZVQFoJKYeRpBNEcdF3LB+Zo4fYKsDz7h8uJYQ=
 github.com/nikkolasg/hexjson v0.1.0/go.mod h1:fbGbWFZ0FmJMFbpCMtJpwb0tudVxSSZ+Es2TsCg57cA=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
@@ -638,12 +635,8 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade h1:WxZOF2yayUHpHSbUE6NMzumUzBxYc3YGwo0YHnbzsJY=
-google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
 google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a h1:YIa/rzVqMEokBkPtydCkx1VLmv3An1Uw7w1P1m6EhOY=
 google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240723171418-e6d459c13d2a h1:hqK4+jJZXCU4pW7jsAdGOVFIfLHQeV7LaizZKnZ84HI=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240723171418-e6d459c13d2a/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
diff --git a/gossip-relay/README.md b/gossip-relay/README.md
index 07a3b50..3c4694a 100644
--- a/gossip-relay/README.md
+++ b/gossip-relay/README.md
@@ -61,7 +61,7 @@ Publish topic=/drand/pubsub/v0.0.0/<chain-hash> data={randomness}
 
 ```sh
 # Clone this repo
-git clone https://github.com/drand/drand-cli.git
+git clone https://github.com/drand/go-clients.git
 cd drand
 # Build the executable
 make relay-gossip-relay
@@ -175,8 +175,8 @@ import (
 
 	clock "github.com/jonboulle/clockwork"
 
-	"github.com/drand/drand-cli/client"
-	p2pClient "github.com/drand/drand-cli/client/lp2p"
+	"github.com/drand/go-clients/client"
+	p2pClient "github.com/drand/go-clients/client/lp2p"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/log"
 )
@@ -232,9 +232,9 @@ import (
 
   clock "github.com/jonboulle/clockwork"
 
-  "github.com/drand/drand-cli/client"
-  "github.com/drand/drand-cli/client/http"
-  gclient "github.com/drand/drand-cli/client/lp2p"
+  "github.com/drand/go-clients/client"
+  "github.com/drand/go-clients/client/http"
+  gclient "github.com/drand/go-clients/client/lp2p"
   "github.com/drand/drand/v2/common/log"
 )
 
diff --git a/gossip-relay/main.go b/gossip-relay/main.go
index 69c7a9f..77b5705 100644
--- a/gossip-relay/main.go
+++ b/gossip-relay/main.go
@@ -9,9 +9,9 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/urfave/cli/v2"
 
-	"github.com/drand/drand-cli/internal/lib"
-	"github.com/drand/drand-cli/internal/lp2p"
 	"github.com/drand/drand/v2/common/log"
+	"github.com/drand/go-clients/internal/lib"
+	"github.com/drand/go-clients/internal/lp2p"
 )
 
 // Automatically set through -ldflags
diff --git a/internal/cli.go b/internal/cli.go
index da66262..cf1bc48 100644
--- a/internal/cli.go
+++ b/internal/cli.go
@@ -11,8 +11,8 @@ import (
 
 	client "github.com/drand/drand/v2/common/client"
 
-	"github.com/drand/drand-cli/internal/lib"
 	"github.com/drand/drand/v2/common"
+	"github.com/drand/go-clients/internal/lib"
 )
 
 // Automatically set through -ldflags
diff --git a/internal/grpc/client.go b/internal/grpc/client.go
index 7b30b26..3a731bc 100644
--- a/internal/grpc/client.go
+++ b/internal/grpc/client.go
@@ -14,12 +14,12 @@ import (
 
 	"github.com/drand/drand/v2/crypto"
 
-	localClient "github.com/drand/drand-cli/client"
 	commonutils "github.com/drand/drand/v2/common"
 	"github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/protobuf/drand"
+	localClient "github.com/drand/go-clients/client"
 )
 
 const grpcDefaultTimeout = 5 * time.Second
diff --git a/internal/lib/cli.go b/internal/lib/cli.go
index 4f5a5fc..36f65f3 100644
--- a/internal/lib/cli.go
+++ b/internal/lib/cli.go
@@ -20,15 +20,15 @@ import (
 
 	"github.com/drand/drand/v2/common/key"
 
-	pubClient "github.com/drand/drand-cli/client"
-	http2 "github.com/drand/drand-cli/client/http"
-	gclient "github.com/drand/drand-cli/client/lp2p"
-	"github.com/drand/drand-cli/internal/grpc"
-	"github.com/drand/drand-cli/internal/lp2p"
 	commonutils "github.com/drand/drand/v2/common"
 	chainCommon "github.com/drand/drand/v2/common/chain"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
+	pubClient "github.com/drand/go-clients/client"
+	http2 "github.com/drand/go-clients/client/http"
+	gclient "github.com/drand/go-clients/client/lp2p"
+	"github.com/drand/go-clients/internal/grpc"
+	"github.com/drand/go-clients/internal/lp2p"
 )
 
 var (
diff --git a/internal/lib/cli_test.go b/internal/lib/cli_test.go
index 9515cdd..7e1945b 100644
--- a/internal/lib/cli_test.go
+++ b/internal/lib/cli_test.go
@@ -14,11 +14,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 
-	"github.com/drand/drand-cli/client"
-	httpmock "github.com/drand/drand-cli/client/test/http/mock"
 	commonutils "github.com/drand/drand/v2/common"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/crypto"
+	"github.com/drand/go-clients/client"
+	httpmock "github.com/drand/go-clients/client/test/http/mock"
 )
 
 var (
diff --git a/internal/lp2p/relaynode.go b/internal/lp2p/relaynode.go
index 68563f0..cfe3c9e 100644
--- a/internal/lp2p/relaynode.go
+++ b/internal/lp2p/relaynode.go
@@ -11,10 +11,10 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	"google.golang.org/protobuf/proto"
 
-	client2 "github.com/drand/drand-cli/client"
 	"github.com/drand/drand/v2/common/client"
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/protobuf/drand"
+	client2 "github.com/drand/go-clients/client"
 )
 
 // GossipRelayConfig configures a gossip-relay relay node.
diff --git a/internal/lp2p/relaynode_test.go b/internal/lp2p/relaynode_test.go
index d79db7e..a987183 100644
--- a/internal/lp2p/relaynode_test.go
+++ b/internal/lp2p/relaynode_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/drand/drand/v2/common/log"
 	"github.com/drand/drand/v2/crypto"
 
-	"github.com/drand/drand-cli/client"
-	"github.com/drand/drand-cli/client/test/result/mock"
 	"github.com/drand/drand/v2/common/chain"
 	client2 "github.com/drand/drand/v2/common/client"
+	"github.com/drand/go-clients/client"
+	"github.com/drand/go-clients/client/test/result/mock"
 )
 
 type mockClient struct {
diff --git a/main.go b/main.go
index e41ebed..3a04dcc 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	drand "github.com/drand/drand-cli/internal"
+	drand "github.com/drand/go-clients/internal"
 )
 
 func main() {