diff --git a/blog/comments/Makefile b/blog/comments/Makefile
index 6e13773241..bcbbf8b2d9 100644
--- a/blog/comments/Makefile
+++ b/blog/comments/Makefile
@@ -1,6 +1,6 @@
 
 GOPATH:=$(shell go env GOPATH)
-MODIFY=Mgithub.com/micro/go-micro/api/proto/api.proto=github.com/micro/go-micro/v3/api/proto
+MODIFY=Mgithub.com/micro/micro/proto/api/api.proto=github.com/micro/micro/v3/proto/api
 
 .PHONY: proto
 proto:
diff --git a/blog/comments/proto/comments.pb.go b/blog/comments/proto/comments.pb.go
index bdd4f0790b..0ee8acc3d2 100644
--- a/blog/comments/proto/comments.pb.go
+++ b/blog/comments/proto/comments.pb.go
@@ -1,218 +1,125 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.22.0
-// 	protoc        v3.11.4
 // source: github.com/micro/services/blog/comments/proto/comments.proto
 
 package comments
 
 import (
+	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
+	math "math"
 )
 
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Request struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
 	// post to comment on
 	PostId string `protobuf:"bytes,1,opt,name=post_id,json=postId,proto3" json:"post_id,omitempty"`
 	// message to leave
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (x *Request) Reset() {
-	*x = Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+func (m *Request) Reset()         { *m = Request{} }
+func (m *Request) String() string { return proto.CompactTextString(m) }
+func (*Request) ProtoMessage()    {}
+func (*Request) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8266712419156109, []int{0}
 }
 
-func (x *Request) String() string {
-	return protoimpl.X.MessageStringOf(x)
+func (m *Request) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Request.Unmarshal(m, b)
 }
-
-func (*Request) ProtoMessage() {}
-
-func (x *Request) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
+func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Request.Marshal(b, m, deterministic)
 }
-
-// Deprecated: Use Request.ProtoReflect.Descriptor instead.
-func (*Request) Descriptor() ([]byte, []int) {
-	return file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescGZIP(), []int{0}
+func (m *Request) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request.Merge(m, src)
+}
+func (m *Request) XXX_Size() int {
+	return xxx_messageInfo_Request.Size(m)
 }
