diff --git a/Makefile b/Makefile
index 4bf28d4fe..537b538a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 PROTOC ?= $(shell which protoc)
-PROTOS := $(shell find $(shell pwd) -type f -name '*.proto' -print)
 CWD    := $(shell pwd)
 TOOLS  := $(CWD)/tools/bin
-PACKAGES := go list ./... | grep -vE 'vendor|test|proto|diff|bin|fuzz'
+PACKAGES := go list ./... | grep -vE 'vendor|tools'
+COVERED_PACKAGES := $(PACKAGES) | grep -vE 'mock|tests|checkpointspb'
 PACKAGE_DIRECTORIES := $(PACKAGES) | sed 's/github.com\/pingcap\/br\/*//'
-PACKAGE_FILES := $$(find . -name '*.go' -type f | grep -vE 'vendor|\.pb\.go|lightning/mock|res_vfsdata')
+PACKAGE_FILES := $$(find . -name '*.go' -type f | grep -vE 'vendor|\.pb\.go|mock|tools|res_vfsdata')
 CHECKER := awk '{ print } END { if (NR > 0) { exit 1 } }'
 
 BR_PKG := github.com/pingcap/br
@@ -44,10 +44,10 @@ GOTEST  := CGO_ENABLED=1 GO111MODULE=on go test -ldflags '$(LDFLAGS)'
 PREPARE_MOD := cp go.mod1 go.mod && cp go.sum1 go.sum
 FINISH_MOD := cp go.mod go.mod1 && cp go.sum go.sum1
 
-RACE_FLAG =
+RACEFLAG =
 ifeq ("$(WITH_RACE)", "1")
-	RACE_FLAG = -race
-	GOBUILD   = CGO_ENABLED=1 GO111MODULE=on $(GO) build -ldflags '$(LDFLAGS)'
+	RACEFLAG = -race
+	GOBUILD  = CGO_ENABLED=1 GO111MODULE=on $(GO) build -ldflags '$(LDFLAGS)'
 endif
 
 all: build check test
@@ -64,7 +64,7 @@ finish-prepare:
 	@rm tmp_parser.go
 
 data_parsers: tools pkg/lightning/mydump/parser_generated.go web
-	PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOPATH)/src" pkg/lightning/checkpoints/file_checkpoints.proto --gogofaster_out=.
+	PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOPATH)/src" pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto --gogofaster_out=.
 	$(TOOLS)/vfsgendev -source='"github.com/pingcap/br/pkg/lightning/web".Res' && mv res_vfsdata.go pkg/lightning/web/
 
 web:
@@ -78,15 +78,15 @@ br:
 
 lightning_for_web:
 	$(PREPARE_MOD)
-	$(GOBUILD) $(RACE_FLAG) -tags dev -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go
+	$(GOBUILD) $(RACEFLAG) -tags dev -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go
 
 lightning:
 	$(PREPARE_MOD)
