diff --git a/shared/plugin/definition/publisher.go b/pkg/plugin/definition/publisher.go
similarity index 87%
rename from shared/plugin/definition/publisher.go
rename to pkg/plugin/definition/publisher.go
index 737aff7..93f9e21 100644
--- a/shared/plugin/definition/publisher.go
+++ b/pkg/plugin/definition/publisher.go
@@ -7,10 +7,10 @@ type Publisher interface {
 	// Publish sends a message (as a byte slice) using the underlying messaging system.
 	Publish(ctx context.Context, msg []byte) error
 
-	Close() error // Important for releasing resources
+	Close() error // Important for releasing resources.
 }
 
 type PublisherProvider interface {
-	// New initializes a new publisher instance with the given configuration
+	// New initializes a new publisher instance with the given configuration.
 	New(ctx context.Context, config map[string]string) (Publisher, error)
 }
diff --git a/shared/plugin/definition/signVerifier.go b/pkg/plugin/definition/signVerifier.go
similarity index 100%
rename from shared/plugin/definition/signVerifier.go
rename to pkg/plugin/definition/signVerifier.go
diff --git a/shared/plugin/definition/signer.go b/pkg/plugin/definition/signer.go
similarity index 100%
rename from shared/plugin/definition/signer.go
rename to pkg/plugin/definition/signer.go
diff --git a/shared/plugin/implementation/publisher/cmd/plugin.go b/pkg/plugin/implementation/publisher/cmd/plugin.go
similarity index 90%
rename from shared/plugin/implementation/publisher/cmd/plugin.go
rename to pkg/plugin/implementation/publisher/cmd/plugin.go
index 9602839..561d6f2 100644
--- a/shared/plugin/implementation/publisher/cmd/plugin.go
+++ b/pkg/plugin/implementation/publisher/cmd/plugin.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/beckn/beckn-onix/shared/plugin/definition"
-	"github.com/beckn/beckn-onix/shared/plugin/implementation/publisher"
+	"github.com/beckn/beckn-onix/pkg/plugin/definition"
+	"github.com/beckn/beckn-onix/pkg/plugin/implementation/publisher"
 )
 
 // Returns error if required fields are missing.
diff --git a/shared/plugin/implementation/publisher/cmd/plugin_test.go b/pkg/plugin/implementation/publisher/cmd/plugin_test.go
similarity index 97%
rename from shared/plugin/implementation/publisher/cmd/plugin_test.go
rename to pkg/plugin/implementation/publisher/cmd/plugin_test.go
index 55239ba..4c40e54 100644
--- a/shared/plugin/implementation/publisher/cmd/plugin_test.go
+++ b/pkg/plugin/implementation/publisher/cmd/plugin_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/beckn/beckn-onix/shared/plugin/definition"
+	"github.com/beckn/beckn-onix/pkg/plugin/definition"
 )
 
 // MockPublisher is a mock implementation of the definition.Publisher interface for testing.
diff --git a/shared/plugin/implementation/publisher/publisher.go b/pkg/plugin/implementation/publisher/publisher.go
similarity index 100%
rename from shared/plugin/implementation/publisher/publisher.go
rename to pkg/plugin/implementation/publisher/publisher.go
diff --git a/shared/plugin/implementation/publisher/publisher_test.go b/pkg/plugin/implementation/publisher/publisher_test.go
similarity index 68%
rename from shared/plugin/implementation/publisher/publisher_test.go
rename to pkg/plugin/implementation/publisher/publisher_test.go
index 7b4848f..9ca3d2c 100644
--- a/shared/plugin/implementation/publisher/publisher_test.go
+++ b/pkg/plugin/implementation/publisher/publisher_test.go
@@ -4,22 +4,9 @@ import (
 	"context"
 	"errors"
 	"testing"
-
-	"cloud.google.com/go/pubsub"
 )
 
-// Helper to create a test publisher directly
-func createTestPublisher() *Publisher {
-	client, _ := pubsub.NewClient(context.Background(), "test-project")
-	topic := client.Topic("test-topic")
-	return &Publisher{
-		client: client,
-		topic:  topic,
-		config: &Config{ProjectID: "test-project", TopicID: "test-topic"},
-	}
-}
-
-// TestValidate tests the validate function
+// TestValidate tests the validate function.
 func TestValidate(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -68,8 +55,8 @@ func TestValidate(t *testing.T) {
 	}
 }
 
-// TestNew tests the New function with validation errors only
-// We can't easily test the pubsub client creation parts without complex mocks
+// TestNew tests the New function with validation errors only.
+// We can't easily test the pubsub client creation parts without complex mocks.
 func TestNew(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -109,15 +96,3 @@ func TestNew(t *testing.T) {
 		})
 	}
 }
