diff --git a/Taskfile.yml b/Taskfile.yml
index 780f80f0b9b..c76a2e418bc 100755
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -5,6 +5,7 @@ tasks:
     desc: Compile protobuf definitions
     cmds:
       - '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/commands/*.proto'
+      - '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/board/*.proto'
       - '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/monitor/*.proto'
       - '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/settings/*.proto'
 
diff --git a/cli/board/attach.go b/cli/board/attach.go
index 2721e677b53..bdfd85418fd 100644
--- a/cli/board/attach.go
+++ b/cli/board/attach.go
@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/cli/output"
 	"github.com/arduino/arduino-cli/commands/board"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cli/board/details.go b/cli/board/details.go
index 909cddef101..0a19efade24 100644
--- a/cli/board/details.go
+++ b/cli/board/details.go
@@ -23,7 +23,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/commands/board"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 	"github.com/arduino/arduino-cli/table"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
diff --git a/cli/board/list.go b/cli/board/list.go
index 8aed4babd3c..62b2304f71d 100644
--- a/cli/board/list.go
+++ b/cli/board/list.go
@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/commands/board"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 	"github.com/arduino/arduino-cli/table"
 	"github.com/spf13/cobra"
 )
diff --git a/cli/board/listall.go b/cli/board/listall.go
index d2e2c03eef0..a3e43c7f5cf 100644
--- a/cli/board/listall.go
+++ b/cli/board/listall.go
@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/commands/board"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 	"github.com/arduino/arduino-cli/table"
 	"github.com/spf13/cobra"
 )
diff --git a/commands/board/attach.go b/commands/board/attach.go
index fdd80600654..68e497635f5 100644
--- a/commands/board/attach.go
+++ b/commands/board/attach.go
@@ -27,7 +27,8 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/arduino-cli/commands"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
+	commonrpc "github.com/arduino/arduino-cli/rpc/commands"
 	discovery "github.com/arduino/board-discovery"
 	paths "github.com/arduino/go-paths-helper"
 )
@@ -89,7 +90,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskPr
 		if board == nil {
 			return nil, fmt.Errorf("no supported board found at %s", deviceURI.String())
 		}
-		taskCB(&rpc.TaskProgress{Name: "Board found: " + board.Name()})
+		taskCB(&commonrpc.TaskProgress{Name: "Board found: " + board.Name()})
 
 		// TODO: should be stoped the monitor: when running as a pure CLI  is released
 		// by the OS, when run as daemon the resource's state is unknown and could be leaked.
@@ -103,7 +104,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskPr
 	if err != nil {
 		return nil, fmt.Errorf("cannot export sketch metadata: %s", err)
 	}
-	taskCB(&rpc.TaskProgress{Name: "Selected fqbn: " + sketch.Metadata.CPU.Fqbn, Completed: true})
+	taskCB(&commonrpc.TaskProgress{Name: "Selected fqbn: " + sketch.Metadata.CPU.Fqbn, Completed: true})
 	return &rpc.BoardAttachResp{}, nil
 }
 
diff --git a/commands/board/details.go b/commands/board/details.go
index a49edfc7f84..1b9df30f209 100644
--- a/commands/board/details.go
+++ b/commands/board/details.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/commands"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 )
 
 // Details FIXMEDOC
diff --git a/commands/board/list.go b/commands/board/list.go
index 283697161e7..ea6e68b0e5b 100644
--- a/commands/board/list.go
+++ b/commands/board/list.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/arduino/arduino-cli/cli/globals"
 	"github.com/arduino/arduino-cli/commands"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/commands/board/listall.go b/commands/board/listall.go
index 1a134248be0..e4804515200 100644
--- a/commands/board/listall.go
+++ b/commands/board/listall.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/commands"
-	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/board"
 )
 
 // ListAll FIXMEDOC
diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go
index 38e195a3495..020165ddf8b 100644
--- a/commands/daemon/daemon.go
+++ b/commands/daemon/daemon.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/commands/compile"
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/commands/lib"
@@ -37,40 +36,6 @@ type ArduinoCoreServerImpl struct {
 	VersionString     string
 }
 
