diff --git a/cmd/getstream.go b/cmd/getstream.go
index 1c25df5..18f62ae 100644
--- a/cmd/getstream.go
+++ b/cmd/getstream.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/lbryio/reflector.go/peer"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	"github.com/lbryio/lbry.go/v2/stream"
diff --git a/cmd/peer.go b/cmd/peer.go
index c631bfe..3dc98cb 100644
--- a/cmd/peer.go
+++ b/cmd/peer.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/lbryio/reflector.go/db"
-	"github.com/lbryio/reflector.go/peer"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	log "github.com/sirupsen/logrus"
diff --git a/cmd/reflector.go b/cmd/reflector.go
index 93e9a9f..dfb41c6 100644
--- a/cmd/reflector.go
+++ b/cmd/reflector.go
@@ -12,10 +12,10 @@ import (
 	"github.com/lbryio/reflector.go/db"
 	"github.com/lbryio/reflector.go/internal/metrics"
 	"github.com/lbryio/reflector.go/meta"
-	"github.com/lbryio/reflector.go/peer"
-	"github.com/lbryio/reflector.go/peer/http3"
 	"github.com/lbryio/reflector.go/reflector"
 	"github.com/lbryio/reflector.go/server/http"
+	http32 "github.com/lbryio/reflector.go/server/http3"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
@@ -122,7 +122,7 @@ func reflectorCmd(cmd *cobra.Command, args []string) {
 	}
 	defer peerServer.Shutdown()
 
-	http3PeerServer := http3.NewServer(underlyingStoreWithCaches, requestQueueSize)
+	http3PeerServer := http32.NewServer(underlyingStoreWithCaches, requestQueueSize)
 	err = http3PeerServer.Start(":" + strconv.Itoa(http3PeerPort))
 	if err != nil {
 		log.Fatal(err)
@@ -161,7 +161,7 @@ func initUpstreamStore() store.BlobStore {
 			Timeout: 30 * time.Second,
 		})
 	case "http3":
-		s = http3.NewStore(http3.StoreOpts{
+		s = http32.NewStore(http32.StoreOpts{
 			Address: upstreamReflector,
 			Timeout: 30 * time.Second,
 		})
diff --git a/cmd/start.go b/cmd/start.go
index f7a91de..ae2a3c9 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/lbryio/reflector.go/cluster"
 	"github.com/lbryio/reflector.go/db"
-	"github.com/lbryio/reflector.go/peer"
 	"github.com/lbryio/reflector.go/prism"
 	"github.com/lbryio/reflector.go/reflector"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	"github.com/lbryio/lbry.go/v2/dht"
diff --git a/cmd/test.go b/cmd/test.go
index afa2ff2..a01bfe3 100644
--- a/cmd/test.go
+++ b/cmd/test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/lbryio/reflector.go/meta"
-	"github.com/lbryio/reflector.go/peer"
 	"github.com/lbryio/reflector.go/reflector"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	log "github.com/sirupsen/logrus"
diff --git a/prism/prism.go b/prism/prism.go
index 3484775..3fc229f 100644
--- a/prism/prism.go
+++ b/prism/prism.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/lbryio/reflector.go/cluster"
 	"github.com/lbryio/reflector.go/db"
-	"github.com/lbryio/reflector.go/peer"
 	"github.com/lbryio/reflector.go/reflector"
+	"github.com/lbryio/reflector.go/server/peer"
 	"github.com/lbryio/reflector.go/store"
 
 	"github.com/lbryio/lbry.go/v2/dht"
diff --git a/peer/http3/client.go b/server/http3/client.go
similarity index 100%
rename from peer/http3/client.go
rename to server/http3/client.go
diff --git a/peer/http3/server.go b/server/http3/server.go
similarity index 100%
rename from peer/http3/server.go
rename to server/http3/server.go
diff --git a/peer/http3/store.go b/server/http3/store.go
similarity index 100%
rename from peer/http3/store.go
rename to server/http3/store.go
diff --git a/peer/http3/worker.go b/server/http3/worker.go
similarity index 100%
rename from peer/http3/worker.go
rename to server/http3/worker.go
diff --git a/peer/client.go b/server/peer/client.go
similarity index 100%
rename from peer/client.go
rename to server/peer/client.go
diff --git a/peer/server.go b/server/peer/server.go
similarity index 100%
rename from peer/server.go
rename to server/peer/server.go
diff --git a/peer/server_test.go b/server/peer/server_test.go
similarity index 100%
rename from peer/server_test.go
rename to server/peer/server_test.go
diff --git a/peer/store.go b/server/peer/store.go
similarity index 100%
rename from peer/store.go
rename to server/peer/store.go