diff --git a/common/options/listeneropts/options.go b/common/options/listeneropts/options.go
index 4d00c308..55c4c5e7 100644
--- a/common/options/listeneropts/options.go
+++ b/common/options/listeneropts/options.go
@@ -3,14 +3,14 @@ package listeneropts
 import (
 	"errors"
 	"fmt"
-	"github.com/Azure/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common"
 	"reflect"
 	"time"
 
 	"github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-shuttle/internal/aad"
-	sbinternal "github.com/Azure/go-shuttle/internal/servicebus"
+	"github.com/pdaru/go-shuttle/internal/aad"
+	sbinternal "github.com/pdaru/go-shuttle/internal/servicebus"
 )
 
 // Option provides structure for configuring when starting to listen to a specified topic
diff --git a/common/options/publisheropts/options.go b/common/options/publisheropts/options.go
index f695864c..cc2291a9 100644
--- a/common/options/publisheropts/options.go
+++ b/common/options/publisheropts/options.go
@@ -7,10 +7,10 @@ import (
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
 
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/internal/aad"
-	sbinternal "github.com/Azure/go-shuttle/internal/servicebus"
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/internal/aad"
+	sbinternal "github.com/pdaru/go-shuttle/internal/servicebus"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 // ManagementOption provides structure for configuring a new Publisher
diff --git a/common/types.go b/common/types.go
index 81e9f8f9..9e5d6ed5 100644
--- a/common/types.go
+++ b/common/types.go
@@ -5,7 +5,7 @@ import (
 
 	servicebus "github.com/Azure/azure-service-bus-go"
 
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 var _ Listener = &ListenerSettings{}
diff --git a/go.mod b/go.mod
index 1df18d7f..28235580 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Azure/go-shuttle
+module github.com/pdaru/go-shuttle
 
 go 1.14
 
diff --git a/handlers/concurrent.go b/handlers/concurrent.go
index 5f868c59..68e79dc8 100644
--- a/handlers/concurrent.go
+++ b/handlers/concurrent.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/prometheus/listener"
+	"github.com/pdaru/go-shuttle/prometheus/listener"
 )
 
 var _ servicebus.Handler = (*concurrent)(nil)
diff --git a/handlers/lockrenewer.go b/handlers/lockrenewer.go
index 4bdabda7..0d8cb814 100644
--- a/handlers/lockrenewer.go
+++ b/handlers/lockrenewer.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/prometheus/listener"
-	"github.com/Azure/go-shuttle/tracing"
 	"github.com/devigned/tab"
+	"github.com/pdaru/go-shuttle/prometheus/listener"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 type EntityInfoProvider interface {
diff --git a/handlers/lockrenewer_test.go b/handlers/lockrenewer_test.go
index 5c4f042f..0121a40d 100644
--- a/handlers/lockrenewer_test.go
+++ b/handlers/lockrenewer_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/handlers"
-	"github.com/Azure/go-shuttle/prometheus/listener"
+	"github.com/pdaru/go-shuttle/handlers"
+	"github.com/pdaru/go-shuttle/prometheus/listener"
 	prom "github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/handlers/messagecontext_test.go b/handlers/messagecontext_test.go
index d71dc162..0eaf4364 100644
--- a/handlers/messagecontext_test.go
+++ b/handlers/messagecontext_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/handlers"
+	"github.com/pdaru/go-shuttle/handlers"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/handlers/shuttleadapter.go b/handlers/shuttleadapter.go
index 2f66fc76..c32db83d 100644
--- a/handlers/shuttleadapter.go
+++ b/handlers/shuttleadapter.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/message"
 	"github.com/devigned/tab"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 var _ servicebus.Handler = (*shuttleAdapter)(nil)
diff --git a/integration/concurrentcreate_topic_test.go b/integration/concurrentcreate_topic_test.go
index 99a67c47..93ee2da6 100644
--- a/integration/concurrentcreate_topic_test.go
+++ b/integration/concurrentcreate_topic_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package integration
@@ -8,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Azure/go-shuttle/topic"
-	"github.com/Azure/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic"
+	"github.com/pdaru/go-shuttle/topic/listener"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Azure/go-shuttle/message"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 func (suite *serviceBusTopicSuite) TestCreatePublisherConcurrently() {
diff --git a/integration/issue_topic_test.go b/integration/issue_topic_test.go
index 359f664a..96f1e398 100644
--- a/integration/issue_topic_test.go
+++ b/integration/issue_topic_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package integration
@@ -9,12 +10,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/go-shuttle/topic"
-	"github.com/Azure/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic"
+	"github.com/pdaru/go-shuttle/topic/listener"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Azure/go-shuttle/message"
 	"github.com/devigned/tab"
+	"github.com/pdaru/go-shuttle/message"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integration/listener_queue_test.go b/integration/listener_queue_test.go
index dbf1adf1..b4a89f13 100644
--- a/integration/listener_queue_test.go
+++ b/integration/listener_queue_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package integration
@@ -6,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/Azure/go-shuttle/queue"
+	"github.com/pdaru/go-shuttle/queue"
 )
 
 // TestCreateNewListenerFromConnectionString tests the creation of a listener with a connection string
diff --git a/integration/listener_topic_test.go b/integration/listener_topic_test.go
index ebcc01ba..02730c6a 100644
--- a/integration/listener_topic_test.go
+++ b/integration/listener_topic_test.go
@@ -1,16 +1,17 @@
+//go:build integration
 // +build integration
 
 package integration
 
 import (
 	"context"
-	"github.com/Azure/go-shuttle/topic"
-	"github.com/Azure/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic"
+	"github.com/pdaru/go-shuttle/topic/listener"
 	"strings"
 	"time"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/message"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 // TestCreateNewListenerFromConnectionString tests the creation of a listener with a connection string
diff --git a/integration/protomsg/Makefile b/integration/protomsg/Makefile
index 2cc316d4..b86ae861 100644
--- a/integration/protomsg/Makefile
+++ b/integration/protomsg/Makefile
@@ -1,3 +1,3 @@
 
 all:
-	@protoc ./message.proto --go_opt=Mmessage.proto=github.com/Azure/go-shuttle/integration --go_opt=paths=source_relative --go_out .
\ No newline at end of file
+	@protoc ./message.proto --go_opt=Mmessage.proto=github.com/pdaru/go-shuttle/integration --go_opt=paths=source_relative --go_out .
\ No newline at end of file
diff --git a/integration/protomsg/message.proto b/integration/protomsg/message.proto
index df7df7f3..36b29156 100644
--- a/integration/protomsg/message.proto
+++ b/integration/protomsg/message.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "github.com/Azure/go-shuttle/integration/protomsg";
+option go_package = "github.com/pdaru/go-shuttle/integration/protomsg";
 
 package protomsg;
 
diff --git a/integration/publisher_queue_test.go b/integration/publisher_queue_test.go
index bad62099..8f47edfd 100644
--- a/integration/publisher_queue_test.go
+++ b/integration/publisher_queue_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/go-shuttle/queue"
-	"github.com/Azure/go-shuttle/queue/publisher"
+	"github.com/pdaru/go-shuttle/queue"
+	"github.com/pdaru/go-shuttle/queue/publisher"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/integration/publisher_topic_test.go b/integration/publisher_topic_test.go
index b30313ab..bc5cc5c7 100644
--- a/integration/publisher_topic_test.go
+++ b/integration/publisher_topic_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package integration
@@ -8,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/go-shuttle/topic"
-	"github.com/Azure/go-shuttle/topic/publisher"
+	"github.com/pdaru/go-shuttle/topic"
+	"github.com/pdaru/go-shuttle/topic/publisher"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/integration/pubsub_queue_test.go b/integration/pubsub_queue_test.go
index ead54c3f..1d45b7d5 100644
--- a/integration/pubsub_queue_test.go
+++ b/integration/pubsub_queue_test.go
@@ -13,14 +13,14 @@ import (
 	"github.com/devigned/tab"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/Azure/go-shuttle/common/options/publisheropts"
-	"github.com/Azure/go-shuttle/integration/protomsg"
-	"github.com/Azure/go-shuttle/internal/reflection"
-	"github.com/Azure/go-shuttle/marshal"
-	"github.com/Azure/go-shuttle/message"
-	"github.com/Azure/go-shuttle/queue"
-	"github.com/Azure/go-shuttle/queue/listener"
-	"github.com/Azure/go-shuttle/queue/publisher"
+	"github.com/pdaru/go-shuttle/common/options/publisheropts"
+	"github.com/pdaru/go-shuttle/integration/protomsg"
+	"github.com/pdaru/go-shuttle/internal/reflection"
+	"github.com/pdaru/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/message"
+	"github.com/pdaru/go-shuttle/queue"
+	"github.com/pdaru/go-shuttle/queue/listener"
+	"github.com/pdaru/go-shuttle/queue/publisher"
 )
 
 // TestPublishAndListenWithConnectionStringUsingDefault tests both the publisher and listener with default configurations
diff --git a/integration/pubsub_topic_test.go b/integration/pubsub_topic_test.go
index 954243db..09c670c2 100644
--- a/integration/pubsub_topic_test.go
+++ b/integration/pubsub_topic_test.go
@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Azure/go-shuttle/internal/reflection"
-	"github.com/Azure/go-shuttle/message"
-	"github.com/Azure/go-shuttle/topic"
-	"github.com/Azure/go-shuttle/topic/listener"
-	"github.com/Azure/go-shuttle/topic/publisher"
+	"github.com/pdaru/go-shuttle/internal/reflection"
+	"github.com/pdaru/go-shuttle/message"
+	"github.com/pdaru/go-shuttle/topic"
+	"github.com/pdaru/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic/publisher"
 )
 
 // TestPublishAndListenWithConnectionStringUsingDefault tests both the publisher and listener with default configurations
diff --git a/integration/suite_queue_test.go b/integration/suite_queue_test.go
index 474914a7..0ef23222 100644
--- a/integration/suite_queue_test.go
+++ b/integration/suite_queue_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/Azure/go-shuttle/internal/test"
-	"github.com/Azure/go-shuttle/queue/listener"
-	"github.com/Azure/go-shuttle/queue/publisher"
+	"github.com/pdaru/go-shuttle/internal/test"
+	"github.com/pdaru/go-shuttle/queue/listener"
+	"github.com/pdaru/go-shuttle/queue/publisher"
 )
 
 type serviceBusQueueSuite struct {
diff --git a/integration/suite_topic_test.go b/integration/suite_topic_test.go
index 87b793d4..de5ed852 100644
--- a/integration/suite_topic_test.go
+++ b/integration/suite_topic_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package integration
@@ -9,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/go-shuttle/topic/listener"
-	"github.com/Azure/go-shuttle/topic/publisher"
+	"github.com/pdaru/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic/publisher"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-shuttle/internal/test"
+	"github.com/pdaru/go-shuttle/internal/test"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/internal/servicebus/namespace.go b/internal/servicebus/namespace.go
index 48cc6b59..71e8e9ea 100644
--- a/internal/servicebus/namespace.go
+++ b/internal/servicebus/namespace.go
@@ -7,7 +7,7 @@ import (
 	"github.com/Azure/azure-amqp-common-go/v3/auth"
 	servicebussdk "github.com/Azure/azure-service-bus-go"
 
-	"github.com/Azure/go-shuttle/internal/aad"
+	"github.com/pdaru/go-shuttle/internal/aad"
 )
 
 const (
diff --git a/listener/alias.go b/listener/alias.go
index 5c0f5bfa..9e0472ff 100644
--- a/listener/alias.go
+++ b/listener/alias.go
@@ -5,7 +5,7 @@ import (
 
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
-	topic "github.com/Azure/go-shuttle/topic/listener"
+	topic "github.com/pdaru/go-shuttle/topic/listener"
 )
 
 // Deprecated: use topic package
@@ -90,4 +90,4 @@ func WithFilterDescriber(filterName string, filter servicebus.FilterDescriber) M
 // Deprecated: use topic package
 func WithTypeFilter(event interface{}) ManagementOption {
 	return topic.WithTypeFilter(event)
-}
\ No newline at end of file
+}
diff --git a/marshal/types_test.go b/marshal/types_test.go
index 146d9021..0423c320 100644
--- a/marshal/types_test.go
+++ b/marshal/types_test.go
@@ -3,7 +3,7 @@ package marshal_test
 import (
 	"testing"
 
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 type customMarshaller struct {
diff --git a/message/abandon.go b/message/abandon.go
index 78a131bc..f4cf470d 100644
--- a/message/abandon.go
+++ b/message/abandon.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 // Abandon stops processing the message and releases the lock on it.
diff --git a/message/complete.go b/message/complete.go
index 241ff457..44029de0 100644
--- a/message/complete.go
+++ b/message/complete.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 // Complete will notify Azure Service Bus that the message was successfully handled and should be deleted from the queue
diff --git a/message/deadletter.go b/message/deadletter.go
index 801cba7c..ed19583b 100644
--- a/message/deadletter.go
+++ b/message/deadletter.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 // DeadLetter will notify Azure Service Bus that the message will be sent to the deadletter queue
diff --git a/message/error.go b/message/error.go
index 97764789..d1942d31 100644
--- a/message/error.go
+++ b/message/error.go
@@ -6,7 +6,7 @@ import (
 
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-amqp"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 // Error is a wrapper around Abandon() that allows to trace the error before abandoning the message
diff --git a/message/handler.go b/message/handler.go
index 80d3443c..3c688cc0 100644
--- a/message/handler.go
+++ b/message/handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 )
 
 // HandleFunc is a func to handle the message received from a subscription
diff --git a/message/handler_test.go b/message/handler_test.go
index a077a667..187541fb 100644
--- a/message/handler_test.go
+++ b/message/handler_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/message"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 var completeHandler = message.HandleFunc(func(ctx context.Context, m *message.Message) message.Handler {
diff --git a/message/message.go b/message/message.go
index 790d14b3..e0103781 100644
--- a/message/message.go
+++ b/message/message.go
@@ -6,7 +6,7 @@ import (
 
 	servicebus "github.com/Azure/azure-service-bus-go"
 
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 // Message is the wrapping type of service bus message with a type
diff --git a/message/retrylater.go b/message/retrylater.go
index abf5d473..99ba9a0a 100644
--- a/message/retrylater.go
+++ b/message/retrylater.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/tracing"
+	"github.com/pdaru/go-shuttle/tracing"
 	"github.com/pkg/errors"
 )
 
diff --git a/prometheus/register.go b/prometheus/register.go
index 2401bf6d..8ae1ab0f 100644
--- a/prometheus/register.go
+++ b/prometheus/register.go
@@ -1,8 +1,8 @@
 package prometheus
 
 import (
-	"github.com/Azure/go-shuttle/prometheus/listener"
-	"github.com/Azure/go-shuttle/prometheus/publisher"
+	"github.com/pdaru/go-shuttle/prometheus/listener"
+	"github.com/pdaru/go-shuttle/prometheus/publisher"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/publisher/alias.go b/publisher/alias.go
index c8a32da6..b926b150 100644
--- a/publisher/alias.go
+++ b/publisher/alias.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-shuttle/publisher/topic"
+	"github.com/pdaru/go-shuttle/publisher/topic"
 )
 
 // Deprecated: use topic package
@@ -70,4 +70,4 @@ func SetMessageID(messageID string) Option {
 // SetCorrelationID sets the SetCorrelationID of the message.
 func SetCorrelationID(correlationID string) Option {
 	return topic.SetCorrelationID(correlationID)
-}
\ No newline at end of file
+}
diff --git a/publisher/queue/alias.go b/publisher/queue/alias.go
index 272f6b6c..8e28769c 100644
--- a/publisher/queue/alias.go
+++ b/publisher/queue/alias.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	queue "github.com/Azure/go-shuttle/queue/publisher"
+	queue "github.com/pdaru/go-shuttle/queue/publisher"
 )
 
 // Deprecated: use queue package
diff --git a/publisher/topic/alias.go b/publisher/topic/alias.go
index 07b935d2..e8072b82 100644
--- a/publisher/topic/alias.go
+++ b/publisher/topic/alias.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	topic "github.com/Azure/go-shuttle/topic/publisher"
+	topic "github.com/pdaru/go-shuttle/topic/publisher"
 )
 
 // Deprecated: use topic package
@@ -70,4 +70,4 @@ func SetMessageID(messageID string) Option {
 // Deprecated: use topic package
 func SetCorrelationID(correlationID string) Option {
 	return topic.SetCorrelationID(correlationID)
-}
\ No newline at end of file
+}
diff --git a/queue/listener/listener.go b/queue/listener/listener.go
index 91c14b00..e9e6141d 100644
--- a/queue/listener/listener.go
+++ b/queue/listener/listener.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"fmt"
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/common/options/listeneropts"
-	"github.com/Azure/go-shuttle/handlers"
-	"github.com/Azure/go-shuttle/message"
 	"github.com/devigned/tab"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common/options/listeneropts"
+	"github.com/pdaru/go-shuttle/handlers"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 const (
diff --git a/queue/listener/options.go b/queue/listener/options.go
index 021defdb..fbf4bbf9 100644
--- a/queue/listener/options.go
+++ b/queue/listener/options.go
@@ -2,7 +2,7 @@ package listener
 
 import (
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-shuttle/common/options/listeneropts"
+	"github.com/pdaru/go-shuttle/common/options/listeneropts"
 	"time"
 )
 
diff --git a/queue/publisher/options.go b/queue/publisher/options.go
index 9beca4cf..db646062 100644
--- a/queue/publisher/options.go
+++ b/queue/publisher/options.go
@@ -7,9 +7,9 @@ import (
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
 
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/common/options/publisheropts"
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common/options/publisheropts"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 type DeadLetterTarget struct {
diff --git a/queue/publisher/publisher.go b/queue/publisher/publisher.go
index 44c638db..409d2085 100644
--- a/queue/publisher/publisher.go
+++ b/queue/publisher/publisher.go
@@ -9,11 +9,11 @@ import (
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/devigned/tab"
 
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/common/errorhandling"
-	"github.com/Azure/go-shuttle/internal/reflection"
-	"github.com/Azure/go-shuttle/marshal"
-	"github.com/Azure/go-shuttle/prometheus/publisher"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common/errorhandling"
+	"github.com/pdaru/go-shuttle/internal/reflection"
+	"github.com/pdaru/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/prometheus/publisher"
 )
 
 type QueuePublisher interface {
diff --git a/queue/queue.go b/queue/queue.go
index d4d91f06..9d153d17 100644
--- a/queue/queue.go
+++ b/queue/queue.go
@@ -2,9 +2,9 @@ package queue
 
 import (
 	"context"
-	"github.com/Azure/go-shuttle/common/options/listeneropts"
-	"github.com/Azure/go-shuttle/queue/listener"
-	"github.com/Azure/go-shuttle/queue/publisher"
+	"github.com/pdaru/go-shuttle/common/options/listeneropts"
+	"github.com/pdaru/go-shuttle/queue/listener"
+	"github.com/pdaru/go-shuttle/queue/publisher"
 )
 
 func NewListener(opts ...listeneropts.ManagementOption) (*listener.Listener, error) {
diff --git a/topic/listener/listener.go b/topic/listener/listener.go
index 5c3182eb..f587d955 100644
--- a/topic/listener/listener.go
+++ b/topic/listener/listener.go
@@ -8,10 +8,10 @@ import (
 
 	amqp "github.com/Azure/azure-amqp-common-go/v3"
 	servicebus "github.com/Azure/azure-service-bus-go"
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/handlers"
-	"github.com/Azure/go-shuttle/message"
 	"github.com/devigned/tab"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/handlers"
+	"github.com/pdaru/go-shuttle/message"
 )
 
 const (
diff --git a/topic/listener/options.go b/topic/listener/options.go
index 3b61a1fb..5fd122d3 100644
--- a/topic/listener/options.go
+++ b/topic/listener/options.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/common/options/listeneropts"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common/options/listeneropts"
 )
 
 type Option = listeneropts.Option
diff --git a/topic/publisher/options.go b/topic/publisher/options.go
index 4e9cf309..581c3c99 100644
--- a/topic/publisher/options.go
+++ b/topic/publisher/options.go
@@ -6,9 +6,9 @@ import (
 	"github.com/Azure/azure-service-bus-go"
 	"github.com/Azure/go-autorest/autorest/adal"
 
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/common/options/publisheropts"
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/common/options/publisheropts"
+	"github.com/pdaru/go-shuttle/marshal"
 )
 
 // ManagementOption provides structure for configuring a new Publisher
diff --git a/topic/publisher/publisher.go b/topic/publisher/publisher.go
index 057b1f2f..d9b53a05 100644
--- a/topic/publisher/publisher.go
+++ b/topic/publisher/publisher.go
@@ -6,16 +6,16 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/go-shuttle/common/errorhandling"
-	"github.com/Azure/go-shuttle/marshal"
+	"github.com/pdaru/go-shuttle/common/errorhandling"
+	"github.com/pdaru/go-shuttle/marshal"
 
 	amqp "github.com/Azure/azure-amqp-common-go/v3"
 	servicebus "github.com/Azure/azure-service-bus-go"
 	"github.com/devigned/tab"
 
-	"github.com/Azure/go-shuttle/common"
-	"github.com/Azure/go-shuttle/internal/reflection"
-	"github.com/Azure/go-shuttle/prometheus/publisher"
+	"github.com/pdaru/go-shuttle/common"
+	"github.com/pdaru/go-shuttle/internal/reflection"
+	"github.com/pdaru/go-shuttle/prometheus/publisher"
 )
 
 type TopicPublisher interface {
diff --git a/topic/topic.go b/topic/topic.go
index 75b4ce13..82329498 100644
--- a/topic/topic.go
+++ b/topic/topic.go
@@ -2,9 +2,9 @@ package topic
 
 import (
 	"context"
-	"github.com/Azure/go-shuttle/common/options/listeneropts"
-	"github.com/Azure/go-shuttle/topic/listener"
-	"github.com/Azure/go-shuttle/topic/publisher"
+	"github.com/pdaru/go-shuttle/common/options/listeneropts"
+	"github.com/pdaru/go-shuttle/topic/listener"
+	"github.com/pdaru/go-shuttle/topic/publisher"
 )
 
 func NewListener(opts ...listeneropts.ManagementOption) (*listener.Listener, error) {