diff --git a/auth/service/proto/accounts/accounts.pb.go b/auth/service/proto/accounts.pb.go
similarity index 62%
rename from auth/service/proto/accounts/accounts.pb.go
rename to auth/service/proto/accounts.pb.go
index e776cb64..f389386c 100644
--- a/auth/service/proto/accounts/accounts.pb.go
+++ b/auth/service/proto/accounts.pb.go
@@ -1,12 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/accounts/accounts.proto
+// source: accounts.proto
 
 package go_micro_auth
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	auth "github.com/micro/go-micro/v2/auth/service/proto/auth"
 	math "math"
 )
 
@@ -31,7 +30,7 @@ func (m *ListAccountsRequest) Reset()         { *m = ListAccountsRequest{} }
 func (m *ListAccountsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAccountsRequest) ProtoMessage()    {}
 func (*ListAccountsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_25929ace37374fcc, []int{0}
+	return fileDescriptor_e1e7723af4c007b7, []int{0}
 }
 
 func (m *ListAccountsRequest) XXX_Unmarshal(b []byte) error {
@@ -53,17 +52,17 @@ func (m *ListAccountsRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_ListAccountsRequest proto.InternalMessageInfo
 
 type ListAccountsResponse struct {
-	Accounts             []*auth.Account `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
-	XXX_unrecognized     []byte          `json:"-"`
-	XXX_sizecache        int32           `json:"-"`
+	Accounts             []*Account `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
 func (m *ListAccountsResponse) Reset()         { *m = ListAccountsResponse{} }
 func (m *ListAccountsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAccountsResponse) ProtoMessage()    {}
 func (*ListAccountsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_25929ace37374fcc, []int{1}
+	return fileDescriptor_e1e7723af4c007b7, []int{1}
 }
 
 func (m *ListAccountsResponse) XXX_Unmarshal(b []byte) error {
@@ -84,7 +83,7 @@ func (m *ListAccountsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ListAccountsResponse proto.InternalMessageInfo
 
-func (m *ListAccountsResponse) GetAccounts() []*auth.Account {
+func (m *ListAccountsResponse) GetAccounts() []*Account {
 	if m != nil {
 		return m.Accounts
 	}
@@ -97,21 +96,19 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/auth/service/proto/accounts/accounts.proto", fileDescriptor_25929ace37374fcc)
+	proto.RegisterFile("accounts.proto", fileDescriptor_e1e7723af4c007b7)
 }
 
-var fileDescriptor_25929ace37374fcc = []byte{
-	// 186 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcf, 0x2c, 0xc9,
-	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x4f, 0xcf, 0xd7,
-	0x85, 0x30, 0x12, 0x4b, 0x4b, 0x32, 0xf4, 0x8b, 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0xf5, 0x0b,
-	0x8a, 0xf2, 0x4b, 0xf2, 0xf5, 0x13, 0x93, 0x93, 0xf3, 0x4b, 0xf3, 0x4a, 0x8a, 0xe1, 0x0c, 0x3d,
-	0xb0, 0xb8, 0x10, 0x6f, 0x7a, 0xbe, 0x1e, 0x58, 0x93, 0x1e, 0x48, 0x93, 0x94, 0x0d, 0x69, 0x86,
-	0x82, 0x84, 0x40, 0x04, 0xc4, 0x30, 0x25, 0x51, 0x2e, 0x61, 0x9f, 0xcc, 0xe2, 0x12, 0x47, 0xa8,
-	0x15, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x4a, 0x5e, 0x5c, 0x22, 0xa8, 0xc2, 0xc5, 0x05,
-	0xf9, 0x79, 0xc5, 0xa9, 0x42, 0x46, 0x5c, 0x1c, 0x30, 0xd7, 0x48, 0x30, 0x2a, 0x30, 0x6b, 0x70,
-	0x1b, 0x89, 0xe9, 0xa1, 0x38, 0x47, 0x0f, 0xaa, 0x25, 0x08, 0xae, 0xce, 0x28, 0x96, 0x8b, 0x03,
-	0x66, 0x8e, 0x50, 0x20, 0x17, 0x0b, 0xc8, 0x5c, 0x21, 0x25, 0x34, 0x5d, 0x58, 0xdc, 0x20, 0xa5,
-	0x8c, 0x57, 0x0d, 0xc4, 0x41, 0x4a, 0x0c, 0x49, 0x6c, 0x60, 0x8f, 0x18, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x23, 0x27, 0x81, 0xfe, 0x5d, 0x01, 0x00, 0x00,
+var fileDescriptor_e1e7723af4c007b7 = []byte{
+	// 147 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0x4c, 0x4e, 0xce,
+	0x2f, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4d, 0xcf, 0xd7, 0xcb,
+	0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x4b, 0x2c, 0x2d, 0xc9, 0x90, 0xe2, 0x02, 0x91, 0x10, 0x29, 0x25,
+	0x51, 0x2e, 0x61, 0x9f, 0xcc, 0xe2, 0x12, 0x47, 0xa8, 0x86, 0xa0, 0xd4, 0xc2, 0xd2, 0xd4, 0xe2,
+	0x12, 0x25, 0x2f, 0x2e, 0x11, 0x54, 0xe1, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x23, 0x2e,
+	0x0e, 0x98, 0xd9, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x62, 0x7a, 0x28, 0x86, 0xeb, 0x41,
+	0xb5, 0x04, 0xc1, 0xd5, 0x19, 0xc5, 0x72, 0x71, 0xc0, 0xcc, 0x11, 0x0a, 0xe4, 0x62, 0x01, 0x99,
+	0x2b, 0xa4, 0x84, 0xa6, 0x0b, 0x8b, 0x1b, 0xa4, 0x94, 0xf1, 0xaa, 0x81, 0x38, 0x48, 0x89, 0x21,
+	0x89, 0x0d, 0xec, 0x11, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xbb, 0xf1, 0x10, 0xf5,
+	0x00, 0x00, 0x00,
 }
diff --git a/auth/service/proto/accounts/accounts.pb.micro.go b/auth/service/proto/accounts.pb.micro.go
similarity index 94%
rename from auth/service/proto/accounts/accounts.pb.micro.go
rename to auth/service/proto/accounts.pb.micro.go
index 820b968d..56408164 100644
--- a/auth/service/proto/accounts/accounts.pb.micro.go
+++ b/auth/service/proto/accounts.pb.micro.go
@@ -1,12 +1,11 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/accounts/accounts.proto
+// source: accounts.proto
 
 package go_micro_auth
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/micro/go-micro/v2/auth/service/proto/auth"
 	math "math"
 )
 
diff --git a/auth/service/proto/accounts/accounts.proto b/auth/service/proto/accounts.proto
similarity index 76%
rename from auth/service/proto/accounts/accounts.proto
rename to auth/service/proto/accounts.proto
index 8f93aa23..47143693 100644
--- a/auth/service/proto/accounts/accounts.proto
+++ b/auth/service/proto/accounts.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package go.micro.auth;
 
-import "github.com/micro/go-micro/auth/service/proto/auth/auth.proto";
+import "auth.proto";
 
 service Accounts {
   rpc List(ListAccountsRequest) returns (ListAccountsResponse) {};
diff --git a/auth/service/proto/auth/auth.pb.go b/auth/service/proto/auth.pb.go
similarity index 82%
rename from auth/service/proto/auth/auth.pb.go
rename to auth/service/proto/auth.pb.go
index 10641f49..df741fe8 100644
--- a/auth/service/proto/auth/auth.pb.go
+++ b/auth/service/proto/auth.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/auth/auth.proto
+// source: auth.proto
 
 package go_micro_auth
 
@@ -38,7 +38,7 @@ func (m *Token) Reset()         { *m = Token{} }
 func (m *Token) String() string { return proto.CompactTextString(m) }
 func (*Token) ProtoMessage()    {}
 func (*Token) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{0}
+	return fileDescriptor_8bbd6f3875b0e874, []int{0}
 }
 
 func (m *Token) XXX_Unmarshal(b []byte) error {
@@ -130,7 +130,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{1}
+	return fileDescriptor_8bbd6f3875b0e874, []int{1}
 }
 
 func (m *Account) XXX_Unmarshal(b []byte) error {
@@ -199,7 +199,7 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{2}
+	return fileDescriptor_8bbd6f3875b0e874, []int{2}
 }
 
 func (m *Resource) XXX_Unmarshal(b []byte) error {
@@ -256,7 +256,7 @@ func (m *GenerateRequest) Reset()         { *m = GenerateRequest{} }
 func (m *GenerateRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateRequest) ProtoMessage()    {}
 func (*GenerateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{3}
+	return fileDescriptor_8bbd6f3875b0e874, []int{3}
 }
 
 func (m *GenerateRequest) XXX_Unmarshal(b []byte) error {
@@ -323,7 +323,7 @@ func (m *GenerateResponse) Reset()         { *m = GenerateResponse{} }
 func (m *GenerateResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateResponse) ProtoMessage()    {}
 func (*GenerateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{4}
+	return fileDescriptor_8bbd6f3875b0e874, []int{4}
 }
 
 func (m *GenerateResponse) XXX_Unmarshal(b []byte) error {
@@ -363,7 +363,7 @@ func (m *GrantRequest) Reset()         { *m = GrantRequest{} }
 func (m *GrantRequest) String() string { return proto.CompactTextString(m) }
 func (*GrantRequest) ProtoMessage()    {}
 func (*GrantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{5}
+	return fileDescriptor_8bbd6f3875b0e874, []int{5}
 }
 
 func (m *GrantRequest) XXX_Unmarshal(b []byte) error {
@@ -408,7 +408,7 @@ func (m *GrantResponse) Reset()         { *m = GrantResponse{} }
 func (m *GrantResponse) String() string { return proto.CompactTextString(m) }
 func (*GrantResponse) ProtoMessage()    {}
 func (*GrantResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{6}
+	return fileDescriptor_8bbd6f3875b0e874, []int{6}
 }
 
 func (m *GrantResponse) XXX_Unmarshal(b []byte) error {
@@ -441,7 +441,7 @@ func (m *RevokeRequest) Reset()         { *m = RevokeRequest{} }
 func (m *RevokeRequest) String() string { return proto.CompactTextString(m) }
 func (*RevokeRequest) ProtoMessage()    {}
 func (*RevokeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{7}
+	return fileDescriptor_8bbd6f3875b0e874, []int{7}
 }
 
 func (m *RevokeRequest) XXX_Unmarshal(b []byte) error {
@@ -486,7 +486,7 @@ func (m *RevokeResponse) Reset()         { *m = RevokeResponse{} }
 func (m *RevokeResponse) String() string { return proto.CompactTextString(m) }
 func (*RevokeResponse) ProtoMessage()    {}
 func (*RevokeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{8}
+	return fileDescriptor_8bbd6f3875b0e874, []int{8}
 }
 
 func (m *RevokeResponse) XXX_Unmarshal(b []byte) error {
@@ -518,7 +518,7 @@ func (m *InspectRequest) Reset()         { *m = InspectRequest{} }
 func (m *InspectRequest) String() string { return proto.CompactTextString(m) }
 func (*InspectRequest) ProtoMessage()    {}
 func (*InspectRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{9}
+	return fileDescriptor_8bbd6f3875b0e874, []int{9}
 }
 
 func (m *InspectRequest) XXX_Unmarshal(b []byte) error {
@@ -557,7 +557,7 @@ func (m *InspectResponse) Reset()         { *m = InspectResponse{} }
 func (m *InspectResponse) String() string { return proto.CompactTextString(m) }
 func (*InspectResponse) ProtoMessage()    {}
 func (*InspectResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{10}
+	return fileDescriptor_8bbd6f3875b0e874, []int{10}
 }
 
 func (m *InspectResponse) XXX_Unmarshal(b []byte) error {
@@ -597,7 +597,7 @@ func (m *RefreshRequest) Reset()         { *m = RefreshRequest{} }
 func (m *RefreshRequest) String() string { return proto.CompactTextString(m) }
 func (*RefreshRequest) ProtoMessage()    {}
 func (*RefreshRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{11}
+	return fileDescriptor_8bbd6f3875b0e874, []int{11}
 }
 
 func (m *RefreshRequest) XXX_Unmarshal(b []byte) error {
@@ -643,7 +643,7 @@ func (m *RefreshResponse) Reset()         { *m = RefreshResponse{} }
 func (m *RefreshResponse) String() string { return proto.CompactTextString(m) }
 func (*RefreshResponse) ProtoMessage()    {}
 func (*RefreshResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b246cecfa8195ff3, []int{12}
+	return fileDescriptor_8bbd6f3875b0e874, []int{12}
 }
 
 func (m *RefreshResponse) XXX_Unmarshal(b []byte) error {
@@ -691,49 +691,47 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/auth/service/proto/auth/auth.proto", fileDescriptor_b246cecfa8195ff3)
+	proto.RegisterFile("auth.proto", fileDescriptor_8bbd6f3875b0e874)
 }
 
-var fileDescriptor_b246cecfa8195ff3 = []byte{
-	// 630 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xae, 0xed, 0xfc, 0xb8, 0x93, 0xa6, 0xa9, 0x56, 0x55, 0xb1, 0x22, 0x28, 0xc1, 0x20, 0x54,
-	0xa1, 0xe2, 0xa0, 0xf4, 0x82, 0xf8, 0x13, 0x15, 0x54, 0xe5, 0x47, 0xe5, 0x60, 0x21, 0xc1, 0x0d,
-	0xb9, 0xce, 0xd0, 0x98, 0x34, 0x5e, 0xb3, 0x5e, 0x47, 0xe4, 0xc8, 0x0b, 0xf1, 0x66, 0xbc, 0x00,
-	0x27, 0xb4, 0xeb, 0x5d, 0xc7, 0x71, 0x12, 0x84, 0x50, 0xb9, 0x44, 0x33, 0xe3, 0x99, 0x6f, 0x66,
-	0xbe, 0xf9, 0xec, 0xc0, 0x93, 0x8b, 0x88, 0x8f, 0xb2, 0x73, 0x2f, 0xa4, 0x93, 0xfe, 0x24, 0x0a,
-	0x19, 0xed, 0x5f, 0xd0, 0xfb, 0xb9, 0x11, 0x64, 0x7c, 0xd4, 0x4f, 0x91, 0x4d, 0xa3, 0x10, 0xfb,
-	0x09, 0xa3, 0x5c, 0x85, 0xc4, 0x8f, 0x27, 0x7d, 0xd2, 0xbe, 0xa0, 0x9e, 0x4c, 0xf6, 0x44, 0xd0,
-	0xfd, 0x61, 0x42, 0xfd, 0x3d, 0x1d, 0x63, 0x4c, 0x76, 0xa1, 0xce, 0x85, 0xe1, 0x18, 0x3d, 0xe3,
-	0x60, 0xd3, 0xcf, 0x1d, 0x42, 0xa0, 0xc6, 0x67, 0x09, 0x3a, 0xa6, 0x0c, 0x4a, 0x9b, 0x38, 0xd0,
-	0x0c, 0x19, 0x06, 0x1c, 0x87, 0x8e, 0xd5, 0x33, 0x0e, 0x2c, 0x5f, 0xbb, 0x64, 0x0f, 0x1a, 0xf8,
-	0x2d, 0x89, 0xd8, 0xcc, 0xa9, 0xc9, 0x07, 0xca, 0x13, 0x15, 0x69, 0x76, 0xfe, 0x05, 0x43, 0xee,
-	0xd4, 0x25, 0x90, 0x76, 0x45, 0x57, 0x46, 0x2f, 0x31, 0x75, 0x1a, 0x3d, 0x4b, 0x74, 0x95, 0x0e,
-	0x79, 0x06, 0xf6, 0x04, 0x79, 0x30, 0x0c, 0x78, 0xe0, 0x34, 0x7b, 0xd6, 0x41, 0x6b, 0xe0, 0x7a,
-	0x0b, 0x73, 0x7b, 0x72, 0x66, 0xef, 0x4c, 0x25, 0x9d, 0xc4, 0x9c, 0xcd, 0xfc, 0xa2, 0x86, 0x5c,
-	0x87, 0xcd, 0x38, 0x98, 0x60, 0x9a, 0x04, 0x21, 0x3a, 0xb6, 0xec, 0x38, 0x0f, 0x74, 0x1f, 0x43,
-	0x7b, 0xa1, 0x90, 0xec, 0x80, 0x35, 0xc6, 0x99, 0x5a, 0x5c, 0x98, 0x62, 0xac, 0x69, 0x70, 0x99,
-	0xe9, 0xbd, 0x73, 0xe7, 0x91, 0xf9, 0xd0, 0x70, 0x7f, 0x19, 0xd0, 0x3c, 0x0e, 0x43, 0x9a, 0xc5,
-	0x9c, 0x6c, 0x83, 0x19, 0x0d, 0x55, 0x99, 0x19, 0x0d, 0xc9, 0x21, 0x34, 0x52, 0x0c, 0x19, 0x72,
-	0x59, 0xd6, 0x1a, 0xec, 0xae, 0x1a, 0xda, 0x57, 0x39, 0xf3, 0xd5, 0xad, 0xf2, 0xea, 0xcf, 0x4b,
-	0xab, 0xd7, 0xe4, 0xea, 0x77, 0x2a, 0x28, 0xaa, 0xfb, 0xdf, 0x2d, 0x5f, 0xbf, 0xd2, 0xe5, 0xdf,
-	0x81, 0xed, 0x63, 0x4a, 0x33, 0x16, 0xa2, 0x50, 0x86, 0x40, 0x55, 0x85, 0xd2, 0x5e, 0xa9, 0x96,
-	0x2e, 0xd8, 0x18, 0x0f, 0x13, 0x1a, 0xc5, 0x5c, 0xca, 0x65, 0xd3, 0x2f, 0x7c, 0xf7, 0xbb, 0x09,
-	0x9d, 0x53, 0x8c, 0x91, 0x05, 0x1c, 0x7d, 0xfc, 0x9a, 0x61, 0xba, 0x4c, 0x6a, 0x41, 0x93, 0x59,
-	0xa6, 0xe9, 0x55, 0x89, 0x26, 0x4b, 0xd2, 0x74, 0x58, 0xa1, 0xa9, 0x82, 0xbb, 0x96, 0xae, 0xdb,
-	0xd0, 0xce, 0x0f, 0xf2, 0x69, 0x41, 0xba, 0x5b, 0x79, 0xf0, 0x24, 0x17, 0xf0, 0x7f, 0xe4, 0xf4,
-	0x25, 0xec, 0xcc, 0x47, 0x4d, 0x13, 0x1a, 0xa7, 0x48, 0x1e, 0x40, 0x33, 0xc8, 0xaf, 0x2c, 0x31,
-	0x5a, 0x83, 0xbd, 0xd5, 0x1a, 0xf0, 0x75, 0x9a, 0xfb, 0x01, 0xb6, 0x4e, 0x59, 0x10, 0x73, 0xcd,
-	0x22, 0x81, 0x9a, 0x20, 0x4a, 0x5f, 0x47, 0xd8, 0xe4, 0x08, 0x6c, 0xa6, 0xae, 0xa7, 0x04, 0x7a,
-	0xad, 0x02, 0xab, 0x8f, 0xeb, 0x17, 0x89, 0x6e, 0x07, 0xda, 0x0a, 0x38, 0x9f, 0xcd, 0xfd, 0x08,
-	0x6d, 0x1f, 0xa7, 0x74, 0x8c, 0x57, 0xde, 0x6a, 0x07, 0xb6, 0x35, 0xb2, 0xea, 0x75, 0x17, 0xb6,
-	0x5f, 0xc7, 0x69, 0x82, 0x61, 0xb1, 0xd7, 0xca, 0xaf, 0x94, 0xfb, 0x02, 0x3a, 0x45, 0xde, 0x3f,
-	0x53, 0xf8, 0x56, 0xb4, 0xff, 0xcc, 0x30, 0x1d, 0xe9, 0x66, 0x7b, 0xc5, 0xfb, 0x9c, 0x77, 0xd3,
-	0x6f, 0xee, 0x2d, 0xd8, 0x92, 0x7d, 0xb5, 0x62, 0x4c, 0xa9, 0x98, 0x96, 0x8c, 0xe5, 0x82, 0x71,
-	0x9f, 0x42, 0xa7, 0x00, 0x53, 0x13, 0xdd, 0x2b, 0x8f, 0xbe, 0xee, 0xe3, 0x90, 0xa7, 0x0c, 0x7e,
-	0x1a, 0x50, 0x3b, 0xce, 0xf8, 0x88, 0x9c, 0x81, 0xad, 0xd5, 0x41, 0xf6, 0xff, 0xac, 0xf0, 0xee,
-	0xcd, 0xb5, 0xcf, 0x15, 0x9d, 0x1b, 0xe4, 0x0d, 0x34, 0x15, 0x51, 0xe4, 0x46, 0x25, 0x7b, 0x91,
-	0xe8, 0xee, 0xfe, 0xba, 0xc7, 0x65, 0x2c, 0xb5, 0xe2, 0x12, 0xd6, 0x22, 0x8f, 0x4b, 0x58, 0x15,
-	0x66, 0xdc, 0x8d, 0xf3, 0x86, 0xfc, 0x73, 0x3a, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x18,
-	0xd0, 0x5a, 0xdc, 0x06, 0x00, 0x00,
+var fileDescriptor_8bbd6f3875b0e874 = []byte{
+	// 601 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
+	0x10, 0xad, 0xed, 0x7c, 0x38, 0x93, 0x4f, 0xad, 0xaa, 0x60, 0x45, 0x50, 0x82, 0x41, 0x28, 0x42,
+	0x95, 0x85, 0xd2, 0x0b, 0x02, 0x81, 0xa8, 0xa0, 0x2a, 0x1f, 0x2a, 0x07, 0x0b, 0x09, 0x6e, 0xc8,
+	0x75, 0x06, 0x12, 0xd2, 0x78, 0xcd, 0x7a, 0x5d, 0x91, 0x23, 0x7f, 0x88, 0x7f, 0xc6, 0x1f, 0xe0,
+	0x84, 0x76, 0xbd, 0xeb, 0x38, 0x4e, 0x82, 0x10, 0x6a, 0x6f, 0x3b, 0xbb, 0x33, 0x6f, 0xe6, 0xbd,
+	0x79, 0x71, 0x00, 0x82, 0x94, 0x4f, 0xbd, 0x98, 0x51, 0x4e, 0x49, 0xfb, 0x0b, 0xf5, 0x16, 0xb3,
+	0x90, 0x51, 0x4f, 0x5c, 0xba, 0x3f, 0x4d, 0xa8, 0xbe, 0xa7, 0x73, 0x8c, 0xc8, 0x3e, 0x54, 0xb9,
+	0x38, 0x38, 0xc6, 0xd0, 0x18, 0x35, 0xfc, 0x2c, 0x20, 0x04, 0x2a, 0x7c, 0x19, 0xa3, 0x63, 0xca,
+	0x4b, 0x79, 0x26, 0x0e, 0xd4, 0x43, 0x86, 0x01, 0xc7, 0x89, 0x63, 0x0d, 0x8d, 0x91, 0xe5, 0xeb,
+	0x90, 0xf4, 0xa1, 0x86, 0xdf, 0xe3, 0x19, 0x5b, 0x3a, 0x15, 0xf9, 0xa0, 0x22, 0x51, 0x91, 0xa4,
+	0xe7, 0x5f, 0x31, 0xe4, 0x4e, 0x55, 0x02, 0xe9, 0x50, 0x74, 0x65, 0xf4, 0x02, 0x13, 0xa7, 0x36,
+	0xb4, 0x44, 0x57, 0x19, 0x90, 0x67, 0x60, 0x2f, 0x90, 0x07, 0x93, 0x80, 0x07, 0x4e, 0x7d, 0x68,
+	0x8d, 0x9a, 0x63, 0xd7, 0x5b, 0x9b, 0xdb, 0x93, 0x33, 0x7b, 0x67, 0x2a, 0xe9, 0x24, 0xe2, 0x6c,
+	0xe9, 0xe7, 0x35, 0xe4, 0x26, 0x34, 0xa2, 0x60, 0x81, 0x49, 0x1c, 0x84, 0xe8, 0xd8, 0xb2, 0xe3,
+	0xea, 0x62, 0xf0, 0x04, 0xda, 0x6b, 0x85, 0xa4, 0x07, 0xd6, 0x1c, 0x97, 0x8a, 0xb8, 0x38, 0x8a,
+	0xb1, 0x2e, 0x83, 0x8b, 0x54, 0xf3, 0xce, 0x82, 0xc7, 0xe6, 0x23, 0xc3, 0xfd, 0x6d, 0x40, 0xfd,
+	0x38, 0x0c, 0x69, 0x1a, 0x71, 0xd2, 0x01, 0x73, 0x36, 0x51, 0x65, 0xe6, 0x6c, 0x42, 0x0e, 0xa1,
+	0x96, 0x60, 0xc8, 0x90, 0xcb, 0xb2, 0xe6, 0x78, 0x7f, 0xdb, 0xd0, 0xbe, 0xca, 0x59, 0x51, 0xb7,
+	0x8a, 0xd4, 0x9f, 0x17, 0xa8, 0x57, 0x24, 0xf5, 0x7b, 0x25, 0x14, 0xd5, 0xfd, 0xdf, 0xc8, 0x57,
+	0xaf, 0x94, 0xfc, 0x3b, 0xb0, 0x7d, 0x4c, 0x68, 0xca, 0x42, 0x14, 0xce, 0x10, 0xa8, 0xaa, 0x50,
+	0x9e, 0xb7, 0xba, 0x65, 0x00, 0x36, 0x46, 0x93, 0x98, 0xce, 0x22, 0x2e, 0xed, 0xd2, 0xf0, 0xf3,
+	0xd8, 0xfd, 0x61, 0x42, 0xf7, 0x14, 0x23, 0x64, 0x01, 0x47, 0x1f, 0xbf, 0xa5, 0x98, 0x6c, 0x8a,
+	0x9a, 0xcb, 0x64, 0x16, 0x65, 0x7a, 0x55, 0x90, 0xc9, 0x92, 0x32, 0x1d, 0x96, 0x64, 0x2a, 0xe1,
+	0xee, 0x94, 0xeb, 0x2e, 0xb4, 0xb3, 0x85, 0x7c, 0x5a, 0xb3, 0x6e, 0x2b, 0xbb, 0x3c, 0xc9, 0x0c,
+	0x7c, 0x8d, 0x9a, 0xbe, 0x84, 0xde, 0x6a, 0xd4, 0x24, 0xa6, 0x51, 0x82, 0xe4, 0x21, 0xd4, 0x83,
+	0x6c, 0xcb, 0x12, 0xa3, 0x39, 0xee, 0x6f, 0xf7, 0x80, 0xaf, 0xd3, 0xdc, 0x0f, 0xd0, 0x3a, 0x65,
+	0x41, 0xc4, 0xb5, 0x8a, 0x04, 0x2a, 0x42, 0x28, 0xbd, 0x1d, 0x71, 0x26, 0x47, 0x60, 0x33, 0xb5,
+	0x3d, 0x65, 0xd0, 0x1b, 0x25, 0x58, 0xbd, 0x5c, 0x3f, 0x4f, 0x74, 0xbb, 0xd0, 0x56, 0xc0, 0xd9,
+	0x6c, 0xee, 0x47, 0x68, 0xfb, 0x78, 0x49, 0xe7, 0x78, 0xe5, 0xad, 0x7a, 0xd0, 0xd1, 0xc8, 0xaa,
+	0xd7, 0x7d, 0xe8, 0xbc, 0x8e, 0x92, 0x18, 0xc3, 0x9c, 0xd7, 0xd6, 0xaf, 0x94, 0xfb, 0x02, 0xba,
+	0x79, 0xde, 0x7f, 0x4b, 0xf8, 0x56, 0xb4, 0xff, 0xcc, 0x30, 0x99, 0xea, 0x66, 0xfd, 0xfc, 0xf7,
+	0x9c, 0x75, 0xd3, 0xbf, 0xdc, 0x3b, 0xd0, 0x92, 0x7d, 0xb5, 0x63, 0x4c, 0xe9, 0x98, 0xa6, 0xbc,
+	0xcb, 0x0c, 0xe3, 0x3e, 0x85, 0x6e, 0x0e, 0xa6, 0x26, 0x7a, 0x50, 0x1c, 0x7d, 0xd7, 0xc7, 0x21,
+	0x4b, 0x19, 0xff, 0x32, 0xa0, 0x72, 0x9c, 0xf2, 0x29, 0x39, 0x03, 0x5b, 0xbb, 0x83, 0x1c, 0xfc,
+	0xdd, 0xe1, 0x83, 0xdb, 0x3b, 0xdf, 0x95, 0x9c, 0x7b, 0xe4, 0x0d, 0xd4, 0x95, 0x50, 0xe4, 0x56,
+	0x29, 0x7b, 0x5d, 0xe8, 0xc1, 0xc1, 0xae, 0xe7, 0x22, 0x96, 0xa2, 0xb8, 0x81, 0xb5, 0xae, 0xe3,
+	0x06, 0x56, 0x49, 0x19, 0x77, 0xef, 0xbc, 0x26, 0xff, 0x9c, 0x8e, 0xfe, 0x04, 0x00, 0x00, 0xff,
+	0xff, 0x9a, 0xf4, 0x9d, 0x85, 0xaa, 0x06, 0x00, 0x00,
 }
diff --git a/auth/service/proto/auth/auth.pb.micro.go b/auth/service/proto/auth.pb.micro.go
similarity index 98%
rename from auth/service/proto/auth/auth.pb.micro.go
rename to auth/service/proto/auth.pb.micro.go
index 61107958..f304e32b 100644
--- a/auth/service/proto/auth/auth.pb.micro.go
+++ b/auth/service/proto/auth.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/auth/auth.proto
+// source: auth.proto
 
 package go_micro_auth
 
diff --git a/auth/service/proto/auth/auth.proto b/auth/service/proto/auth.proto
similarity index 100%
rename from auth/service/proto/auth/auth.proto
rename to auth/service/proto/auth.proto
diff --git a/auth/service/proto/rules/rules.pb.go b/auth/service/proto/rules.pb.go
similarity index 66%
rename from auth/service/proto/rules/rules.pb.go
rename to auth/service/proto/rules.pb.go
index d9efd3a9..04d02a75 100644
--- a/auth/service/proto/rules/rules.pb.go
+++ b/auth/service/proto/rules.pb.go
@@ -1,12 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/rules/rules.proto
+// source: rules.proto
 
 package go_micro_auth
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	auth "github.com/micro/go-micro/v2/auth/service/proto/auth"
 	math "math"
 )
 
@@ -46,24 +45,24 @@ func (x Access) String() string {
 }
 
 func (Access) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_d5bb7c98c32bdd99, []int{0}
+	return fileDescriptor_8e722d3e922f0937, []int{0}
 }
 
 type Rule struct {
-	Id                   string         `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Role                 string         `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
-	Resource             *auth.Resource `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
-	Access               Access         `protobuf:"varint,4,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	Id                   string    `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Role                 string    `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
+	Resource             *Resource `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
+	Access               Access    `protobuf:"varint,4,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
 func (m *Rule) Reset()         { *m = Rule{} }
 func (m *Rule) String() string { return proto.CompactTextString(m) }
 func (*Rule) ProtoMessage()    {}
 func (*Rule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d5bb7c98c32bdd99, []int{0}
+	return fileDescriptor_8e722d3e922f0937, []int{0}
 }
 
 func (m *Rule) XXX_Unmarshal(b []byte) error {
@@ -98,7 +97,7 @@ func (m *Rule) GetRole() string {
 	return ""
 }
 
-func (m *Rule) GetResource() *auth.Resource {
+func (m *Rule) GetResource() *Resource {
 	if m != nil {
 		return m.Resource
 	}
@@ -113,19 +112,19 @@ func (m *Rule) GetAccess() Access {
 }
 
 type CreateRequest struct {
-	Role                 string         `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
-	Resource             *auth.Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
-	Access               Access         `protobuf:"varint,3,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	Role                 string    `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
+	Resource             *Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
+	Access               Access    `protobuf:"varint,3,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
 func (m *CreateRequest) Reset()         { *m = CreateRequest{} }
 func (m *CreateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateRequest) ProtoMessage()    {}
 func (*CreateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d5bb7c98c32bdd99, []int{1}
+	return fileDescriptor_8e722d3e922f0937, []int{1}
 }
 
 func (m *CreateRequest) XXX_Unmarshal(b []byte) error {
@@ -153,7 +152,7 @@ func (m *CreateRequest) GetRole() string {
 	return ""
 }
 
-func (m *CreateRequest) GetResource() *auth.Resource {
+func (m *CreateRequest) GetResource() *Resource {
 	if m != nil {
 		return m.Resource
 	}
@@ -177,7 +176,7 @@ func (m *CreateResponse) Reset()         { *m = CreateResponse{} }
 func (m *CreateResponse) String() string { return proto.CompactTextString(m) }
 func (*CreateResponse) ProtoMessage()    {}
 func (*CreateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d5bb7c98c32bdd99, []int{2}
+	return fileDescriptor_8e722d3e922f0937, []int{2}
 }
 
 func (m *CreateResponse) XXX_Unmarshal(b []byte) error {
@@ -199,19 +198,19 @@ func (m *CreateResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_CreateResponse proto.InternalMessageInfo
 
 type DeleteRequest struct {
-	Role                 string         `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
-	Resource             *auth.Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
-	Access               Access         `protobuf:"varint,3,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	Role                 string    `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
+	Resource             *Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
+	Access               Access    `protobuf:"varint,3,opt,name=access,proto3,enum=go.micro.auth.Access" json:"access,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
 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_d5bb7c98c32bdd99, []int{3}
+	return fileDescriptor_8e722d3e922f0937, []int{3}
 }
 
 func (m *DeleteRequest) XXX_Unmarshal(b []byte) error {
@@ -239,7 +238,7 @@ func (m *DeleteRequest) GetRole() string {
 	return ""
 }
 
-func (m *DeleteRequest) GetResource() *auth.Resource {
+func (m *DeleteRequest) GetResource() *Resource {
 	if m != nil {
 		return m.Resource
 	}
@@ -263,7 +262,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_d5bb7c98c32bdd99, []int{4}
+	return fileDescriptor_8e722d3e922f0937, []int{4}
 }
 
 func (m *DeleteResponse) XXX_Unmarshal(b []byte) error {
@@ -294,7 +293,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_d5bb7c98c32bdd99, []int{5}
+	return fileDescriptor_8e722d3e922f0937, []int{5}
 }
 
 func (m *ListRequest) XXX_Unmarshal(b []byte) error {
@@ -326,7 +325,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_d5bb7c98c32bdd99, []int{6}
+	return fileDescriptor_8e722d3e922f0937, []int{6}
 }
 
 func (m *ListResponse) XXX_Unmarshal(b []byte) error {
@@ -366,33 +365,31 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/auth/service/proto/rules/rules.proto", fileDescriptor_d5bb7c98c32bdd99)
+	proto.RegisterFile("rules.proto", fileDescriptor_8e722d3e922f0937)
 }
 
-var fileDescriptor_d5bb7c98c32bdd99 = []byte{
-	// 384 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0x41, 0x6b, 0xdb, 0x30,
-	0x1c, 0xc5, 0x23, 0xc7, 0xf1, 0xb6, 0xbf, 0x97, 0x60, 0x34, 0xc6, 0x8c, 0xb7, 0x81, 0xc9, 0xc9,
-	0x1b, 0xc4, 0x06, 0xe7, 0x34, 0x18, 0x83, 0x30, 0x87, 0x30, 0x36, 0x3c, 0x10, 0x2d, 0x3d, 0x27,
-	0xce, 0x9f, 0xc4, 0xe0, 0x54, 0xa9, 0x64, 0xf7, 0x2b, 0xf4, 0xd6, 0x4f, 0xd8, 0x0f, 0x53, 0x2c,
-	0x39, 0xa1, 0x71, 0x1a, 0x68, 0x6e, 0xbd, 0x08, 0x49, 0xef, 0xe9, 0xf9, 0xa7, 0x67, 0x1b, 0x7e,
-	0xad, 0xf2, 0x72, 0x5d, 0x2d, 0xc2, 0x8c, 0x6f, 0xa2, 0x4d, 0x9e, 0x09, 0x1e, 0xad, 0xf8, 0x48,
-	0x4f, 0xe6, 0x55, 0xb9, 0x8e, 0x24, 0x8a, 0xdb, 0x3c, 0xc3, 0x68, 0x2b, 0x78, 0xc9, 0x23, 0x51,
-	0x15, 0x28, 0xf5, 0x18, 0xaa, 0x1d, 0xda, 0x5f, 0xf1, 0x50, 0xd9, 0xc3, 0xda, 0xee, 0xfd, 0x3c,
-	0x2b, 0x4e, 0x6d, 0xd5, 0x83, 0x0e, 0x1b, 0xde, 0x13, 0x30, 0x59, 0x55, 0x20, 0x1d, 0x80, 0x91,
-	0x2f, 0x5d, 0xe2, 0x93, 0xe0, 0x1d, 0x33, 0xf2, 0x25, 0xa5, 0x60, 0x0a, 0x5e, 0xa0, 0x6b, 0xa8,
-	0x1d, 0x35, 0xa7, 0x63, 0x78, 0x2b, 0x50, 0xf2, 0x4a, 0x64, 0xe8, 0x76, 0x7d, 0x12, 0xd8, 0xf1,
-	0xa7, 0xf0, 0x00, 0x26, 0x64, 0x8d, 0xcc, 0xf6, 0x46, 0x3a, 0x02, 0x6b, 0x9e, 0x65, 0x28, 0xa5,
-	0x6b, 0xfa, 0x24, 0x18, 0xc4, 0x1f, 0x5b, 0x47, 0x26, 0x4a, 0x64, 0x8d, 0x69, 0x78, 0x47, 0xa0,
-	0xff, 0x5b, 0xe0, 0xbc, 0x44, 0x86, 0x37, 0x15, 0xca, 0x72, 0x4f, 0x42, 0x4e, 0x90, 0x18, 0xe7,
-	0x93, 0x74, 0x5f, 0x42, 0xe2, 0xc0, 0x60, 0x07, 0x22, 0xb7, 0xfc, 0x5a, 0xa2, 0x62, 0x4b, 0xb0,
-	0xc0, 0x57, 0xc1, 0xb6, 0x03, 0x69, 0xd8, 0xfa, 0x60, 0xff, 0xcb, 0x65, 0xd9, 0x80, 0x0d, 0x7f,
-	0xc0, 0x7b, 0xbd, 0xd4, 0x32, 0xfd, 0x06, 0x3d, 0xf5, 0x0d, 0xb9, 0xc4, 0xef, 0x06, 0x76, 0xfc,
-	0xa1, 0x4d, 0x54, 0x15, 0xc8, 0xb4, 0xe3, 0x7b, 0x08, 0x96, 0x7e, 0x1a, 0xb5, 0xe1, 0xcd, 0x65,
-	0xfa, 0x37, 0xfd, 0x7f, 0x95, 0x3a, 0x9d, 0x7a, 0x31, 0x63, 0x93, 0xf4, 0x62, 0x9a, 0x38, 0x84,
-	0x02, 0x58, 0xc9, 0x34, 0xfd, 0x33, 0x4d, 0x1c, 0x23, 0x7e, 0x20, 0xd0, 0xab, 0xcf, 0x4b, 0x3a,
-	0x03, 0x4b, 0x37, 0x46, 0xbf, 0xb4, 0xf2, 0x0f, 0xde, 0xa8, 0xf7, 0xf5, 0x84, 0xda, 0x5c, 0xa5,
-	0x53, 0x07, 0xe9, 0xeb, 0x1d, 0x05, 0x1d, 0xd4, 0x7f, 0x14, 0xd4, 0xea, 0xa4, 0x43, 0x27, 0x60,
-	0xd6, 0x35, 0x50, 0xaf, 0x65, 0x7c, 0x52, 0x95, 0xf7, 0xf9, 0x59, 0x6d, 0x17, 0xb1, 0xb0, 0xd4,
-	0x8f, 0x32, 0x7e, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x85, 0x65, 0x07, 0x9d, 0xb7, 0x03, 0x00, 0x00,
+var fileDescriptor_8e722d3e922f0937 = []byte{
+	// 346 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0xc1, 0x4e, 0xb3, 0x40,
+	0x14, 0x85, 0x3b, 0x94, 0xf2, 0xff, 0x5e, 0x6c, 0x43, 0xae, 0x31, 0x12, 0xd4, 0x84, 0x74, 0x85,
+	0x26, 0xb2, 0xa0, 0x2b, 0x97, 0x8d, 0x34, 0x8d, 0xd1, 0x60, 0x32, 0xd1, 0xb8, 0xae, 0xf4, 0x46,
+	0x49, 0xd0, 0xa9, 0x33, 0xf0, 0x0c, 0xee, 0x7c, 0x42, 0x1f, 0xc6, 0xc0, 0xd0, 0xc6, 0x52, 0x9b,
+	0xe8, 0xce, 0x0d, 0x61, 0x38, 0x67, 0x0e, 0xdf, 0x3d, 0x30, 0x60, 0xcb, 0x32, 0x27, 0x15, 0x2e,
+	0xa4, 0x28, 0x04, 0xf6, 0x1f, 0x45, 0xf8, 0x9c, 0xa5, 0x52, 0x84, 0xb3, 0xb2, 0x78, 0xf2, 0xa0,
+	0xba, 0x6a, 0x69, 0xf8, 0xce, 0xc0, 0xe4, 0x65, 0x4e, 0x38, 0x00, 0x23, 0x9b, 0xbb, 0xcc, 0x67,
+	0xc1, 0x0e, 0x37, 0xb2, 0x39, 0x22, 0x98, 0x52, 0xe4, 0xe4, 0x1a, 0xf5, 0x93, 0xfa, 0x1e, 0x47,
+	0xf0, 0x5f, 0x92, 0x12, 0xa5, 0x4c, 0xc9, 0xed, 0xfa, 0x2c, 0xb0, 0xa3, 0x83, 0x70, 0x2d, 0x3a,
+	0xe4, 0x8d, 0xcc, 0x57, 0x46, 0x3c, 0x03, 0x6b, 0x96, 0xa6, 0xa4, 0x94, 0x6b, 0xfa, 0x2c, 0x18,
+	0x44, 0xfb, 0xad, 0x2d, 0xe3, 0x5a, 0xe4, 0x8d, 0x69, 0xf8, 0xc6, 0xa0, 0x7f, 0x21, 0x69, 0x56,
+	0x10, 0xa7, 0xd7, 0x92, 0x54, 0xb1, 0x22, 0x61, 0x5b, 0x48, 0x8c, 0xdf, 0x93, 0x74, 0x7f, 0x42,
+	0xe2, 0xc0, 0x60, 0x09, 0xa2, 0x16, 0xe2, 0x45, 0x51, 0xcd, 0x16, 0x53, 0x4e, 0x7f, 0x82, 0x6d,
+	0x09, 0xd2, 0xb0, 0xf5, 0xc1, 0xbe, 0xce, 0x54, 0xd1, 0x80, 0x0d, 0xcf, 0x61, 0x57, 0x2f, 0xb5,
+	0x8c, 0x27, 0xd0, 0xab, 0xff, 0x08, 0x97, 0xf9, 0xdd, 0xc0, 0x8e, 0xf6, 0xda, 0x44, 0x65, 0x4e,
+	0x5c, 0x3b, 0x4e, 0x43, 0xb0, 0xf4, 0xdb, 0xd0, 0x86, 0x7f, 0x77, 0xc9, 0x55, 0x72, 0x73, 0x9f,
+	0x38, 0x9d, 0x6a, 0x31, 0xe5, 0xe3, 0xe4, 0x76, 0x12, 0x3b, 0x0c, 0x01, 0xac, 0x78, 0x92, 0x5c,
+	0x4e, 0x62, 0xc7, 0x88, 0x3e, 0x18, 0xf4, 0xaa, 0xfd, 0x0a, 0xa7, 0x60, 0xe9, 0xc6, 0xf0, 0xa8,
+	0x95, 0xbf, 0xf6, 0x45, 0xbd, 0xe3, 0x2d, 0x6a, 0x33, 0x4a, 0xa7, 0x0a, 0xd2, 0xe3, 0x6d, 0x04,
+	0xad, 0xd5, 0xbf, 0x11, 0xd4, 0xea, 0xa4, 0x83, 0x63, 0x30, 0xab, 0x1a, 0xd0, 0x6b, 0x19, 0xbf,
+	0x54, 0xe5, 0x1d, 0x7e, 0xab, 0x2d, 0x23, 0x1e, 0xac, 0xfa, 0xa0, 0x8c, 0x3e, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0xb8, 0x06, 0xc3, 0x53, 0x52, 0x03, 0x00, 0x00,
 }
diff --git a/auth/service/proto/rules/rules.pb.micro.go b/auth/service/proto/rules.pb.micro.go
similarity index 96%
rename from auth/service/proto/rules/rules.pb.micro.go
rename to auth/service/proto/rules.pb.micro.go
index ee3a7f24..fa25ba61 100644
--- a/auth/service/proto/rules/rules.pb.micro.go
+++ b/auth/service/proto/rules.pb.micro.go
@@ -1,12 +1,11 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/auth/service/proto/rules/rules.proto
+// source: rules.proto
 
 package go_micro_auth
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/micro/go-micro/v2/auth/service/proto/auth"
 	math "math"
 )
 
diff --git a/auth/service/proto/rules/rules.proto b/auth/service/proto/rules.proto
similarity index 90%
rename from auth/service/proto/rules/rules.proto
rename to auth/service/proto/rules.proto
index d4937b51..cc941952 100644
--- a/auth/service/proto/rules/rules.proto
+++ b/auth/service/proto/rules.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package go.micro.auth;
 
-import "github.com/micro/go-micro/auth/service/proto/auth/auth.proto";
+import "auth.proto";
 
 service Rules {
 	rpc Create(CreateRequest) returns (CreateResponse) {};
diff --git a/auth/service/service.go b/auth/service/service.go
index a30e3498..21d918c7 100644
--- a/auth/service/service.go
+++ b/auth/service/service.go
@@ -8,8 +8,7 @@ import (
 	"time"
 
 	"github.com/micro/go-micro/v2/auth"
-	authPb "github.com/micro/go-micro/v2/auth/service/proto/auth"
-	rulePb "github.com/micro/go-micro/v2/auth/service/proto/rules"
+	pb "github.com/micro/go-micro/v2/auth/service/proto"
 	"github.com/micro/go-micro/v2/auth/token"
 	"github.com/micro/go-micro/v2/auth/token/jwt"
 	"github.com/micro/go-micro/v2/client"
@@ -27,11 +26,11 @@ func NewAuth(opts ...auth.Option) auth.Auth {
 // svc is the service implementation of the Auth interface
 type svc struct {
 	options auth.Options
-	auth    authPb.AuthService
-	rule    rulePb.RulesService
+	auth    pb.AuthService
+	rule    pb.RulesService
 	jwt     token.Provider
 
-	rules []*rulePb.Rule
+	rules []*pb.Rule
 	sync.Mutex
 }
 
@@ -45,8 +44,8 @@ func (s *svc) Init(opts ...auth.Option) {
 	}
 
 	dc := client.DefaultClient
-	s.auth = authPb.NewAuthService("go.micro.auth", dc)
-	s.rule = rulePb.NewRulesService("go.micro.auth", dc)
+	s.auth = pb.NewAuthService("go.micro.auth", dc)
+	s.rule = pb.NewRulesService("go.micro.auth", dc)
 
 	// if we have a JWT public key passed as an option,
 	// we can decode tokens with the type "JWT" locally
@@ -81,7 +80,7 @@ func (s *svc) Options() auth.Options {
 func (s *svc) Generate(id string, opts ...auth.GenerateOption) (*auth.Account, error) {
 	options := auth.NewGenerateOptions(opts...)
 
-	rsp, err := s.auth.Generate(context.TODO(), &authPb.GenerateRequest{
+	rsp, err := s.auth.Generate(context.TODO(), &pb.GenerateRequest{
 		Id:           id,
 		Roles:        options.Roles,
 		Metadata:     options.Metadata,
@@ -97,10 +96,10 @@ func (s *svc) Generate(id string, opts ...auth.GenerateOption) (*auth.Account, e
 
 // Grant access to a resource
 func (s *svc) Grant(role string, res *auth.Resource) error {
-	_, err := s.rule.Create(context.TODO(), &rulePb.CreateRequest{
+	_, err := s.rule.Create(context.TODO(), &pb.CreateRequest{
 		Role:   role,
-		Access: rulePb.Access_GRANTED,
-		Resource: &authPb.Resource{
+		Access: pb.Access_GRANTED,
+		Resource: &pb.Resource{
 			Type:     res.Type,
 			Name:     res.Name,
 			Endpoint: res.Endpoint,
@@ -111,10 +110,10 @@ func (s *svc) Grant(role string, res *auth.Resource) error {
 
 // Revoke access to a resource
 func (s *svc) Revoke(role string, res *auth.Resource) error {
-	_, err := s.rule.Delete(context.TODO(), &rulePb.DeleteRequest{
+	_, err := s.rule.Delete(context.TODO(), &pb.DeleteRequest{
 		Role:   role,
-		Access: rulePb.Access_GRANTED,
-		Resource: &authPb.Resource{
+		Access: pb.Access_GRANTED,
+		Resource: &pb.Resource{
 			Type:     res.Type,
 			Name:     res.Name,
 			Endpoint: res.Endpoint,
@@ -144,12 +143,12 @@ func (s *svc) Verify(acc *auth.Account, res *auth.Resource) error {
 	for _, q := range queries {
 		for _, rule := range s.listRules(q...) {
 			switch accessForRule(rule, acc, res) {
-			case rulePb.Access_UNKNOWN:
+			case pb.Access_UNKNOWN:
 				continue // rule did not specify access, check the next rule
-			case rulePb.Access_GRANTED:
+			case pb.Access_GRANTED:
 				log.Infof("%v granted access to %v:%v:%v by rule %v", acc.ID, res.Type, res.Name, res.Endpoint, rule.Id)
 				return nil // rule grants the account access to the resource
-			case rulePb.Access_DENIED:
+			case pb.Access_DENIED:
 				log.Infof("%v denied access to %v:%v:%v by rule %v", acc.ID, res.Type, res.Name, res.Endpoint, rule.Id)
 				return auth.ErrForbidden // rule denies access to the resource
 			}
@@ -177,7 +176,7 @@ func (s *svc) Inspect(token string) (*auth.Account, error) {
 		}
 	}
 
-	rsp, err := s.auth.Inspect(context.TODO(), &authPb.InspectRequest{
+	rsp, err := s.auth.Inspect(context.TODO(), &pb.InspectRequest{
 		Token: token,
 	})
 	if err != nil {
@@ -191,7 +190,7 @@ func (s *svc) Inspect(token string) (*auth.Account, error) {
 func (s *svc) Refresh(secret string, opts ...auth.RefreshOption) (*auth.Token, error) {
 	options := auth.NewRefreshOptions(opts...)
 
-	rsp, err := s.auth.Refresh(context.Background(), &authPb.RefreshRequest{
+	rsp, err := s.auth.Refresh(context.Background(), &pb.RefreshRequest{
 		Secret:      secret,
 		TokenExpiry: int64(options.TokenExpiry.Seconds()),
 	})
@@ -206,7 +205,7 @@ var ruleJoinKey = ":"
 
 // accessForRule returns a rule status, indicating if a rule permits access to a
 // resource for a given account
-func accessForRule(rule *rulePb.Rule, acc *auth.Account, res *auth.Resource) rulePb.Access {
+func accessForRule(rule *pb.Rule, acc *auth.Account, res *auth.Resource) pb.Access {
 	if rule.Role == "*" {
 		return rule.Access
 	}
@@ -222,18 +221,18 @@ func accessForRule(rule *rulePb.Rule, acc *auth.Account, res *auth.Resource) rul
 		}
 	}
 
-	return rulePb.Access_UNKNOWN
+	return pb.Access_UNKNOWN
 }
 
 // listRules gets all the rules from the store which have an id
 // prefix matching the filters
-func (s *svc) listRules(filters ...string) []*rulePb.Rule {
+func (s *svc) listRules(filters ...string) []*pb.Rule {
 	s.Lock()
 	defer s.Unlock()
 
 	prefix := strings.Join(filters, ruleJoinKey)
 
-	var rules []*rulePb.Rule
+	var rules []*pb.Rule
 	for _, r := range s.rules {
 		if strings.HasPrefix(r.Id, prefix) {
 			rules = append(rules, r)
@@ -245,7 +244,7 @@ func (s *svc) listRules(filters ...string) []*rulePb.Rule {
 
 // loadRules retrieves the rules from the auth service
 func (s *svc) loadRules() {
-	rsp, err := s.rule.List(context.TODO(), &rulePb.ListRequest{})
+	rsp, err := s.rule.List(context.TODO(), &pb.ListRequest{})
 	s.Lock()
 	defer s.Unlock()
 
@@ -257,7 +256,7 @@ func (s *svc) loadRules() {
 	s.rules = rsp.Rules
 }
 
-func serializeToken(t *authPb.Token) *auth.Token {
+func serializeToken(t *pb.Token) *auth.Token {
 	return &auth.Token{
 		Token:    t.Token,
 		Type:     t.Type,
@@ -269,7 +268,7 @@ func serializeToken(t *authPb.Token) *auth.Token {
 	}
 }
 
-func serializeAccount(a *authPb.Account) *auth.Account {
+func serializeAccount(a *pb.Account) *auth.Account {
 	var secret *auth.Token
 	if a.Secret != nil {
 		secret = serializeToken(a.Secret)