diff --git a/proxy/README.md b/network/proxy/README.md
similarity index 100%
rename from proxy/README.md
rename to network/proxy/README.md
diff --git a/proxy/grpc/grpc.go b/network/proxy/grpc/grpc.go
similarity index 98%
rename from proxy/grpc/grpc.go
rename to network/proxy/grpc/grpc.go
index afb2453c..7aceb289 100644
--- a/proxy/grpc/grpc.go
+++ b/network/proxy/grpc/grpc.go
@@ -10,7 +10,7 @@ import (
 	"github.com/micro/go-micro/client/grpc"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/config/options"
-	"github.com/micro/go-micro/proxy"
+	"github.com/micro/go-micro/network/proxy"
 	"github.com/micro/go-micro/server"
 )
 
diff --git a/proxy/http/http.go b/network/proxy/http/http.go
similarity index 98%
rename from proxy/http/http.go
rename to network/proxy/http/http.go
index 61a6fc06..7c19b6e1 100644
--- a/proxy/http/http.go
+++ b/network/proxy/http/http.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/errors"
-	"github.com/micro/go-micro/proxy"
+	"github.com/micro/go-micro/network/proxy"
 	"github.com/micro/go-micro/server"
 )
 
diff --git a/proxy/http/http_test.go b/network/proxy/http/http_test.go
similarity index 100%
rename from proxy/http/http_test.go
rename to network/proxy/http/http_test.go
diff --git a/proxy/mucp/mucp.go b/network/proxy/mucp/mucp.go
similarity index 98%
rename from proxy/mucp/mucp.go
rename to network/proxy/mucp/mucp.go
index cca97c90..9e8afd39 100644
--- a/proxy/mucp/mucp.go
+++ b/network/proxy/mucp/mucp.go
@@ -10,7 +10,7 @@ import (
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/codec/bytes"
 	"github.com/micro/go-micro/config/options"
-	"github.com/micro/go-micro/proxy"
+	"github.com/micro/go-micro/network/proxy"
 	"github.com/micro/go-micro/server"
 )
 
diff --git a/proxy/proxy.go b/network/proxy/proxy.go
similarity index 100%
rename from proxy/proxy.go
rename to network/proxy/proxy.go
diff --git a/router/default_router.go b/network/router/default_router.go
similarity index 100%
rename from router/default_router.go
rename to network/router/default_router.go
diff --git a/router/default_table.go b/network/router/default_table.go
similarity index 100%
rename from router/default_table.go
rename to network/router/default_table.go
diff --git a/router/options.go b/network/router/options.go
similarity index 100%
rename from router/options.go
rename to network/router/options.go
diff --git a/router/query.go b/network/router/query.go
similarity index 100%
rename from router/query.go
rename to network/router/query.go
diff --git a/router/route.go b/network/router/route.go
similarity index 100%
rename from router/route.go
rename to network/router/route.go
diff --git a/router/router.go b/network/router/router.go
similarity index 100%
rename from router/router.go
rename to network/router/router.go
diff --git a/router/table.go b/network/router/table.go
similarity index 100%
rename from router/table.go
rename to network/router/table.go
diff --git a/router/table_watcher.go b/network/router/table_watcher.go
similarity index 100%
rename from router/table_watcher.go
rename to network/router/table_watcher.go