diff --git a/pkg/accounts/accounts_v1.pb.go b/pkg/accounts/accounts_v1.pb.go
new file mode 100644
index 0000000..565b67f
--- /dev/null
+++ b/pkg/accounts/accounts_v1.pb.go
@@ -0,0 +1,462 @@
+/// This file has messages for describing environments
+
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.26.0
+// 	protoc        v4.24.4
+// source: accounts/accounts_v1.proto
+
+package accounts
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	reflect "reflect"
+	sync "sync"
+)
+
+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)
+)
+
+// *
+// Represents a environment UUID only
+type AccountId struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Contour ID: UUID
+}
+
+func (x *AccountId) Reset() {
+	*x = AccountId{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_accounts_accounts_v1_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccountId) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccountId) ProtoMessage() {}
+
+func (x *AccountId) ProtoReflect() protoreflect.Message {
+	mi := &file_accounts_accounts_v1_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)
+}
+
+// Deprecated: Use AccountId.ProtoReflect.Descriptor instead.
+func (*AccountId) Descriptor() ([]byte, []int) {
+	return file_accounts_accounts_v1_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *AccountId) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+type AccountPassword struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Password string `protobuf:"bytes,1,opt,name=Password,proto3" json:"Password,omitempty"`
+}
+
+func (x *AccountPassword) Reset() {
+	*x = AccountPassword{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_accounts_accounts_v1_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccountPassword) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccountPassword) ProtoMessage() {}
+
+func (x *AccountPassword) ProtoReflect() protoreflect.Message {
+	mi := &file_accounts_accounts_v1_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)
+}
+
+// Deprecated: Use AccountPassword.ProtoReflect.Descriptor instead.
+func (*AccountPassword) Descriptor() ([]byte, []int) {
+	return file_accounts_accounts_v1_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *AccountPassword) GetPassword() string {
+	if x != nil {
+		return x.Password
+	}
+	return ""
+}
+
+type AccountData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Account name
+}
+
+func (x *AccountData) Reset() {
+	*x = AccountData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_accounts_accounts_v1_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccountData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccountData) ProtoMessage() {}
+
+func (x *AccountData) ProtoReflect() protoreflect.Message {
+	mi := &file_accounts_accounts_v1_proto_msgTypes[2]
+	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)
+}
+
+// Deprecated: Use AccountData.ProtoReflect.Descriptor instead.
+func (*AccountData) Descriptor() ([]byte, []int) {
+	return file_accounts_accounts_v1_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *AccountData) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+type AccountWithPassword struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data            *AccountData     `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	AccountPassword *AccountPassword `protobuf:"bytes,2,opt,name=AccountPassword,proto3" json:"AccountPassword,omitempty"`
+}
+
+func (x *AccountWithPassword) Reset() {
+	*x = AccountWithPassword{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_accounts_accounts_v1_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccountWithPassword) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccountWithPassword) ProtoMessage() {}
+
+func (x *AccountWithPassword) ProtoReflect() protoreflect.Message {
+	mi := &file_accounts_accounts_v1_proto_msgTypes[3]
+	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)
+}
+
+// Deprecated: Use AccountWithPassword.ProtoReflect.Descriptor instead.
+func (*AccountWithPassword) Descriptor() ([]byte, []int) {
+	return file_accounts_accounts_v1_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *AccountWithPassword) GetData() *AccountData {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
+func (x *AccountWithPassword) GetAccountPassword() *AccountPassword {
+	if x != nil {
+		return x.AccountPassword
+	}
+	return nil
+}
+
+type AccountFull struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id   *AccountId   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Data *AccountData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (x *AccountFull) Reset() {
+	*x = AccountFull{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_accounts_accounts_v1_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccountFull) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccountFull) ProtoMessage() {}
+
+func (x *AccountFull) ProtoReflect() protoreflect.Message {
+	mi := &file_accounts_accounts_v1_proto_msgTypes[4]
+	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)
+}
+
+// Deprecated: Use AccountFull.ProtoReflect.Descriptor instead.
+func (*AccountFull) Descriptor() ([]byte, []int) {
+	return file_accounts_accounts_v1_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *AccountFull) GetId() *AccountId {
+	if x != nil {
+		return x.Id
+	}
+	return nil
+}
+
+func (x *AccountFull) GetData() *AccountData {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
+var File_accounts_accounts_v1_proto protoreflect.FileDescriptor
+
+var file_accounts_accounts_v1_proto_rawDesc = []byte{
+	0x0a, 0x1a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x73, 0x5f, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x1b, 0x0a, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x22, 0x2d, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77,
+	0x6f, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22,
+	0x21, 0x0a, 0x0b, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x22, 0x85, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x57, 0x69,
+	0x74, 0x68, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x29, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x43, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x5d, 0x0a, 0x0b, 0x41, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x23, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73,
+	0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x52, 0x02, 0x69, 0x64, 0x12, 0x29,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x44,
+	0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xa9, 0x02, 0x0a, 0x08, 0x41, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x38, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x12, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00,
+	0x12, 0x38, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x15, 0x2e, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c,
+	0x6c, 0x1a, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x06, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x12, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e,
+	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x13, 0x2e, 0x61,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49,
+	0x64, 0x1a, 0x15, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x04, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x75, 0x6c,
+	0x6c, 0x22, 0x00, 0x30, 0x01, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x64,
+	0x68, 0x6f, 0x75, 0x73, 0x65, 0x70, 0x6c, 0x61, 0x6e, 0x74, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x2f,
+	0x73, 0x6f, 0x66, 0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x2d, 0x67, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
+	0x6b, 0x67, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
+}
+
+var (
+	file_accounts_accounts_v1_proto_rawDescOnce sync.Once
+	file_accounts_accounts_v1_proto_rawDescData = file_accounts_accounts_v1_proto_rawDesc
+)
+
+func file_accounts_accounts_v1_proto_rawDescGZIP() []byte {
+	file_accounts_accounts_v1_proto_rawDescOnce.Do(func() {
+		file_accounts_accounts_v1_proto_rawDescData = protoimpl.X.CompressGZIP(file_accounts_accounts_v1_proto_rawDescData)
+	})
+	return file_accounts_accounts_v1_proto_rawDescData
+}
+
+var file_accounts_accounts_v1_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_accounts_accounts_v1_proto_goTypes = []interface{}{
+	(*AccountId)(nil),           // 0: accounts.AccountId
+	(*AccountPassword)(nil),     // 1: accounts.AccountPassword
+	(*AccountData)(nil),         // 2: accounts.AccountData
+	(*AccountWithPassword)(nil), // 3: accounts.AccountWithPassword
+	(*AccountFull)(nil),         // 4: accounts.AccountFull
+	(*emptypb.Empty)(nil),       // 5: google.protobuf.Empty
+}
+var file_accounts_accounts_v1_proto_depIdxs = []int32{
+	2, // 0: accounts.AccountWithPassword.data:type_name -> accounts.AccountData
+	1, // 1: accounts.AccountWithPassword.AccountPassword:type_name -> accounts.AccountPassword
+	0, // 2: accounts.AccountFull.id:type_name -> accounts.AccountId
+	2, // 3: accounts.AccountFull.data:type_name -> accounts.AccountData
+	2, // 4: accounts.Accounts.Create:input_type -> accounts.AccountData
+	4, // 5: accounts.Accounts.Update:input_type -> accounts.AccountFull
+	4, // 6: accounts.Accounts.Delete:input_type -> accounts.AccountFull
+	0, // 7: accounts.Accounts.Get:input_type -> accounts.AccountId
+	5, // 8: accounts.Accounts.List:input_type -> google.protobuf.Empty
+	4, // 9: accounts.Accounts.Create:output_type -> accounts.AccountFull
+	4, // 10: accounts.Accounts.Update:output_type -> accounts.AccountFull
+	5, // 11: accounts.Accounts.Delete:output_type -> google.protobuf.Empty
+	4, // 12: accounts.Accounts.Get:output_type -> accounts.AccountFull
+	4, // 13: accounts.Accounts.List:output_type -> accounts.AccountFull
+	9, // [9:14] is the sub-list for method output_type
+	4, // [4:9] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
+}
+
+func init() { file_accounts_accounts_v1_proto_init() }
+func file_accounts_accounts_v1_proto_init() {
+	if File_accounts_accounts_v1_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_accounts_accounts_v1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccountId); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_accounts_accounts_v1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccountPassword); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_accounts_accounts_v1_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccountData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_accounts_accounts_v1_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccountWithPassword); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_accounts_accounts_v1_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccountFull); 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_accounts_accounts_v1_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   5,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_accounts_accounts_v1_proto_goTypes,
+		DependencyIndexes: file_accounts_accounts_v1_proto_depIdxs,
+		MessageInfos:      file_accounts_accounts_v1_proto_msgTypes,
+	}.Build()
+	File_accounts_accounts_v1_proto = out.File
+	file_accounts_accounts_v1_proto_rawDesc = nil
+	file_accounts_accounts_v1_proto_goTypes = nil
+	file_accounts_accounts_v1_proto_depIdxs = nil
+}
diff --git a/pkg/accounts/accounts_v1_grpc.pb.go b/pkg/accounts/accounts_v1_grpc.pb.go
new file mode 100644
index 0000000..2fff8c3
--- /dev/null
+++ b/pkg/accounts/accounts_v1_grpc.pb.go
@@ -0,0 +1,274 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+
+package accounts
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+// AccountsClient is the client API for Accounts service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type AccountsClient interface {
+	Create(ctx context.Context, in *AccountData, opts ...grpc.CallOption) (*AccountFull, error)
+	Update(ctx context.Context, in *AccountFull, opts ...grpc.CallOption) (*AccountFull, error)
+	Delete(ctx context.Context, in *AccountFull, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	Get(ctx context.Context, in *AccountId, opts ...grpc.CallOption) (*AccountFull, error)
+	List(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Accounts_ListClient, error)
+}
+
+type accountsClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewAccountsClient(cc grpc.ClientConnInterface) AccountsClient {
+	return &accountsClient{cc}
+}
+
+func (c *accountsClient) Create(ctx context.Context, in *AccountData, opts ...grpc.CallOption) (*AccountFull, error) {
+	out := new(AccountFull)
+	err := c.cc.Invoke(ctx, "/accounts.Accounts/Create", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountsClient) Update(ctx context.Context, in *AccountFull, opts ...grpc.CallOption) (*AccountFull, error) {
+	out := new(AccountFull)
+	err := c.cc.Invoke(ctx, "/accounts.Accounts/Update", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountsClient) Delete(ctx context.Context, in *AccountFull, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/accounts.Accounts/Delete", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountsClient) Get(ctx context.Context, in *AccountId, opts ...grpc.CallOption) (*AccountFull, error) {
+	out := new(AccountFull)
+	err := c.cc.Invoke(ctx, "/accounts.Accounts/Get", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountsClient) List(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Accounts_ListClient, error) {
+	stream, err := c.cc.NewStream(ctx, &Accounts_ServiceDesc.Streams[0], "/accounts.Accounts/List", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &accountsListClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type Accounts_ListClient interface {
+	Recv() (*AccountFull, error)
+	grpc.ClientStream
+}
+
+type accountsListClient struct {
+	grpc.ClientStream
+}
+
+func (x *accountsListClient) Recv() (*AccountFull, error) {
+	m := new(AccountFull)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// AccountsServer is the server API for Accounts service.
+// All implementations must embed UnimplementedAccountsServer
+// for forward compatibility
+type AccountsServer interface {
+	Create(context.Context, *AccountData) (*AccountFull, error)
+	Update(context.Context, *AccountFull) (*AccountFull, error)
+	Delete(context.Context, *AccountFull) (*emptypb.Empty, error)
+	Get(context.Context, *AccountId) (*AccountFull, error)
+	List(*emptypb.Empty, Accounts_ListServer) error
+	mustEmbedUnimplementedAccountsServer()
+}
+
+// UnimplementedAccountsServer must be embedded to have forward compatible implementations.
+type UnimplementedAccountsServer struct {
+}
+
+func (UnimplementedAccountsServer) Create(context.Context, *AccountData) (*AccountFull, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
+}
+func (UnimplementedAccountsServer) Update(context.Context, *AccountFull) (*AccountFull, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
+}
+func (UnimplementedAccountsServer) Delete(context.Context, *AccountFull) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
+}
+func (UnimplementedAccountsServer) Get(context.Context, *AccountId) (*AccountFull, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
+}
+func (UnimplementedAccountsServer) List(*emptypb.Empty, Accounts_ListServer) error {
+	return status.Errorf(codes.Unimplemented, "method List not implemented")
+}
+func (UnimplementedAccountsServer) mustEmbedUnimplementedAccountsServer() {}
+
+// UnsafeAccountsServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to AccountsServer will
+// result in compilation errors.
+type UnsafeAccountsServer interface {
+	mustEmbedUnimplementedAccountsServer()
+}
+
+func RegisterAccountsServer(s grpc.ServiceRegistrar, srv AccountsServer) {
+	s.RegisterService(&Accounts_ServiceDesc, srv)
+}
+
+func _Accounts_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AccountData)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountsServer).Create(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/accounts.Accounts/Create",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountsServer).Create(ctx, req.(*AccountData))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Accounts_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AccountFull)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountsServer).Update(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/accounts.Accounts/Update",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountsServer).Update(ctx, req.(*AccountFull))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Accounts_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AccountFull)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountsServer).Delete(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/accounts.Accounts/Delete",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountsServer).Delete(ctx, req.(*AccountFull))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Accounts_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AccountId)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountsServer).Get(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/accounts.Accounts/Get",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountsServer).Get(ctx, req.(*AccountId))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Accounts_List_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(emptypb.Empty)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(AccountsServer).List(m, &accountsListServer{stream})
+}
+
+type Accounts_ListServer interface {
+	Send(*AccountFull) error
+	grpc.ServerStream
+}
+
+type accountsListServer struct {
+	grpc.ServerStream
+}
+
+func (x *accountsListServer) Send(m *AccountFull) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+// Accounts_ServiceDesc is the grpc.ServiceDesc for Accounts service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Accounts_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "accounts.Accounts",
+	HandlerType: (*AccountsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Create",
+			Handler:    _Accounts_Create_Handler,
+		},
+		{
+			MethodName: "Update",
+			Handler:    _Accounts_Update_Handler,
+		},
+		{
+			MethodName: "Delete",
+			Handler:    _Accounts_Delete_Handler,
+		},
+		{
+			MethodName: "Get",
+			Handler:    _Accounts_Get_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "List",
+			Handler:       _Accounts_List_Handler,
+			ServerStreams: true,
+		},
+	},
+	Metadata: "accounts/accounts_v1.proto",
+}
diff --git a/pkg/proto/environments_v1.pb.go b/pkg/environments/environments_v1.pb.go
similarity index 56%
rename from pkg/proto/environments_v1.pb.go
rename to pkg/environments/environments_v1.pb.go
index 3b3b6d3..e38d931 100644
--- a/pkg/proto/environments_v1.pb.go
+++ b/pkg/environments/environments_v1.pb.go
@@ -4,7 +4,7 @@
 // versions:
 // 	protoc-gen-go v1.26.0
 // 	protoc        v4.24.4
-// source: proto/environments_v1.proto
+// source: environments/environments_v1.proto
 
 package environments
 
@@ -50,11 +50,11 @@ func (x Provider) String() string {
 }
 
 func (Provider) Descriptor() protoreflect.EnumDescriptor {
-	return file_proto_environments_v1_proto_enumTypes[0].Descriptor()
+	return file_environments_environments_v1_proto_enumTypes[0].Descriptor()
 }
 
 func (Provider) Type() protoreflect.EnumType {
-	return &file_proto_environments_v1_proto_enumTypes[0]
+	return &file_environments_environments_v1_proto_enumTypes[0]
 }
 
 func (x Provider) Number() protoreflect.EnumNumber {
@@ -63,7 +63,7 @@ func (x Provider) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Provider.Descriptor instead.
 func (Provider) EnumDescriptor() ([]byte, []int) {
-	return file_proto_environments_v1_proto_rawDescGZIP(), []int{0}
+	return file_environments_environments_v1_proto_rawDescGZIP(), []int{0}
 }
 
 // *
@@ -79,7 +79,7 @@ type EnvironmentId struct {
 func (x *EnvironmentId) Reset() {
 	*x = EnvironmentId{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_environments_v1_proto_msgTypes[0]
+		mi := &file_environments_environments_v1_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -92,7 +92,7 @@ func (x *EnvironmentId) String() string {
 func (*EnvironmentId) ProtoMessage() {}
 
 func (x *EnvironmentId) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_environments_v1_proto_msgTypes[0]
+	mi := &file_environments_environments_v1_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -105,7 +105,7 @@ func (x *EnvironmentId) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EnvironmentId.ProtoReflect.Descriptor instead.
 func (*EnvironmentId) Descriptor() ([]byte, []int) {
-	return file_proto_environments_v1_proto_rawDescGZIP(), []int{0}
+	return file_environments_environments_v1_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *EnvironmentId) GetId() string {
@@ -127,7 +127,7 @@ type EnvironmentData struct {
 func (x *EnvironmentData) Reset() {
 	*x = EnvironmentData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_environments_v1_proto_msgTypes[1]
+		mi := &file_environments_environments_v1_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -140,7 +140,7 @@ func (x *EnvironmentData) String() string {
 func (*EnvironmentData) ProtoMessage() {}
 
 func (x *EnvironmentData) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_environments_v1_proto_msgTypes[1]
+	mi := &file_environments_environments_v1_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -153,7 +153,7 @@ func (x *EnvironmentData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EnvironmentData.ProtoReflect.Descriptor instead.
 func (*EnvironmentData) Descriptor() ([]byte, []int) {
-	return file_proto_environments_v1_proto_rawDescGZIP(), []int{1}
+	return file_environments_environments_v1_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *EnvironmentData) GetName() string {
@@ -182,7 +182,7 @@ type EnvironmentFull struct {
 func (x *EnvironmentFull) Reset() {
 	*x = EnvironmentFull{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_environments_v1_proto_msgTypes[2]
+		mi := &file_environments_environments_v1_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -195,7 +195,7 @@ func (x *EnvironmentFull) String() string {
 func (*EnvironmentFull) ProtoMessage() {}
 
 func (x *EnvironmentFull) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_environments_v1_proto_msgTypes[2]
+	mi := &file_environments_environments_v1_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -208,7 +208,7 @@ func (x *EnvironmentFull) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EnvironmentFull.ProtoReflect.Descriptor instead.
 func (*EnvironmentFull) Descriptor() ([]byte, []int) {
-	return file_proto_environments_v1_proto_rawDescGZIP(), []int{2}
+	return file_environments_environments_v1_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *EnvironmentFull) GetId() *EnvironmentId {
@@ -225,83 +225,83 @@ func (x *EnvironmentFull) GetData() *EnvironmentData {
 	return nil
 }
 
-var File_proto_environments_v1_proto protoreflect.FileDescriptor
+var File_environments_environments_v1_proto protoreflect.FileDescriptor
 
-var file_proto_environments_v1_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x5f, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x65,
-	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x1b, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70,
-	0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1f, 0x0a, 0x0d, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x59, 0x0a, 0x0f, 0x45, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x32, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x22, 0x71, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x2b, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x17, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x10, 0x00,
-	0x32, 0xed, 0x02, 0x0a, 0x0c, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x12, 0x48, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e,
-	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72,
-	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76,
+var file_environments_environments_v1_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x65,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x76, 0x31, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
+	0x1f, 0x0a, 0x0d, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x22, 0x59, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44,
+	0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x69,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x71, 0x0a, 0x0f, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x2b,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x6e, 0x76,
 	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f,
-	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x06, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
-	0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46,
-	0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12,
-	0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45,
-	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x16,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12,
-	0x1b, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45,
-	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x1a, 0x1d, 0x2e, 0x65,
+	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x52, 0x02, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x17,
+	0x0a, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x65,
+	0x74, 0x7a, 0x6e, 0x65, 0x72, 0x10, 0x00, 0x32, 0xed, 0x02, 0x0a, 0x0c, 0x45, 0x6e, 0x76, 0x69,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x48, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74,
+	0x61, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c,
+	0x22, 0x00, 0x12, 0x48, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65,
 	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a,
-	0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1d, 0x2e,
-	0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x30, 0x01,
-	0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x64, 0x68, 0x6f, 0x75, 0x73, 0x65,
-	0x70, 0x6c, 0x61, 0x6e, 0x74, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x2d, 0x67, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e,
-	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x1d, 0x2e, 0x65, 0x6e,
+	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72,
+	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x06,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12,
+	0x43, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x49, 0x64, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75,
+	0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
+	0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46,
+	0x75, 0x6c, 0x6c, 0x22, 0x00, 0x30, 0x01, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x2e, 0x62,
+	0x61, 0x64, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x70, 0x6c, 0x61, 0x6e, 0x74, 0x73, 0x2e, 0x6e, 0x65,
+	0x74, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x73, 0x6f, 0x66,
+	0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2d, 0x67, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_proto_environments_v1_proto_rawDescOnce sync.Once
-	file_proto_environments_v1_proto_rawDescData = file_proto_environments_v1_proto_rawDesc
+	file_environments_environments_v1_proto_rawDescOnce sync.Once
+	file_environments_environments_v1_proto_rawDescData = file_environments_environments_v1_proto_rawDesc
 )
 
-func file_proto_environments_v1_proto_rawDescGZIP() []byte {
-	file_proto_environments_v1_proto_rawDescOnce.Do(func() {
-		file_proto_environments_v1_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_environments_v1_proto_rawDescData)
+func file_environments_environments_v1_proto_rawDescGZIP() []byte {
+	file_environments_environments_v1_proto_rawDescOnce.Do(func() {
+		file_environments_environments_v1_proto_rawDescData = protoimpl.X.CompressGZIP(file_environments_environments_v1_proto_rawDescData)
 	})
-	return file_proto_environments_v1_proto_rawDescData
+	return file_environments_environments_v1_proto_rawDescData
 }
 
-var file_proto_environments_v1_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_proto_environments_v1_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_proto_environments_v1_proto_goTypes = []interface{}{
+var file_environments_environments_v1_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_environments_environments_v1_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_environments_environments_v1_proto_goTypes = []interface{}{
 	(Provider)(0),           // 0: environments.Provider
 	(*EnvironmentId)(nil),   // 1: environments.EnvironmentId
 	(*EnvironmentData)(nil), // 2: environments.EnvironmentData
 	(*EnvironmentFull)(nil), // 3: environments.EnvironmentFull
 	(*emptypb.Empty)(nil),   // 4: google.protobuf.Empty
 }
-var file_proto_environments_v1_proto_depIdxs = []int32{
+var file_environments_environments_v1_proto_depIdxs = []int32{
 	0, // 0: environments.EnvironmentData.provider:type_name -> environments.Provider
 	1, // 1: environments.EnvironmentFull.id:type_name -> environments.EnvironmentId
 	2, // 2: environments.EnvironmentFull.data:type_name -> environments.EnvironmentData
@@ -322,13 +322,13 @@ var file_proto_environments_v1_proto_depIdxs = []int32{
 	0, // [0:3] is the sub-list for field type_name
 }
 
-func init() { file_proto_environments_v1_proto_init() }
-func file_proto_environments_v1_proto_init() {
-	if File_proto_environments_v1_proto != nil {
+func init() { file_environments_environments_v1_proto_init() }
+func file_environments_environments_v1_proto_init() {
+	if File_environments_environments_v1_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_proto_environments_v1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_environments_environments_v1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EnvironmentId); i {
 			case 0:
 				return &v.state
@@ -340,7 +340,7 @@ func file_proto_environments_v1_proto_init() {
 				return nil
 			}
 		}
-		file_proto_environments_v1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_environments_environments_v1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EnvironmentData); i {
 			case 0:
 				return &v.state
@@ -352,7 +352,7 @@ func file_proto_environments_v1_proto_init() {
 				return nil
 			}
 		}
-		file_proto_environments_v1_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_environments_environments_v1_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EnvironmentFull); i {
 			case 0:
 				return &v.state
@@ -369,19 +369,19 @@ func file_proto_environments_v1_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_proto_environments_v1_proto_rawDesc,
+			RawDescriptor: file_environments_environments_v1_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_proto_environments_v1_proto_goTypes,
-		DependencyIndexes: file_proto_environments_v1_proto_depIdxs,
-		EnumInfos:         file_proto_environments_v1_proto_enumTypes,
-		MessageInfos:      file_proto_environments_v1_proto_msgTypes,
+		GoTypes:           file_environments_environments_v1_proto_goTypes,
+		DependencyIndexes: file_environments_environments_v1_proto_depIdxs,
+		EnumInfos:         file_environments_environments_v1_proto_enumTypes,
+		MessageInfos:      file_environments_environments_v1_proto_msgTypes,
 	}.Build()
-	File_proto_environments_v1_proto = out.File
-	file_proto_environments_v1_proto_rawDesc = nil
-	file_proto_environments_v1_proto_goTypes = nil
-	file_proto_environments_v1_proto_depIdxs = nil
+	File_environments_environments_v1_proto = out.File
+	file_environments_environments_v1_proto_rawDesc = nil
+	file_environments_environments_v1_proto_goTypes = nil
+	file_environments_environments_v1_proto_depIdxs = nil
 }
diff --git a/pkg/proto/environments_v1_grpc.pb.go b/pkg/environments/environments_v1_grpc.pb.go
similarity index 99%
rename from pkg/proto/environments_v1_grpc.pb.go
rename to pkg/environments/environments_v1_grpc.pb.go
index bfeb5ae..046dd8e 100644
--- a/pkg/proto/environments_v1_grpc.pb.go
+++ b/pkg/environments/environments_v1_grpc.pb.go
@@ -270,5 +270,5 @@ var Environments_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "proto/environments_v1.proto",
+	Metadata: "environments/environments_v1.proto",
 }
diff --git a/proto b/proto
index 5a816b2..9060b30 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit 5a816b20847900194ab853e9c613a8f8ee844fc9
+Subproject commit 9060b308bdffde1aa96a5458c29a6948e79d0948