+func (m *Request) XXX_DiscardUnknown() {
+	xxx_messageInfo_Request.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request proto.InternalMessageInfo
 
-func (x *Request) GetPostId() string {
-	if x != nil {
-		return x.PostId
+func (m *Request) GetPostId() string {
+	if m != nil {
+		return m.PostId
 	}
 	return ""
 }
 
-func (x *Request) GetMessage() string {
-	if x != nil {
-		return x.Message
+func (m *Request) GetMessage() string {
+	if m != nil {
+		return m.Message
 	}
 	return ""
 }
 
 type Response struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (x *Response) Reset() {
-	*x = Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+func (m *Response) Reset()         { *m = Response{} }
+func (m *Response) String() string { return proto.CompactTextString(m) }
+func (*Response) ProtoMessage()    {}
+func (*Response) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8266712419156109, []int{1}
 }
 
-func (x *Response) String() string {
-	return protoimpl.X.MessageStringOf(x)
+func (m *Response) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Response.Unmarshal(m, b)
 }
-
-func (*Response) ProtoMessage() {}
-
-func (x *Response) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
+func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Response.Marshal(b, m, deterministic)
+}
+func (m *Response) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Response.Merge(m, src)
+}
+func (m *Response) XXX_Size() int {
+	return xxx_messageInfo_Response.Size(m)
+}
+func (m *Response) XXX_DiscardUnknown() {
+	xxx_messageInfo_Response.DiscardUnknown(m)
 }
 
-// Deprecated: Use Response.ProtoReflect.Descriptor instead.
-func (*Response) Descriptor() ([]byte, []int) {
-	return file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescGZIP(), []int{1}
-}
-
-var File_github_com_micro_services_blog_comments_proto_comments_proto protoreflect.FileDescriptor
-
-var file_github_com_micro_services_blog_comments_proto_comments_proto_rawDesc = []byte{
-	0x0a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x63,
-	0x72, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x67,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08,
-	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x3c, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6f, 0x73, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x32, 0x3b, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2f,
-	0x0a, 0x04, 0x53, 0x61, 0x76, 0x65, 0x12, 0x11, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescOnce sync.Once
-	file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescData = file_github_com_micro_services_blog_comments_proto_comments_proto_rawDesc
-)
+var xxx_messageInfo_Response proto.InternalMessageInfo
 
-func file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescGZIP() []byte {
-	file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescOnce.Do(func() {
-		file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescData)
-	})
-	return file_github_com_micro_services_blog_comments_proto_comments_proto_rawDescData
+func init() {
+	proto.RegisterType((*Request)(nil), "comments.Request")
+	proto.RegisterType((*Response)(nil), "comments.Response")
 }
 
-var file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_github_com_micro_services_blog_comments_proto_comments_proto_goTypes = []interface{}{
-	(*Request)(nil),  // 0: comments.Request
-	(*Response)(nil), // 1: comments.Response
-}
-var file_github_com_micro_services_blog_comments_proto_comments_proto_depIdxs = []int32{
-	0, // 0: comments.Comments.Save:input_type -> comments.Request
-	1, // 1: comments.Comments.Save:output_type -> comments.Response
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+func init() {
+	proto.RegisterFile("github.com/micro/services/blog/comments/proto/comments.proto", fileDescriptor_8266712419156109)
 }
 
-func init() { file_github_com_micro_services_blog_comments_proto_comments_proto_init() }
-func file_github_com_micro_services_blog_comments_proto_comments_proto_init() {
-	if File_github_com_micro_services_blog_comments_proto_comments_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_github_com_micro_services_blog_comments_proto_comments_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_github_com_micro_services_blog_comments_proto_comments_proto_goTypes,
-		DependencyIndexes: file_github_com_micro_services_blog_comments_proto_comments_proto_depIdxs,
-		MessageInfos:      file_github_com_micro_services_blog_comments_proto_comments_proto_msgTypes,
-	}.Build()
-	File_github_com_micro_services_blog_comments_proto_comments_proto = out.File
-	file_github_com_micro_services_blog_comments_proto_comments_proto_rawDesc = nil
-	file_github_com_micro_services_blog_comments_proto_comments_proto_goTypes = nil
-	file_github_com_micro_services_blog_comments_proto_comments_proto_depIdxs = nil
+var fileDescriptor_8266712419156109 = []byte{
+	// 174 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xce, 0x31, 0xcf, 0x82, 0x40,
+	0x0c, 0x06, 0xe0, 0x8f, 0x2f, 0x06, 0xb0, 0x9b, 0xb7, 0x48, 0x9c, 0x0c, 0x93, 0x13, 0x4d, 0x74,
+	0x94, 0xcd, 0xc9, 0x15, 0x7f, 0x80, 0x81, 0xa3, 0xc1, 0x4b, 0x3c, 0x8a, 0xf4, 0xe0, 0xf7, 0x1b,
+	0x4f, 0x20, 0x8e, 0x4f, 0x9b, 0xf6, 0x7d, 0x21, 0x6f, 0x8c, 0x7b, 0x0c, 0x55, 0xa6, 0xd9, 0xa2,
+	0x35, 0xba, 0x67, 0x14, 0xea, 0x47, 0xa3, 0x49, 0xb0, 0x7a, 0x72, 0x83, 0x9a, 0xad, 0xa5, 0xd6,
+	0x09, 0x76, 0x3d, 0x3b, 0x5e, 0x98, 0x79, 0xaa, 0x78, 0x76, 0x9a, 0x43, 0x54, 0xd0, 0x6b, 0x20,
+	0x71, 0x6a, 0x0b, 0x51, 0xc7, 0xe2, 0xee, 0xa6, 0x4e, 0x82, 0x7d, 0x70, 0x58, 0x17, 0xe1, 0x87,
+	0xd7, 0x5a, 0x25, 0x10, 0x59, 0x12, 0x29, 0x1b, 0x4a, 0xfe, 0xfd, 0x62, 0x66, 0x0a, 0x10, 0x17,
+	0x24, 0x1d, 0xb7, 0x42, 0xc7, 0x33, 0xc4, 0x97, 0xe9, 0xab, 0x42, 0x58, 0xdd, 0xca, 0x91, 0xd4,
+	0x26, 0x5b, 0x82, 0xa7, 0x94, 0x9d, 0xfa, 0x1d, 0x7d, 0x4f, 0xd3, 0xbf, 0x2a, 0xf4, 0xbd, 0x4e,
+	0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x41, 0xc4, 0x9e, 0xd7, 0x00, 0x00, 0x00,
 }
diff --git a/blog/comments/proto/comments.pb.micro.go b/blog/comments/proto/comments.pb.micro.go
index 025d97b13d..ae27dfeeb2 100644
--- a/blog/comments/proto/comments.pb.micro.go
+++ b/blog/comments/proto/comments.pb.micro.go
@@ -11,9 +11,9 @@ import (
 
 import (
 	context "context"
-	api "github.com/micro/go-micro/v3/api"
-	client "github.com/micro/go-micro/v3/client"
-	server "github.com/micro/go-micro/v3/server"
+	api "github.com/micro/micro/v3/service/api"
+	client "github.com/micro/micro/v3/service/client"
+	server "github.com/micro/micro/v3/service/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/blog/posts/Makefile b/blog/posts/Makefile
index d85170df81..014a01e968 100644
--- a/blog/posts/Makefile
+++ b/blog/posts/Makefile
@@ -1,6 +1,6 @@
 
 GOPATH:=$(shell go env GOPATH)
-MODIFY=Mgithub.com/micro/go-micro/api/proto/api.proto=github.com/micro/go-micro/v3/api/proto
+MODIFY=Mgithub.com/micro/micro/proto/api/api.proto=github.com/micro/micro/v3/proto/api
 
 .PHONY: proto
 proto:
diff --git a/blog/posts/handler/posts.go b/blog/posts/handler/posts.go
index 25b94da480..48efc2e62e 100644
--- a/blog/posts/handler/posts.go
+++ b/blog/posts/handler/posts.go
@@ -7,7 +7,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/micro/go-micro/v3/errors"
+	"github.com/micro/micro/v3/service/errors"
 	"github.com/micro/micro/v3/service/logger"
 	"github.com/micro/micro/v3/service/store"
 
diff --git a/blog/posts/proto/posts/posts.pb.go b/blog/posts/proto/posts/posts.pb.go
index 69c825758a..68ef4fb1e0 100644
--- a/blog/posts/proto/posts/posts.pb.go
+++ b/blog/posts/proto/posts/posts.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto/posts/posts.proto
+// source: github.com/micro/services/blog/posts/proto/posts/posts.proto
 
 package posts
 
@@ -38,7 +38,7 @@ func (m *Post) Reset()         { *m = Post{} }
 func (m *Post) String() string { return proto.CompactTextString(m) }
 func (*Post) ProtoMessage()    {}
 func (*Post) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{0}
+	return fileDescriptor_ead3372a32dfec97, []int{0}
 }
 
 func (m *Post) XXX_Unmarshal(b []byte) error {
@@ -120,8 +120,9 @@ func (m *Post) GetTags() []string {
 type QueryRequest struct {
 	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Slug                 string   `protobuf:"bytes,2,opt,name=slug,proto3" json:"slug,omitempty"`
-	Offset               int64    `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"`
-	Limit                int64    `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"`
+	Tag                  string   `protobuf:"bytes,3,opt,name=tag,proto3" json:"tag,omitempty"`
+	Offset               int64    `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
+	Limit                int64    `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -131,7 +132,7 @@ func (m *QueryRequest) Reset()         { *m = QueryRequest{} }
 func (m *QueryRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryRequest) ProtoMessage()    {}
 func (*QueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{1}
+	return fileDescriptor_ead3372a32dfec97, []int{1}
 }
 
 func (m *QueryRequest) XXX_Unmarshal(b []byte) error {
@@ -166,6 +167,13 @@ func (m *QueryRequest) GetSlug() string {
 	return ""
 }
 
+func (m *QueryRequest) GetTag() string {
+	if m != nil {
+		return m.Tag
+	}
+	return ""
+}
+
 func (m *QueryRequest) GetOffset() int64 {
 	if m != nil {
 		return m.Offset
@@ -191,7 +199,7 @@ func (m *QueryResponse) Reset()         { *m = QueryResponse{} }
 func (m *QueryResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryResponse) ProtoMessage()    {}
 func (*QueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{2}
+	return fileDescriptor_ead3372a32dfec97, []int{2}
 }
 
 func (m *QueryResponse) XXX_Unmarshal(b []byte) error {
@@ -237,7 +245,7 @@ func (m *SaveRequest) Reset()         { *m = SaveRequest{} }
 func (m *SaveRequest) String() string { return proto.CompactTextString(m) }
 func (*SaveRequest) ProtoMessage()    {}
 func (*SaveRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{3}
+	return fileDescriptor_ead3372a32dfec97, []int{3}
 }
 
 func (m *SaveRequest) XXX_Unmarshal(b []byte) error {
@@ -311,7 +319,7 @@ func (m *SaveResponse) Reset()         { *m = SaveResponse{} }
 func (m *SaveResponse) String() string { return proto.CompactTextString(m) }
 func (*SaveResponse) ProtoMessage()    {}
 func (*SaveResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{4}
+	return fileDescriptor_ead3372a32dfec97, []int{4}
 }
 
 func (m *SaveResponse) XXX_Unmarshal(b []byte) error {
@@ -350,7 +358,7 @@ func (m *DeleteRequest) Reset()         { *m = DeleteRequest{} }
 func (m *DeleteRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteRequest) ProtoMessage()    {}
 func (*DeleteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{5}
+	return fileDescriptor_ead3372a32dfec97, []int{5}
 }
 
 func (m *DeleteRequest) XXX_Unmarshal(b []byte) error {
@@ -388,7 +396,7 @@ func (m *DeleteResponse) Reset()         { *m = DeleteResponse{} }
 func (m *DeleteResponse) String() string { return proto.CompactTextString(m) }
 func (*DeleteResponse) ProtoMessage()    {}
 func (*DeleteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a1e4efc789192621, []int{6}
+	return fileDescriptor_ead3372a32dfec97, []int{6}
 }
 
 func (m *DeleteResponse) XXX_Unmarshal(b []byte) error {
@@ -420,32 +428,34 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("proto/posts/posts.proto", fileDescriptor_a1e4efc789192621)
-}
-
-var fileDescriptor_a1e4efc789192621 = []byte{
-	// 365 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x52, 0x5d, 0x4e, 0xf3, 0x30,
-	0x10, 0xfc, 0xd2, 0xfc, 0xf4, 0xeb, 0xf6, 0x47, 0x68, 0x5b, 0xc0, 0xaa, 0x10, 0x94, 0x3c, 0xf5,
-	0xa9, 0x88, 0x82, 0xc4, 0x05, 0x38, 0x00, 0x84, 0x0b, 0x10, 0xa8, 0x5b, 0x22, 0xa5, 0x75, 0x88,
-	0x1d, 0x24, 0xce, 0xc1, 0x29, 0xb8, 0x02, 0xa7, 0x23, 0x5e, 0x3b, 0x25, 0xa9, 0xe8, 0x1b, 0x2f,
-	0xd1, 0xce, 0x6c, 0x76, 0x77, 0x66, 0x12, 0x38, 0xce, 0x72, 0xa1, 0xc4, 0x45, 0x26, 0xa4, 0x92,
-	0xe6, 0x39, 0x23, 0x06, 0x7d, 0x02, 0xe1, 0x97, 0x03, 0xde, 0x5d, 0x59, 0xe1, 0x00, 0x5a, 0xc9,
-	0x82, 0x39, 0x13, 0x67, 0xda, 0x89, 0xca, 0x0a, 0x47, 0xe0, 0xab, 0x44, 0xa5, 0x9c, 0xb5, 0x88,
-	0x32, 0x00, 0x11, 0x3c, 0x99, 0x16, 0x2b, 0xe6, 0x12, 0x49, 0x35, 0x32, 0x68, 0x3f, 0x8b, 0x8d,
-	0xe2, 0x1b, 0xc5, 0x3c, 0xa2, 0x2b, 0x48, 0x9d, 0x9c, 0xc7, 0x8a, 0x2f, 0x98, 0x5f, 0x76, 0xdc,
-	0xa8, 0x82, 0xba, 0x53, 0x64, 0x0b, 0xea, 0x04, 0xa6, 0x63, 0x21, 0x1e, 0x41, 0x10, 0x17, 0xea,
-	0x45, 0xe4, 0xac, 0x4d, 0xcb, 0x2c, 0xd2, 0x97, 0x55, 0xbc, 0x92, 0xec, 0xff, 0xc4, 0xd5, 0x97,
-	0x75, 0x1d, 0x3e, 0x42, 0xef, 0xbe, 0xe0, 0xf9, 0x7b, 0xc4, 0x5f, 0x0b, 0xfe, 0x8b, 0x87, 0x4a,
-	0x6d, 0xab, 0xa6, 0xb6, 0xdc, 0x2f, 0x96, 0x4b, 0xc9, 0x15, 0x79, 0x70, 0x23, 0x8b, 0xb4, 0xdf,
-	0x34, 0x59, 0x27, 0xc6, 0x83, 0x1b, 0x19, 0x10, 0xce, 0xa1, 0x6f, 0x2f, 0xc8, 0x4c, 0x6c, 0x24,
-	0xc7, 0x73, 0x30, 0xc1, 0x95, 0x57, 0xdc, 0x69, 0x77, 0xde, 0x9d, 0x99, 0x4c, 0x75, 0x84, 0x91,
-	0x8d, 0xf4, 0xc3, 0x81, 0xee, 0x43, 0xfc, 0xc6, 0xf7, 0xa9, 0xfa, 0x8b, 0x64, 0x4f, 0xa0, 0xa3,
-	0x92, 0x75, 0xb9, 0x3d, 0x5e, 0x67, 0x36, 0xdb, 0x1f, 0x62, 0x9b, 0x55, 0x50, 0xcb, 0xea, 0x14,
-	0x7a, 0x46, 0x94, 0x35, 0xb2, 0xa3, 0x2a, 0x3c, 0x83, 0xfe, 0x2d, 0x4f, 0xb9, 0xda, 0x27, 0x3b,
-	0x3c, 0x80, 0x41, 0xf5, 0x82, 0x59, 0x31, 0xff, 0x74, 0xc0, 0xd7, 0xc6, 0x25, 0x5e, 0x83, 0x4f,
-	0x31, 0xe1, 0xd0, 0xe6, 0x51, 0xff, 0x2c, 0xe3, 0x51, 0x93, 0x34, 0xd3, 0xe1, 0x3f, 0xbc, 0x04,
-	0x4f, 0x4b, 0x42, 0xb4, 0xfd, 0x5a, 0x68, 0xe3, 0x61, 0x83, 0xdb, 0x8e, 0xdc, 0x40, 0x60, 0x44,
-	0x60, 0xb5, 0xb4, 0x21, 0x7a, 0x7c, 0xb8, 0xc3, 0x56, 0x83, 0x4f, 0x01, 0xfd, 0xf5, 0x57, 0xdf,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x05, 0x88, 0xa9, 0x15, 0x10, 0x03, 0x00, 0x00,
+	proto.RegisterFile("github.com/micro/services/blog/posts/proto/posts/posts.proto", fileDescriptor_ead3372a32dfec97)
+}
+
+var fileDescriptor_ead3372a32dfec97 = []byte{
+	// 397 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x4b, 0xee, 0xd3, 0x30,
+	0x10, 0xc6, 0xc9, 0xf3, 0x4f, 0xa7, 0x0f, 0x55, 0x6e, 0x41, 0x56, 0x85, 0x20, 0x64, 0xd5, 0x55,
+	0x23, 0x0a, 0x12, 0x1b, 0x96, 0x1c, 0x00, 0xc2, 0x09, 0xd2, 0xc4, 0x4d, 0x2d, 0x25, 0x75, 0x88,
+	0x27, 0x95, 0x38, 0x07, 0xa7, 0xe0, 0x0a, 0x9c, 0x0e, 0xf9, 0x55, 0xd2, 0x8a, 0xee, 0xd8, 0x44,
+	0xf3, 0x7d, 0x13, 0x7b, 0x7e, 0xf3, 0x45, 0x81, 0x4f, 0x35, 0xc7, 0xd3, 0x70, 0xd8, 0x95, 0xa2,
+	0xcd, 0x5a, 0x5e, 0xf6, 0x22, 0x93, 0xac, 0xbf, 0xf0, 0x92, 0xc9, 0xec, 0xd0, 0x88, 0x3a, 0xeb,
+	0x84, 0x44, 0x99, 0x75, 0xbd, 0x40, 0xe1, 0x6a, 0xf5, 0xdc, 0x69, 0x87, 0x44, 0x5a, 0xa4, 0xbf,
+	0x3d, 0x08, 0xbf, 0x08, 0x89, 0x64, 0x01, 0x3e, 0xaf, 0xa8, 0x97, 0x78, 0xdb, 0x49, 0xee, 0xf3,
+	0x8a, 0xac, 0x21, 0x42, 0x8e, 0x0d, 0xa3, 0xbe, 0xb6, 0x8c, 0x20, 0x04, 0x42, 0xd9, 0x0c, 0x35,
+	0x0d, 0xb4, 0xa9, 0x6b, 0x42, 0xe1, 0xa9, 0x14, 0x67, 0x64, 0x67, 0xa4, 0xa1, 0xb6, 0x9d, 0xd4,
+	0x9d, 0x9e, 0x15, 0xc8, 0x2a, 0x1a, 0x25, 0xde, 0x36, 0xc8, 0x9d, 0x54, 0x9d, 0xa1, 0xab, 0x74,
+	0x27, 0x36, 0x1d, 0x2b, 0xc9, 0x4b, 0x88, 0x8b, 0x01, 0x4f, 0xa2, 0xa7, 0x4f, 0xfa, 0x32, 0xab,
+	0xd4, 0x64, 0x2c, 0x6a, 0x49, 0x9f, 0x27, 0x81, 0x9a, 0xac, 0xea, 0xb4, 0x87, 0xd9, 0xd7, 0x81,
+	0xf5, 0x3f, 0x72, 0xf6, 0x7d, 0x60, 0xff, 0xd8, 0xc1, 0xd1, 0xfa, 0x23, 0xda, 0x25, 0x04, 0x58,
+	0xb8, 0x05, 0x54, 0xa9, 0x26, 0x8a, 0xe3, 0x51, 0x32, 0x83, 0x1f, 0xe4, 0x56, 0xa9, 0x04, 0x1a,
+	0xde, 0x72, 0xb4, 0xec, 0x46, 0xa4, 0x7b, 0x98, 0xdb, 0x99, 0xb2, 0x13, 0x67, 0xc9, 0xc8, 0x5b,
+	0x30, 0x51, 0x52, 0x2f, 0x09, 0xb6, 0xd3, 0xfd, 0x74, 0x67, 0x52, 0x56, 0xa1, 0xe6, 0x36, 0xe4,
+	0x9f, 0x1e, 0x4c, 0xbf, 0x15, 0x17, 0xf6, 0x88, 0xf3, 0x7f, 0x64, 0xfd, 0x0a, 0x26, 0xc8, 0x5b,
+	0x26, 0xb1, 0x68, 0x3b, 0x4b, 0xfc, 0xd7, 0xb8, 0xa6, 0x17, 0x8f, 0xd2, 0x7b, 0x0d, 0x33, 0x03,
+	0x65, 0x17, 0xb9, 0xa3, 0x4a, 0xdf, 0xc0, 0xfc, 0x33, 0x6b, 0x18, 0x3e, 0xc2, 0x4e, 0x97, 0xb0,
+	0x70, 0x2f, 0x98, 0x2b, 0xf6, 0xbf, 0x3c, 0x88, 0xd4, 0xe2, 0x92, 0x7c, 0x80, 0x48, 0xc7, 0x44,
+	0x56, 0x36, 0x8f, 0xf1, 0x87, 0xda, 0xac, 0x6f, 0x4d, 0x73, 0x3a, 0x7d, 0x46, 0xde, 0x41, 0xa8,
+	0x90, 0x08, 0xb1, 0xfd, 0x51, 0x68, 0x9b, 0xd5, 0x8d, 0x77, 0x3d, 0xf2, 0x11, 0x62, 0x03, 0x41,
+	0xdc, 0xa5, 0x37, 0xd0, 0x9b, 0x17, 0x77, 0xae, 0x3b, 0x78, 0x88, 0xf5, 0x7f, 0xf0, 0xfe, 0x4f,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x40, 0x57, 0x3c, 0x47, 0x03, 0x00, 0x00,
 }
diff --git a/blog/posts/proto/posts/posts.pb.micro.go b/blog/posts/proto/posts/posts.pb.micro.go
index 5d724cf5c1..ed5787de06 100644
--- a/blog/posts/proto/posts/posts.pb.micro.go
+++ b/blog/posts/proto/posts/posts.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: proto/posts/posts.proto
+// source: github.com/micro/services/blog/posts/proto/posts/posts.proto
 
 package posts
 
diff --git a/blog/tags/Makefile b/blog/tags/Makefile
index 4444e1f06d..17bcbfb165 100644
--- a/blog/tags/Makefile
+++ b/blog/tags/Makefile
@@ -1,6 +1,6 @@
 
 GOPATH:=$(shell go env GOPATH)
-MODIFY=Mgithub.com/micro/go-micro/api/proto/api.proto=github.com/micro/go-micro/v3/api/proto
+MODIFY=Mgithub.com/micro/micro/proto/api/api.proto=github.com/micro/micro/v3/proto/api
 
 .PHONY: proto
 proto:
diff --git a/blog/tags/handler/tags.go b/blog/tags/handler/tags.go
index cad9b418a5..dcf1f7df55 100644
--- a/blog/tags/handler/tags.go
+++ b/blog/tags/handler/tags.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/gosimple/slug"
-	"github.com/micro/go-micro/v3/errors"
+	"github.com/micro/micro/v3/service/errors"
 	"github.com/micro/micro/v3/service/logger"
 	"github.com/micro/micro/v3/service/store"
 	pb "github.com/micro/services/blog/tags/proto"
diff --git a/blog/tags/proto/tags.pb.go b/blog/tags/proto/tags.pb.go
index 893224e696..626ffe908b 100644
--- a/blog/tags/proto/tags.pb.go
+++ b/blog/tags/proto/tags.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto/tags.proto
+// source: github.com/micro/services/blog/tags/proto/tags.proto
 
 package tags
 
@@ -37,7 +37,7 @@ func (m *Tag) Reset()         { *m = Tag{} }
 func (m *Tag) String() string { return proto.CompactTextString(m) }
 func (*Tag) ProtoMessage()    {}
 func (*Tag) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{0}
+	return fileDescriptor_fc76523216c4be8e, []int{0}
 }
 
 func (m *Tag) XXX_Unmarshal(b []byte) error {
@@ -107,7 +107,7 @@ func (m *AddRequest) Reset()         { *m = AddRequest{} }
 func (m *AddRequest) String() string { return proto.CompactTextString(m) }
 func (*AddRequest) ProtoMessage()    {}
 func (*AddRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{1}
+	return fileDescriptor_fc76523216c4be8e, []int{1}
 }
 
 func (m *AddRequest) XXX_Unmarshal(b []byte) error {
@@ -166,7 +166,7 @@ func (m *AddResponse) Reset()         { *m = AddResponse{} }
 func (m *AddResponse) String() string { return proto.CompactTextString(m) }
 func (*AddResponse) ProtoMessage()    {}
 func (*AddResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{2}
+	return fileDescriptor_fc76523216c4be8e, []int{2}
 }
 
 func (m *AddResponse) XXX_Unmarshal(b []byte) error {
@@ -200,7 +200,7 @@ func (m *RemoveRequest) Reset()         { *m = RemoveRequest{} }
 func (m *RemoveRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveRequest) ProtoMessage()    {}
 func (*RemoveRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{3}
+	return fileDescriptor_fc76523216c4be8e, []int{3}
 }
 
 func (m *RemoveRequest) XXX_Unmarshal(b []byte) error {
@@ -252,7 +252,7 @@ func (m *RemoveResponse) Reset()         { *m = RemoveResponse{} }
 func (m *RemoveResponse) String() string { return proto.CompactTextString(m) }
 func (*RemoveResponse) ProtoMessage()    {}
 func (*RemoveResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{4}
+	return fileDescriptor_fc76523216c4be8e, []int{4}
 }
 
 func (m *RemoveResponse) XXX_Unmarshal(b []byte) error {
@@ -286,7 +286,7 @@ func (m *UpdateRequest) Reset()         { *m = UpdateRequest{} }
 func (m *UpdateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateRequest) ProtoMessage()    {}
 func (*UpdateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{5}
+	return fileDescriptor_fc76523216c4be8e, []int{5}
 }
 
 func (m *UpdateRequest) XXX_Unmarshal(b []byte) error {
@@ -338,7 +338,7 @@ func (m *UpdateResponse) Reset()         { *m = UpdateResponse{} }
 func (m *UpdateResponse) String() string { return proto.CompactTextString(m) }
 func (*UpdateResponse) ProtoMessage()    {}
 func (*UpdateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{6}
+	return fileDescriptor_fc76523216c4be8e, []int{6}
 }
 
 func (m *UpdateResponse) XXX_Unmarshal(b []byte) error {
@@ -375,7 +375,7 @@ func (m *ListRequest) Reset()         { *m = ListRequest{} }
 func (m *ListRequest) String() string { return proto.CompactTextString(m) }
 func (*ListRequest) ProtoMessage()    {}
 func (*ListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{7}
+	return fileDescriptor_fc76523216c4be8e, []int{7}
 }
 
 func (m *ListRequest) XXX_Unmarshal(b []byte) error {
@@ -435,7 +435,7 @@ func (m *ListResponse) Reset()         { *m = ListResponse{} }
 func (m *ListResponse) String() string { return proto.CompactTextString(m) }
 func (*ListResponse) ProtoMessage()    {}
 func (*ListResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_53c4e9b325a9c45b, []int{8}
+	return fileDescriptor_fc76523216c4be8e, []int{8}
 }
 
 func (m *ListResponse) XXX_Unmarshal(b []byte) error {
@@ -476,33 +476,35 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("proto/tags.proto", fileDescriptor_53c4e9b325a9c45b)
-}
-
-var fileDescriptor_53c4e9b325a9c45b = []byte{
-	// 377 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x53, 0x41, 0x4f, 0xf2, 0x40,
-	0x10, 0xa5, 0x6c, 0x21, 0x1f, 0xd3, 0x0f, 0xc5, 0x91, 0x43, 0xd3, 0x44, 0x43, 0x7a, 0xe2, 0xa0,
-	0x90, 0x60, 0xfc, 0x01, 0x06, 0x2f, 0x26, 0x9e, 0x1a, 0x3d, 0x18, 0x4f, 0x95, 0x6e, 0x48, 0x13,
-	0x68, 0x6b, 0x77, 0x6b, 0x24, 0x5e, 0xfc, 0x8f, 0xfe, 0x21, 0xdb, 0xd9, 0x6d, 0x5d, 0x90, 0x78,
-	0xd1, 0xdb, 0xcc, 0x9b, 0xce, 0xbc, 0xb7, 0x6f, 0xa6, 0x30, 0xc8, 0xf2, 0x54, 0xa6, 0x53, 0x19,
-	0x2e, 0xc5, 0x84, 0x42, 0xb4, 0xab, 0xd8, 0x7f, 0x03, 0x76, 0x17, 0x2e, 0x11, 0xc1, 0x96, 0x9b,
-	0x8c, 0xbb, 0xd6, 0xc8, 0x1a, 0xf7, 0x02, 0x8a, 0x2b, 0x4c, 0xac, 0x8a, 0xa5, 0xdb, 0x56, 0x58,
-	0x15, 0xe3, 0x10, 0x3a, 0x32, 0x96, 0x2b, 0xee, 0x32, 0x02, 0x55, 0x82, 0x23, 0x70, 0x22, 0x2e,
-	0x16, 0x79, 0x9c, 0xc9, 0x38, 0x4d, 0x5c, 0x9b, 0x6a, 0x26, 0x54, 0xf5, 0x2d, 0xd2, 0x22, 0x91,
-	0x6e, 0xa7, 0xac, 0xb1, 0x40, 0x25, 0xfe, 0xbb, 0x05, 0x70, 0x15, 0x45, 0x01, 0x7f, 0x2e, 0xb8,
-	0x90, 0x78, 0x0a, 0x90, 0x73, 0x91, 0x16, 0xf9, 0x82, 0xdf, 0x5c, 0x6b, 0x29, 0x06, 0xd2, 0x88,
-	0x6c, 0x1b, 0x22, 0xf7, 0x0b, 0x1a, 0xc3, 0x61, 0xdd, 0x37, 0xcf, 0x79, 0x28, 0x79, 0x44, 0xa2,
-	0x58, 0xb0, 0x0b, 0xfb, 0x7d, 0x70, 0x48, 0x81, 0xc8, 0xd2, 0x44, 0x70, 0xff, 0x01, 0xfa, 0x01,
-	0x5f, 0xa7, 0x2f, 0xfc, 0xcf, 0x35, 0xf9, 0x03, 0x38, 0xa8, 0x47, 0x6b, 0xb2, 0x47, 0xe8, 0xdf,
-	0x67, 0x51, 0x29, 0xa3, 0x26, 0xdb, 0xb7, 0x85, 0x66, 0x58, 0xfb, 0x07, 0xc7, 0xd9, 0x37, 0xc7,
-	0x2b, 0xba, 0x7a, 0xb8, 0xa6, 0xdb, 0x80, 0x73, 0x1b, 0x0b, 0xf9, 0x9b, 0x97, 0x79, 0xf0, 0x6f,
-	0x1d, 0x27, 0x73, 0xda, 0x24, 0x23, 0x43, 0x9b, 0x9c, 0x6a, 0xe1, 0xab, 0xaa, 0xd9, 0xba, 0xa6,
-	0x73, 0xff, 0x1c, 0xfe, 0x2b, 0x6a, 0x25, 0x05, 0x4f, 0x80, 0xae, 0xaf, 0x64, 0x65, 0x63, 0x67,
-	0xd6, 0x9b, 0xd0, 0x59, 0x96, 0x77, 0x18, 0x10, 0x3c, 0xfb, 0xb0, 0xc0, 0x2e, 0x33, 0x81, 0x67,
-	0xc0, 0xca, 0xed, 0xe0, 0x40, 0x7d, 0xf0, 0x75, 0x2a, 0xde, 0x91, 0x81, 0xe8, 0xe7, 0xb5, 0xf0,
-	0x12, 0xba, 0xca, 0x61, 0x3c, 0x56, 0xe5, 0xad, 0x55, 0x7a, 0xc3, 0x6d, 0xb0, 0x69, 0x9b, 0x82,
-	0x5d, 0x89, 0x43, 0x3d, 0xd3, 0xf0, 0xc8, 0x43, 0x13, 0x32, 0x79, 0x94, 0xb5, 0x35, 0xcf, 0xd6,
-	0x16, 0x6b, 0x9e, 0x1d, 0xf7, 0x5b, 0x4f, 0x5d, 0xfa, 0xef, 0x2e, 0x3e, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0x9a, 0x72, 0x97, 0xbb, 0x8b, 0x03, 0x00, 0x00,
+	proto.RegisterFile("github.com/micro/services/blog/tags/proto/tags.proto", fileDescriptor_fc76523216c4be8e)
+}
+
+var fileDescriptor_fc76523216c4be8e = []byte{
+	// 406 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x41, 0x4f, 0xab, 0x40,
+	0x10, 0x2e, 0x5d, 0xda, 0xbc, 0x0e, 0xaf, 0xef, 0xf5, 0xed, 0xeb, 0x81, 0x90, 0x68, 0x08, 0x27,
+	0x0e, 0x5a, 0x92, 0xaa, 0x3f, 0xa0, 0xa9, 0x17, 0x13, 0x4f, 0xa4, 0x1e, 0x8c, 0x27, 0x0a, 0x1b,
+	0xdc, 0xa4, 0xb0, 0xc8, 0x2e, 0x8d, 0x8d, 0x17, 0xff, 0xa3, 0x7f, 0xc8, 0xb0, 0x0b, 0xb8, 0xad,
+	0x8d, 0x17, 0xbd, 0xcd, 0x7c, 0xc3, 0xcc, 0xf7, 0xed, 0x37, 0x03, 0x5c, 0xa6, 0x54, 0x3c, 0x56,
+	0xeb, 0x59, 0xcc, 0xb2, 0x20, 0xa3, 0x71, 0xc9, 0x02, 0x4e, 0xca, 0x2d, 0x8d, 0x09, 0x0f, 0xd6,
+	0x1b, 0x96, 0x06, 0x22, 0x4a, 0x79, 0x50, 0x94, 0x4c, 0x30, 0x19, 0xce, 0x64, 0x88, 0xcd, 0x3a,
+	0xf6, 0x5e, 0x00, 0xad, 0xa2, 0x14, 0x63, 0x30, 0xc5, 0xae, 0x20, 0xb6, 0xe1, 0x1a, 0xfe, 0x28,
+	0x94, 0x71, 0x8d, 0xf1, 0x4d, 0x95, 0xda, 0x7d, 0x85, 0xd5, 0x31, 0x9e, 0xc2, 0x40, 0x50, 0xb1,
+	0x21, 0x36, 0x92, 0xa0, 0x4a, 0xb0, 0x0b, 0x56, 0x42, 0x78, 0x5c, 0xd2, 0x42, 0x50, 0x96, 0xdb,
+	0xa6, 0xac, 0xe9, 0x50, 0xdd, 0x17, 0xb3, 0x2a, 0x17, 0xf6, 0xc0, 0x35, 0x7c, 0x14, 0xaa, 0xc4,
+	0x7b, 0x35, 0x00, 0x16, 0x49, 0x12, 0x92, 0xa7, 0x8a, 0x70, 0x81, 0x4f, 0x01, 0x4a, 0xc2, 0x59,
+	0x55, 0xc6, 0xe4, 0xe6, 0xba, 0x91, 0xa2, 0x21, 0x9d, 0xc8, 0xbe, 0x26, 0xf2, 0xb8, 0x20, 0x1f,
+	0xfe, 0xb6, 0x7d, 0xcb, 0x92, 0x44, 0x82, 0x24, 0x52, 0x14, 0x0a, 0x0f, 0x61, 0x6f, 0x0c, 0x96,
+	0x54, 0xc0, 0x0b, 0x96, 0x73, 0xe2, 0xdd, 0xc3, 0x38, 0x24, 0x19, 0xdb, 0x92, 0x1f, 0xd7, 0xe4,
+	0x4d, 0xe0, 0x4f, 0x3b, 0xba, 0x21, 0x7b, 0x80, 0xf1, 0x5d, 0x91, 0x44, 0xa2, 0x23, 0x3b, 0xb6,
+	0x85, 0x6e, 0x58, 0xff, 0x0b, 0xc7, 0xd1, 0x27, 0xc7, 0x6b, 0xba, 0x76, 0x78, 0x43, 0xb7, 0x03,
+	0xeb, 0x96, 0x72, 0xf1, 0x9d, 0x97, 0x39, 0xf0, 0x2b, 0xa3, 0xf9, 0x52, 0x6e, 0x12, 0x49, 0x43,
+	0xbb, 0x5c, 0xd6, 0xa2, 0x67, 0x55, 0x33, 0x9b, 0x5a, 0x93, 0x7b, 0xe7, 0xf0, 0x5b, 0x51, 0x2b,
+	0x29, 0xf8, 0x04, 0xe4, 0xf5, 0xd9, 0x86, 0x8b, 0x7c, 0x6b, 0x3e, 0x9a, 0xc9, 0xb3, 0x5c, 0x45,
+	0x69, 0x28, 0xe1, 0xf9, 0x9b, 0x01, 0xe6, 0x2a, 0x4a, 0x39, 0x3e, 0x03, 0xb4, 0x48, 0x12, 0x3c,
+	0x51, 0x1f, 0x7c, 0x9c, 0x8a, 0xf3, 0x4f, 0x43, 0x9a, 0xe7, 0xf5, 0xf0, 0x15, 0x0c, 0x95, 0xc3,
+	0xf8, 0xbf, 0x2a, 0xef, 0xad, 0xd2, 0x99, 0xee, 0x83, 0x5d, 0x5b, 0x00, 0x66, 0x2d, 0x0e, 0x37,
+	0x33, 0x35, 0x8f, 0x1c, 0xac, 0x43, 0x3a, 0x8f, 0xb2, 0xb6, 0xe5, 0xd9, 0xdb, 0x62, 0xcb, 0x73,
+	0xe0, 0x7e, 0x6f, 0x3d, 0x94, 0xff, 0xdd, 0xc5, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xb1,
+	0x3f, 0xea, 0xaf, 0x03, 0x00, 0x00,
 }
diff --git a/blog/tags/proto/tags.pb.micro.go b/blog/tags/proto/tags.pb.micro.go
index 029b1ecda3..c87b47a1dd 100644
--- a/blog/tags/proto/tags.pb.micro.go
+++ b/blog/tags/proto/tags.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: proto/tags.proto
+// source: github.com/micro/services/blog/tags/proto/tags.proto
 
 package tags
 
diff --git a/chat/proto/chat.pb.go b/chat/proto/chat.pb.go
index cca8e16649..50d03799ef 100644
--- a/chat/proto/chat.pb.go
+++ b/chat/proto/chat.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: chat/proto/chat.proto
+// source: github.com/micro/services/chat/proto/chat.proto
 
 package chat
 
@@ -32,7 +32,7 @@ func (m *NewRequest) Reset()         { *m = NewRequest{} }
 func (m *NewRequest) String() string { return proto.CompactTextString(m) }
 func (*NewRequest) ProtoMessage()    {}
 func (*NewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{0}
+	return fileDescriptor_4935707190cdb38c, []int{0}
 }
 
 func (m *NewRequest) XXX_Unmarshal(b []byte) error {
@@ -72,7 +72,7 @@ func (m *NewResponse) Reset()         { *m = NewResponse{} }
 func (m *NewResponse) String() string { return proto.CompactTextString(m) }
 func (*NewResponse) ProtoMessage()    {}
 func (*NewResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{1}
+	return fileDescriptor_4935707190cdb38c, []int{1}
 }
 
 func (m *NewResponse) XXX_Unmarshal(b []byte) error {
@@ -114,7 +114,7 @@ func (m *HistoryRequest) Reset()         { *m = HistoryRequest{} }
 func (m *HistoryRequest) String() string { return proto.CompactTextString(m) }
 func (*HistoryRequest) ProtoMessage()    {}
 func (*HistoryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{2}
+	return fileDescriptor_4935707190cdb38c, []int{2}
 }
 
 func (m *HistoryRequest) XXX_Unmarshal(b []byte) error {
@@ -154,7 +154,7 @@ func (m *HistoryResponse) Reset()         { *m = HistoryResponse{} }
 func (m *HistoryResponse) String() string { return proto.CompactTextString(m) }
 func (*HistoryResponse) ProtoMessage()    {}
 func (*HistoryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{3}
+	return fileDescriptor_4935707190cdb38c, []int{3}
 }
 
 func (m *HistoryResponse) XXX_Unmarshal(b []byte) error {
@@ -203,7 +203,7 @@ func (m *SendRequest) Reset()         { *m = SendRequest{} }
 func (m *SendRequest) String() string { return proto.CompactTextString(m) }
 func (*SendRequest) ProtoMessage()    {}
 func (*SendRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{4}
+	return fileDescriptor_4935707190cdb38c, []int{4}
 }
 
 func (m *SendRequest) XXX_Unmarshal(b []byte) error {
@@ -270,7 +270,7 @@ func (m *SendResponse) Reset()         { *m = SendResponse{} }
 func (m *SendResponse) String() string { return proto.CompactTextString(m) }
 func (*SendResponse) ProtoMessage()    {}
 func (*SendResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{5}
+	return fileDescriptor_4935707190cdb38c, []int{5}
 }
 
 func (m *SendResponse) XXX_Unmarshal(b []byte) error {
@@ -316,7 +316,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_825b1469f80f958d, []int{6}
+	return fileDescriptor_4935707190cdb38c, []int{6}
 }
 
 func (m *Message) XXX_Unmarshal(b []byte) error {
@@ -396,32 +396,36 @@ func init() {
 	proto.RegisterType((*Message)(nil), "chat.Message")
 }
 
-func init() { proto.RegisterFile("chat/proto/chat.proto", fileDescriptor_825b1469f80f958d) }
-
-var fileDescriptor_825b1469f80f958d = []byte{
-	// 370 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x4e, 0x3a, 0x31,
-	0x10, 0xc7, 0xd3, 0xdd, 0xfd, 0x6d, 0x61, 0xf8, 0x89, 0xda, 0x48, 0x58, 0xd7, 0x0b, 0xe9, 0x41,
-	0x41, 0x23, 0x18, 0x4c, 0x3c, 0x79, 0x31, 0x5c, 0xe4, 0x20, 0x87, 0xf5, 0x01, 0xc8, 0x42, 0x1b,
-	0x59, 0xa3, 0xbb, 0x48, 0x4b, 0xd0, 0x57, 0xf0, 0x65, 0x7c, 0x0b, 0x9f, 0xcb, 0xf4, 0x0f, 0xd0,
-	0x35, 0x72, 0x9b, 0xf9, 0xce, 0x74, 0xfa, 0xf9, 0x76, 0x0a, 0x8d, 0xe9, 0x2c, 0x95, 0xbd, 0xf9,
-	0xa2, 0x90, 0x45, 0x4f, 0x85, 0x5d, 0x1d, 0x92, 0x40, 0xc5, 0xf4, 0x0c, 0x60, 0xc4, 0x57, 0x09,
-	0x7f, 0x5b, 0x72, 0x21, 0xc9, 0x31, 0x54, 0x96, 0x82, 0x2f, 0xc6, 0x19, 0x13, 0x11, 0x6a, 0xf9,
-	0xed, 0x6a, 0x82, 0x55, 0x3e, 0x64, 0x82, 0x9e, 0x42, 0x4d, 0x37, 0x8a, 0x79, 0x91, 0x0b, 0x4e,
-	0x9a, 0x80, 0xd5, 0xf9, 0x71, 0xc6, 0x22, 0xd4, 0x42, 0xed, 0x6a, 0x12, 0xaa, 0x74, 0xc8, 0x68,
-	0x07, 0xea, 0xf7, 0x99, 0x90, 0xc5, 0xe2, 0x63, 0x3d, 0x74, 0x67, 0xeb, 0x2d, 0xec, 0x6f, 0x5a,
-	0xed, 0xd8, 0x0e, 0x54, 0x5e, 0xb9, 0x10, 0xe9, 0x13, 0x37, 0x00, 0xb5, 0xfe, 0x5e, 0x57, 0x33,
-	0x3f, 0x18, 0x35, 0xd9, 0x94, 0xe9, 0x27, 0x82, 0xda, 0x23, 0xcf, 0xd9, 0xfa, 0x9a, 0x13, 0xa8,
-	0x4e, 0x5f, 0x32, 0x9e, 0x3b, 0x17, 0x55, 0x8c, 0x30, 0x64, 0x2e, 0x83, 0xe7, 0x32, 0xa8, 0x82,
-	0x75, 0x1c, 0xf9, 0xa6, 0x60, 0x0c, 0x93, 0x08, 0xb0, 0x58, 0x4e, 0x9e, 0xf9, 0x54, 0x46, 0x81,
-	0x2e, 0xac, 0x53, 0x42, 0x20, 0x90, 0xfc, 0x5d, 0x46, 0xff, 0xb4, 0xac, 0x63, 0x5a, 0x87, 0xff,
-	0x86, 0xc5, 0xf8, 0xa0, 0x5f, 0x08, 0xb0, 0x45, 0x26, 0x75, 0xf0, 0x36, 0x44, 0x5e, 0xc6, 0xca,
-	0xa0, 0xde, 0x6e, 0x50, 0x7f, 0x17, 0x68, 0x50, 0x02, 0x6d, 0x02, 0x16, 0x6a, 0x58, 0x6a, 0x88,
-	0xfc, 0x24, 0x54, 0xe9, 0x9d, 0x74, 0x1d, 0x84, 0x7f, 0x3b, 0xc0, 0x5b, 0x07, 0xfd, 0x6f, 0x04,
-	0xc1, 0x60, 0x96, 0x4a, 0x72, 0x0e, 0xfe, 0x88, 0xaf, 0xc8, 0x81, 0x79, 0xf7, 0xed, 0xe7, 0x88,
-	0x0f, 0x1d, 0xc5, 0xae, 0xeb, 0x06, 0xb0, 0xdd, 0x20, 0x39, 0x32, 0xd5, 0xf2, 0xee, 0xe3, 0xc6,
-	0x2f, 0xd5, 0x9e, 0xbb, 0x84, 0x40, 0x3d, 0x17, 0xb1, 0x23, 0x9d, 0x35, 0xc6, 0xc4, 0x95, 0x6c,
-	0xfb, 0x05, 0xe0, 0x41, 0x91, 0xe7, 0x0a, 0xbd, 0xfc, 0x1d, 0xe2, 0x72, 0xda, 0x46, 0x57, 0x68,
-	0x12, 0xea, 0xef, 0x7d, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x81, 0x53, 0x8a, 0xc9, 0xf7, 0x02,
-	0x00, 0x00,
+func init() {
+	proto.RegisterFile("github.com/micro/services/chat/proto/chat.proto", fileDescriptor_4935707190cdb38c)
+}
+
+var fileDescriptor_4935707190cdb38c = []byte{
+	// 405 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6e, 0xda, 0x40,
+	0x10, 0xc6, 0xb5, 0xb6, 0xeb, 0x85, 0xa1, 0xa5, 0xed, 0xaa, 0x15, 0xae, 0x7b, 0x41, 0x3e, 0xb4,
+	0x50, 0x54, 0x5c, 0x51, 0x29, 0x97, 0xe4, 0x92, 0x70, 0x09, 0x87, 0x70, 0x70, 0x6e, 0xb9, 0x20,
+	0x63, 0xaf, 0x60, 0xa3, 0x60, 0x13, 0xef, 0x3a, 0x24, 0xaf, 0x90, 0x97, 0xc9, 0x5b, 0xe4, 0xb9,
+	0xa2, 0xfd, 0x03, 0xd8, 0x51, 0x90, 0x72, 0x9b, 0xf9, 0x66, 0x3c, 0xfb, 0xfb, 0x76, 0xd6, 0x10,
+	0x2e, 0x98, 0x58, 0x96, 0xf3, 0x61, 0x92, 0xaf, 0xc2, 0x15, 0x4b, 0x8a, 0x3c, 0xe4, 0xb4, 0xb8,
+	0x63, 0x09, 0xe5, 0x61, 0xb2, 0x8c, 0x45, 0xb8, 0x2e, 0x72, 0x91, 0xab, 0x70, 0xa8, 0x42, 0xe2,
+	0xc8, 0x38, 0xf8, 0x0d, 0x30, 0xa5, 0x9b, 0x88, 0xde, 0x96, 0x94, 0x0b, 0xf2, 0x03, 0x1a, 0x25,
+	0xa7, 0xc5, 0x8c, 0xa5, 0xdc, 0x43, 0x5d, 0xbb, 0xd7, 0x8c, 0xb0, 0xcc, 0x27, 0x29, 0x0f, 0x7e,
+	0x41, 0x4b, 0x35, 0xf2, 0x75, 0x9e, 0x71, 0x4a, 0x3a, 0x80, 0xe5, 0xf7, 0x33, 0x96, 0x7a, 0xa8,
+	0x8b, 0x7a, 0xcd, 0xc8, 0x95, 0xe9, 0x24, 0x0d, 0xfa, 0xd0, 0x3e, 0x67, 0x5c, 0xe4, 0xc5, 0xc3,
+	0x76, 0xe8, 0xc1, 0xd6, 0x13, 0xf8, 0xbc, 0x6b, 0x35, 0x63, 0xfb, 0xd0, 0x58, 0x51, 0xce, 0xe3,
+	0x05, 0xd5, 0x00, 0xad, 0xd1, 0xa7, 0xa1, 0x62, 0xbe, 0xd0, 0x6a, 0xb4, 0x2b, 0x07, 0x8f, 0x08,
+	0x5a, 0x97, 0x34, 0x4b, 0xb7, 0xc7, 0xfc, 0x84, 0x66, 0x72, 0xc3, 0x68, 0x56, 0x39, 0xa8, 0xa1,
+	0x85, 0x49, 0x5a, 0x65, 0xb0, 0xaa, 0x0c, 0xb2, 0x60, 0x1c, 0x7b, 0xb6, 0x2e, 0x68, 0xc3, 0xc4,
+	0x03, 0xcc, 0xcb, 0xf9, 0x35, 0x4d, 0x84, 0xe7, 0xa8, 0xc2, 0x36, 0x25, 0x04, 0x1c, 0x41, 0xef,
+	0x85, 0xf7, 0x41, 0xc9, 0x2a, 0x0e, 0xda, 0xf0, 0x51, 0xb3, 0x68, 0x1f, 0xc1, 0x13, 0x02, 0x6c,
+	0x90, 0x49, 0x1b, 0xac, 0x1d, 0x91, 0xc5, 0xd2, 0x3a, 0xa8, 0x75, 0x18, 0xd4, 0x3e, 0x04, 0xea,
+	0xd4, 0x40, 0x3b, 0x80, 0xb9, 0x1c, 0x16, 0x6b, 0x22, 0x3b, 0x72, 0x65, 0x7a, 0x2a, 0xaa, 0x0e,
+	0xdc, 0xb7, 0x1d, 0xe0, 0xbd, 0x83, 0xd1, 0x33, 0x02, 0x67, 0xbc, 0x8c, 0x05, 0xf9, 0x03, 0xf6,
+	0x94, 0x6e, 0xc8, 0x17, 0x7d, 0xef, 0xfb, 0xc7, 0xe1, 0x7f, 0xad, 0x28, 0x66, 0x5d, 0x47, 0x80,
+	0xcd, 0x06, 0xc9, 0x37, 0x5d, 0xad, 0xef, 0xde, 0xff, 0xfe, 0x4a, 0x35, 0xdf, 0xfd, 0x05, 0x47,
+	0x5e, 0x17, 0x31, 0x23, 0x2b, 0x6b, 0xf4, 0x49, 0x55, 0x32, 0xed, 0x03, 0xc0, 0xe3, 0x3c, 0xcb,
+	0x24, 0x7a, 0xfd, 0x39, 0xf8, 0xf5, 0xb4, 0x87, 0xfe, 0xa1, 0xb3, 0xc1, 0x55, 0xff, 0x3d, 0xbf,
+	0xc2, 0xb1, 0x0c, 0xe7, 0xae, 0x8a, 0xff, 0xbf, 0x04, 0x00, 0x00, 0xff, 0xff, 0x38, 0x55, 0x82,
+	0x43, 0x3e, 0x03, 0x00, 0x00,
 }
diff --git a/chat/proto/chat.pb.micro.go b/chat/proto/chat.pb.micro.go
index 5e6ec91824..7f0c7fa8be 100644
--- a/chat/proto/chat.pb.micro.go
+++ b/chat/proto/chat.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: chat/proto/chat.proto
+// source: github.com/micro/services/chat/proto/chat.proto
 
 package chat
 
diff --git a/go.mod b/go.mod
index 79d57dfc5a..8cf98cb953 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/golang/protobuf v1.4.2
 	github.com/google/uuid v1.1.2
 	github.com/gosimple/slug v1.9.0
-	github.com/micro/go-micro/v3 v3.0.0-beta.3
 	github.com/micro/micro/v3 v3.0.0-beta.6.0.20201015134940-68ac1ddfa568
 	github.com/miekg/dns v1.1.31 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect
@@ -15,8 +14,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
 	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
 	google.golang.org/genproto v0.0.0-20201001141541-efaab9d3c4f7 // indirect
-	google.golang.org/grpc v1.32.0
-	google.golang.org/protobuf v1.25.0
+	google.golang.org/grpc v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 )
 
diff --git a/go.sum b/go.sum
index 630fa5f564..851e129759 100644
--- a/go.sum
+++ b/go.sum
@@ -32,7 +32,6 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
 github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw=
 github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
@@ -48,8 +47,6 @@ github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvd
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
-github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8=
 github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
@@ -66,7 +63,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
-github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
@@ -85,16 +81,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY=
 github.com/cloudflare/cloudflare-go v0.10.9 h1:d8KOgLpYiC+Xq3T4tuO+/goM+RZvuO+T4pojuv8giL8=
 github.com/cloudflare/cloudflare-go v0.10.9/go.mod h1:5TrsWH+3f4NV6WjtS5QFp+DifH81rph40gU374Sh0dQ=
-github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
-github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
-github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
-github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
-github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
-github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
@@ -108,16 +94,11 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/dnsimple/dnsimple-go v0.30.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg=
-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/ef-ds/deque v1.0.4-0.20190904040645-54cb57c252a1/go.mod h1:HvODWzv6Y6kBf3Ah2WzN1bHjDUezGLaAhwuWVwfpEJs=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch/v5 v5.0.0 h1:dKTrUeykyQwKb/kx7Z+4ukDs6l+4L41HqG1XHnhX7WE=
@@ -127,7 +108,6 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsouza/go-dockerclient v1.6.0/go.mod h1:YWwtNPuL4XTX1SKJQk86cWPmmqwx+4np9qfPbb+znGc=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-acme/lego/v3 v3.4.0 h1:deB9NkelA+TfjGHVw8J7iKl/rMtffcGMWSMmptvMv0A=
 github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M=
@@ -143,18 +123,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.3 h1:ZOigqf7iBxkA4jdQ3am7ATzdlOFp9YzA6NmuvEEZc9g=
 github.com/gobwas/ws v1.0.3/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -226,12 +201,10 @@ github.com/gosimple/slug v1.9.0 h1:r5vDcYrFz9BmfIAMC829un9hq7hKM4cHUrsv36LbEqs=
 github.com/gosimple/slug v1.9.0/go.mod h1:AMZ+sOVe65uByN3kgEyf9WEBKBCSS+dJjMX9x4vDJbg=
 github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
-github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-retryablehttp v0.6.4 h1:BbgctKO892xEyOXnGiaAwIoSq1QZ/SS4AhjoAh9DnfY=
 github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
@@ -258,8 +231,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b h1:FQ7+9fxhyp82ks9vAuyPzG0/vVbWwMwLJ+P6yJI5FN8=
 github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b/go.mod h1:HMcgvsgd0Fjj4XXDkbjdmlbI505rUPBs6WBMYg2pXks=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s=
@@ -287,8 +258,6 @@ github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+tw
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/micro/go-micro/v3 v3.0.0-beta.3 h1:4B8UbMg+HRL3Cb7Ly1tIY6c9t0dNjNwEf0Tyh+Jk4zk=
-github.com/micro/go-micro/v3 v3.0.0-beta.3/go.mod h1:DiwYchJ8kCWOZVXMsZwuFcNDAdSCS6aEbYfEni4LvK4=
 github.com/micro/micro/v3 v3.0.0-beta.6.0.20201015134940-68ac1ddfa568 h1:Nz+CWXbuowAMG8GBJYufNCaWoNW0WqN0IohFAdlMGdY=
 github.com/micro/micro/v3 v3.0.0-beta.6.0.20201015134940-68ac1ddfa568/go.mod h1:PK1Fa+RtdIVinOLBPgJQJP5Ov8V0ExXx+ywA80f9TdQ=
 github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -308,7 +277,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
@@ -330,13 +298,6 @@ github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ=
@@ -366,7 +327,6 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
@@ -385,7 +345,6 @@ github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLS
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -397,7 +356,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
 github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
@@ -409,7 +367,6 @@ github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
 github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
@@ -420,7 +377,6 @@ github.com/xanzy/go-gitlab v0.35.1 h1:jJSgT0NxjCvrSZf7Gvn2NxxV9xAYkTjYrKW8XwWhrf
 github.com/xanzy/go-gitlab v0.35.1/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
@@ -445,7 +401,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -555,12 +510,10 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -595,9 +548,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -743,10 +694,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v;L>?3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -754,7 +704,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/helloworld/proto/helloworld.pb.go b/helloworld/proto/helloworld.pb.go
index 60cfed51a3..03afbc83da 100644
--- a/helloworld/proto/helloworld.pb.go
+++ b/helloworld/proto/helloworld.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: helloworld/proto/helloworld.proto
+// source: github.com/micro/services/helloworld/proto/helloworld.proto
 
 package helloworld
 
@@ -31,7 +31,7 @@ func (m *Request) Reset()         { *m = Request{} }
 func (m *Request) String() string { return proto.CompactTextString(m) }
 func (*Request) ProtoMessage()    {}
 func (*Request) Descriptor() ([]byte, []int) {
-	return fileDescriptor_641cff7980a2aacd, []int{0}
+	return fileDescriptor_db677fb74c3ffc82, []int{0}
 }
 
 func (m *Request) XXX_Unmarshal(b []byte) error {
@@ -70,7 +70,7 @@ func (m *Response) Reset()         { *m = Response{} }
 func (m *Response) String() string { return proto.CompactTextString(m) }
 func (*Response) ProtoMessage()    {}
 func (*Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor_641cff7980a2aacd, []int{1}
+	return fileDescriptor_db677fb74c3ffc82, []int{1}
 }
 
 func (m *Response) XXX_Unmarshal(b []byte) error {
@@ -103,17 +103,21 @@ func init() {
 	proto.RegisterType((*Response)(nil), "helloworld.Response")
 }
 
-func init() { proto.RegisterFile("helloworld/proto/helloworld.proto", fileDescriptor_641cff7980a2aacd) }
-
-var fileDescriptor_641cff7980a2aacd = []byte{
-	// 138 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcc, 0x48, 0xcd, 0xc9,
-	0xc9, 0x2f, 0xcf, 0x2f, 0xca, 0x49, 0xd1, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x47, 0x08, 0xe8,
-	0x81, 0x05, 0x84, 0xb8, 0x10, 0x22, 0x4a, 0xb2, 0x5c, 0xec, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5,
-	0x25, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41,
-	0x60, 0xb6, 0x92, 0x0c, 0x17, 0x47, 0x50, 0x6a, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x90, 0x00,
-	0x17, 0x73, 0x6e, 0x71, 0x3a, 0x54, 0x1a, 0xc4, 0x34, 0x72, 0xe4, 0xe2, 0xf2, 0x80, 0x1b, 0x25,
-	0x64, 0xcc, 0xc5, 0xe2, 0x9c, 0x98, 0x93, 0x23, 0x24, 0xac, 0x87, 0x64, 0x23, 0xd4, 0x70, 0x29,
-	0x11, 0x54, 0x41, 0x88, 0x91, 0x4a, 0x0c, 0x49, 0x6c, 0x60, 0x27, 0x19, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x72, 0xbc, 0x74, 0x44, 0xb7, 0x00, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("github.com/micro/services/helloworld/proto/helloworld.proto", fileDescriptor_db677fb74c3ffc82)
+}
+
+var fileDescriptor_db677fb74c3ffc82 = []byte{
+	// 163 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9,
+	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x4e, 0x2d,
+	0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0xcf, 0x48, 0xcd, 0xc9, 0xc9, 0x2f, 0xcf, 0x2f, 0xca, 0x49,
+	0xd1, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x47, 0x12, 0xd0, 0x03, 0x0b, 0x08, 0x71, 0x21, 0x44, 0x94,
+	0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12,
+	0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x25, 0x19, 0x2e, 0x8e, 0xa0,
+	0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x01, 0x2e, 0xe6, 0xdc, 0xe2, 0x74, 0xa8, 0x34,
+	0x88, 0x69, 0xe4, 0xc8, 0xc5, 0xe5, 0x01, 0x37, 0x4a, 0xc8, 0x98, 0x8b, 0xc5, 0x39, 0x31, 0x27,
+	0x47, 0x48, 0x58, 0x0f, 0xc9, 0x46, 0xa8, 0xe1, 0x52, 0x22, 0xa8, 0x82, 0x10, 0x23, 0x95, 0x18,
+	0x92, 0xd8, 0xc0, 0x4e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x03, 0x31, 0x86, 0xda, 0xd1,
+	0x00, 0x00, 0x00,
 }
diff --git a/helloworld/proto/helloworld.pb.micro.go b/helloworld/proto/helloworld.pb.micro.go
index f343c98b09..82e15b67a3 100644
--- a/helloworld/proto/helloworld.pb.micro.go
+++ b/helloworld/proto/helloworld.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: helloworld/proto/helloworld.proto
+// source: github.com/micro/services/helloworld/proto/helloworld.proto
 
 package helloworld
 
@@ -11,9 +11,9 @@ import (
 
 import (
 	context "context"
-	api "github.com/micro/go-micro/v3/api"
-	client "github.com/micro/go-micro/v3/client"
-	server "github.com/micro/go-micro/v3/server"
+	api "github.com/micro/micro/v3/service/api"
+	client "github.com/micro/micro/v3/service/client"
+	server "github.com/micro/micro/v3/service/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/test/kv/handler/handler.go b/test/kv/handler/handler.go
index 4d6f697589..1ce779fb59 100644
--- a/test/kv/handler/handler.go
+++ b/test/kv/handler/handler.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/micro/go-micro/v3/logger"
+	log "github.com/micro/micro/v3/service/logger"
 	store "github.com/micro/micro/v3/service/store"
 
 	pb "github.com/micro/services/test/kv/proto"
diff --git a/test/kv/proto/example.pb.go b/test/kv/proto/example.pb.go
index fda3a41d33..0fd70b7651 100644
--- a/test/kv/proto/example.pb.go
+++ b/test/kv/proto/example.pb.go
@@ -1,15 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: test/service/storeexample/proto/example.proto
+// source: github.com/micro/services/test/kv/proto/example.proto
 
 package srv_test_example
 
 import (
-	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -34,7 +30,7 @@ func (m *Request) Reset()         { *m = Request{} }
 func (m *Request) String() string { return proto.CompactTextString(m) }
 func (*Request) ProtoMessage()    {}
 func (*Request) Descriptor() ([]byte, []int) {
-	return fileDescriptor_060cb6963cd2b8f6, []int{0}
+	return fileDescriptor_c4c395a09e1b1991, []int{0}
 }
 
 func (m *Request) XXX_Unmarshal(b []byte) error {
@@ -66,7 +62,7 @@ func (m *Response) Reset()         { *m = Response{} }
 func (m *Response) String() string { return proto.CompactTextString(m) }
 func (*Response) ProtoMessage()    {}
 func (*Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor_060cb6963cd2b8f6, []int{1}
+	return fileDescriptor_c4c395a09e1b1991, []int{1}
 }
 
 func (m *Response) XXX_Unmarshal(b []byte) error {
@@ -100,99 +96,22 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("test/service/storeexample/proto/example.proto", fileDescriptor_060cb6963cd2b8f6)
-}
-
-var fileDescriptor_060cb6963cd2b8f6 = []byte{
-	// 155 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2d, 0x49, 0x2d, 0x2e,
-	0xd1, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0x4d, 0xad,
-	0x48, 0xcc, 0x2d, 0xc8, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x87, 0xf2, 0xf4, 0xc0,
-	0x3c, 0x21, 0x81, 0xe2, 0xa2, 0x32, 0x3d, 0x90, 0x96, 0x78, 0xa8, 0xb8, 0x12, 0x27, 0x17, 0x7b,
-	0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x92, 0x0c, 0x17, 0x47, 0x50, 0x6a, 0x71, 0x41, 0x7e,
-	0x5e, 0x71, 0xaa, 0x90, 0x00, 0x17, 0x73, 0x6e, 0x71, 0xba, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67,
-	0x10, 0x88, 0x69, 0x14, 0xc0, 0xc5, 0xee, 0x0a, 0xd1, 0x23, 0xe4, 0xca, 0xc5, 0x15, 0x92, 0x5a,
-	0x5c, 0xe2, 0x5a, 0x51, 0x90, 0x59, 0x54, 0x29, 0x24, 0xa9, 0x87, 0x6e, 0xa8, 0x1e, 0xd4, 0x44,
-	0x29, 0x29, 0x6c, 0x52, 0x10, 0x1b, 0x94, 0x18, 0x92, 0xd8, 0xc0, 0x6e, 0x32, 0x06, 0x04, 0x00,
-	0x00, 0xff, 0xff, 0x4c, 0xad, 0xe6, 0x25, 0xc4, 0x00, 0x00, 0x00,
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ExampleClient is the client API for Example service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ExampleClient interface {
-	TestExpiry(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error)
-}
-
-type exampleClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewExampleClient(cc *grpc.ClientConn) ExampleClient {
-	return &exampleClient{cc}
-}
-
-func (c *exampleClient) TestExpiry(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, "/srv.test_example.Example/TestExpiry", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ExampleServer is the server API for Example service.
-type ExampleServer interface {
-	TestExpiry(context.Context, *Request) (*Response, error)
-}
-
-// UnimplementedExampleServer can be embedded to have forward compatible implementations.
-type UnimplementedExampleServer struct {
-}
-
-func (*UnimplementedExampleServer) TestExpiry(ctx context.Context, req *Request) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method TestExpiry not implemented")
-}
-
-func RegisterExampleServer(s *grpc.Server, srv ExampleServer) {
-	s.RegisterService(&_Example_serviceDesc, srv)
-}
-
-func _Example_TestExpiry_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Request)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ExampleServer).TestExpiry(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/srv.test_example.Example/TestExpiry",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ExampleServer).TestExpiry(ctx, req.(*Request))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Example_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "srv.test_example.Example",
-	HandlerType: (*ExampleServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "TestExpiry",
-			Handler:    _Example_TestExpiry_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "test/service/storeexample/proto/example.proto",
+	proto.RegisterFile("github.com/micro/services/test/kv/proto/example.proto", fileDescriptor_c4c395a09e1b1991)
+}
+
+var fileDescriptor_c4c395a09e1b1991 = []byte{
+	// 206 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4d, 0xcf, 0x2c, 0xc9,
+	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x4e, 0x2d,
+	0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0xcf, 0x2e, 0xd3, 0x2f, 0x28,
+	0xca, 0x2f, 0xc9, 0xd7, 0x4f, 0xad, 0x48, 0xcc, 0x2d, 0xc8, 0x49, 0xd5, 0x03, 0xf3, 0x84, 0x04,
+	0x8a, 0x8b, 0xca, 0xf4, 0x40, 0x0a, 0xe2, 0xa1, 0xe2, 0x4a, 0x9c, 0x5c, 0xec, 0x41, 0xa9, 0x85,
+	0xa5, 0xa9, 0xc5, 0x25, 0x4a, 0x32, 0x5c, 0x1c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9,
+	0x42, 0x02, 0x5c, 0xcc, 0xb9, 0xc5, 0xe9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6,
+	0xd1, 0x2a, 0x26, 0x2e, 0x76, 0x57, 0x88, 0x26, 0x21, 0x57, 0x2e, 0xae, 0x90, 0xd4, 0xe2, 0x12,
+	0xd7, 0x8a, 0x82, 0xcc, 0xa2, 0x4a, 0x21, 0x49, 0x3d, 0x74, 0x53, 0xf5, 0xa0, 0x46, 0x4a, 0x49,
+	0x61, 0x93, 0x82, 0x58, 0xa1, 0xc4, 0x20, 0xe4, 0xcc, 0xc5, 0x01, 0x32, 0xc6, 0x27, 0xb3, 0xb8,
+	0x84, 0x7c, 0x43, 0x3c, 0xb8, 0x78, 0x61, 0x86, 0xf8, 0x64, 0xe6, 0x66, 0x52, 0x60, 0x92, 0x27,
+	0x17, 0x1f, 0xcc, 0x24, 0xff, 0xb4, 0xb4, 0xe2, 0x54, 0xf2, 0x8d, 0x4a, 0x62, 0x03, 0x07, 0xb7,
+	0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x58, 0x31, 0xa7, 0x72, 0xa7, 0x01, 0x00, 0x00,
 }
diff --git a/test/kv/proto/example.pb.micro.go b/test/kv/proto/example.pb.micro.go
index 3d97c3f8a8..53211307d3 100644
--- a/test/kv/proto/example.pb.micro.go
+++ b/test/kv/proto/example.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: test/service/storeexample/proto/example.proto
+// source: github.com/micro/services/test/kv/proto/example.proto
 
 package srv_test_example
 
@@ -11,9 +11,9 @@ import (
 
 import (
 	context "context"
-	api "github.com/micro/go-micro/v3/api"
-	client "github.com/micro/go-micro/v3/client"
-	server "github.com/micro/go-micro/v3/server"
+	api "github.com/micro/micro/v3/service/api"
+	client "github.com/micro/micro/v3/service/client"
+	server "github.com/micro/micro/v3/service/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/test/pubsub/proto/pubsub.pb.go b/test/pubsub/proto/pubsub.pb.go
index 77c97443e8..fe6e4d45d3 100644
--- a/test/pubsub/proto/pubsub.pb.go
+++ b/test/pubsub/proto/pubsub.pb.go
@@ -1,157 +1,88 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.11.4
-// source: github.com/micro/services/pubsub/proto/pubsub.proto
+// source: github.com/micro/services/test/pubsub/proto/pubsub.proto
 
 package pubsub
 
 import (
+	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
+	math "math"
 )
 
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Message struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Body                 []byte   `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (x *Message) Reset() {
-	*x = Message{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_micro_services_pubsub_proto_pubsub_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+func (m *Message) Reset()         { *m = Message{} }
+func (m *Message) String() string { return proto.CompactTextString(m) }
+func (*Message) ProtoMessage()    {}
+func (*Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_59fce66331057326, []int{0}
 }
 
-func (x *Message) String() string {
-	return protoimpl.X.MessageStringOf(x)
+func (m *Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Message.Unmarshal(m, b)
 }
-
-func (*Message) ProtoMessage() {}
-
-func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_micro_services_pubsub_proto_pubsub_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
+func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
 }
-
-// Deprecated: Use Message.ProtoReflect.Descriptor instead.
-func (*Message) Descriptor() ([]byte, []int) {
-	return file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescGZIP(), []int{0}
+func (m *Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Message.Merge(m, src)
+}
+func (m *Message) XXX_Size() int {
+	return xxx_messageInfo_Message.Size(m)
 }
+func (m *Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_Message.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Message proto.InternalMessageInfo
 
-func (x *Message) GetId() string {
-	if x != nil {
-		return x.Id
+func (m *Message) GetId() string {
+	if m != nil {
+		return m.Id
 	}
 	return ""
 }
 
-func (x *Message) GetBody() []byte {
-	if x != nil {
-		return x.Body
+func (m *Message) GetBody() []byte {
+	if m != nil {
+		return m.Body
 	}
 	return nil
 }
 
-var File_github_com_micro_services_pubsub_proto_pubsub_proto protoreflect.FileDescriptor
-
-var file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDesc = []byte{
-	0x0a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x63,
-	0x72, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x73,
-	0x75, 0x62, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x75, 0x62, 0x73, 0x75, 0x62, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x70, 0x75, 0x62, 0x73, 0x75, 0x62, 0x22, 0x2d, 0x0a,
-	0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescOnce sync.Once
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescData = file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDesc
-)
-
-func file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescGZIP() []byte {
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescOnce.Do(func() {
-		file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescData)
-	})
-	return file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDescData
+func init() {
+	proto.RegisterType((*Message)(nil), "pubsub.Message")
 }
 
-var file_github_com_micro_services_pubsub_proto_pubsub_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_github_com_micro_services_pubsub_proto_pubsub_proto_goTypes = []interface{}{
-	(*Message)(nil), // 0: pubsub.Message
-}
-var file_github_com_micro_services_pubsub_proto_pubsub_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+func init() {
+	proto.RegisterFile("github.com/micro/services/test/pubsub/proto/pubsub.proto", fileDescriptor_59fce66331057326)
 }
 
-func init() { file_github_com_micro_services_pubsub_proto_pubsub_proto_init() }
-func file_github_com_micro_services_pubsub_proto_pubsub_proto_init() {
-	if File_github_com_micro_services_pubsub_proto_pubsub_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_github_com_micro_services_pubsub_proto_pubsub_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_github_com_micro_services_pubsub_proto_pubsub_proto_goTypes,
-		DependencyIndexes: file_github_com_micro_services_pubsub_proto_pubsub_proto_depIdxs,
-		MessageInfos:      file_github_com_micro_services_pubsub_proto_pubsub_proto_msgTypes,
-	}.Build()
-	File_github_com_micro_services_pubsub_proto_pubsub_proto = out.File
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_rawDesc = nil
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_goTypes = nil
-	file_github_com_micro_services_pubsub_proto_pubsub_proto_depIdxs = nil
+var fileDescriptor_59fce66331057326 = []byte{
+	// 126 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
+	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x4e, 0x2d,
+	0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x2f, 0x28, 0x4d, 0x2a, 0x2e,
+	0x4d, 0xd2, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x87, 0x72, 0xf4, 0xc0, 0x1c, 0x21, 0x36, 0x08, 0x4f,
+	0x49, 0x97, 0x8b, 0xdd, 0x37, 0xb5, 0xb8, 0x38, 0x31, 0x3d, 0x55, 0x88, 0x8f, 0x8b, 0x29, 0x33,
+	0x45, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x88, 0x29, 0x33, 0x45, 0x48, 0x88, 0x8b, 0x25, 0x29,
+	0x3f, 0xa5, 0x52, 0x82, 0x49, 0x81, 0x51, 0x83, 0x27, 0x08, 0xcc, 0x4e, 0x62, 0x03, 0xeb, 0x36,
+	0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x26, 0xef, 0xb4, 0x87, 0x79, 0x00, 0x00, 0x00,
 }
diff --git a/test/pubsub/proto/pubsub.pb.micro.go b/test/pubsub/proto/pubsub.pb.micro.go
index 41f5339960..dd5a28cf42 100644
--- a/test/pubsub/proto/pubsub.pb.micro.go
+++ b/test/pubsub/proto/pubsub.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/services/pubsub/proto/pubsub.proto
+// source: github.com/micro/services/test/pubsub/proto/pubsub.proto
 
 package pubsub
 
diff --git a/test/routes/proto/stream.pb.go b/test/routes/proto/stream.pb.go
index 2eb27252f4..7f7e1ae18a 100644
--- a/test/routes/proto/stream.pb.go
+++ b/test/routes/proto/stream.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto/stream.proto
+// source: github.com/micro/services/test/routes/proto/stream.proto
 
 package stream
 
@@ -36,7 +36,7 @@ func (m *Point) Reset()         { *m = Point{} }
 func (m *Point) String() string { return proto.CompactTextString(m) }
 func (*Point) ProtoMessage()    {}
 func (*Point) Descriptor() ([]byte, []int) {
-	return fileDescriptor_45777bc300452f06, []int{0}
+	return fileDescriptor_585c4bbb470dd9c7, []int{0}
 }
 
 func (m *Point) XXX_Unmarshal(b []byte) error {
@@ -87,7 +87,7 @@ func (m *Rectangle) Reset()         { *m = Rectangle{} }
 func (m *Rectangle) String() string { return proto.CompactTextString(m) }
 func (*Rectangle) ProtoMessage()    {}
 func (*Rectangle) Descriptor() ([]byte, []int) {
-	return fileDescriptor_45777bc300452f06, []int{1}
+	return fileDescriptor_585c4bbb470dd9c7, []int{1}
 }
 
 func (m *Rectangle) XXX_Unmarshal(b []byte) error {
@@ -138,7 +138,7 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_45777bc300452f06, []int{2}
+	return fileDescriptor_585c4bbb470dd9c7, []int{2}
 }
 
 func (m *Feature) XXX_Unmarshal(b []byte) error {
@@ -188,7 +188,7 @@ func (m *RouteNote) Reset()         { *m = RouteNote{} }
 func (m *RouteNote) String() string { return proto.CompactTextString(m) }
 func (*RouteNote) ProtoMessage()    {}
 func (*RouteNote) Descriptor() ([]byte, []int) {
-	return fileDescriptor_45777bc300452f06, []int{3}
+	return fileDescriptor_585c4bbb470dd9c7, []int{3}
 }
 
 func (m *RouteNote) XXX_Unmarshal(b []byte) error {
@@ -245,7 +245,7 @@ func (m *RouteSummary) Reset()         { *m = RouteSummary{} }
 func (m *RouteSummary) String() string { return proto.CompactTextString(m) }
 func (*RouteSummary) ProtoMessage()    {}
 func (*RouteSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_45777bc300452f06, []int{4}
+	return fileDescriptor_585c4bbb470dd9c7, []int{4}
 }
 
 func (m *RouteSummary) XXX_Unmarshal(b []byte) error {
@@ -303,33 +303,35 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("proto/stream.proto", fileDescriptor_45777bc300452f06)
-}
-
-var fileDescriptor_45777bc300452f06 = []byte{
-	// 371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x52, 0x4f, 0x4b, 0xfb, 0x40,
-	0x10, 0xed, 0xf6, 0xd7, 0x3f, 0xbf, 0x4c, 0x52, 0xc4, 0xc1, 0x43, 0x29, 0x8a, 0x1a, 0x2f, 0xf5,
-	0x52, 0x4b, 0x05, 0x3d, 0x4b, 0xc1, 0x2a, 0x88, 0x94, 0xe8, 0xbd, 0xac, 0xc9, 0xda, 0x2e, 0x24,
-	0xd9, 0x92, 0x6c, 0x0e, 0x7e, 0x0e, 0x3f, 0xa3, 0xdf, 0xc3, 0xcd, 0xee, 0x26, 0xb6, 0xb6, 0x78,
-	0xcb, 0xbc, 0x37, 0x6f, 0xde, 0xec, 0x9b, 0x00, 0xae, 0x33, 0x21, 0xc5, 0x55, 0x2e, 0x33, 0x46,
-	0x93, 0x91, 0x2e, 0xb0, 0x63, 0x2a, 0xff, 0x0e, 0xda, 0x73, 0xc1, 0x53, 0x89, 0x03, 0xf8, 0x1f,
-	0x53, 0xc9, 0x65, 0x11, 0xb1, 0x3e, 0x39, 0x23, 0xc3, 0x76, 0x50, 0xd7, 0x78, 0x0c, 0x4e, 0x2c,
-	0xd2, 0xa5, 0x21, 0x9b, 0x9a, 0xfc, 0x01, 0xfc, 0x47, 0x70, 0x02, 0x16, 0x4a, 0x9a, 0x2e, 0x63,
-	0x86, 0x27, 0xd0, 0x8c, 0x85, 0x1e, 0xe0, 0x4e, 0x7a, 0x23, 0x6b, 0xa9, 0x1d, 0x02, 0x45, 0x94,
-	0xf4, 0x8a, 0xeb, 0x11, 0xbb, 0xf4, 0x8a, 0xfb, 0x0f, 0xd0, 0xbd, 0x67, 0x54, 0x16, 0x19, 0x43,
-	0x84, 0x56, 0x4a, 0x13, 0xb3, 0x8b, 0x13, 0xe8, 0x6f, 0xbc, 0x54, 0x3b, 0x8a, 0x50, 0x6d, 0x25,
-	0xd2, 0xfd, 0x33, 0x6a, 0xda, 0x9f, 0xab, 0xa5, 0x44, 0x21, 0xd9, 0xb3, 0x90, 0xdb, 0x3a, 0xf2,
-	0xa7, 0x0e, 0xfb, 0xd0, 0x4d, 0x58, 0x9e, 0xd3, 0xa5, 0x79, 0xa8, 0x13, 0x54, 0xa5, 0xff, 0x49,
-	0xc0, 0xd3, 0x23, 0x5f, 0x8a, 0x24, 0xa1, 0xd9, 0x07, 0x9e, 0x82, 0xbb, 0x2e, 0xd5, 0x8b, 0x50,
-	0x14, 0xa9, 0xb4, 0xa1, 0x81, 0x86, 0xa6, 0x25, 0x82, 0x17, 0xd0, 0x7b, 0x37, 0xaf, 0xb1, 0x2d,
-	0x26, 0x3a, 0xcf, 0x82, 0xa6, 0x49, 0xe5, 0x1e, 0xf1, 0x5c, 0xa5, 0x17, 0xb2, 0xfe, 0x3f, 0x93,
-	0x7b, 0x55, 0xe3, 0x39, 0x78, 0x2c, 0xa6, 0xeb, 0x9c, 0x45, 0x0b, 0xc9, 0x55, 0x16, 0x2d, 0xcd,
-	0xbb, 0x16, 0x7b, 0x55, 0xd0, 0xe4, 0x8b, 0x00, 0xe8, 0xad, 0x66, 0x05, 0x57, 0x97, 0x1a, 0x01,
-	0xcc, 0x98, 0xac, 0x32, 0xdc, 0x7e, 0xe5, 0xe0, 0xa0, 0x2a, 0x2d, 0xef, 0x37, 0xf0, 0x06, 0xbc,
-	0x27, 0xe5, 0x66, 0x81, 0x1c, 0x0f, 0xab, 0x96, 0xfa, 0xa2, 0x7b, 0x54, 0x63, 0xa2, 0x74, 0xae,
-	0xea, 0x10, 0x59, 0xa4, 0xbd, 0x7f, 0x1b, 0x1d, 0xd5, 0x53, 0x36, 0xf2, 0xf2, 0x1b, 0x43, 0x82,
-	0xb7, 0xf6, 0x2c, 0xd3, 0x15, 0x95, 0x1b, 0x66, 0xd5, 0xa5, 0x06, 0xbb, 0x50, 0x29, 0x1b, 0x93,
-	0xb7, 0x8e, 0xfe, 0x6d, 0xaf, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x12, 0xaf, 0xc8, 0xcc,
-	0x02, 0x00, 0x00,
+	proto.RegisterFile("github.com/micro/services/test/routes/proto/stream.proto", fileDescriptor_585c4bbb470dd9c7)
+}
+
+var fileDescriptor_585c4bbb470dd9c7 = []byte{
+	// 402 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x5d, 0x6b, 0xd5, 0x40,
+	0x10, 0xed, 0x5e, 0xfb, 0x71, 0x33, 0xf7, 0x16, 0x71, 0xf0, 0xe1, 0x12, 0x14, 0x35, 0xbe, 0xd4,
+	0x97, 0xa4, 0x54, 0xa8, 0xbe, 0x4a, 0xc1, 0x2a, 0x88, 0x94, 0xe8, 0x7b, 0xd9, 0x6e, 0xc6, 0x64,
+	0x21, 0x9b, 0xbd, 0xec, 0x4e, 0x04, 0x7f, 0x87, 0xbf, 0xd1, 0xff, 0x21, 0xd9, 0x4d, 0x62, 0x6b,
+	0x2f, 0x7d, 0xcb, 0x39, 0x67, 0xce, 0xcc, 0xce, 0x99, 0xc0, 0xfb, 0x5a, 0x73, 0xd3, 0xdf, 0xe4,
+	0xca, 0x9a, 0xc2, 0x68, 0xe5, 0x6c, 0xe1, 0xc9, 0xfd, 0xd4, 0x8a, 0x7c, 0xc1, 0xe4, 0xb9, 0x70,
+	0xb6, 0x67, 0xf2, 0xc5, 0xd6, 0x59, 0xb6, 0x85, 0x67, 0x47, 0xd2, 0xe4, 0x01, 0xe0, 0x61, 0x44,
+	0xd9, 0x07, 0x38, 0xb8, 0xb2, 0xba, 0x63, 0x4c, 0x61, 0xd9, 0x4a, 0xd6, 0xdc, 0x57, 0xb4, 0x11,
+	0x2f, 0xc5, 0xc9, 0x41, 0x39, 0x63, 0x7c, 0x06, 0x49, 0x6b, 0xbb, 0x3a, 0x8a, 0x8b, 0x20, 0xfe,
+	0x23, 0xb2, 0xcf, 0x90, 0x94, 0xa4, 0x58, 0x76, 0x75, 0x4b, 0xf8, 0x1c, 0x16, 0xad, 0x0d, 0x0d,
+	0x56, 0x67, 0xc7, 0xf9, 0x38, 0x32, 0x4c, 0x28, 0x17, 0xad, 0x1d, 0xe4, 0x46, 0x87, 0x16, 0xf7,
+	0xe5, 0x46, 0x67, 0x9f, 0xe0, 0xe8, 0x23, 0x49, 0xee, 0x1d, 0x21, 0xc2, 0x7e, 0x27, 0x4d, 0x7c,
+	0x4b, 0x52, 0x86, 0x6f, 0x7c, 0x03, 0xcb, 0xd6, 0x2a, 0xc9, 0xda, 0x76, 0xbb, 0x7b, 0xcc, 0x72,
+	0x76, 0x05, 0x49, 0x39, 0x2c, 0xff, 0xd5, 0xf2, 0x5d, 0x9f, 0x78, 0xd0, 0x87, 0x1b, 0x38, 0x32,
+	0xe4, 0xbd, 0xac, 0xe3, 0xa2, 0x49, 0x39, 0xc1, 0xec, 0xb7, 0x80, 0x75, 0x68, 0xf9, 0xad, 0x37,
+	0x46, 0xba, 0x5f, 0xf8, 0x02, 0x56, 0xdb, 0xc1, 0x7d, 0xad, 0x6c, 0xdf, 0xf1, 0x18, 0x1a, 0x04,
+	0xea, 0x62, 0x60, 0xf0, 0x35, 0x1c, 0xff, 0x88, 0xdb, 0x8c, 0x25, 0x31, 0xba, 0xf5, 0x48, 0xc6,
+	0xa2, 0x14, 0x96, 0x95, 0xf6, 0x2c, 0x3b, 0x45, 0x9b, 0x47, 0x31, 0xf7, 0x09, 0xe3, 0x2b, 0x58,
+	0x53, 0x2b, 0xb7, 0x9e, 0xaa, 0x6b, 0xd6, 0x86, 0x36, 0xfb, 0x41, 0x5f, 0x8d, 0xdc, 0x77, 0x6d,
+	0xe8, 0xec, 0x8f, 0x00, 0x08, 0xaf, 0xba, 0xec, 0x75, 0x45, 0x98, 0x03, 0x5c, 0x12, 0x4f, 0x19,
+	0xde, 0xdd, 0x32, 0x7d, 0x3c, 0xc1, 0x51, 0xcf, 0xf6, 0xf0, 0x1c, 0xd6, 0x5f, 0xb4, 0x9f, 0x0c,
+	0x1e, 0x9f, 0x4c, 0x25, 0xf3, 0x45, 0x77, 0xb8, 0x4e, 0x05, 0x9e, 0xc3, 0xaa, 0x24, 0x65, 0x5d,
+	0x15, 0x66, 0xff, 0x3f, 0xe8, 0xe9, 0xdc, 0xe5, 0x56, 0x5e, 0xd9, 0xde, 0x89, 0xc0, 0x77, 0xe3,
+	0x59, 0x2e, 0x1a, 0xc9, 0xb7, 0x86, 0x4d, 0x97, 0x4a, 0xef, 0x53, 0x83, 0xed, 0x54, 0xdc, 0x1c,
+	0x86, 0xdf, 0xf6, 0xed, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x82, 0x91, 0x05, 0xf2, 0x02,
+	0x00, 0x00,
 }
diff --git a/test/routes/proto/stream.pb.micro.go b/test/routes/proto/stream.pb.micro.go
index 03c9f700e7..56803060e2 100644
--- a/test/routes/proto/stream.pb.micro.go
+++ b/test/routes/proto/stream.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: proto/stream.proto
+// source: github.com/micro/services/test/routes/proto/stream.proto
 
 package stream
 
diff --git a/test/template/proto/idiomatic.pb.go b/test/template/proto/idiomatic.pb.go
index 3891e6ffb2..0837564ab3 100644
--- a/test/template/proto/idiomatic.pb.go
+++ b/test/template/proto/idiomatic.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto/idiomatic.proto
+// source: github.com/micro/services/test/template/proto/idiomatic.proto
 
 package idiomatic
 
@@ -31,7 +31,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{0}
+	return fileDescriptor_62f877917a7b488e, []int{0}
 }
 
 func (m *Message) XXX_Unmarshal(b []byte) error {
@@ -70,7 +70,7 @@ func (m *Request) Reset()         { *m = Request{} }
 func (m *Request) String() string { return proto.CompactTextString(m) }
 func (*Request) ProtoMessage()    {}
 func (*Request) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{1}
+	return fileDescriptor_62f877917a7b488e, []int{1}
 }
 
 func (m *Request) XXX_Unmarshal(b []byte) error {
@@ -109,7 +109,7 @@ func (m *Response) Reset()         { *m = Response{} }
 func (m *Response) String() string { return proto.CompactTextString(m) }
 func (*Response) ProtoMessage()    {}
 func (*Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{2}
+	return fileDescriptor_62f877917a7b488e, []int{2}
 }
 
 func (m *Response) XXX_Unmarshal(b []byte) error {
@@ -148,7 +148,7 @@ func (m *StreamingRequest) Reset()         { *m = StreamingRequest{} }
 func (m *StreamingRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingRequest) ProtoMessage()    {}
 func (*StreamingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{3}
+	return fileDescriptor_62f877917a7b488e, []int{3}
 }
 
 func (m *StreamingRequest) XXX_Unmarshal(b []byte) error {
@@ -187,7 +187,7 @@ func (m *StreamingResponse) Reset()         { *m = StreamingResponse{} }
 func (m *StreamingResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingResponse) ProtoMessage()    {}
 func (*StreamingResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{4}
+	return fileDescriptor_62f877917a7b488e, []int{4}
 }
 
 func (m *StreamingResponse) XXX_Unmarshal(b []byte) error {
@@ -226,7 +226,7 @@ func (m *Ping) Reset()         { *m = Ping{} }
 func (m *Ping) String() string { return proto.CompactTextString(m) }
 func (*Ping) ProtoMessage()    {}
 func (*Ping) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{5}
+	return fileDescriptor_62f877917a7b488e, []int{5}
 }
 
 func (m *Ping) XXX_Unmarshal(b []byte) error {
@@ -265,7 +265,7 @@ func (m *Pong) Reset()         { *m = Pong{} }
 func (m *Pong) String() string { return proto.CompactTextString(m) }
 func (*Pong) ProtoMessage()    {}
 func (*Pong) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70718d389c4b1652, []int{6}
+	return fileDescriptor_62f877917a7b488e, []int{6}
 }
 
 func (m *Pong) XXX_Unmarshal(b []byte) error {
@@ -303,25 +303,29 @@ func init() {
 	proto.RegisterType((*Pong)(nil), "idiomatic.Pong")
 }
 
-func init() { proto.RegisterFile("proto/idiomatic.proto", fileDescriptor_70718d389c4b1652) }
-
-var fileDescriptor_70718d389c4b1652 = []byte{
-	// 270 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x3f, 0x4f, 0xc3, 0x30,
-	0x10, 0xc5, 0x6b, 0xb5, 0xa4, 0xcd, 0x2d, 0x6d, 0x8f, 0x3f, 0x42, 0x69, 0x41, 0xc8, 0x53, 0x58,
-	0x4a, 0x29, 0x23, 0x1b, 0x0c, 0x88, 0x01, 0x09, 0x85, 0x8d, 0xcd, 0x14, 0xcb, 0xb2, 0xa8, 0xed,
-	0x92, 0x73, 0x07, 0x3e, 0x1b, 0x5f, 0x0e, 0xc5, 0x71, 0x4a, 0x8a, 0xca, 0x76, 0xf7, 0x7e, 0xef,
-	0x4e, 0xef, 0x6c, 0x38, 0x5e, 0x97, 0xce, 0xbb, 0x2b, 0xfd, 0xae, 0x9d, 0x11, 0x5e, 0x2f, 0x67,
-	0xa1, 0xc7, 0x74, 0x2b, 0xf0, 0x09, 0xf4, 0x9f, 0x24, 0x91, 0x50, 0x12, 0x47, 0xd0, 0x25, 0xf1,
-	0x75, 0xca, 0x2e, 0x58, 0x9e, 0x16, 0x55, 0xc9, 0xcf, 0xa0, 0x5f, 0xc8, 0xcf, 0x8d, 0x24, 0x8f,
-	0x08, 0x3d, 0x2b, 0x8c, 0x8c, 0x34, 0xd4, 0x7c, 0x0a, 0x83, 0x42, 0xd2, 0xda, 0x59, 0x0a, 0xc3,
-	0x86, 0x54, 0x33, 0x6c, 0x48, 0xf1, 0x1c, 0x46, 0x2f, 0xbe, 0x94, 0xc2, 0x68, 0xab, 0x9a, 0x2d,
-	0x47, 0x70, 0xb0, 0x74, 0x1b, 0xeb, 0x83, 0xaf, 0x5b, 0xd4, 0x0d, 0xbf, 0x84, 0x71, 0xcb, 0x19,
-	0x17, 0xee, 0xb7, 0x9e, 0x43, 0xef, 0x59, 0x5b, 0x85, 0x27, 0x90, 0x90, 0x2f, 0xdd, 0x87, 0x8c,
-	0x38, 0x76, 0x81, 0xbb, 0xff, 0xf9, 0xe2, 0x9b, 0x41, 0xfa, 0xd8, 0x1c, 0x8f, 0xd7, 0xd0, 0xbb,
-	0x17, 0xab, 0x15, 0xe2, 0xec, 0xf7, 0x85, 0x62, 0xd4, 0xec, 0x70, 0x47, 0xab, 0x43, 0xf1, 0x0e,
-	0x3e, 0x40, 0x52, 0x67, 0xc5, 0x49, 0xcb, 0xf0, 0xf7, 0xd0, 0x6c, 0xba, 0x1f, 0x36, 0x6b, 0xe6,
-	0x0c, 0x17, 0x30, 0xa8, 0x2e, 0x09, 0x69, 0x87, 0x2d, 0x77, 0x25, 0x66, 0x3b, 0x82, 0xb3, 0x8a,
-	0x77, 0x72, 0x36, 0x67, 0x77, 0xe3, 0xd7, 0x61, 0xf8, 0xc0, 0xdb, 0x2d, 0x7d, 0x4b, 0x82, 0x70,
-	0xf3, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xd7, 0xdf, 0x69, 0xea, 0x01, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("github.com/micro/services/test/template/proto/idiomatic.proto", fileDescriptor_62f877917a7b488e)
+}
+
+var fileDescriptor_62f877917a7b488e = []byte{
+	// 303 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xbd, 0x4e, 0x33, 0x31,
+	0x10, 0x8c, 0x95, 0x7c, 0xf9, 0xd9, 0xe6, 0x0b, 0x06, 0x21, 0x94, 0x04, 0x84, 0x5c, 0x85, 0x26,
+	0x0e, 0xa1, 0x40, 0x08, 0xd1, 0x40, 0x81, 0x28, 0x90, 0xd0, 0xd1, 0xd1, 0x39, 0xc7, 0xca, 0x58,
+	0xc4, 0x76, 0xb8, 0x75, 0x90, 0x78, 0x36, 0x5e, 0x0e, 0x9d, 0xef, 0x2e, 0x5c, 0x50, 0x28, 0xe8,
+	0x76, 0x67, 0x66, 0x47, 0x33, 0x36, 0x5c, 0x69, 0x13, 0x5e, 0x56, 0xf3, 0x49, 0xea, 0xad, 0xb4,
+	0x26, 0xcd, 0xbc, 0x24, 0xcc, 0xde, 0x4d, 0x8a, 0x24, 0x03, 0x52, 0x90, 0x01, 0xed, 0x72, 0xa1,
+	0x02, 0xca, 0x65, 0xe6, 0x83, 0x97, 0xe6, 0xd9, 0x78, 0xab, 0x82, 0x49, 0x27, 0x71, 0xe7, 0xbd,
+	0x35, 0x20, 0x86, 0xd0, 0xb9, 0x47, 0x22, 0xa5, 0x91, 0xf7, 0xa1, 0x49, 0xea, 0xe3, 0x80, 0x1d,
+	0xb3, 0x71, 0x2f, 0xc9, 0x47, 0x71, 0x08, 0x9d, 0x04, 0xdf, 0x56, 0x48, 0x81, 0x73, 0x68, 0x39,
+	0x65, 0xb1, 0x64, 0xe3, 0x2c, 0x46, 0xd0, 0x4d, 0x90, 0x96, 0xde, 0x51, 0x3c, 0xb6, 0xa4, 0xab,
+	0x63, 0x4b, 0x5a, 0x8c, 0xa1, 0xff, 0x18, 0x32, 0x54, 0xd6, 0x38, 0x5d, 0xb9, 0xec, 0xc1, 0xbf,
+	0xd4, 0xaf, 0x5c, 0x88, 0xba, 0x66, 0x52, 0x2c, 0xe2, 0x04, 0x76, 0x6a, 0xca, 0xd2, 0x70, 0xbb,
+	0xf4, 0x08, 0x5a, 0x0f, 0xc6, 0x69, 0xbe, 0x0f, 0x6d, 0x0a, 0x99, 0x7f, 0xc5, 0x92, 0x2e, 0xb7,
+	0xc8, 0xfb, 0xdf, 0xf9, 0xd9, 0x27, 0x83, 0xde, 0x5d, 0x55, 0x9e, 0x9f, 0x42, 0xeb, 0x46, 0x2d,
+	0x16, 0x9c, 0x4f, 0xbe, 0x5f, 0xa8, 0x8c, 0x3a, 0xd8, 0xdd, 0xc0, 0x8a, 0x50, 0xa2, 0xc1, 0x6f,
+	0xa1, 0x5d, 0x64, 0xe5, 0xc3, 0x9a, 0xe0, 0x67, 0xd1, 0xc1, 0x68, 0x3b, 0x59, 0xd9, 0x4c, 0x19,
+	0x9f, 0x41, 0x37, 0x6f, 0x12, 0xd3, 0xfe, 0xaf, 0xa9, 0x73, 0x70, 0xb0, 0x01, 0x78, 0xa7, 0x45,
+	0x63, 0xcc, 0xa6, 0xec, 0xfa, 0xe2, 0xe9, 0xfc, 0x4f, 0x1f, 0x7f, 0xb9, 0x76, 0x99, 0xb7, 0x23,
+	0x70, 0xf6, 0x15, 0x00, 0x00, 0xff, 0xff, 0xeb, 0xd1, 0xb5, 0x3e, 0x3a, 0x02, 0x00, 0x00,
 }
diff --git a/test/template/proto/idiomatic.pb.micro.go b/test/template/proto/idiomatic.pb.micro.go
index 2791244f40..77624ed05f 100644
--- a/test/template/proto/idiomatic.pb.micro.go
+++ b/test/template/proto/idiomatic.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: proto/idiomatic.proto
+// source: github.com/micro/services/test/template/proto/idiomatic.proto
 
 package idiomatic
 
@@ -11,9 +11,9 @@ import (
 
 import (
 	context "context"
-	api "github.com/micro/go-micro/v3/api"
-	client "github.com/micro/go-micro/v3/client"
-	server "github.com/micro/go-micro/v3/server"
+	api "github.com/micro/micro/v3/service/api"
+	client "github.com/micro/micro/v3/service/client"
+	server "github.com/micro/micro/v3/service/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/test/template/proto/idiomatic.proto b/test/template/proto/idiomatic.proto
index 58ce947789..eeca0d9804 100644
--- a/test/template/proto/idiomatic.proto
+++ b/test/template/proto/idiomatic.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package idiomatic;
 
-option go_package = "proto;idiomatic";
+option go_package = "github.com/micro/services/test/template/proto;idiomatic";
 
 service Idiomatic {
 	rpc Call(Request) returns (Response) {}