diff --git a/events.go b/events.go
index 85eaafc..1a9a6f9 100644
--- a/events.go
+++ b/events.go
@@ -3,7 +3,7 @@
 package runtime
 
 import (
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 )
 
diff --git a/go.mod b/go.mod
index 069e04f..6507982 100644
--- a/go.mod
+++ b/go.mod
@@ -11,8 +11,10 @@ require (
 require (
 	github.com/coder/websocket v1.8.14 // indirect
 	github.com/expr-lang/expr v1.17.8 // indirect
-	github.com/pilot-protocol/common v0.1.0 // indirect
+	github.com/pilot-protocol/common v0.2.0 // indirect
 	github.com/pilot-protocol/trustedagents v0.1.0 // indirect
 )
 
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/handshake.go b/handshake.go
index 17dbb7c..d986ddb 100644
--- a/handshake.go
+++ b/handshake.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
-	registryclient "github.com/TeoSlayer/pilotprotocol/pkg/registry/client"
+	"github.com/pilot-protocol/common/protocol"
+	registryclient "github.com/pilot-protocol/common/registry/client"
 	"github.com/pilot-protocol/handshake"
 )
 
diff --git a/identity.go b/identity.go
index fef506c..a64e9a5 100644
--- a/identity.go
+++ b/identity.go
@@ -6,7 +6,7 @@ import (
 	"crypto/ed25519"
 	"errors"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 )
 
diff --git a/policy_manager.go b/policy_manager.go
index 4df3938..815ab5d 100644
--- a/policy_manager.go
+++ b/policy_manager.go
@@ -3,7 +3,7 @@
 package runtime
 
 import (
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 )
 
diff --git a/runtime.go b/runtime.go
index 9e2fe57..3fcdce0 100644
--- a/runtime.go
+++ b/runtime.go
@@ -13,7 +13,7 @@ package runtime
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 )
 
diff --git a/streams.go b/streams.go
index dc0e00f..b9c55b4 100644
--- a/streams.go
+++ b/streams.go
@@ -6,7 +6,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 )
 
diff --git a/zz_deps_test.go b/zz_deps_test.go
index 9abd2d4..ead1e93 100644
--- a/zz_deps_test.go
+++ b/zz_deps_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 	"github.com/pilot-protocol/runtime"
 )
diff --git a/zz_listener_test.go b/zz_listener_test.go
index a424dd1..fd32545 100644
--- a/zz_listener_test.go
+++ b/zz_listener_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
 	"github.com/pilot-protocol/runtime"
 )
diff --git a/zz_policy_manager_test.go b/zz_policy_manager_test.go
index e994344..ca0aec6 100644
--- a/zz_policy_manager_test.go
+++ b/zz_policy_manager_test.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/pilot-protocol/runtime"
 )
 
diff --git a/zz_streams_ceiling_test.go b/zz_streams_ceiling_test.go
index 6ab6e58..9b39620 100644
--- a/zz_streams_ceiling_test.go
+++ b/zz_streams_ceiling_test.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 	"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/handshake"
 	"github.com/pilot-protocol/runtime"
 )