diff --git a/network/mucp/mucp.go b/network/mucp/mucp.go
index 33786058..12cff4f6 100644
--- a/network/mucp/mucp.go
+++ b/network/mucp/mucp.go
@@ -18,14 +18,14 @@ import (
 	pb "github.com/micro/go-micro/v3/network/mucp/proto"
 	"github.com/micro/go-micro/v3/proxy"
 	"github.com/micro/go-micro/v3/registry/noop"
-	"github.com/micro/go-micro/v3/resolver/dns"
+	"github.com/micro/go-micro/v3/network/resolver/dns"
 	"github.com/micro/go-micro/v3/router"
 	"github.com/micro/go-micro/v3/server"
 	smucp "github.com/micro/go-micro/v3/server/mucp"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	bun "github.com/micro/go-micro/v3/tunnel/broker"
-	tun "github.com/micro/go-micro/v3/tunnel/transport"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	bun "github.com/micro/go-micro/v3/network/tunnel/broker"
+	tun "github.com/micro/go-micro/v3/network/tunnel/transport"
 	"github.com/micro/go-micro/v3/util/backoff"
 )
 
diff --git a/network/options.go b/network/options.go
index 75d49589..f5be9de2 100644
--- a/network/options.go
+++ b/network/options.go
@@ -6,8 +6,8 @@ import (
 	"github.com/micro/go-micro/v3/proxy/mucp"
 	"github.com/micro/go-micro/v3/router"
 	regRouter "github.com/micro/go-micro/v3/router/registry"
-	"github.com/micro/go-micro/v3/tunnel"
-	tmucp "github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	tmucp "github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type Option func(*Options)
diff --git a/resolver/dns/dns.go b/network/resolver/dns/dns.go
similarity index 96%
rename from resolver/dns/dns.go
rename to network/resolver/dns/dns.go
index b85e7ec6..f70766a2 100644
--- a/resolver/dns/dns.go
+++ b/network/resolver/dns/dns.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"net"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 	"github.com/miekg/dns"
 )
 
