diff --git a/client.go b/client.go
index 8bfdd16..0ef9670 100644
--- a/client.go
+++ b/client.go
@@ -3,8 +3,8 @@
 package eventstream
 
 import (
-	"github.com/TeoSlayer/pilotprotocol/pkg/driver"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/driver"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Client connects to a remote event stream broker on port 1002.
diff --git a/examples/main.go b/examples/main.go
index e2fd3c4..ac3dd04 100644
--- a/examples/main.go
+++ b/examples/main.go
@@ -8,8 +8,8 @@ import (
 	"log"
 
 	internales "github.com/pilot-protocol/eventstream"
-	"github.com/TeoSlayer/pilotprotocol/pkg/driver"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/driver"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 7613ac1..66d0d47 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/pilot-protocol/eventstream
 
 go 1.25.10
 
-require github.com/TeoSlayer/pilotprotocol v0.0.0
+require github.com/pilot-protocol/common v0.1.0
 
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/server.go b/server.go
index b306567..d0ba7f7 100644
--- a/server.go
+++ b/server.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/driver"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/driver"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Server is a pub/sub event broker on port 1002.
diff --git a/service.go b/service.go
index e9f6634..a346de8 100644
--- a/service.go
+++ b/service.go
@@ -12,8 +12,8 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/coreapi"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Publish rate-limit constants. Issue #196: previously any single publisher
diff --git a/service_disabled.go b/service_disabled.go
index 113d1d4..d28d427 100644
--- a/service_disabled.go
+++ b/service_disabled.go
@@ -13,7 +13,7 @@ package eventstream
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is a no-op replacement for the real plugin Service.
diff --git a/zz_added_coverage_test.go b/zz_added_coverage_test.go
index af91e8e..3ab3a7f 100644
--- a/zz_added_coverage_test.go
+++ b/zz_added_coverage_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // --- stub EventBus -----------------------------------------------------------
diff --git a/zz_service_e2e_test.go b/zz_service_e2e_test.go
index e852de2..82aad0b 100644
--- a/zz_service_e2e_test.go
+++ b/zz_service_e2e_test.go
@@ -13,8 +13,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/coreapi"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 type esFakeStream struct {