-	$(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go
+	$(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go
 
 lightning-ctl:
 	$(PREPARE_MOD)
-	$(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_CTL_BIN) cmd/tidb-lightning-ctl/main.go
+	$(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_CTL_BIN) cmd/tidb-lightning-ctl/main.go
 
 build_for_integration_test:
 	$(PREPARE_MOD)
@@ -107,7 +107,7 @@ build_for_integration_test:
 	$(GOBUILD) $(RACEFLAG) -o bin/gc tests/br_z_gc_safepoint/*.go && \
 	$(GOBUILD) $(RACEFLAG) -o bin/oauth tests/br_gcs/*.go && \
 	$(GOBUILD) $(RACEFLAG) -o bin/rawkv tests/br_rawkv/*.go && \
-	$(GOBUILD) $(RACE_FLAG) -o bin/parquet_gen tests/lightning_checkpoint_parquet/*.go \
+	$(GOBUILD) $(RACEFLAG) -o bin/parquet_gen tests/lightning_checkpoint_parquet/*.go \
 	) || (make failpoint-disable && exit 1)
 	@make failpoint-disable
 
@@ -121,7 +121,8 @@ testcover: tools
 	mkdir -p "$(TEST_DIR)"
 	$(PREPARE_MOD)
 	@make failpoint-enable
-	$(GOTEST) -cover -covermode=count -coverprofile="$(TEST_DIR)/cov.unit.out" $$($(PACKAGES)) || ( make failpoint-disable && exit 1 )
+	$(GOTEST) -cover -covermode=count -coverprofile="$(TEST_DIR)/cov.unit.out" \
+		$$($(COVERED_PACKAGES)) || ( make failpoint-disable && exit 1 )
 	@make failpoint-disable
 
 integration_test: bins build build_for_integration_test
diff --git a/pkg/lightning/backend/backend_test.go b/pkg/lightning/backend/backend_test.go
index 64297af24..de462353f 100644
--- a/pkg/lightning/backend/backend_test.go
+++ b/pkg/lightning/backend/backend_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pingcap/parser/mysql"
 
 	kv "github.com/pingcap/br/pkg/lightning/backend"
-	"github.com/pingcap/br/pkg/lightning/mock"
+	"github.com/pingcap/br/pkg/mock"
 )
 
 type backendSuite struct {
diff --git a/pkg/lightning/backend/importer_test.go b/pkg/lightning/backend/importer_test.go
index 5819e2da9..36f95ba96 100644
--- a/pkg/lightning/backend/importer_test.go
+++ b/pkg/lightning/backend/importer_test.go
@@ -28,7 +28,7 @@ import (
 
 	kv "github.com/pingcap/br/pkg/lightning/backend"
 	"github.com/pingcap/br/pkg/lightning/common"
-	"github.com/pingcap/br/pkg/lightning/mock"
+	"github.com/pingcap/br/pkg/mock"
 )
 
 type importerSuite struct {
diff --git a/pkg/lightning/checkpoints/checkpoints.go b/pkg/lightning/checkpoints/checkpoints.go
index 5d0a9935f..ad2344544 100644
--- a/pkg/lightning/checkpoints/checkpoints.go
+++ b/pkg/lightning/checkpoints/checkpoints.go
@@ -31,6 +31,7 @@ import (
 	"go.uber.org/zap"
 	"modernc.org/mathutil"
 
+	"github.com/pingcap/br/pkg/lightning/checkpoints/checkpointspb"
 	"github.com/pingcap/br/pkg/lightning/common"
 	"github.com/pingcap/br/pkg/lightning/config"
 	"github.com/pingcap/br/pkg/lightning/log"
@@ -901,16 +902,16 @@ func (cpdb *MySQLCheckpointsDB) Update(checkpointDiffs map[string]*TableCheckpoi
 
 type FileCheckpointsDB struct {
 	lock        sync.Mutex // we need to ensure only a thread can access to `checkpoints` at a time
-	checkpoints CheckpointsModel
+	checkpoints checkpointspb.CheckpointsModel
 	path        string
 }
 
 func NewFileCheckpointsDB(path string) *FileCheckpointsDB {
 	cpdb := &FileCheckpointsDB{
 		path: path,
-		checkpoints: CheckpointsModel{
-			TaskCheckpoint: &TaskCheckpointModel{},
-			Checkpoints:    map[string]*TableCheckpointModel{},
+		checkpoints: checkpointspb.CheckpointsModel{
+			TaskCheckpoint: &checkpointspb.TaskCheckpointModel{},
+			Checkpoints:    map[string]*checkpointspb.TableCheckpointModel{},
 		},
 	}
 	// ignore all errors -- file maybe not created yet (and it is fine).
@@ -923,15 +924,15 @@ func NewFileCheckpointsDB(path string) *FileCheckpointsDB {
 		// FIXME: patch for empty map may need initialize manually, because currently
 		// FIXME: a map of zero size -> marshall -> unmarshall -> become nil, see checkpoint_test.go
 		if cpdb.checkpoints.Checkpoints == nil {
-			cpdb.checkpoints.Checkpoints = map[string]*TableCheckpointModel{}
+			cpdb.checkpoints.Checkpoints = map[string]*checkpointspb.TableCheckpointModel{}
 		}
 		for _, table := range cpdb.checkpoints.Checkpoints {
 			if table.Engines == nil {
-				table.Engines = map[int32]*EngineCheckpointModel{}
+				table.Engines = map[int32]*checkpointspb.EngineCheckpointModel{}
 			}
 			for _, engine := range table.Engines {
 				if engine.Chunks == nil {
-					engine.Chunks = map[string]*ChunkCheckpointModel{}
+					engine.Chunks = map[string]*checkpointspb.ChunkCheckpointModel{}
 				}
 			}
 		}
@@ -959,7 +960,7 @@ func (cpdb *FileCheckpointsDB) Initialize(ctx context.Context, cfg *config.Confi
 	cpdb.lock.Lock()
 	defer cpdb.lock.Unlock()
 
-	cpdb.checkpoints.TaskCheckpoint = &TaskCheckpointModel{
+	cpdb.checkpoints.TaskCheckpoint = &checkpointspb.TaskCheckpointModel{
 		TaskId:       cfg.TaskID,
 		SourceDir:    cfg.Mydumper.SourceDir,
 		Backend:      cfg.TikvImporter.Backend,
@@ -972,16 +973,16 @@ func (cpdb *FileCheckpointsDB) Initialize(ctx context.Context, cfg *config.Confi
 	}
 
 	if cpdb.checkpoints.Checkpoints == nil {
-		cpdb.checkpoints.Checkpoints = make(map[string]*TableCheckpointModel)
+		cpdb.checkpoints.Checkpoints = make(map[string]*checkpointspb.TableCheckpointModel)
 	}
 
 	for _, db := range dbInfo {
 		for _, table := range db.Tables {
 			tableName := common.UniqueTable(db.Name, table.Name)
 			if _, ok := cpdb.checkpoints.Checkpoints[tableName]; !ok {
-				cpdb.checkpoints.Checkpoints[tableName] = &TableCheckpointModel{
+				cpdb.checkpoints.Checkpoints[tableName] = &checkpointspb.TableCheckpointModel{
 					Status:  uint32(CheckpointStatusLoaded),
-					Engines: map[int32]*EngineCheckpointModel{},
+					Engines: map[int32]*checkpointspb.EngineCheckpointModel{},
 					TableID: table.ID,
 				}
 			}
@@ -1025,7 +1026,7 @@ func (cpdb *FileCheckpointsDB) Get(_ context.Context, tableName string) (*TableC
 
 	tableModel, ok := cpdb.checkpoints.Checkpoints[tableName]
 	if !ok {
-		tableModel = &TableCheckpointModel{}
+		tableModel = &checkpointspb.TableCheckpointModel{}
 	}
 
 	cp := &TableCheckpoint{
@@ -1086,15 +1087,15 @@ func (cpdb *FileCheckpointsDB) InsertEngineCheckpoints(_ context.Context, tableN
 
 	tableModel := cpdb.checkpoints.Checkpoints[tableName]
 	for engineID, engine := range checkpoints {
-		engineModel := &EngineCheckpointModel{
+		engineModel := &checkpointspb.EngineCheckpointModel{
 			Status: uint32(CheckpointStatusLoaded),
-			Chunks: make(map[string]*ChunkCheckpointModel),
+			Chunks: make(map[string]*checkpointspb.ChunkCheckpointModel),
 		}
 		for _, value := range engine.Chunks {
 			key := value.Key.String()
 			chunk, ok := engineModel.Chunks[key]
 			if !ok {
-				chunk = &ChunkCheckpointModel{
+				chunk = &checkpointspb.ChunkCheckpointModel{
 					Path:   value.Key.Path,
 					Offset: value.Key.Offset,
 				}
diff --git a/pkg/lightning/checkpoints/checkpoints_test.go b/pkg/lightning/checkpoints/checkpoints_test.go
index 0cd858c73..349130a70 100644
--- a/pkg/lightning/checkpoints/checkpoints_test.go
+++ b/pkg/lightning/checkpoints/checkpoints_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/pingcap/check"
 
+	"github.com/pingcap/br/pkg/lightning/checkpoints/checkpointspb"
 	"github.com/pingcap/br/pkg/lightning/mydump"
 	"github.com/pingcap/br/pkg/lightning/verification"
 )
@@ -294,9 +295,9 @@ func (s *checkpointSuite) TestApplyDiff(c *C) {
 func (s *checkpointSuite) TestCheckpointMarshallUnmarshall(c *C) {
 	path := filepath.Join(c.MkDir(), "filecheckpoint")
 	fileChkp := NewFileCheckpointsDB(path)
-	fileChkp.checkpoints.Checkpoints["a"] = &TableCheckpointModel{
+	fileChkp.checkpoints.Checkpoints["a"] = &checkpointspb.TableCheckpointModel{
 		Status:  uint32(CheckpointStatusLoaded),
-		Engines: map[int32]*EngineCheckpointModel{},
+		Engines: map[int32]*checkpointspb.EngineCheckpointModel{},
 	}
 	fileChkp.Close()
 
diff --git a/pkg/lightning/checkpoints/file_checkpoints.pb.go b/pkg/lightning/checkpoints/checkpointspb/file_checkpoints.pb.go
similarity index 91%
rename from pkg/lightning/checkpoints/file_checkpoints.pb.go
rename to pkg/lightning/checkpoints/checkpointspb/file_checkpoints.pb.go
index a70ae492e..10d9d5539 100644
--- a/pkg/lightning/checkpoints/file_checkpoints.pb.go
+++ b/pkg/lightning/checkpoints/checkpointspb/file_checkpoints.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: pkg/lightning/checkpoints/file_checkpoints.proto
+// source: pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto
 
-package checkpoints
+package checkpointspb
 
 import (
 	encoding_binary "encoding/binary"
@@ -34,7 +34,7 @@ func (m *CheckpointsModel) Reset()         { *m = CheckpointsModel{} }
 func (m *CheckpointsModel) String() string { return proto.CompactTextString(m) }
 func (*CheckpointsModel) ProtoMessage()    {}
 func (*CheckpointsModel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c42c6f4a8e50df4, []int{0}
+	return fileDescriptor_c57c7b77a714394c, []int{0}
 }
 func (m *CheckpointsModel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -79,7 +79,7 @@ func (m *TaskCheckpointModel) Reset()         { *m = TaskCheckpointModel{} }
 func (m *TaskCheckpointModel) String() string { return proto.CompactTextString(m) }
 func (*TaskCheckpointModel) ProtoMessage()    {}
 func (*TaskCheckpointModel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c42c6f4a8e50df4, []int{1}
+	return fileDescriptor_c57c7b77a714394c, []int{1}
 }
 func (m *TaskCheckpointModel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -120,7 +120,7 @@ func (m *TableCheckpointModel) Reset()         { *m = TableCheckpointModel{} }
 func (m *TableCheckpointModel) String() string { return proto.CompactTextString(m) }
 func (*TableCheckpointModel) ProtoMessage()    {}
 func (*TableCheckpointModel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c42c6f4a8e50df4, []int{2}
+	return fileDescriptor_c57c7b77a714394c, []int{2}
 }
 func (m *TableCheckpointModel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -159,7 +159,7 @@ func (m *EngineCheckpointModel) Reset()         { *m = EngineCheckpointModel{} }
 func (m *EngineCheckpointModel) String() string { return proto.CompactTextString(m) }
 func (*EngineCheckpointModel) ProtoMessage()    {}
 func (*EngineCheckpointModel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c42c6f4a8e50df4, []int{3}
+	return fileDescriptor_c57c7b77a714394c, []int{3}
 }
 func (m *EngineCheckpointModel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -210,7 +210,7 @@ func (m *ChunkCheckpointModel) Reset()         { *m = ChunkCheckpointModel{} }
 func (m *ChunkCheckpointModel) String() string { return proto.CompactTextString(m) }
 func (*ChunkCheckpointModel) ProtoMessage()    {}
 func (*ChunkCheckpointModel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c42c6f4a8e50df4, []int{4}
+	return fileDescriptor_c57c7b77a714394c, []int{4}
 }
 func (m *ChunkCheckpointModel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -251,63 +251,63 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("pkg/lightning/checkpoints/file_checkpoints.proto", fileDescriptor_5c42c6f4a8e50df4)
+	proto.RegisterFile("pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto", fileDescriptor_c57c7b77a714394c)
 }
 
-var fileDescriptor_5c42c6f4a8e50df4 = []byte{
-	// 823 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4f, 0x6f, 0x23, 0x35,
-	0x14, 0xef, 0x64, 0x9a, 0x34, 0x71, 0x92, 0x6e, 0x6a, 0xba, 0x8b, 0x29, 0x10, 0x85, 0x2c, 0x87,
-	0x20, 0xd8, 0x54, 0x5a, 0x2e, 0xa8, 0x82, 0x03, 0x6d, 0x57, 0x62, 0x55, 0xad, 0xa8, 0xcc, 0xc2,
-	0x81, 0xcb, 0xc8, 0x19, 0xbb, 0x99, 0xd1, 0xfc, 0xf1, 0xc8, 0xf6, 0x0c, 0x9b, 0xfd, 0x0e, 0x48,
-	0x7c, 0x0c, 0xbe, 0x04, 0xf7, 0x15, 0xa7, 0x3d, 0x72, 0x84, 0xf6, 0xce, 0x67, 0x40, 0x7e, 0x9e,
-	0x36, 0x93, 0x55, 0x54, 0x71, 0x7b, 0xef, 0xf7, 0x7e, 0xef, 0xe7, 0xf7, 0x9e, 0x9f, 0x8d, 0x4e,
-	0x8a, 0x64, 0x79, 0x9c, 0xc6, 0xcb, 0xc8, 0xe4, 0x71, 0xde, 0xb4, 0xc2, 0x48, 0x84, 0x49, 0x21,
-	0xe3, 0xdc, 0xe8, 0xe3, 0xab, 0x38, 0x15, 0x41, 0x03, 0x98, 0x17, 0x4a, 0x1a, 0x79, 0xf4, 0x64,
-	0x19, 0x9b, 0xa8, 0x5c, 0xcc, 0x43, 0x99, 0x1d, 0x2f, 0xe5, 0x52, 0x1e, 0x03, 0xbc, 0x28, 0xaf,
-	0xc0, 0x03, 0x07, 0x2c, 0x47, 0x9f, 0xfe, 0xeb, 0xa1, 0xd1, 0xd9, 0x5a, 0xe4, 0x85, 0xe4, 0x22,
-	0xc5, 0xe7, 0xa8, 0xdf, 0x10, 0x26, 0xde, 0xc4, 0x9f, 0xf5, 0x9f, 0x4e, 0xe7, 0xef, 0xf2, 0x9a,
-	0xc0, 0xb3, 0xdc, 0xa8, 0x15, 0x6d, 0xa6, 0xe1, 0x6f, 0xd0, 0x03, 0xc3, 0x74, 0xd2, 0xa8, 0x91,
-	0xb4, 0x26, 0xde, 0xac, 0xff, 0xf4, 0x70, 0xfe, 0x92, 0xe9, 0x64, 0x9d, 0x0c, 0x62, 0x74, 0xdf,
-	0x6c, 0x80, 0x47, 0x3f, 0x6e, 0x14, 0x06, 0xfa, 0x78, 0x84, 0xfc, 0x44, 0xac, 0x88, 0x37, 0xf1,
-	0x66, 0x3d, 0x6a, 0x4d, 0xfc, 0x39, 0x6a, 0x57, 0x2c, 0x2d, 0x45, 0x2d, 0xfd, 0x70, 0xfe, 0x92,
-	0x2d, 0x52, 0xf1, 0xae, 0xb6, 0xe3, 0x9c, 0xb4, 0xbe, 0xf2, 0xa6, 0xbf, 0xb7, 0xd0, 0x7b, 0x5b,
-	0x8e, 0xc7, 0xef, 0xa3, 0x3d, 0xa8, 0x36, 0xe6, 0x20, 0xef, 0xd3, 0x8e, 0x75, 0x9f, 0x73, 0xfc,
-	0x31, 0x42, 0x5a, 0x96, 0x2a, 0x14, 0x01, 0x8f, 0x15, 0x1c, 0xd3, 0xa3, 0x3d, 0x87, 0x9c, 0xc7,
-	0x0a, 0x13, 0xb4, 0xb7, 0x60, 0x61, 0x22, 0x72, 0x4e, 0x7c, 0x88, 0xdd, 0xba, 0xf8, 0x31, 0x1a,
-	0xc6, 0x59, 0x21, 0x95, 0x11, 0x2a, 0x60, 0x9c, 0x2b, 0xb2, 0x0b, 0xf1, 0xc1, 0x2d, 0xf8, 0x2d,
-	0xe7, 0x0a, 0x7f, 0x88, 0x7a, 0x26, 0xe6, 0x8b, 0x20, 0x92, 0xda, 0x90, 0x36, 0x10, 0xba, 0x16,
-	0xf8, 0x4e, 0x6a, 0x73, 0x17, 0xb4, 0x7c, 0xd2, 0x99, 0x78, 0xb3, 0xb6, 0x0b, 0x5e, 0x4a, 0x65,
-	0x6c, 0xc1, 0x05, 0x77, 0xc2, 0x7b, 0x90, 0xd7, 0x29, 0x38, 0x48, 0x4e, 0xd1, 0x50, 0xdb, 0x03,
-	0x78, 0x90, 0x54, 0x50, 0x73, 0x17, 0xc2, 0x7d, 0x07, 0x5e, 0x54, 0xb6, 0xea, 0xc7, 0x68, 0x78,
-	0xb7, 0x55, 0x41, 0x25, 0x14, 0xe9, 0xb9, 0xda, 0xee, 0xc0, 0x9f, 0x84, 0x9a, 0xfe, 0xda, 0x42,
-	0x87, 0xdb, 0xc6, 0x89, 0x31, 0xda, 0x8d, 0x98, 0x8e, 0x60, 0x50, 0x03, 0x0a, 0x36, 0x7e, 0x84,
-	0x3a, 0xda, 0x30, 0x53, 0x6a, 0x18, 0xc3, 0x90, 0xd6, 0x9e, 0x1d, 0x1f, 0x4b, 0x53, 0x19, 0x06,
-	0x0b, 0xa6, 0x05, 0x8c, 0xc0, 0xa7, 0x3d, 0x40, 0x4e, 0x99, 0x16, 0xf8, 0x6b, 0xb4, 0x27, 0xf2,
-	0x65, 0x9c, 0x0b, 0x4d, 0xba, 0xf5, 0x9a, 0x6d, 0x3b, 0x72, 0xfe, 0xcc, 0x91, 0xdc, 0x9a, 0xdd,
-	0xa6, 0xd8, 0xe1, 0x1b, 0xcb, 0x7e, 0x7e, 0x0e, 0x0d, 0xf8, 0xf4, 0xd6, 0x3d, 0xa2, 0x68, 0xd0,
-	0x4c, 0x69, 0x6e, 0xce, 0x81, 0xdb, 0x9c, 0x2f, 0x36, 0x37, 0xe7, 0x51, 0x7d, 0xc4, 0x3d, 0xab,
-	0xf3, 0x87, 0x87, 0x1e, 0x6e, 0x25, 0x35, 0x9a, 0xf7, 0x36, 0x9a, 0x3f, 0x41, 0x9d, 0x30, 0x2a,
-	0xf3, 0x44, 0x93, 0x56, 0xdd, 0xdc, 0xd6, 0xfc, 0xf9, 0x19, 0x90, 0x5c, 0x73, 0x75, 0xc6, 0xd1,
-	0x25, 0xea, 0x37, 0xe0, 0xff, 0xb3, 0xfa, 0x40, 0xbf, 0xa7, 0xfe, 0x3f, 0x7d, 0x74, 0xb8, 0x8d,
-	0x63, 0xef, 0xb3, 0x60, 0x26, 0xaa, 0xc5, 0xc1, 0xb6, 0x2d, 0xc9, 0xab, 0x2b, 0x2d, 0xdc, 0xa3,
-	0xf5, 0x69, 0xed, 0xe1, 0x27, 0x08, 0x87, 0x32, 0x2d, 0xb3, 0x3c, 0x28, 0x84, 0xca, 0x4a, 0xc3,
-	0x4c, 0x2c, 0x73, 0x32, 0x98, 0xf8, 0xb3, 0x36, 0x3d, 0x70, 0x91, 0xcb, 0x75, 0xc0, 0x5e, 0xbf,
-	0xc8, 0x79, 0x50, 0x4b, 0xb5, 0xdd, 0xf5, 0x8b, 0x9c, 0x7f, 0xef, 0xd4, 0x46, 0xc8, 0x2f, 0xa4,
-	0x86, 0xdd, 0xf6, 0xa9, 0x35, 0xf1, 0xa7, 0x68, 0xbf, 0x50, 0xa2, 0x0a, 0x94, 0xfc, 0x25, 0xe6,
-	0x41, 0xc6, 0x5e, 0xc1, 0x76, 0xfb, 0x74, 0x60, 0x51, 0x6a, 0xc1, 0x17, 0xec, 0x95, 0x7d, 0x19,
-	0x6b, 0x42, 0x17, 0x08, 0x5d, 0xd5, 0x08, 0x26, 0x55, 0x18, 0x2c, 0x56, 0x46, 0x68, 0xd8, 0x8b,
-	0x5d, 0xda, 0x4d, 0xaa, 0xf0, 0xd4, 0xfa, 0xf6, 0xd9, 0xd8, 0x60, 0x52, 0x69, 0x82, 0x20, 0xd4,
-	0x49, 0xaa, 0xf0, 0xa2, 0xd2, 0xf8, 0x13, 0x34, 0xb0, 0x01, 0xf8, 0xad, 0x74, 0x99, 0x91, 0xfe,
-	0xc4, 0x9b, 0x75, 0x68, 0x3f, 0xa9, 0xc2, 0xb3, 0x1a, 0xc2, 0x1f, 0xd9, 0xf7, 0x98, 0x09, 0x6d,
-	0x58, 0x56, 0x90, 0xe1, 0xc4, 0x9b, 0x8d, 0xe8, 0x1a, 0xb0, 0x53, 0x34, 0xab, 0x42, 0x90, 0x7d,
-	0x78, 0xa8, 0x60, 0xe3, 0x09, 0xea, 0x87, 0x32, 0x2b, 0x94, 0xd0, 0xda, 0x8e, 0xe9, 0x01, 0x84,
-	0x9a, 0x10, 0xfe, 0x00, 0x75, 0xed, 0xc3, 0x0c, 0xec, 0xe5, 0x8e, 0xdc, 0x07, 0x62, 0xfd, 0x0b,
-	0xb1, 0xb2, 0x7d, 0xc0, 0x27, 0xaf, 0xe3, 0xd7, 0x82, 0x1c, 0xb8, 0x26, 0x2d, 0xf0, 0x43, 0xfc,
-	0x5a, 0x9c, 0x7e, 0xf6, 0xe6, 0x9f, 0xf1, 0xce, 0x9b, 0xeb, 0xb1, 0xf7, 0xf6, 0x7a, 0xec, 0xfd,
-	0x7d, 0x3d, 0xf6, 0x7e, 0xbb, 0x19, 0xef, 0xbc, 0xbd, 0x19, 0xef, 0xfc, 0x75, 0x33, 0xde, 0xf9,
-	0xb9, 0xf9, 0x11, 0x2f, 0x3a, 0xf0, 0xd5, 0x7f, 0xf9, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2,
-	0xdb, 0x56, 0x3e, 0x57, 0x06, 0x00, 0x00,
+var fileDescriptor_c57c7b77a714394c = []byte{
+	// 829 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xce, 0x7a, 0x63, 0xc7, 0x1e, 0xdb, 0xa9, 0x33, 0xa4, 0x65, 0x08, 0x60, 0x19, 0x97, 0x83,
+	0xa5, 0x52, 0x5b, 0x2a, 0x17, 0x54, 0x01, 0x12, 0x49, 0x2a, 0x51, 0x45, 0x15, 0xd1, 0x50, 0x38,
+	0x70, 0x59, 0xcd, 0xee, 0x4c, 0xec, 0xd5, 0x7a, 0x77, 0x56, 0x33, 0xb3, 0x4b, 0xdd, 0xff, 0x80,
+	0xc4, 0xcf, 0xe0, 0x4f, 0x70, 0xaf, 0x38, 0xf5, 0xc8, 0x11, 0x92, 0x3b, 0xbf, 0x01, 0xcd, 0x9b,
+	0x75, 0xbc, 0xae, 0xac, 0xa8, 0xb7, 0xf7, 0xbe, 0xf7, 0xbd, 0x6f, 0xde, 0x7b, 0xfb, 0x66, 0x16,
+	0x7d, 0x9b, 0x27, 0xf3, 0xd9, 0x32, 0x9e, 0x2f, 0x4c, 0x16, 0x67, 0xf3, 0x59, 0xb4, 0x10, 0x51,
+	0x92, 0xcb, 0x38, 0x33, 0xba, 0x6e, 0xe7, 0xe1, 0xec, 0x2a, 0x5e, 0x8a, 0xa0, 0x06, 0x4d, 0x73,
+	0x25, 0x8d, 0x3c, 0x79, 0x3c, 0x8f, 0xcd, 0xa2, 0x08, 0xa7, 0x91, 0x4c, 0x67, 0x73, 0x39, 0x97,
+	0x33, 0x80, 0xc3, 0xe2, 0x0a, 0x3c, 0x70, 0xc0, 0x72, 0xf4, 0xf1, 0x7f, 0x1e, 0x1a, 0x9c, 0x6d,
+	0x44, 0x5e, 0x48, 0x2e, 0x96, 0xf8, 0x1c, 0x75, 0x6b, 0xc2, 0xc4, 0x1b, 0xf9, 0x93, 0xee, 0x93,
+	0xf1, 0xf4, 0x5d, 0x5e, 0x1d, 0x78, 0x96, 0x19, 0xb5, 0xa2, 0xf5, 0x34, 0xfc, 0x0d, 0xba, 0x67,
+	0x98, 0x4e, 0x6a, 0x35, 0x92, 0xc6, 0xc8, 0x9b, 0x74, 0x9f, 0x1c, 0x4f, 0x5f, 0x32, 0x9d, 0x6c,
+	0x92, 0x41, 0x8c, 0x1e, 0x9a, 0x2d, 0xf0, 0xe4, 0xa7, 0xad, 0xc2, 0x40, 0x1f, 0x0f, 0x90, 0x9f,
+	0x88, 0x15, 0xf1, 0x46, 0xde, 0xa4, 0x43, 0xad, 0x89, 0x1f, 0xa1, 0x66, 0xc9, 0x96, 0x85, 0xa8,
+	0xa4, 0xef, 0x4f, 0x5f, 0xb2, 0x70, 0x29, 0xde, 0xd5, 0x76, 0x9c, 0xa7, 0x8d, 0xaf, 0xbc, 0xf1,
+	0x1f, 0x0d, 0xf4, 0xc1, 0x8e, 0xe3, 0xf1, 0x87, 0xe8, 0x00, 0xaa, 0x8d, 0x39, 0xc8, 0xfb, 0xb4,
+	0x65, 0xdd, 0xe7, 0x1c, 0x7f, 0x8a, 0x90, 0x96, 0x85, 0x8a, 0x44, 0xc0, 0x63, 0x05, 0xc7, 0x74,
+	0x68, 0xc7, 0x21, 0xe7, 0xb1, 0xc2, 0x04, 0x1d, 0x84, 0x2c, 0x4a, 0x44, 0xc6, 0x89, 0x0f, 0xb1,
+	0xb5, 0x8b, 0x1f, 0xa2, 0x7e, 0x9c, 0xe6, 0x52, 0x19, 0xa1, 0x02, 0xc6, 0xb9, 0x22, 0xfb, 0x10,
+	0xef, 0xad, 0xc1, 0xef, 0x38, 0x57, 0xf8, 0x63, 0xd4, 0x31, 0x31, 0x0f, 0x83, 0x85, 0xd4, 0x86,
+	0x34, 0x81, 0xd0, 0xb6, 0xc0, 0xf7, 0x52, 0x9b, 0xdb, 0xa0, 0xe5, 0x93, 0xd6, 0xc8, 0x9b, 0x34,
+	0x5d, 0xf0, 0x52, 0x2a, 0x63, 0x0b, 0xce, 0xb9, 0x13, 0x3e, 0x80, 0xbc, 0x56, 0xce, 0x41, 0x72,
+	0x8c, 0xfa, 0xda, 0x1e, 0xc0, 0x83, 0xa4, 0x84, 0x9a, 0xdb, 0x10, 0xee, 0x3a, 0xf0, 0xa2, 0xb4,
+	0x55, 0x3f, 0x44, 0xfd, 0xdb, 0x1d, 0x0b, 0x4a, 0xa1, 0x48, 0xc7, 0xd5, 0x76, 0x0b, 0xfe, 0x2c,
+	0xd4, 0xf8, 0xb7, 0x06, 0x3a, 0xde, 0x35, 0x4e, 0x8c, 0xd1, 0xfe, 0x82, 0xe9, 0x05, 0x0c, 0xaa,
+	0x47, 0xc1, 0xc6, 0x0f, 0x50, 0x4b, 0x1b, 0x66, 0x0a, 0x0d, 0x63, 0xe8, 0xd3, 0xca, 0xb3, 0xe3,
+	0x63, 0xcb, 0xa5, 0x8c, 0x82, 0x90, 0x69, 0x01, 0x23, 0xf0, 0x69, 0x07, 0x90, 0x53, 0xa6, 0x05,
+	0xfe, 0x1a, 0x1d, 0x88, 0x6c, 0x1e, 0x67, 0x42, 0x93, 0x76, 0xb5, 0x66, 0xbb, 0x8e, 0x9c, 0x3e,
+	0x73, 0x24, 0xb7, 0x66, 0xeb, 0x14, 0x3b, 0x7c, 0x63, 0xd9, 0xcf, 0xcf, 0xa1, 0x01, 0x9f, 0xae,
+	0xdd, 0x13, 0x8a, 0x7a, 0xf5, 0x94, 0xfa, 0xe6, 0x1c, 0xb9, 0xcd, 0xf9, 0x62, 0x7b, 0x73, 0x1e,
+	0x54, 0x47, 0xdc, 0xb1, 0x3a, 0x7f, 0x7a, 0xe8, 0xfe, 0x4e, 0x52, 0xad, 0x79, 0x6f, 0xab, 0xf9,
+	0xa7, 0xa8, 0x15, 0x2d, 0x8a, 0x2c, 0xd1, 0xa4, 0x51, 0x35, 0xb7, 0x33, 0x7f, 0x7a, 0x06, 0x24,
+	0xd7, 0x5c, 0x95, 0x71, 0x72, 0x89, 0xba, 0x35, 0xf8, 0x7d, 0x56, 0x1f, 0xe8, 0x77, 0xd4, 0xff,
+	0x97, 0x8f, 0x8e, 0x77, 0x71, 0xec, 0xf7, 0xcc, 0x99, 0x59, 0x54, 0xe2, 0x60, 0xdb, 0x96, 0xe4,
+	0xd5, 0x95, 0x16, 0xee, 0xd2, 0xfa, 0xb4, 0xf2, 0xf0, 0x63, 0x84, 0x23, 0xb9, 0x2c, 0xd2, 0x2c,
+	0xc8, 0x85, 0x4a, 0x0b, 0xc3, 0x4c, 0x2c, 0x33, 0xd2, 0x1b, 0xf9, 0x93, 0x26, 0x3d, 0x72, 0x91,
+	0xcb, 0x4d, 0xc0, 0x7e, 0x7e, 0x91, 0xf1, 0xa0, 0x92, 0x6a, 0xba, 0xcf, 0x2f, 0x32, 0xfe, 0x83,
+	0x53, 0x1b, 0x20, 0x3f, 0x97, 0x1a, 0x76, 0xdb, 0xa7, 0xd6, 0xc4, 0x9f, 0xa3, 0xc3, 0x5c, 0x89,
+	0x32, 0x50, 0xf2, 0xd7, 0x98, 0x07, 0x29, 0x7b, 0x05, 0xdb, 0xed, 0xd3, 0x9e, 0x45, 0xa9, 0x05,
+	0x5f, 0xb0, 0x57, 0xf6, 0x66, 0x6c, 0x08, 0x6d, 0x20, 0xb4, 0x55, 0x2d, 0x98, 0x94, 0x51, 0x10,
+	0xae, 0x8c, 0xd0, 0xb0, 0x17, 0xfb, 0xb4, 0x9d, 0x94, 0xd1, 0xa9, 0xf5, 0xed, 0xb5, 0xb1, 0xc1,
+	0xa4, 0xd4, 0x04, 0x41, 0xa8, 0x95, 0x94, 0xd1, 0x45, 0xa9, 0xf1, 0x67, 0xa8, 0x67, 0x03, 0xf0,
+	0x5a, 0xe9, 0x22, 0x25, 0xdd, 0x91, 0x37, 0x69, 0xd1, 0x6e, 0x52, 0x46, 0x67, 0x15, 0x84, 0x3f,
+	0xb1, 0xf7, 0x31, 0x15, 0xda, 0xb0, 0x34, 0x27, 0xfd, 0x91, 0x37, 0x19, 0xd0, 0x0d, 0x60, 0xa7,
+	0x68, 0x56, 0xb9, 0x20, 0x87, 0x70, 0x51, 0xc1, 0xc6, 0x23, 0xd4, 0x8d, 0x64, 0x9a, 0x2b, 0xa1,
+	0xb5, 0x1d, 0xd3, 0x3d, 0x08, 0xd5, 0x21, 0xfc, 0x11, 0x6a, 0xdb, 0x8b, 0x19, 0xd8, 0x8f, 0x3b,
+	0x70, 0x0f, 0x88, 0xf5, 0x2f, 0xc4, 0xca, 0xf6, 0x01, 0x8f, 0xbc, 0x8e, 0x5f, 0x0b, 0x72, 0xe4,
+	0x9a, 0xb4, 0xc0, 0x8f, 0xf1, 0x6b, 0x71, 0xfa, 0xe8, 0xcd, 0xbf, 0xc3, 0xbd, 0x37, 0xd7, 0x43,
+	0xef, 0xed, 0xf5, 0xd0, 0xfb, 0xe7, 0x7a, 0xe8, 0xfd, 0x7e, 0x33, 0xdc, 0x7b, 0x7b, 0x33, 0xdc,
+	0xfb, 0xfb, 0x66, 0xb8, 0xf7, 0x4b, 0x7f, 0xeb, 0x5f, 0x11, 0xb6, 0xe0, 0xb1, 0xff, 0xf2, 0xff,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xd6, 0xd3, 0x15, 0x5d, 0x06, 0x00, 0x00,
 }
 
 func (m *CheckpointsModel) Marshal() (dAtA []byte, err error) {
diff --git a/pkg/lightning/checkpoints/file_checkpoints.proto b/pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto
similarity index 97%
rename from pkg/lightning/checkpoints/file_checkpoints.proto
rename to pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto
index 82166877f..261a405da 100644
--- a/pkg/lightning/checkpoints/file_checkpoints.proto
+++ b/pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto
@@ -15,7 +15,7 @@ syntax = "proto3";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-option go_package = "checkpoints";
+option go_package = "checkpointspb";
 option (gogoproto.goproto_getters_all) = false;
 
 message CheckpointsModel {
@@ -67,3 +67,4 @@ message ChunkCheckpointModel {
     string sort_key = 16;
     int64 file_size = 17;
 }
+
diff --git a/pkg/lightning/mydump/reader_test.go b/pkg/lightning/mydump/reader_test.go
index 7785c86b1..90d3f3967 100644
--- a/pkg/lightning/mydump/reader_test.go
+++ b/pkg/lightning/mydump/reader_test.go
@@ -22,8 +22,8 @@ import (
 	"github.com/golang/mock/gomock"
 	. "github.com/pingcap/check"
 
-	"github.com/pingcap/br/pkg/lightning/mock"
 	. "github.com/pingcap/br/pkg/lightning/mydump"
+	"github.com/pingcap/br/pkg/mock"
 	"github.com/pingcap/br/pkg/storage"
 )
 
diff --git a/pkg/lightning/restore/restore_test.go b/pkg/lightning/restore/restore_test.go
index c32760827..bf38e691f 100644
--- a/pkg/lightning/restore/restore_test.go
+++ b/pkg/lightning/restore/restore_test.go
@@ -42,10 +42,10 @@ import (
 	"github.com/pingcap/br/pkg/lightning/config"
 	"github.com/pingcap/br/pkg/lightning/glue"
 	"github.com/pingcap/br/pkg/lightning/log"
-	"github.com/pingcap/br/pkg/lightning/mock"
 	"github.com/pingcap/br/pkg/lightning/mydump"
 	"github.com/pingcap/br/pkg/lightning/verification"
 	"github.com/pingcap/br/pkg/lightning/worker"
+	"github.com/pingcap/br/pkg/mock"
 	"github.com/pingcap/br/pkg/storage"
 )
 
diff --git a/pkg/lightning/mock/backend.go b/pkg/mock/backend.go
similarity index 100%
rename from pkg/lightning/mock/backend.go
rename to pkg/mock/backend.go
diff --git a/pkg/lightning/mock/glue.go b/pkg/mock/glue.go
similarity index 100%
rename from pkg/lightning/mock/glue.go
rename to pkg/mock/glue.go
diff --git a/pkg/lightning/mock/glue_checkpoint.go b/pkg/mock/glue_checkpoint.go
similarity index 100%
rename from pkg/lightning/mock/glue_checkpoint.go
rename to pkg/mock/glue_checkpoint.go
diff --git a/pkg/lightning/mock/importer.go b/pkg/mock/importer.go
similarity index 100%
rename from pkg/lightning/mock/importer.go
rename to pkg/mock/importer.go
diff --git a/pkg/lightning/mock/storage.go b/pkg/mock/storage.go
similarity index 100%
rename from pkg/lightning/mock/storage.go
rename to pkg/mock/storage.go