diff --git a/server/internal/clients/clients.go b/server/internal/clients/clients.go
index 24d0272..931542c 100644
--- a/server/internal/clients/clients.go
+++ b/server/internal/clients/clients.go
@@ -13,9 +13,9 @@ import (
 	"github.com/rs/xid"
 
 	"github.com/mochi-co/mqtt/server/internal/circ"
-	"github.com/mochi-co/mqtt/server/internal/packets"
 	"github.com/mochi-co/mqtt/server/internal/topics"
 	"github.com/mochi-co/mqtt/server/listeners/auth"
+	"github.com/mochi-co/mqtt/server/packets"
 	"github.com/mochi-co/mqtt/server/system"
 )
 
diff --git a/server/internal/clients/clients_test.go b/server/internal/clients/clients_test.go
index f239b19..52c7366 100644
--- a/server/internal/clients/clients_test.go
+++ b/server/internal/clients/clients_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/mochi-co/mqtt/server/internal/circ"
-	"github.com/mochi-co/mqtt/server/internal/packets"
 	"github.com/mochi-co/mqtt/server/listeners/auth"
+	"github.com/mochi-co/mqtt/server/packets"
 	"github.com/mochi-co/mqtt/server/system"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/internal/topics/trie.go b/server/internal/topics/trie.go
index 533330d..a9a47ac 100644
--- a/server/internal/topics/trie.go
+++ b/server/internal/topics/trie.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mochi-co/mqtt/server/internal/packets"
+	"github.com/mochi-co/mqtt/server/packets"
 )
 
 // Subscriptions is a map of subscriptions keyed on client.
diff --git a/server/internal/topics/trie_test.go b/server/internal/topics/trie_test.go
index 1c159e3..2170f6a 100644
--- a/server/internal/topics/trie_test.go
+++ b/server/internal/topics/trie_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mochi-co/mqtt/server/internal/packets"
+	"github.com/mochi-co/mqtt/server/packets"
 )
 
 func TestNew(t *testing.T) {
diff --git a/server/server.go b/server/server.go
index 9c3f588..465f76d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/mochi-co/mqtt/server/internal/circ"
 	"github.com/mochi-co/mqtt/server/internal/clients"
-	"github.com/mochi-co/mqtt/server/internal/packets"
 	"github.com/mochi-co/mqtt/server/internal/topics"
 	"github.com/mochi-co/mqtt/server/listeners"
 	"github.com/mochi-co/mqtt/server/listeners/auth"
+	"github.com/mochi-co/mqtt/server/packets"
 	"github.com/mochi-co/mqtt/server/persistence"
 	"github.com/mochi-co/mqtt/server/system"
 )
diff --git a/server/server_test.go b/server/server_test.go
index d878599..fdec2ee 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/mochi-co/mqtt/server/internal/circ"
 	"github.com/mochi-co/mqtt/server/internal/clients"
-	"github.com/mochi-co/mqtt/server/internal/packets"
 	"github.com/mochi-co/mqtt/server/internal/topics"
 	"github.com/mochi-co/mqtt/server/listeners"
 	"github.com/mochi-co/mqtt/server/listeners/auth"
+	"github.com/mochi-co/mqtt/server/packets"
 	"github.com/mochi-co/mqtt/server/persistence"
 	"github.com/mochi-co/mqtt/server/system"
 )