-
-// TestPublish tests the behavior of the Publisher.Publish method
-// Since we can't easily mock the pubsub client and topic, we'll skip the actual test
-func TestPublish(t *testing.T) {
-	t.Skip("Requires real pubsub client or complex mocking")
-}
-
-// TestClose tests the behavior of the Publisher.Close method
-// Since we can't easily mock the pubsub client, we'll skip the actual test
-func TestClose(t *testing.T) {
-	t.Skip("Requires real pubsub client or complex mocking")
-}
diff --git a/shared/plugin/implementation/signVerifier/cmd/plugin.go b/pkg/plugin/implementation/signVerifier/cmd/plugin.go
similarity index 66%
rename from shared/plugin/implementation/signVerifier/cmd/plugin.go
rename to pkg/plugin/implementation/signVerifier/cmd/plugin.go
index 1e4fb06..35c1287 100644
--- a/shared/plugin/implementation/signVerifier/cmd/plugin.go
+++ b/pkg/plugin/implementation/signVerifier/cmd/plugin.go
@@ -4,17 +4,16 @@ import (
 	"context"
 	"errors"
 
-	"github.com/beckn/beckn-onix/shared/plugin/definition"
+	"github.com/beckn/beckn-onix/pkg/plugin/definition"
 
-	plugin "github.com/beckn/beckn-onix/shared/plugin/definition"
-	verifier "github.com/beckn/beckn-onix/shared/plugin/implementation/signVerifier"
+	verifier "github.com/beckn/beckn-onix/pkg/plugin/implementation/signVerifier"
 )
 
 // VerifierProvider provides instances of Verifier.
 type VerifierProvider struct{}
 
 // New initializes a new Verifier instance.
-func (vp VerifierProvider) New(ctx context.Context, config map[string]string) (plugin.Verifier, func() error, error) {
+func (vp VerifierProvider) New(ctx context.Context, config map[string]string) (definition.Verifier, func() error, error) {
 	if ctx == nil {
 		return nil, nil, errors.New("context cannot be nil")
 	}
diff --git a/shared/plugin/implementation/signVerifier/cmd/plugin_test.go b/pkg/plugin/implementation/signVerifier/cmd/plugin_test.go
similarity index 100%
rename from shared/plugin/implementation/signVerifier/cmd/plugin_test.go
rename to pkg/plugin/implementation/signVerifier/cmd/plugin_test.go
diff --git a/shared/plugin/implementation/signVerifier/signVerifier.go b/pkg/plugin/implementation/signVerifier/signVerifier.go
similarity index 100%
rename from shared/plugin/implementation/signVerifier/signVerifier.go
rename to pkg/plugin/implementation/signVerifier/signVerifier.go
diff --git a/shared/plugin/implementation/signVerifier/signVerifier_test.go b/pkg/plugin/implementation/signVerifier/signVerifier_test.go
similarity index 100%
rename from shared/plugin/implementation/signVerifier/signVerifier_test.go
rename to pkg/plugin/implementation/signVerifier/signVerifier_test.go
diff --git a/shared/plugin/implementation/signer/cmd/plugin.go b/pkg/plugin/implementation/signer/cmd/plugin.go
similarity index 82%
rename from shared/plugin/implementation/signer/cmd/plugin.go
rename to pkg/plugin/implementation/signer/cmd/plugin.go
index 854ecbe..2d78d98 100644
--- a/shared/plugin/implementation/signer/cmd/plugin.go
+++ b/pkg/plugin/implementation/signer/cmd/plugin.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/beckn/beckn-onix/shared/plugin/definition"
-	"github.com/beckn/beckn-onix/shared/plugin/implementation/signer"
+	"github.com/beckn/beckn-onix/pkg/plugin/definition"
+	"github.com/beckn/beckn-onix/pkg/plugin/implementation/signer"
 )
 
 // SignerProvider implements the definition.SignerProvider interface.
diff --git a/shared/plugin/implementation/signer/cmd/plugin_test.go b/pkg/plugin/implementation/signer/cmd/plugin_test.go
similarity index 100%
rename from shared/plugin/implementation/signer/cmd/plugin_test.go
rename to pkg/plugin/implementation/signer/cmd/plugin_test.go
diff --git a/shared/plugin/implementation/signer/signer.go b/pkg/plugin/implementation/signer/signer.go
similarity index 100%
rename from shared/plugin/implementation/signer/signer.go
rename to pkg/plugin/implementation/signer/signer.go
diff --git a/shared/plugin/implementation/signer/signer_test.go b/pkg/plugin/implementation/signer/signer_test.go
similarity index 100%
rename from shared/plugin/implementation/signer/signer_test.go
rename to pkg/plugin/implementation/signer/signer_test.go
diff --git a/shared/plugin/manager.go b/pkg/plugin/manager.go
similarity index 98%
rename from shared/plugin/manager.go
rename to pkg/plugin/manager.go
index 5fed0f1..60d18ac 100644
--- a/shared/plugin/manager.go
+++ b/pkg/plugin/manager.go
@@ -7,7 +7,7 @@ import (
 	"plugin"
 	"strings"
 
-	"github.com/beckn/beckn-onix/shared/plugin/definition"
+	"github.com/beckn/beckn-onix/pkg/plugin/definition"
 )
 
 // Config represents the plugin manager configuration.