diff --git a/resolver/dnssrv/dnssrv.go b/network/resolver/dnssrv/dnssrv.go
similarity index 93%
rename from resolver/dnssrv/dnssrv.go
rename to network/resolver/dnssrv/dnssrv.go
index 0088b422..667f690a 100644
--- a/resolver/dnssrv/dnssrv.go
+++ b/network/resolver/dnssrv/dnssrv.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a DNS network resolve
diff --git a/resolver/http/http.go b/network/resolver/http/http.go
similarity index 96%
rename from resolver/http/http.go
rename to network/resolver/http/http.go
index aff41f09..1ccad794 100644
--- a/resolver/http/http.go
+++ b/network/resolver/http/http.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a HTTP network resolver
diff --git a/resolver/noop/noop.go b/network/resolver/noop/noop.go
similarity index 82%
rename from resolver/noop/noop.go
rename to network/resolver/noop/noop.go
index 85643bf6..4be283f3 100644
--- a/resolver/noop/noop.go
+++ b/network/resolver/noop/noop.go
@@ -2,7 +2,7 @@
 package noop
 
 import (
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 type Resolver struct{}
diff --git a/resolver/registry/registry.go b/network/resolver/registry/registry.go
similarity index 94%
rename from resolver/registry/registry.go
rename to network/resolver/registry/registry.go
index 689cb29a..f9b2af2f 100644
--- a/resolver/registry/registry.go
+++ b/network/resolver/registry/registry.go
@@ -4,7 +4,7 @@ package registry
 import (
 	"github.com/micro/go-micro/v3/registry"
 	"github.com/micro/go-micro/v3/registry/mdns"
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a registry network resolver
diff --git a/resolver/resolver.go b/network/resolver/resolver.go
similarity index 100%
rename from resolver/resolver.go
rename to network/resolver/resolver.go
diff --git a/resolver/static/static.go b/network/resolver/static/static.go
similarity index 93%
rename from resolver/static/static.go
rename to network/resolver/static/static.go
index 56d737ce..a5badf1a 100644
--- a/resolver/static/static.go
+++ b/network/resolver/static/static.go
@@ -2,7 +2,7 @@
 package static
 
 import (
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver returns a static list of nodes. In the event the node list
diff --git a/tunnel/broker/broker.go b/network/tunnel/broker/broker.go
similarity index 97%
rename from tunnel/broker/broker.go
rename to network/tunnel/broker/broker.go
index caa1eb27..93476471 100644
--- a/tunnel/broker/broker.go
+++ b/network/tunnel/broker/broker.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/micro/go-micro/v3/broker"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	"github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type tunBroker struct {
diff --git a/tunnel/mucp/crypto.go b/network/tunnel/mucp/crypto.go
similarity index 97%
rename from tunnel/mucp/crypto.go
rename to network/tunnel/mucp/crypto.go
index 534e96f2..908f177c 100644
--- a/tunnel/mucp/crypto.go
+++ b/network/tunnel/mucp/crypto.go
@@ -6,7 +6,7 @@ import (
 	"crypto/rand"
 	"crypto/sha256"
 
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 	"github.com/oxtoacart/bpool"
 )
 
diff --git a/tunnel/mucp/crypto_test.go b/network/tunnel/mucp/crypto_test.go
similarity index 100%
rename from tunnel/mucp/crypto_test.go
rename to network/tunnel/mucp/crypto_test.go
diff --git a/tunnel/mucp/link.go b/network/tunnel/mucp/link.go
similarity index 100%
rename from tunnel/mucp/link.go
rename to network/tunnel/mucp/link.go
diff --git a/tunnel/mucp/listener.go b/network/tunnel/mucp/listener.go
similarity index 98%
rename from tunnel/mucp/listener.go
rename to network/tunnel/mucp/listener.go
index c1d6a305..dc453c7a 100644
--- a/tunnel/mucp/listener.go
+++ b/network/tunnel/mucp/listener.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/micro/go-micro/v3/logger"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 type tunListener struct {
diff --git a/tunnel/mucp/mucp.go b/network/tunnel/mucp/mucp.go
similarity index 99%
rename from tunnel/mucp/mucp.go
rename to network/tunnel/mucp/mucp.go
index 37329bd2..8167554f 100644
--- a/tunnel/mucp/mucp.go
+++ b/network/tunnel/mucp/mucp.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 var (
diff --git a/tunnel/mucp/mucp_test.go b/network/tunnel/mucp/mucp_test.go
similarity index 99%
rename from tunnel/mucp/mucp_test.go
rename to network/tunnel/mucp/mucp_test.go
index 7be28ec6..919ff253 100644
--- a/tunnel/mucp/mucp_test.go
+++ b/network/tunnel/mucp/mucp_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 func testBrokenTunAccept(t *testing.T, tun tunnel.Tunnel, wait chan bool, wg *sync.WaitGroup) {
diff --git a/tunnel/mucp/session.go b/network/tunnel/mucp/session.go
similarity index 99%
rename from tunnel/mucp/session.go
rename to network/tunnel/mucp/session.go
index e73d924b..23ea0807 100644
--- a/tunnel/mucp/session.go
+++ b/network/tunnel/mucp/session.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 // session is our pseudo session for transport.Socket
diff --git a/tunnel/options.go b/network/tunnel/options.go
similarity index 100%
rename from tunnel/options.go
rename to network/tunnel/options.go
diff --git a/tunnel/transport/listener.go b/network/tunnel/transport/listener.go
similarity index 90%
rename from tunnel/transport/listener.go
rename to network/tunnel/transport/listener.go
index bdb848ea..7f99cb31 100644
--- a/tunnel/transport/listener.go
+++ b/network/tunnel/transport/listener.go
@@ -2,7 +2,7 @@ package transport
 
 import (
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 type tunListener struct {
diff --git a/tunnel/transport/transport.go b/network/tunnel/transport/transport.go
similarity index 95%
rename from tunnel/transport/transport.go
rename to network/tunnel/transport/transport.go
index f96b2b30..28fcff2d 100644
--- a/tunnel/transport/transport.go
+++ b/network/tunnel/transport/transport.go
@@ -5,8 +5,8 @@ import (
 	"context"
 
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	"github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type tunTransport struct {
diff --git a/tunnel/tunnel.go b/network/tunnel/tunnel.go
similarity index 100%
rename from tunnel/tunnel.go
rename to network/tunnel/tunnel.go