-// BoardDetails FIXMEDOC
-func (s *ArduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
-	return board.Details(ctx, req)
-}
-
-// BoardList FIXMEDOC
-func (s *ArduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
-	ports, err := board.List(req.GetInstance().GetId())
-	if err != nil {
-		return nil, err
-	}
-
-	return &rpc.BoardListResp{
-		Ports: ports,
-	}, nil
-}
-
-// BoardListAll FIXMEDOC
-func (s *ArduinoCoreServerImpl) BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
-	return board.ListAll(ctx, req)
-}
-
-// BoardAttach FIXMEDOC
-func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {
-
-	resp, err := board.Attach(stream.Context(), req,
-		func(p *rpc.TaskProgress) { stream.Send(&rpc.BoardAttachResp{TaskProgress: p}) },
-	)
-	if err != nil {
-		return err
-	}
-	return stream.Send(resp)
-}
-
 // Destroy FIXMEDOC
 func (s *ArduinoCoreServerImpl) Destroy(ctx context.Context, req *rpc.DestroyReq) (*rpc.DestroyResp, error) {
 	return commands.Destroy(ctx, req)
diff --git a/go.sum b/go.sum
index db46a426af6..a07a80b85a8 100644
--- a/go.sum
+++ b/go.sum
@@ -184,6 +184,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/rpc/commands/board.pb.go b/rpc/board/board.pb.go
similarity index 69%
rename from rpc/commands/board.pb.go
rename to rpc/board/board.pb.go
index 33314fae378..26ca5af5c1c 100644
--- a/rpc/commands/board.pb.go
+++ b/rpc/board/board.pb.go
@@ -1,10 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: commands/board.proto
+// source: board/board.proto
 
-package commands
+package board
 
 import (
 	fmt "fmt"
+	commands "github.com/arduino/arduino-cli/rpc/commands"
 	proto "github.com/golang/protobuf/proto"
 	math "math"
 )
@@ -21,18 +22,18 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type BoardDetailsReq struct {
-	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
-	Fqbn                 string    `protobuf:"bytes,2,opt,name=fqbn,proto3" json:"fqbn,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
-	XXX_unrecognized     []byte    `json:"-"`
-	XXX_sizecache        int32     `json:"-"`
+	Instance             *commands.Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
+	Fqbn                 string             `protobuf:"bytes,2,opt,name=fqbn,proto3" json:"fqbn,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *BoardDetailsReq) Reset()         { *m = BoardDetailsReq{} }
 func (m *BoardDetailsReq) String() string { return proto.CompactTextString(m) }
 func (*BoardDetailsReq) ProtoMessage()    {}
 func (*BoardDetailsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{0}
+	return fileDescriptor_91410b7a560825bc, []int{0}
 }
 
 func (m *BoardDetailsReq) XXX_Unmarshal(b []byte) error {
@@ -53,7 +54,7 @@ func (m *BoardDetailsReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BoardDetailsReq proto.InternalMessageInfo
 
-func (m *BoardDetailsReq) GetInstance() *Instance {
+func (m *BoardDetailsReq) GetInstance() *commands.Instance {
 	if m != nil {
 		return m.Instance
 	}
@@ -80,7 +81,7 @@ func (m *BoardDetailsResp) Reset()         { *m = BoardDetailsResp{} }
 func (m *BoardDetailsResp) String() string { return proto.CompactTextString(m) }
 func (*BoardDetailsResp) ProtoMessage()    {}
 func (*BoardDetailsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{1}
+	return fileDescriptor_91410b7a560825bc, []int{1}
 }
 
 func (m *BoardDetailsResp) XXX_Unmarshal(b []byte) error {
@@ -135,7 +136,7 @@ func (m *ConfigOption) Reset()         { *m = ConfigOption{} }
 func (m *ConfigOption) String() string { return proto.CompactTextString(m) }
 func (*ConfigOption) ProtoMessage()    {}
 func (*ConfigOption) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{2}
+	return fileDescriptor_91410b7a560825bc, []int{2}
 }
 
 func (m *ConfigOption) XXX_Unmarshal(b []byte) error {
@@ -190,7 +191,7 @@ func (m *ConfigValue) Reset()         { *m = ConfigValue{} }
 func (m *ConfigValue) String() string { return proto.CompactTextString(m) }
 func (*ConfigValue) ProtoMessage()    {}
 func (*ConfigValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{3}
+	return fileDescriptor_91410b7a560825bc, []int{3}
 }
 
 func (m *ConfigValue) XXX_Unmarshal(b []byte) error {
@@ -245,7 +246,7 @@ func (m *RequiredTool) Reset()         { *m = RequiredTool{} }
 func (m *RequiredTool) String() string { return proto.CompactTextString(m) }
 func (*RequiredTool) ProtoMessage()    {}
 func (*RequiredTool) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{4}
+	return fileDescriptor_91410b7a560825bc, []int{4}
 }
 
 func (m *RequiredTool) XXX_Unmarshal(b []byte) error {
@@ -288,20 +289,20 @@ func (m *RequiredTool) GetPackager() string {
 }
 
 type BoardAttachReq struct {
-	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
-	BoardUri             string    `protobuf:"bytes,2,opt,name=board_uri,json=boardUri,proto3" json:"board_uri,omitempty"`
-	SketchPath           string    `protobuf:"bytes,3,opt,name=sketch_path,json=sketchPath,proto3" json:"sketch_path,omitempty"`
-	SearchTimeout        string    `protobuf:"bytes,4,opt,name=search_timeout,json=searchTimeout,proto3" json:"search_timeout,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
-	XXX_unrecognized     []byte    `json:"-"`
-	XXX_sizecache        int32     `json:"-"`
+	Instance             *commands.Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
+	BoardUri             string             `protobuf:"bytes,2,opt,name=board_uri,json=boardUri,proto3" json:"board_uri,omitempty"`
+	SketchPath           string             `protobuf:"bytes,3,opt,name=sketch_path,json=sketchPath,proto3" json:"sketch_path,omitempty"`
+	SearchTimeout        string             `protobuf:"bytes,4,opt,name=search_timeout,json=searchTimeout,proto3" json:"search_timeout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *BoardAttachReq) Reset()         { *m = BoardAttachReq{} }
 func (m *BoardAttachReq) String() string { return proto.CompactTextString(m) }
 func (*BoardAttachReq) ProtoMessage()    {}
 func (*BoardAttachReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{5}
+	return fileDescriptor_91410b7a560825bc, []int{5}
 }
 
 func (m *BoardAttachReq) XXX_Unmarshal(b []byte) error {
@@ -322,7 +323,7 @@ func (m *BoardAttachReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BoardAttachReq proto.InternalMessageInfo
 
-func (m *BoardAttachReq) GetInstance() *Instance {
+func (m *BoardAttachReq) GetInstance() *commands.Instance {
 	if m != nil {
 		return m.Instance
 	}
@@ -351,17 +352,17 @@ func (m *BoardAttachReq) GetSearchTimeout() string {
 }
 
 type BoardAttachResp struct {
-	TaskProgress         *TaskProgress `protobuf:"bytes,1,opt,name=task_progress,json=taskProgress,proto3" json:"task_progress,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
+	TaskProgress         *commands.TaskProgress `protobuf:"bytes,1,opt,name=task_progress,json=taskProgress,proto3" json:"task_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
 func (m *BoardAttachResp) Reset()         { *m = BoardAttachResp{} }
 func (m *BoardAttachResp) String() string { return proto.CompactTextString(m) }
 func (*BoardAttachResp) ProtoMessage()    {}
 func (*BoardAttachResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{6}
+	return fileDescriptor_91410b7a560825bc, []int{6}
 }
 
 func (m *BoardAttachResp) XXX_Unmarshal(b []byte) error {
@@ -382,7 +383,7 @@ func (m *BoardAttachResp) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BoardAttachResp proto.InternalMessageInfo
 
-func (m *BoardAttachResp) GetTaskProgress() *TaskProgress {
+func (m *BoardAttachResp) GetTaskProgress() *commands.TaskProgress {
 	if m != nil {
 		return m.TaskProgress
 	}
@@ -390,17 +391,17 @@ func (m *BoardAttachResp) GetTaskProgress() *TaskProgress {
 }
 
 type BoardListReq struct {
-	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
-	XXX_unrecognized     []byte    `json:"-"`
-	XXX_sizecache        int32     `json:"-"`
+	Instance             *commands.Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *BoardListReq) Reset()         { *m = BoardListReq{} }
 func (m *BoardListReq) String() string { return proto.CompactTextString(m) }
 func (*BoardListReq) ProtoMessage()    {}
 func (*BoardListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{7}
+	return fileDescriptor_91410b7a560825bc, []int{7}
 }
 
 func (m *BoardListReq) XXX_Unmarshal(b []byte) error {
@@ -421,7 +422,7 @@ func (m *BoardListReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BoardListReq proto.InternalMessageInfo
 
-func (m *BoardListReq) GetInstance() *Instance {
+func (m *BoardListReq) GetInstance() *commands.Instance {
 	if m != nil {
 		return m.Instance
 	}
@@ -439,7 +440,7 @@ func (m *BoardListResp) Reset()         { *m = BoardListResp{} }
 func (m *BoardListResp) String() string { return proto.CompactTextString(m) }
 func (*BoardListResp) ProtoMessage()    {}
 func (*BoardListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{8}
+	return fileDescriptor_91410b7a560825bc, []int{8}
 }
 
 func (m *BoardListResp) XXX_Unmarshal(b []byte) error {
@@ -481,7 +482,7 @@ func (m *DetectedPort) Reset()         { *m = DetectedPort{} }
 func (m *DetectedPort) String() string { return proto.CompactTextString(m) }
 func (*DetectedPort) ProtoMessage()    {}
 func (*DetectedPort) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{9}
+	return fileDescriptor_91410b7a560825bc, []int{9}
 }
 
 func (m *DetectedPort) XXX_Unmarshal(b []byte) error {
@@ -531,18 +532,18 @@ func (m *DetectedPort) GetBoards() []*BoardListItem {
 }
 
 type BoardListAllReq struct {
-	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
-	SearchArgs           []string  `protobuf:"bytes,2,rep,name=search_args,json=searchArgs,proto3" json:"search_args,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
-	XXX_unrecognized     []byte    `json:"-"`
-	XXX_sizecache        int32     `json:"-"`
+	Instance             *commands.Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
+	SearchArgs           []string           `protobuf:"bytes,2,rep,name=search_args,json=searchArgs,proto3" json:"search_args,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *BoardListAllReq) Reset()         { *m = BoardListAllReq{} }
 func (m *BoardListAllReq) String() string { return proto.CompactTextString(m) }
 func (*BoardListAllReq) ProtoMessage()    {}
 func (*BoardListAllReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{10}
+	return fileDescriptor_91410b7a560825bc, []int{10}
 }
 
 func (m *BoardListAllReq) XXX_Unmarshal(b []byte) error {
@@ -563,7 +564,7 @@ func (m *BoardListAllReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BoardListAllReq proto.InternalMessageInfo
 
-func (m *BoardListAllReq) GetInstance() *Instance {
+func (m *BoardListAllReq) GetInstance() *commands.Instance {
 	if m != nil {
 		return m.Instance
 	}
@@ -588,7 +589,7 @@ func (m *BoardListAllResp) Reset()         { *m = BoardListAllResp{} }
 func (m *BoardListAllResp) String() string { return proto.CompactTextString(m) }
 func (*BoardListAllResp) ProtoMessage()    {}
 func (*BoardListAllResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{11}
+	return fileDescriptor_91410b7a560825bc, []int{11}
 }
 
 func (m *BoardListAllResp) XXX_Unmarshal(b []byte) error {
@@ -628,7 +629,7 @@ func (m *BoardListItem) Reset()         { *m = BoardListItem{} }
 func (m *BoardListItem) String() string { return proto.CompactTextString(m) }
 func (*BoardListItem) ProtoMessage()    {}
 func (*BoardListItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0882eeddaa6507ab, []int{12}
+	return fileDescriptor_91410b7a560825bc, []int{12}
 }
 
 func (m *BoardListItem) XXX_Unmarshal(b []byte) error {
@@ -664,64 +665,65 @@ func (m *BoardListItem) GetFQBN() string {
 }
 
 func init() {
-	proto.RegisterType((*BoardDetailsReq)(nil), "cc.arduino.cli.commands.BoardDetailsReq")
-	proto.RegisterType((*BoardDetailsResp)(nil), "cc.arduino.cli.commands.BoardDetailsResp")
-	proto.RegisterType((*ConfigOption)(nil), "cc.arduino.cli.commands.ConfigOption")
-	proto.RegisterType((*ConfigValue)(nil), "cc.arduino.cli.commands.ConfigValue")
-	proto.RegisterType((*RequiredTool)(nil), "cc.arduino.cli.commands.RequiredTool")
-	proto.RegisterType((*BoardAttachReq)(nil), "cc.arduino.cli.commands.BoardAttachReq")
-	proto.RegisterType((*BoardAttachResp)(nil), "cc.arduino.cli.commands.BoardAttachResp")
-	proto.RegisterType((*BoardListReq)(nil), "cc.arduino.cli.commands.BoardListReq")
-	proto.RegisterType((*BoardListResp)(nil), "cc.arduino.cli.commands.BoardListResp")
-	proto.RegisterType((*DetectedPort)(nil), "cc.arduino.cli.commands.DetectedPort")
-	proto.RegisterType((*BoardListAllReq)(nil), "cc.arduino.cli.commands.BoardListAllReq")
-	proto.RegisterType((*BoardListAllResp)(nil), "cc.arduino.cli.commands.BoardListAllResp")
-	proto.RegisterType((*BoardListItem)(nil), "cc.arduino.cli.commands.BoardListItem")
-}
-
-func init() { proto.RegisterFile("commands/board.proto", fileDescriptor_0882eeddaa6507ab) }
-
-var fileDescriptor_0882eeddaa6507ab = []byte{
-	// 656 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6e, 0x13, 0x3b,
-	0x10, 0xd6, 0x36, 0x69, 0x4e, 0x32, 0x49, 0x7a, 0x8e, 0xac, 0x9e, 0x73, 0x56, 0xe5, 0x82, 0x74,
-	0x45, 0x51, 0x24, 0xd4, 0x44, 0x2a, 0x17, 0x5c, 0xf0, 0x23, 0xb5, 0x54, 0x48, 0x45, 0x01, 0x8a,
-	0x55, 0x10, 0x42, 0x42, 0x8b, 0xe3, 0x75, 0x13, 0x2b, 0x9b, 0xf5, 0xc6, 0x76, 0xfa, 0x0a, 0x3c,
-	0x0c, 0xb7, 0x3c, 0x01, 0x4f, 0x86, 0xfc, 0xb7, 0xda, 0x4a, 0x84, 0x4a, 0xd0, 0xab, 0x9d, 0x99,
-	0xfd, 0x3c, 0xf3, 0xcd, 0xcc, 0x67, 0xc3, 0x2e, 0x15, 0xcb, 0x25, 0x29, 0x32, 0x35, 0x9e, 0x0a,
-	0x22, 0xb3, 0x51, 0x29, 0x85, 0x16, 0xe8, 0x7f, 0x4a, 0x47, 0x44, 0x66, 0x6b, 0x5e, 0x88, 0x11,
-	0xcd, 0xf9, 0x28, 0x80, 0xf6, 0xfe, 0xad, 0xe0, 0xc6, 0x10, 0x85, 0xc3, 0x27, 0x19, 0xfc, 0x7d,
-	0x62, 0x8e, 0x9f, 0x32, 0x4d, 0x78, 0xae, 0x30, 0x5b, 0xa1, 0xa7, 0xd0, 0xe6, 0x85, 0xd2, 0xa4,
-	0xa0, 0x2c, 0x8e, 0x06, 0xd1, 0xb0, 0x7b, 0xb4, 0x3f, 0xda, 0x90, 0x75, 0x74, 0xe6, 0x81, 0xb8,
-	0x3a, 0x82, 0x10, 0x34, 0x2f, 0x57, 0xd3, 0x22, 0xde, 0x1a, 0x44, 0xc3, 0x0e, 0xb6, 0x76, 0xf2,
-	0x3d, 0x82, 0x7f, 0xae, 0x97, 0x51, 0xa5, 0x01, 0x16, 0x64, 0xc9, 0x02, 0xd0, 0xd8, 0x68, 0x02,
-	0x3b, 0x54, 0x14, 0x97, 0x7c, 0x96, 0x8a, 0x52, 0x73, 0x51, 0xa8, 0xb8, 0x31, 0x68, 0x0c, 0xbb,
-	0x47, 0x07, 0x1b, 0x19, 0x3c, 0xb7, 0xf0, 0x37, 0x16, 0x8d, 0xfb, 0xb4, 0xe6, 0x29, 0x93, 0x4d,
-	0xb2, 0xd5, 0x9a, 0x4b, 0x96, 0xa5, 0x5a, 0x88, 0x5c, 0xc5, 0xcd, 0x1b, 0xb2, 0x61, 0x0f, 0xbf,
-	0x10, 0x22, 0xc7, 0x7d, 0x59, 0xf3, 0x54, 0xf2, 0x25, 0x82, 0x5e, 0xbd, 0x1a, 0xfa, 0x0f, 0x5a,
-	0x8e, 0xa5, 0x1d, 0x53, 0x07, 0x7b, 0x0f, 0xed, 0x43, 0xcf, 0x59, 0x69, 0x4e, 0xa6, 0x2c, 0xf7,
-	0x0d, 0x76, 0x5d, 0x6c, 0x62, 0x42, 0xe8, 0x09, 0xb4, 0xae, 0x48, 0xbe, 0x66, 0xa1, 0xbf, 0x7b,
-	0x37, 0xf4, 0xf7, 0xde, 0x80, 0xb1, 0x3f, 0x93, 0x7c, 0x86, 0x6e, 0x2d, 0x8c, 0x76, 0x61, 0xdb,
-	0xfe, 0xf0, 0x34, 0x9c, 0x83, 0xee, 0x42, 0xd7, 0x1a, 0xd7, 0x48, 0x80, 0x0d, 0x39, 0x0e, 0x7b,
-	0xd0, 0x56, 0x2c, 0x67, 0x54, 0xb3, 0x2c, 0x6e, 0x0c, 0xa2, 0x61, 0x1b, 0x57, 0x7e, 0xf2, 0x01,
-	0x7a, 0xf5, 0x51, 0x54, 0xbb, 0x8a, 0x6a, 0xbb, 0x8a, 0xe1, 0xaf, 0x2b, 0x26, 0x95, 0xe9, 0xdf,
-	0x25, 0x0f, 0xae, 0xc9, 0x5c, 0x12, 0xba, 0x20, 0x33, 0x26, 0x6d, 0xe6, 0x0e, 0xae, 0xfc, 0xe4,
-	0x5b, 0x04, 0x3b, 0x56, 0x0a, 0xc7, 0x5a, 0x13, 0x3a, 0xbf, 0x05, 0xc1, 0xdd, 0x81, 0x8e, 0xbd,
-	0x01, 0xe9, 0x5a, 0x72, 0xcf, 0xa4, 0x6d, 0x03, 0xef, 0x24, 0x37, 0x53, 0x50, 0x0b, 0xa6, 0xe9,
-	0x3c, 0x2d, 0x89, 0x9e, 0x7b, 0x36, 0xe0, 0x42, 0xe7, 0x44, 0xcf, 0xd1, 0x01, 0xec, 0x28, 0x46,
-	0x24, 0x9d, 0xa7, 0x9a, 0x2f, 0x99, 0x58, 0xeb, 0xb8, 0x69, 0x31, 0x7d, 0x17, 0xbd, 0x70, 0xc1,
-	0xe4, 0x93, 0xbf, 0x27, 0x81, 0xb5, 0x2a, 0xd1, 0x4b, 0xe8, 0x6b, 0xa2, 0x16, 0x69, 0x29, 0xc5,
-	0x4c, 0x32, 0xa5, 0x3c, 0xf7, 0xcd, 0xe2, 0xba, 0x20, 0x6a, 0x71, 0xee, 0xc1, 0xb8, 0xa7, 0x6b,
-	0x5e, 0xf2, 0x0a, 0x7a, 0x36, 0xfd, 0x84, 0x2b, 0xfd, 0xe7, 0x23, 0x49, 0x26, 0xd0, 0xaf, 0xa5,
-	0x53, 0x25, 0x7a, 0x0c, 0xdb, 0xa5, 0x90, 0xda, 0x70, 0xfc, 0xf5, 0x05, 0x38, 0x65, 0xda, 0x2a,
-	0xe0, 0x5c, 0x48, 0x8d, 0xdd, 0x99, 0xe4, 0x6b, 0x04, 0xbd, 0x7a, 0xdc, 0x6c, 0x9e, 0x64, 0x59,
-	0xd5, 0x73, 0x07, 0x07, 0xd7, 0x6e, 0xde, 0xbc, 0x2b, 0x54, 0x04, 0xc5, 0x55, 0xbe, 0x99, 0x74,
-	0xb0, 0xbd, 0x26, 0xdd, 0x36, 0xfa, 0x21, 0xea, 0x64, 0xf9, 0x0c, 0x5a, 0x76, 0x7b, 0xe1, 0xb2,
-	0xde, 0xdf, 0xc8, 0xb5, 0x6a, 0xf1, 0x4c, 0xb3, 0x25, 0xf6, 0xa7, 0x92, 0x95, 0xdf, 0x94, 0xf9,
-	0x71, 0x9c, 0xe7, 0xb7, 0x20, 0x30, 0xa3, 0x21, 0x27, 0x11, 0x22, 0x67, 0x2a, 0xde, 0x1a, 0x34,
-	0xac, 0x86, 0x6c, 0xe8, 0x58, 0xce, 0x54, 0x82, 0xfd, 0xeb, 0x56, 0x95, 0x54, 0x65, 0xad, 0x8d,
-	0xe8, 0xb7, 0xda, 0x78, 0x54, 0x5b, 0xa1, 0xf9, 0xf1, 0xd3, 0x2b, 0x88, 0xa0, 0xf9, 0xe2, 0xed,
-	0xc9, 0xeb, 0xf0, 0x84, 0x1a, 0xfb, 0xe4, 0xf0, 0xe3, 0x83, 0x19, 0xd7, 0xf3, 0xf5, 0xd4, 0x54,
-	0x18, 0xfb, 0x8a, 0xe1, 0x7b, 0x48, 0x73, 0x3e, 0x96, 0x25, 0x1d, 0x87, 0xea, 0xd3, 0x96, 0x9d,
-	0xfe, 0xc3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0xae, 0x33, 0x62, 0x4f, 0x06, 0x00, 0x00,
+	proto.RegisterType((*BoardDetailsReq)(nil), "cc.arduino.cli.board.BoardDetailsReq")
+	proto.RegisterType((*BoardDetailsResp)(nil), "cc.arduino.cli.board.BoardDetailsResp")
+	proto.RegisterType((*ConfigOption)(nil), "cc.arduino.cli.board.ConfigOption")
+	proto.RegisterType((*ConfigValue)(nil), "cc.arduino.cli.board.ConfigValue")
+	proto.RegisterType((*RequiredTool)(nil), "cc.arduino.cli.board.RequiredTool")
+	proto.RegisterType((*BoardAttachReq)(nil), "cc.arduino.cli.board.BoardAttachReq")
+	proto.RegisterType((*BoardAttachResp)(nil), "cc.arduino.cli.board.BoardAttachResp")
+	proto.RegisterType((*BoardListReq)(nil), "cc.arduino.cli.board.BoardListReq")
+	proto.RegisterType((*BoardListResp)(nil), "cc.arduino.cli.board.BoardListResp")
+	proto.RegisterType((*DetectedPort)(nil), "cc.arduino.cli.board.DetectedPort")
+	proto.RegisterType((*BoardListAllReq)(nil), "cc.arduino.cli.board.BoardListAllReq")
+	proto.RegisterType((*BoardListAllResp)(nil), "cc.arduino.cli.board.BoardListAllResp")
+	proto.RegisterType((*BoardListItem)(nil), "cc.arduino.cli.board.BoardListItem")
+}
+
+func init() { proto.RegisterFile("board/board.proto", fileDescriptor_91410b7a560825bc) }
+
+var fileDescriptor_91410b7a560825bc = []byte{
+	// 657 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5f, 0x6b, 0x13, 0x41,
+	0x10, 0xe7, 0x9a, 0x34, 0x26, 0x93, 0xa4, 0xea, 0x52, 0xe5, 0xa8, 0x0f, 0xa6, 0x2b, 0x85, 0x20,
+	0x78, 0x81, 0xfa, 0xa0, 0x22, 0x3e, 0xb4, 0x16, 0x21, 0x52, 0x6d, 0x5d, 0xaa, 0x88, 0x20, 0x71,
+	0xb3, 0xb7, 0x4d, 0x96, 0x5c, 0x6e, 0x2f, 0xbb, 0x9b, 0x7e, 0x02, 0x3f, 0x8c, 0x1f, 0xc0, 0x47,
+	0x3f, 0x9c, 0xec, 0x9f, 0x3b, 0xae, 0x52, 0x0b, 0x62, 0x5f, 0x92, 0x99, 0xdf, 0xce, 0xce, 0xfe,
+	0x66, 0xe6, 0xb7, 0x7b, 0x70, 0x77, 0x2a, 0xa9, 0x4a, 0x47, 0xee, 0x37, 0x29, 0x94, 0x34, 0x12,
+	0x6d, 0x33, 0x96, 0x50, 0x95, 0xae, 0x45, 0x2e, 0x13, 0x96, 0x89, 0xc4, 0xad, 0xed, 0xdc, 0x63,
+	0x72, 0xb9, 0xa4, 0x79, 0xaa, 0x47, 0xd6, 0x90, 0xb9, 0x0f, 0xc6, 0x29, 0xdc, 0x3e, 0xb4, 0xeb,
+	0x47, 0xdc, 0x50, 0x91, 0x69, 0xc2, 0x57, 0xe8, 0x15, 0xb4, 0x45, 0xae, 0x0d, 0xcd, 0x19, 0x8f,
+	0xa3, 0x41, 0x34, 0xec, 0xee, 0xef, 0x26, 0x7f, 0xa4, 0x2c, 0x73, 0x25, 0xe3, 0x10, 0x48, 0xaa,
+	0x2d, 0x08, 0x41, 0xf3, 0x7c, 0x35, 0xcd, 0xe3, 0x8d, 0x41, 0x34, 0xec, 0x10, 0x67, 0xe3, 0x5f,
+	0x11, 0xdc, 0xb9, 0x7c, 0x8c, 0x2e, 0x6c, 0x60, 0x4e, 0x97, 0xbc, 0x0c, 0xb4, 0x36, 0x1a, 0xc3,
+	0x16, 0x93, 0xf9, 0xb9, 0x98, 0x4d, 0x64, 0x61, 0x84, 0xcc, 0x75, 0xdc, 0x18, 0x34, 0x86, 0xdd,
+	0x7d, 0x9c, 0x5c, 0x55, 0x54, 0xf2, 0xda, 0xc5, 0x9e, 0xb8, 0x50, 0xd2, 0x67, 0x35, 0x4f, 0xdb,
+	0x54, 0x8a, 0xaf, 0xd6, 0x42, 0xf1, 0x74, 0x62, 0xa4, 0xcc, 0x74, 0xdc, 0xbc, 0x2e, 0x15, 0x09,
+	0xb1, 0x67, 0x52, 0x66, 0xa4, 0xaf, 0x6a, 0x9e, 0xc6, 0xdf, 0x23, 0xe8, 0xd5, 0x8f, 0x42, 0xf7,
+	0xa1, 0xe5, 0xf9, 0xb9, 0x06, 0x75, 0x48, 0xf0, 0xd0, 0x2e, 0xf4, 0xbc, 0x35, 0xc9, 0xe8, 0x94,
+	0x67, 0xa1, 0xb4, 0xae, 0xc7, 0x8e, 0x2d, 0x84, 0x5e, 0x40, 0xeb, 0x82, 0x66, 0x6b, 0x5e, 0x56,
+	0xb6, 0x7b, 0x5d, 0x65, 0x9f, 0x6c, 0x24, 0x09, 0x1b, 0xf0, 0x37, 0xe8, 0xd6, 0x60, 0xb4, 0x0d,
+	0x9b, 0x6e, 0x21, 0x70, 0xf0, 0x0e, 0x7a, 0x08, 0x5d, 0x67, 0x5c, 0x62, 0x00, 0x0e, 0xf2, 0x04,
+	0x76, 0xa0, 0xad, 0x79, 0xc6, 0x99, 0xe1, 0x69, 0xdc, 0x18, 0x44, 0xc3, 0x36, 0xa9, 0x7c, 0xfc,
+	0x19, 0x7a, 0xf5, 0x3e, 0x54, 0x23, 0x8a, 0x6a, 0x23, 0x8a, 0xe1, 0xd6, 0x05, 0x57, 0xda, 0x16,
+	0xef, 0x93, 0x97, 0xae, 0xcd, 0x5c, 0x50, 0xb6, 0xa0, 0x33, 0xae, 0x5c, 0xe6, 0x0e, 0xa9, 0x7c,
+	0xfc, 0x33, 0x82, 0x2d, 0xa7, 0x80, 0x03, 0x63, 0x28, 0x9b, 0xdf, 0x80, 0xce, 0x1e, 0x40, 0xc7,
+	0xb5, 0x6a, 0xb2, 0x56, 0x22, 0x30, 0x69, 0x3b, 0xe0, 0xa3, 0x12, 0xb6, 0x0b, 0x7a, 0xc1, 0x0d,
+	0x9b, 0x4f, 0x0a, 0x6a, 0xe6, 0x81, 0x0d, 0x78, 0xe8, 0x94, 0x9a, 0x39, 0xda, 0x83, 0x2d, 0xcd,
+	0xa9, 0x62, 0xf3, 0x89, 0x11, 0x4b, 0x2e, 0xd7, 0x26, 0x6e, 0xba, 0x98, 0xbe, 0x47, 0xcf, 0x3c,
+	0x88, 0xbf, 0x86, 0xeb, 0x51, 0xb2, 0xd6, 0x05, 0x7a, 0x0b, 0x7d, 0x43, 0xf5, 0x62, 0x52, 0x28,
+	0x39, 0x53, 0x5c, 0xeb, 0xc0, 0x7d, 0xef, 0xaf, 0xdc, 0xcf, 0xa8, 0x5e, 0x9c, 0x86, 0x60, 0xd2,
+	0x33, 0x35, 0x0f, 0xbf, 0x83, 0x9e, 0x4b, 0x7f, 0x2c, 0xb4, 0xf9, 0xff, 0x96, 0xe0, 0x31, 0xf4,
+	0x6b, 0xe9, 0x74, 0x81, 0x9e, 0xc3, 0x66, 0x21, 0x95, 0xb1, 0x1c, 0xaf, 0x91, 0xfe, 0x11, 0x37,
+	0x6e, 0xfc, 0xa7, 0x52, 0x19, 0xe2, 0x37, 0xe0, 0x1f, 0x11, 0xf4, 0xea, 0xb8, 0x1d, 0x3b, 0x4d,
+	0xd3, 0xaa, 0xe0, 0x0e, 0x29, 0x5d, 0x37, 0x76, 0xfb, 0x96, 0x30, 0x59, 0xca, 0xad, 0xf2, 0x6d,
+	0x9b, 0x4b, 0x3b, 0x08, 0xd2, 0x8f, 0xa2, 0x5f, 0xa2, 0x5e, 0x93, 0x2f, 0xa1, 0xe5, 0xa8, 0x94,
+	0x77, 0xf4, 0xd1, 0xd5, 0x44, 0xab, 0xe2, 0xc6, 0x86, 0x2f, 0x49, 0xd8, 0x82, 0x57, 0x61, 0x46,
+	0x76, 0xe1, 0x20, 0xcb, 0x6e, 0x40, 0x5a, 0x56, 0x3d, 0x5e, 0x1c, 0x54, 0xcd, 0x74, 0xbc, 0x31,
+	0x68, 0x38, 0xf5, 0x38, 0xe8, 0x40, 0xcd, 0x34, 0x3e, 0x09, 0xcf, 0x59, 0x75, 0xa4, 0x2e, 0x6a,
+	0x35, 0x44, 0xff, 0x5e, 0xc3, 0xb3, 0xda, 0xe4, 0xec, 0xc2, 0x95, 0x37, 0x0f, 0x41, 0xf3, 0xcd,
+	0x87, 0xc3, 0xf7, 0xe5, 0x83, 0x69, 0xed, 0xc3, 0xc7, 0x5f, 0x86, 0x33, 0x61, 0xe6, 0xeb, 0xa9,
+	0x2d, 0x68, 0x14, 0x8e, 0x2b, 0xff, 0x9f, 0xb0, 0x4c, 0x8c, 0x54, 0xc1, 0xfc, 0xe7, 0x61, 0xda,
+	0x72, 0x4d, 0x7f, 0xfa, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x89, 0xc5, 0xba, 0x31, 0x34, 0x06, 0x00,
+	0x00,
 }
diff --git a/rpc/commands/board.proto b/rpc/board/board.proto
similarity index 83%
rename from rpc/commands/board.proto
rename to rpc/board/board.proto
index 12d9a028dcb..ed1f7d1e198 100644
--- a/rpc/commands/board.proto
+++ b/rpc/board/board.proto
@@ -15,14 +15,14 @@
 
 syntax = "proto3";
 
-package cc.arduino.cli.commands;
+package cc.arduino.cli.board;
 
-option go_package = "github.com/arduino/arduino-cli/rpc/commands";
+option go_package = "github.com/arduino/arduino-cli/rpc/board";
 
 import "commands/common.proto";
 
 message BoardDetailsReq {
-  Instance instance = 1;
+  cc.arduino.cli.commands.Instance instance = 1;
   string fqbn = 2;
 }
 
@@ -51,18 +51,18 @@ message RequiredTool {
 }
 
 message BoardAttachReq {
-  Instance instance = 1;
+  cc.arduino.cli.commands.Instance instance = 1;
   string board_uri = 2;
   string sketch_path = 3;
   string search_timeout = 4;
 }
 
 message BoardAttachResp {
-  TaskProgress task_progress = 1;
+  cc.arduino.cli.commands.TaskProgress task_progress = 1;
 }
 
 message BoardListReq {
-  Instance instance = 1;
+  cc.arduino.cli.commands.Instance instance = 1;
 }
 
 message BoardListResp {
@@ -77,7 +77,7 @@ message DetectedPort {
 }
 
 message BoardListAllReq {
-  Instance instance = 1;
+  cc.arduino.cli.commands.Instance instance = 1;
 	repeated string search_args = 2;
 }
 
diff --git a/rpc/commands/commands.pb.go b/rpc/commands/commands.pb.go
index 780bbed2f1e..51b91f9f39d 100644
--- a/rpc/commands/commands.pb.go
+++ b/rpc/commands/commands.pb.go
@@ -534,76 +534,71 @@ func init() {
 func init() { proto.RegisterFile("commands/commands.proto", fileDescriptor_3690061a1131852d) }
 
 var fileDescriptor_3690061a1131852d = []byte{
-	// 948 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x97, 0xdd, 0x52, 0x1b, 0x37,
-	0x14, 0xc7, 0xb3, 0x24, 0x05, 0x7c, 0x0c, 0x24, 0x51, 0x9c, 0xe0, 0xf1, 0x95, 0xb3, 0x69, 0x8a,
-	0x81, 0x62, 0x28, 0xed, 0xb4, 0x17, 0x9d, 0x5e, 0x90, 0xd0, 0x0b, 0xd2, 0x74, 0xc8, 0x2c, 0x85,
-	0xe9, 0xe4, 0xc6, 0x95, 0x77, 0x15, 0xd0, 0xb0, 0xac, 0x14, 0x69, 0xa1, 0xf5, 0x55, 0x9f, 0xa0,
-	0x2f, 0xd4, 0x17, 0xe9, 0xeb, 0x74, 0xa4, 0x95, 0xe4, 0x35, 0x78, 0x3f, 0x1c, 0xc8, 0x15, 0xec,
-	0x39, 0xbf, 0xf3, 0x3f, 0xab, 0xf3, 0x21, 0xdb, 0xb0, 0x1a, 0xb2, 0x8b, 0x0b, 0x9c, 0x44, 0x72,
-	0xdb, 0xfe, 0xd3, 0xe7, 0x82, 0xa5, 0x0c, 0xad, 0x86, 0x61, 0x1f, 0x8b, 0xe8, 0x92, 0x26, 0xac,
-	0x1f, 0xc6, 0xb4, 0x6f, 0xdd, 0x9d, 0xa7, 0x13, 0x11, 0x2c, 0xc9, 0xf8, 0x4e, 0xcb, 0x99, 0x87,
-	0x0c, 0x8b, 0xc8, 0x58, 0x9f, 0xe5, 0x61, 0x4e, 0x63, 0x62, 0xec, 0x4f, 0x72, 0x76, 0x61, 0x8d,
-	0x63, 0xe5, 0x4b, 0x1e, 0x33, 0x6c, 0x35, 0x90, 0x33, 0xc7, 0x74, 0x98, 0xd9, 0xfc, 0x1f, 0x61,
-	0xe1, 0x20, 0xa1, 0x69, 0x40, 0x3e, 0xa2, 0x1d, 0x68, 0xc5, 0x74, 0x28, 0xb0, 0x18, 0x0d, 0x2e,
-	0x70, 0x82, 0x4f, 0x89, 0x18, 0xb0, 0x24, 0x1e, 0xb5, 0xe7, 0xba, 0x5e, 0x6f, 0x31, 0x40, 0xc6,
-	0xf7, 0x6b, 0xe6, 0x3a, 0x4c, 0xe2, 0x91, 0xff, 0xdf, 0x1c, 0x2c, 0x66, 0xd1, 0x92, 0xa3, 0x9f,
-	0x60, 0x91, 0x26, 0x32, 0xc5, 0x49, 0x48, 0xda, 0x5e, 0xd7, 0xeb, 0x35, 0x77, 0x9f, 0xf7, 0x0b,
-	0x8e, 0xde, 0x3f, 0x30, 0x60, 0xe0, 0x42, 0xd0, 0x77, 0xf0, 0x8c, 0xc7, 0x38, 0xfd, 0xc0, 0xc4,
-	0x85, 0x1c, 0xd0, 0x24, 0x22, 0x7f, 0x0d, 0x88, 0x10, 0x4c, 0xc8, 0xf6, 0x5c, 0xf7, 0x7e, 0xaf,
-	0x11, 0xb4, 0x9c, 0xf7, 0x40, 0x39, 0x7f, 0xd6, 0x3e, 0xb4, 0x0b, 0x4f, 0xb3, 0xf7, 0xa2, 0x64,
-	0x22, 0xaa, 0x7d, 0xbf, 0xeb, 0xf5, 0x1a, 0xc1, 0x13, 0xe7, 0x1c, 0x07, 0xa1, 0x13, 0x78, 0x1c,
-	0xb1, 0x3f, 0x13, 0x55, 0x98, 0x01, 0x17, 0xec, 0x54, 0x10, 0x29, 0xdb, 0x0f, 0xf4, 0x1b, 0xaf,
-	0x17, 0xbe, 0xf1, 0xbe, 0x89, 0x78, 0x67, 0x02, 0x82, 0x47, 0xd1, 0x35, 0x0b, 0x7a, 0x03, 0xcb,
-	0x29, 0x96, 0xe7, 0x63, 0xcd, 0x2f, 0xb4, 0xe6, 0xcb, 0x42, 0xcd, 0xdf, 0xb0, 0x3c, 0x77, 0x7a,
-	0x4b, 0x69, 0xee, 0xc9, 0xff, 0x05, 0x60, 0x9f, 0xc8, 0x54, 0xb0, 0x91, 0xea, 0xcc, 0xed, 0x4a,
-	0xeb, 0x2f, 0x43, 0xd3, 0x89, 0x49, 0xee, 0xbf, 0x81, 0x46, 0x40, 0x64, 0x88, 0x93, 0x3b, 0x90,
-	0xbe, 0x02, 0xb0, 0x5a, 0x92, 0x97, 0xf4, 0xd0, 0xfb, 0x94, 0x1e, 0xce, 0x15, 0xf6, 0xd0, 0x3f,
-	0x84, 0x95, 0x63, 0x1e, 0xe1, 0x94, 0x68, 0xdb, 0x1d, 0x1c, 0x84, 0xc2, 0xc3, 0x09, 0x41, 0xc9,
-	0xa7, 0xcf, 0x89, 0x77, 0xeb, 0x39, 0xf1, 0x7f, 0x87, 0xd5, 0x2c, 0xd5, 0xdb, 0x89, 0x83, 0xdd,
-	0xc1, 0x21, 0x04, 0xb4, 0xa7, 0x2b, 0x7f, 0xc6, 0xd3, 0x2c, 0x01, 0x9c, 0x10, 0x21, 0x29, 0x53,
-	0xe3, 0xe4, 0xaf, 0x41, 0xd3, 0x3d, 0x49, 0x8e, 0xda, 0xb0, 0x70, 0x95, 0x3d, 0xea, 0x54, 0x8d,
-	0xc0, 0x3e, 0xee, 0xfe, 0xdb, 0x82, 0xe6, 0x5e, 0x96, 0xf2, 0x35, 0x13, 0x04, 0x1d, 0xc2, 0x03,
-	0x75, 0x93, 0xa0, 0x6e, 0xc9, 0x79, 0xf5, 0x35, 0xd5, 0x79, 0x5e, 0x41, 0x48, 0xee, 0xdf, 0xdb,
-	0xf1, 0xd0, 0x09, 0x2c, 0x98, 0xa1, 0x47, 0x2f, 0x8a, 0xcf, 0xe7, 0x76, 0xac, 0xf3, 0x65, 0x35,
-	0xa4, 0x94, 0xd1, 0x11, 0xcc, 0x67, 0x13, 0x8f, 0xfc, 0xc2, 0x08, 0xb7, 0x5e, 0x9d, 0x17, 0x95,
-	0x8c, 0x16, 0x8d, 0xa0, 0x99, 0x9b, 0x3e, 0xb4, 0x56, 0x18, 0x35, 0x39, 0xf4, 0x9d, 0x5e, 0x3d,
-	0xd0, 0x94, 0xe4, 0x6f, 0x68, 0x4d, 0x1b, 0x0f, 0xb4, 0x53, 0xa1, 0x72, 0x63, 0x4e, 0x3b, 0xdf,
-	0xcc, 0x18, 0x31, 0xee, 0x89, 0x99, 0x8e, 0x92, 0x9e, 0x8c, 0xa7, 0xa9, 0xa4, 0x27, 0xb9, 0x21,
-	0xf3, 0xef, 0xa1, 0x10, 0x96, 0x5e, 0xa9, 0xcf, 0xca, 0x7d, 0x92, 0x62, 0x1a, 0x4b, 0x54, 0x5c,
-	0x96, 0x3c, 0xa6, 0x32, 0xac, 0xd7, 0x24, 0x25, 0x47, 0x43, 0x68, 0x6a, 0xdb, 0x5e, 0x9a, 0xe2,
-	0xf0, 0xac, 0xa4, 0x47, 0x39, 0xaa, 0xbc, 0x47, 0x13, 0xa0, 0xe4, 0x3b, 0x1e, 0x7a, 0x0f, 0x0d,
-	0x6d, 0x7c, 0x4b, 0x65, 0x8a, 0x5e, 0x96, 0x07, 0x2a, 0x46, 0xe9, 0x7f, 0x55, 0x07, 0x93, 0xdc,
-	0x15, 0x49, 0x19, 0xf6, 0xe2, 0xb8, 0xaa, 0x48, 0x06, 0xab, 0x51, 0x24, 0x47, 0xea, 0x5b, 0x66,
-	0xe1, 0x75, 0xf6, 0xfd, 0xa4, 0xa4, 0xc3, 0x86, 0x28, 0xef, 0xb0, 0x83, 0x74, 0x61, 0x12, 0x78,
-	0xf8, 0xce, 0x7c, 0x76, 0xe8, 0x7b, 0x2f, 0x8e, 0xd1, 0x66, 0x61, 0xe8, 0x35, 0x52, 0xe5, 0xf9,
-	0xba, 0x3e, 0xac, 0xf3, 0x7d, 0x84, 0x47, 0xd6, 0x61, 0xef, 0x40, 0x54, 0xad, 0x61, 0x51, 0x95,
-	0x71, 0x6b, 0x06, 0x5a, 0xa7, 0x4c, 0xe1, 0xb1, 0xf5, 0x1c, 0x27, 0xd4, 0x1c, 0xb2, 0x5a, 0xc5,
-	0xb1, 0x2a, 0x69, 0x7f, 0x16, 0xfc, 0x7a, 0x61, 0x8f, 0xf9, 0xa9, 0xc0, 0x11, 0xa9, 0x51, 0x58,
-	0x43, 0xd6, 0x2b, 0xac, 0x83, 0x75, 0xbe, 0x23, 0x98, 0x3f, 0xd6, 0xdf, 0x49, 0x4b, 0xae, 0xcf,
-	0x0c, 0x28, 0xbf, 0x3e, 0x2d, 0xa3, 0x45, 0x29, 0xac, 0xd8, 0x6c, 0x47, 0x04, 0x8b, 0xf0, 0x0c,
-	0x6d, 0x54, 0xbe, 0x56, 0x06, 0xaa, 0x24, 0x9b, 0xb5, 0xd9, 0x6c, 0x8b, 0xac, 0x55, 0x2f, 0x69,
-	0xaf, 0x32, 0xd8, 0xee, 0xe9, 0x7a, 0x4d, 0x52, 0x72, 0xd5, 0x94, 0xec, 0x06, 0x1d, 0xb9, 0xe1,
-	0x2b, 0x7e, 0xc9, 0x6b, 0x64, 0x79, 0x53, 0x6e, 0xc0, 0xba, 0x7e, 0xe7, 0xb0, 0x62, 0x1c, 0x76,
-	0xb9, 0x36, 0xaa, 0x14, 0x72, 0xbb, 0xb5, 0x59, 0x9b, 0xb5, 0xab, 0x65, 0xec, 0xe3, 0x31, 0xaf,
-	0x7c, 0xe1, 0x89, 0x29, 0xdf, 0x9a, 0x81, 0xb6, 0xab, 0x65, 0x3d, 0xd9, 0x30, 0xee, 0x95, 0xae,
-	0xd6, 0x0d, 0xb6, 0x7c, 0xb5, 0xa6, 0xe0, 0x3a, 0xeb, 0x3f, 0x1e, 0x74, 0x8c, 0x2f, 0x20, 0x92,
-	0xc5, 0x57, 0x64, 0x9f, 0x70, 0x92, 0x44, 0x24, 0x09, 0x29, 0x91, 0xe8, 0xfb, 0x2a, 0xc1, 0x29,
-	0x41, 0xea, 0x45, 0x7e, 0xf8, 0xa4, 0x38, 0xc9, 0xd1, 0x07, 0x58, 0x36, 0x84, 0x59, 0x92, 0xf5,
-	0x2a, 0xa5, 0xf1, 0x8e, 0x6c, 0xd4, 0x45, 0x25, 0x47, 0x7f, 0x40, 0xd3, 0x18, 0xf5, 0x86, 0xac,
-	0x55, 0x85, 0xda, 0x05, 0xe9, 0xd5, 0x03, 0x25, 0x7f, 0xb5, 0xf5, 0x7e, 0xf3, 0x94, 0xa6, 0x67,
-	0x97, 0x43, 0x85, 0x6c, 0x9b, 0x10, 0xfb, 0x77, 0x2b, 0x8c, 0xe9, 0xb6, 0xe0, 0xa1, 0xfb, 0x1d,
-	0x3e, 0x9c, 0xd7, 0x3f, 0x75, 0xbf, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xf5, 0x48, 0xa1,
-	0xa3, 0x0f, 0x00, 0x00,
+	// 867 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x52, 0xdb, 0x46,
+	0x14, 0x8e, 0x9c, 0x14, 0xf0, 0x31, 0x90, 0xb0, 0x21, 0xc1, 0xa3, 0x2b, 0x47, 0x69, 0x07, 0x83,
+	0x6b, 0xe3, 0xd2, 0x4e, 0x7b, 0xd1, 0xe9, 0x45, 0x1a, 0x7a, 0x41, 0x9a, 0x0e, 0x8c, 0xa8, 0x99,
+	0x4e, 0x6f, 0x5c, 0x59, 0x5a, 0xcc, 0x0e, 0xf2, 0x6a, 0xd9, 0x15, 0xb4, 0xbe, 0xea, 0x13, 0xf4,
+	0x5d, 0xfa, 0x36, 0x7d, 0x9d, 0xce, 0xae, 0x76, 0xe5, 0x1f, 0xac, 0x1f, 0x03, 0xb9, 0x02, 0x9d,
+	0xf3, 0x9d, 0xef, 0xec, 0xd9, 0xf3, 0x7d, 0x02, 0xc1, 0x8e, 0x1f, 0x8d, 0x46, 0x1e, 0x0d, 0xc4,
+	0x81, 0xf9, 0xa5, 0xc3, 0x78, 0x14, 0x47, 0x68, 0xc7, 0xf7, 0x3b, 0x1e, 0x0f, 0x6e, 0x08, 0x8d,
+	0x3a, 0x7e, 0x48, 0x3a, 0x26, 0x6d, 0xbf, 0x9a, 0xa9, 0x88, 0x68, 0x82, 0xb7, 0x5f, 0x4f, 0x87,
+	0x19, 0x09, 0xb1, 0x8e, 0xbf, 0x9c, 0x8a, 0x73, 0x13, 0x9c, 0x70, 0xdc, 0xb0, 0x30, 0xf2, 0x02,
+	0x1d, 0x46, 0x69, 0x38, 0x24, 0x83, 0x24, 0xe6, 0x7c, 0x0f, 0xab, 0xc7, 0x94, 0xc4, 0x2e, 0xbe,
+	0x46, 0x5d, 0xd8, 0x0e, 0xc9, 0x80, 0x7b, 0x7c, 0xdc, 0x1f, 0x79, 0xd4, 0x1b, 0x62, 0xde, 0x8f,
+	0x68, 0x38, 0xae, 0x57, 0x1a, 0x56, 0x73, 0xcd, 0x45, 0x3a, 0xf7, 0x4b, 0x92, 0x3a, 0xa1, 0xe1,
+	0xd8, 0xf9, 0xaf, 0x02, 0x6b, 0x49, 0xb5, 0x60, 0xe8, 0x07, 0x58, 0x23, 0x54, 0xc4, 0x1e, 0xf5,
+	0x71, 0xdd, 0x6a, 0x58, 0xcd, 0xda, 0xe1, 0x9b, 0x4e, 0xc6, 0x90, 0x9d, 0x63, 0x0d, 0x74, 0xd3,
+	0x12, 0xf4, 0x0d, 0xbc, 0x66, 0xa1, 0x17, 0x5f, 0x44, 0x7c, 0x24, 0xfa, 0x84, 0x06, 0xf8, 0xaf,
+	0x3e, 0xe6, 0x3c, 0xe2, 0xa2, 0x5e, 0x69, 0x3c, 0x6d, 0x56, 0xdd, 0xed, 0x34, 0x7b, 0x2c, 0x93,
+	0x3f, 0xa9, 0x1c, 0x3a, 0x84, 0x57, 0xc9, 0xb9, 0x08, 0x9e, 0xa9, 0xaa, 0x3f, 0x6d, 0x58, 0xcd,
+	0xaa, 0xfb, 0x32, 0x4d, 0x4e, 0x8a, 0xd0, 0x39, 0x6c, 0x05, 0xd1, 0x9f, 0x54, 0x5e, 0x4c, 0x9f,
+	0xf1, 0x68, 0xc8, 0xb1, 0x10, 0xf5, 0x67, 0xea, 0xc4, 0x7b, 0x99, 0x27, 0x3e, 0xd2, 0x15, 0xa7,
+	0xba, 0xc0, 0x7d, 0x11, 0xcc, 0x45, 0xd0, 0x07, 0xd8, 0x88, 0x3d, 0x71, 0x35, 0xe1, 0xfc, 0x4c,
+	0x71, 0x7e, 0x91, 0xc9, 0xf9, 0xab, 0x27, 0xae, 0x52, 0xbe, 0xf5, 0x78, 0xea, 0xc9, 0xf9, 0x19,
+	0xe0, 0x08, 0x8b, 0x98, 0x47, 0x63, 0xb9, 0x99, 0x87, 0x5d, 0xad, 0xb3, 0x01, 0xb5, 0x94, 0x4c,
+	0x30, 0xe7, 0x03, 0x54, 0x5d, 0x2c, 0x7c, 0x8f, 0x3e, 0x02, 0xf5, 0x2d, 0x80, 0xe1, 0x12, 0x2c,
+	0x67, 0x87, 0xd6, 0x7d, 0x76, 0x58, 0xc9, 0xdc, 0xa1, 0x73, 0x02, 0x9b, 0x3d, 0x16, 0x78, 0x31,
+	0x56, 0xb1, 0x47, 0x18, 0x84, 0xc0, 0xf3, 0x19, 0x42, 0xc1, 0x16, 0xeb, 0xc4, 0x7a, 0xb0, 0x4e,
+	0x9c, 0xdf, 0x60, 0x27, 0x69, 0xf5, 0x71, 0x66, 0xb0, 0x47, 0x18, 0x82, 0x43, 0x7d, 0x31, 0xf3,
+	0x27, 0x9c, 0x66, 0x1d, 0xe0, 0x1c, 0x73, 0x41, 0x22, 0x29, 0x27, 0x67, 0x17, 0x6a, 0xe9, 0x93,
+	0x60, 0xa8, 0x0e, 0xab, 0xb7, 0xc9, 0xa3, 0x6a, 0x55, 0x75, 0xcd, 0xe3, 0xe1, 0xbf, 0x5b, 0x50,
+	0x7b, 0x97, 0xb4, 0x7c, 0x1f, 0x71, 0x8c, 0x4e, 0xe0, 0x99, 0x7c, 0x93, 0xa0, 0x46, 0xce, 0xbc,
+	0xea, 0x35, 0x65, 0xbf, 0x29, 0x40, 0x08, 0xe6, 0x3c, 0xe9, 0x5a, 0xe8, 0x1c, 0x56, 0xb5, 0xe8,
+	0xd1, 0xdb, 0xec, 0xf9, 0x52, 0x8f, 0xd9, 0x9f, 0x17, 0x83, 0x24, 0x33, 0x3a, 0x83, 0x95, 0x44,
+	0xf1, 0xc8, 0xc9, 0xac, 0x48, 0xed, 0x65, 0xbf, 0x2d, 0xc4, 0x28, 0xd2, 0x00, 0x6a, 0x53, 0xea,
+	0x43, 0xbb, 0x99, 0x55, 0xb3, 0xa2, 0xb7, 0x9b, 0xe5, 0x80, 0xfa, 0x4a, 0xfe, 0x86, 0xed, 0x45,
+	0xf2, 0x40, 0xdd, 0x02, 0x96, 0x3b, 0x3a, 0xb5, 0xbf, 0x5a, 0xb2, 0x62, 0xb2, 0x13, 0xad, 0x8e,
+	0x9c, 0x9d, 0x4c, 0xd4, 0x94, 0xb3, 0x93, 0x29, 0x91, 0x39, 0x4f, 0x24, 0xef, 0xfb, 0xe4, 0xaf,
+	0x62, 0x0e, 0xaf, 0x46, 0xe4, 0xf3, 0xa6, 0x20, 0xc1, 0xba, 0x16, 0xa2, 0xf0, 0xfc, 0x54, 0xbf,
+	0xb1, 0x94, 0xdb, 0xc2, 0x10, 0xb5, 0x32, 0x4b, 0xe7, 0x90, 0xb2, 0xcf, 0x97, 0xe5, 0xc1, 0xaa,
+	0xdf, 0x35, 0xbc, 0x30, 0x09, 0xe3, 0x3c, 0x54, 0xcc, 0x61, 0xa0, 0xb2, 0x63, 0x7b, 0x09, 0xb4,
+	0x6a, 0x19, 0xc3, 0x96, 0xc9, 0xf4, 0x28, 0xd1, 0x43, 0x16, 0xb3, 0xa4, 0x58, 0xd9, 0xb4, 0xb3,
+	0x0c, 0x7c, 0xfe, 0x62, 0x7b, 0x6c, 0xc8, 0xbd, 0x00, 0x97, 0xb8, 0x58, 0x8d, 0x2c, 0x77, 0xb1,
+	0x29, 0x58, 0xf5, 0x3b, 0x83, 0x95, 0x9e, 0xfa, 0x4f, 0x28, 0xc7, 0xb4, 0x09, 0x20, 0xdf, 0xb4,
+	0x06, 0xa3, 0x48, 0x09, 0x6c, 0x9a, 0x6e, 0x67, 0xd8, 0xe3, 0xfe, 0x25, 0xda, 0x2f, 0x3c, 0x56,
+	0x02, 0x94, 0x4d, 0x5a, 0xa5, 0xb1, 0x82, 0x21, 0x1f, 0xd6, 0x4d, 0xf4, 0x23, 0x11, 0x31, 0x6a,
+	0x16, 0x16, 0x4b, 0x98, 0x6c, 0xb3, 0x57, 0x12, 0x29, 0x98, 0x5c, 0x4a, 0xe2, 0xdb, 0x71, 0x2a,
+	0xbe, 0xec, 0x43, 0xce, 0x21, 0xf3, 0x97, 0x72, 0x07, 0xac, 0xee, 0xef, 0x0a, 0x36, 0x75, 0xc2,
+	0x98, 0x6b, 0xbf, 0x88, 0x61, 0xca, 0x5b, 0xad, 0xd2, 0x58, 0x63, 0x2d, 0x1d, 0x9f, 0xc8, 0xbc,
+	0xf0, 0xc0, 0x33, 0x2a, 0x6f, 0x2f, 0x81, 0x36, 0xd6, 0x32, 0x99, 0x44, 0x8c, 0xef, 0x72, 0xad,
+	0x75, 0x07, 0x9b, 0x6f, 0xad, 0x05, 0x70, 0xd5, 0xf5, 0x1f, 0x0b, 0x6c, 0x9d, 0x73, 0xb1, 0x88,
+	0xc2, 0x5b, 0x7c, 0x84, 0x19, 0xa6, 0x01, 0xa6, 0x3e, 0xc1, 0x02, 0x7d, 0x5b, 0x44, 0xb8, 0xa0,
+	0x48, 0x1e, 0xe4, 0xbb, 0x7b, 0xd5, 0x09, 0x86, 0x2e, 0x60, 0x43, 0x23, 0xb4, 0x49, 0xf6, 0x8a,
+	0x98, 0x26, 0x1e, 0xd9, 0x2f, 0x0b, 0x15, 0x0c, 0xfd, 0x01, 0x35, 0x1d, 0x54, 0x0e, 0xd9, 0x2d,
+	0x2a, 0x35, 0x06, 0x69, 0x96, 0x03, 0x0a, 0xf6, 0x63, 0xfb, 0xf7, 0xd6, 0x90, 0xc4, 0x97, 0x37,
+	0x03, 0x09, 0x39, 0xd0, 0x25, 0xe6, 0x67, 0xdb, 0x0f, 0xc9, 0x01, 0x67, 0x7e, 0xfa, 0x9d, 0x37,
+	0x58, 0x51, 0x1f, 0x58, 0x5f, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xa7, 0xf0, 0x56, 0x03,
+	0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConnInterface
+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.SupportPackageIsVersion6
+const _ = grpc.SupportPackageIsVersion4
 
 // ArduinoCoreClient is the client API for ArduinoCore service.
 //
@@ -620,11 +615,6 @@ type ArduinoCoreClient interface {
 	// Update libraries index
 	UpdateLibrariesIndex(ctx context.Context, in *UpdateLibrariesIndexReq, opts ...grpc.CallOption) (ArduinoCore_UpdateLibrariesIndexClient, error)
 	Version(ctx context.Context, in *VersionReq, opts ...grpc.CallOption) (*VersionResp, error)
-	// Requests details about a board
-	BoardDetails(ctx context.Context, in *BoardDetailsReq, opts ...grpc.CallOption) (*BoardDetailsResp, error)
-	BoardAttach(ctx context.Context, in *BoardAttachReq, opts ...grpc.CallOption) (ArduinoCore_BoardAttachClient, error)
-	BoardList(ctx context.Context, in *BoardListReq, opts ...grpc.CallOption) (*BoardListResp, error)
-	BoardListAll(ctx context.Context, in *BoardListAllReq, opts ...grpc.CallOption) (*BoardListAllResp, error)
 	Compile(ctx context.Context, in *CompileReq, opts ...grpc.CallOption) (ArduinoCore_CompileClient, error)
 	PlatformInstall(ctx context.Context, in *PlatformInstallReq, opts ...grpc.CallOption) (ArduinoCore_PlatformInstallClient, error)
 	PlatformDownload(ctx context.Context, in *PlatformDownloadReq, opts ...grpc.CallOption) (ArduinoCore_PlatformDownloadClient, error)
@@ -643,10 +633,10 @@ type ArduinoCoreClient interface {
 }
 
 type arduinoCoreClient struct {
-	cc grpc.ClientConnInterface
+	cc *grpc.ClientConn
 }
 
-func NewArduinoCoreClient(cc grpc.ClientConnInterface) ArduinoCoreClient {
+func NewArduinoCoreClient(cc *grpc.ClientConn) ArduinoCoreClient {
 	return &arduinoCoreClient{cc}
 }
 
@@ -773,67 +763,8 @@ func (c *arduinoCoreClient) Version(ctx context.Context, in *VersionReq, opts ..
 	return out, nil
 }
 
-func (c *arduinoCoreClient) BoardDetails(ctx context.Context, in *BoardDetailsReq, opts ...grpc.CallOption) (*BoardDetailsResp, error) {
-	out := new(BoardDetailsResp)
-	err := c.cc.Invoke(ctx, "/cc.arduino.cli.commands.ArduinoCore/BoardDetails", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *arduinoCoreClient) BoardAttach(ctx context.Context, in *BoardAttachReq, opts ...grpc.CallOption) (ArduinoCore_BoardAttachClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[3], "/cc.arduino.cli.commands.ArduinoCore/BoardAttach", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &arduinoCoreBoardAttachClient{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 ArduinoCore_BoardAttachClient interface {
-	Recv() (*BoardAttachResp, error)
-	grpc.ClientStream
-}
-
-type arduinoCoreBoardAttachClient struct {
-	grpc.ClientStream
-}
-
-func (x *arduinoCoreBoardAttachClient) Recv() (*BoardAttachResp, error) {
-	m := new(BoardAttachResp)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *arduinoCoreClient) BoardList(ctx context.Context, in *BoardListReq, opts ...grpc.CallOption) (*BoardListResp, error) {
-	out := new(BoardListResp)
-	err := c.cc.Invoke(ctx, "/cc.arduino.cli.commands.ArduinoCore/BoardList", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *arduinoCoreClient) BoardListAll(ctx context.Context, in *BoardListAllReq, opts ...grpc.CallOption) (*BoardListAllResp, error) {
-	out := new(BoardListAllResp)
-	err := c.cc.Invoke(ctx, "/cc.arduino.cli.commands.ArduinoCore/BoardListAll", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *arduinoCoreClient) Compile(ctx context.Context, in *CompileReq, opts ...grpc.CallOption) (ArduinoCore_CompileClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[4], "/cc.arduino.cli.commands.ArduinoCore/Compile", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[3], "/cc.arduino.cli.commands.ArduinoCore/Compile", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -865,7 +796,7 @@ func (x *arduinoCoreCompileClient) Recv() (*CompileResp, error) {
 }
 
 func (c *arduinoCoreClient) PlatformInstall(ctx context.Context, in *PlatformInstallReq, opts ...grpc.CallOption) (ArduinoCore_PlatformInstallClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[5], "/cc.arduino.cli.commands.ArduinoCore/PlatformInstall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[4], "/cc.arduino.cli.commands.ArduinoCore/PlatformInstall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -897,7 +828,7 @@ func (x *arduinoCorePlatformInstallClient) Recv() (*PlatformInstallResp, error)
 }
 
 func (c *arduinoCoreClient) PlatformDownload(ctx context.Context, in *PlatformDownloadReq, opts ...grpc.CallOption) (ArduinoCore_PlatformDownloadClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[6], "/cc.arduino.cli.commands.ArduinoCore/PlatformDownload", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[5], "/cc.arduino.cli.commands.ArduinoCore/PlatformDownload", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -929,7 +860,7 @@ func (x *arduinoCorePlatformDownloadClient) Recv() (*PlatformDownloadResp, error
 }
 
 func (c *arduinoCoreClient) PlatformUninstall(ctx context.Context, in *PlatformUninstallReq, opts ...grpc.CallOption) (ArduinoCore_PlatformUninstallClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[7], "/cc.arduino.cli.commands.ArduinoCore/PlatformUninstall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[6], "/cc.arduino.cli.commands.ArduinoCore/PlatformUninstall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -961,7 +892,7 @@ func (x *arduinoCorePlatformUninstallClient) Recv() (*PlatformUninstallResp, err
 }
 
 func (c *arduinoCoreClient) PlatformUpgrade(ctx context.Context, in *PlatformUpgradeReq, opts ...grpc.CallOption) (ArduinoCore_PlatformUpgradeClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[8], "/cc.arduino.cli.commands.ArduinoCore/PlatformUpgrade", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[7], "/cc.arduino.cli.commands.ArduinoCore/PlatformUpgrade", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -993,7 +924,7 @@ func (x *arduinoCorePlatformUpgradeClient) Recv() (*PlatformUpgradeResp, error)
 }
 
 func (c *arduinoCoreClient) Upload(ctx context.Context, in *UploadReq, opts ...grpc.CallOption) (ArduinoCore_UploadClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[9], "/cc.arduino.cli.commands.ArduinoCore/Upload", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[8], "/cc.arduino.cli.commands.ArduinoCore/Upload", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1043,7 +974,7 @@ func (c *arduinoCoreClient) PlatformList(ctx context.Context, in *PlatformListRe
 }
 
 func (c *arduinoCoreClient) LibraryDownload(ctx context.Context, in *LibraryDownloadReq, opts ...grpc.CallOption) (ArduinoCore_LibraryDownloadClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[10], "/cc.arduino.cli.commands.ArduinoCore/LibraryDownload", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[9], "/cc.arduino.cli.commands.ArduinoCore/LibraryDownload", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1075,7 +1006,7 @@ func (x *arduinoCoreLibraryDownloadClient) Recv() (*LibraryDownloadResp, error)
 }
 
 func (c *arduinoCoreClient) LibraryInstall(ctx context.Context, in *LibraryInstallReq, opts ...grpc.CallOption) (ArduinoCore_LibraryInstallClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[11], "/cc.arduino.cli.commands.ArduinoCore/LibraryInstall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[10], "/cc.arduino.cli.commands.ArduinoCore/LibraryInstall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1107,7 +1038,7 @@ func (x *arduinoCoreLibraryInstallClient) Recv() (*LibraryInstallResp, error) {
 }
 
 func (c *arduinoCoreClient) LibraryUninstall(ctx context.Context, in *LibraryUninstallReq, opts ...grpc.CallOption) (ArduinoCore_LibraryUninstallClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[12], "/cc.arduino.cli.commands.ArduinoCore/LibraryUninstall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[11], "/cc.arduino.cli.commands.ArduinoCore/LibraryUninstall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1139,7 +1070,7 @@ func (x *arduinoCoreLibraryUninstallClient) Recv() (*LibraryUninstallResp, error
 }
 
 func (c *arduinoCoreClient) LibraryUpgradeAll(ctx context.Context, in *LibraryUpgradeAllReq, opts ...grpc.CallOption) (ArduinoCore_LibraryUpgradeAllClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[13], "/cc.arduino.cli.commands.ArduinoCore/LibraryUpgradeAll", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ArduinoCore_serviceDesc.Streams[12], "/cc.arduino.cli.commands.ArduinoCore/LibraryUpgradeAll", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1210,11 +1141,6 @@ type ArduinoCoreServer interface {
 	// Update libraries index
 	UpdateLibrariesIndex(*UpdateLibrariesIndexReq, ArduinoCore_UpdateLibrariesIndexServer) error
 	Version(context.Context, *VersionReq) (*VersionResp, error)
-	// Requests details about a board
-	BoardDetails(context.Context, *BoardDetailsReq) (*BoardDetailsResp, error)
-	BoardAttach(*BoardAttachReq, ArduinoCore_BoardAttachServer) error
-	BoardList(context.Context, *BoardListReq) (*BoardListResp, error)
-	BoardListAll(context.Context, *BoardListAllReq) (*BoardListAllResp, error)
 	Compile(*CompileReq, ArduinoCore_CompileServer) error
 	PlatformInstall(*PlatformInstallReq, ArduinoCore_PlatformInstallServer) error
 	PlatformDownload(*PlatformDownloadReq, ArduinoCore_PlatformDownloadServer) error
@@ -1254,18 +1180,6 @@ func (*UnimplementedArduinoCoreServer) UpdateLibrariesIndex(req *UpdateLibraries
 func (*UnimplementedArduinoCoreServer) Version(ctx context.Context, req *VersionReq) (*VersionResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
 }
-func (*UnimplementedArduinoCoreServer) BoardDetails(ctx context.Context, req *BoardDetailsReq) (*BoardDetailsResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BoardDetails not implemented")
-}
-func (*UnimplementedArduinoCoreServer) BoardAttach(req *BoardAttachReq, srv ArduinoCore_BoardAttachServer) error {
-	return status.Errorf(codes.Unimplemented, "method BoardAttach not implemented")
-}
-func (*UnimplementedArduinoCoreServer) BoardList(ctx context.Context, req *BoardListReq) (*BoardListResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BoardList not implemented")
-}
-func (*UnimplementedArduinoCoreServer) BoardListAll(ctx context.Context, req *BoardListAllReq) (*BoardListAllResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BoardListAll not implemented")
-}
 func (*UnimplementedArduinoCoreServer) Compile(req *CompileReq, srv ArduinoCore_CompileServer) error {
 	return status.Errorf(codes.Unimplemented, "method Compile not implemented")
 }
@@ -1433,81 +1347,6 @@ func _ArduinoCore_Version_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ArduinoCore_BoardDetails_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BoardDetailsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ArduinoCoreServer).BoardDetails(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cc.arduino.cli.commands.ArduinoCore/BoardDetails",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ArduinoCoreServer).BoardDetails(ctx, req.(*BoardDetailsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ArduinoCore_BoardAttach_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(BoardAttachReq)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(ArduinoCoreServer).BoardAttach(m, &arduinoCoreBoardAttachServer{stream})
-}
-
-type ArduinoCore_BoardAttachServer interface {
-	Send(*BoardAttachResp) error
-	grpc.ServerStream
-}
-
-type arduinoCoreBoardAttachServer struct {
-	grpc.ServerStream
-}
-
-func (x *arduinoCoreBoardAttachServer) Send(m *BoardAttachResp) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func _ArduinoCore_BoardList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BoardListReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ArduinoCoreServer).BoardList(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cc.arduino.cli.commands.ArduinoCore/BoardList",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ArduinoCoreServer).BoardList(ctx, req.(*BoardListReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ArduinoCore_BoardListAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BoardListAllReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ArduinoCoreServer).BoardListAll(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cc.arduino.cli.commands.ArduinoCore/BoardListAll",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ArduinoCoreServer).BoardListAll(ctx, req.(*BoardListAllReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ArduinoCore_Compile_Handler(srv interface{}, stream grpc.ServerStream) error {
 	m := new(CompileReq)
 	if err := stream.RecvMsg(m); err != nil {
@@ -1824,18 +1663,6 @@ var _ArduinoCore_serviceDesc = grpc.ServiceDesc{
 			MethodName: "Version",
 			Handler:    _ArduinoCore_Version_Handler,
 		},
-		{
-			MethodName: "BoardDetails",
-			Handler:    _ArduinoCore_BoardDetails_Handler,
-		},
-		{
-			MethodName: "BoardList",
-			Handler:    _ArduinoCore_BoardList_Handler,
-		},
-		{
-			MethodName: "BoardListAll",
-			Handler:    _ArduinoCore_BoardListAll_Handler,
-		},
 		{
 			MethodName: "PlatformSearch",
 			Handler:    _ArduinoCore_PlatformSearch_Handler,
@@ -1873,11 +1700,6 @@ var _ArduinoCore_serviceDesc = grpc.ServiceDesc{
 			Handler:       _ArduinoCore_UpdateLibrariesIndex_Handler,
 			ServerStreams: true,
 		},
-		{
-			StreamName:    "BoardAttach",
-			Handler:       _ArduinoCore_BoardAttach_Handler,
-			ServerStreams: true,
-		},
 		{
 			StreamName:    "Compile",
 			Handler:       _ArduinoCore_Compile_Handler,
diff --git a/rpc/commands/commands.proto b/rpc/commands/commands.proto
index ecc761eb87a..0e8fdf68ce1 100644
--- a/rpc/commands/commands.proto
+++ b/rpc/commands/commands.proto
@@ -20,7 +20,6 @@ package cc.arduino.cli.commands;
 option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
 import "commands/common.proto";
-import "commands/board.proto";
 import "commands/compile.proto";
 import "commands/core.proto";
 import "commands/upload.proto";
@@ -48,18 +47,6 @@ service ArduinoCore {
 
   rpc Version(VersionReq) returns (VersionResp) {}
 
-  // BOARD COMMANDS
-  // --------------
-
-  // Requests details about a board
-  rpc BoardDetails(BoardDetailsReq) returns (BoardDetailsResp);
-
-  rpc BoardAttach(BoardAttachReq) returns (stream BoardAttachResp);
-
-  rpc BoardList(BoardListReq) returns (BoardListResp);
-
-  rpc BoardListAll(BoardListAllReq) returns (BoardListAllResp);
-
   rpc Compile(CompileReq) returns (stream CompileResp);
 
   rpc PlatformInstall(PlatformInstallReq) returns (stream PlatformInstallResp);
diff --git a/rpc/monitor/monitor.pb.go b/rpc/monitor/monitor.pb.go
index 1a06ba48521..641ef31de7d 100644
--- a/rpc/monitor/monitor.pb.go
+++ b/rpc/monitor/monitor.pb.go
@@ -268,11 +268,11 @@ var fileDescriptor_94d5950496a7550d = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConnInterface
+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.SupportPackageIsVersion6
+const _ = grpc.SupportPackageIsVersion4
 
 // MonitorClient is the client API for Monitor service.
 //
@@ -282,10 +282,10 @@ type MonitorClient interface {
 }
 
 type monitorClient struct {
-	cc grpc.ClientConnInterface
+	cc *grpc.ClientConn
 }
 
-func NewMonitorClient(cc grpc.ClientConnInterface) MonitorClient {
+func NewMonitorClient(cc *grpc.ClientConn) MonitorClient {
 	return &monitorClient{cc}
 }
 
diff --git a/rpc/settings/settings.pb.go b/rpc/settings/settings.pb.go
index 0537c7d9e3a..73f9ff1c2ce 100644
--- a/rpc/settings/settings.pb.go
+++ b/rpc/settings/settings.pb.go
@@ -277,11 +277,11 @@ var fileDescriptor_a4bfd59e429426d0 = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConnInterface
+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.SupportPackageIsVersion6
+const _ = grpc.SupportPackageIsVersion4
 
 // SettingsClient is the client API for Settings service.
 //
@@ -294,10 +294,10 @@ type SettingsClient interface {
 }
 
 type settingsClient struct {
-	cc grpc.ClientConnInterface
+	cc *grpc.ClientConn
 }
 
-func NewSettingsClient(cc grpc.ClientConnInterface) SettingsClient {
+func NewSettingsClient(cc *grpc.ClientConn) SettingsClient {
 	return &settingsClient{cc}
 }