108 files changed, 146 insertions, 230 deletions
diff --git a/Makefile b/Makefile
index 5ffe8c3ea..2d31e7ee8 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ verify-vendor:
 	hack/verify-vendor.sh
 .PHONY: verify-codegen
 verify-codegen:
-	cloud/hack/verify-codegen.sh
+	hack/verify-codegen.sh
 .PHONY: verify-vendor-licenses
 verify-vendor-licenses:
 	hack/verify-vendor-licenses.sh
diff --git a/cloud/hack/test-integration.sh b/cloud/hack/test-integration.sh
deleted file mode 100755
index 1aeea05aa..000000000
--- a/cloud/hack/test-integration.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2019 The KubeEdge Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-SCRIPT_ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/../../ && pwd)
-export KUBE_CONFIG=""
-export KUBE_APISERVER_URL="http://localhost:8080"
-export TESTNS="crd-test"
-
-runTests() {
-  ret=0
-  kubectl get namespace crd-test --no-headers --output=go-template={{.metadata.name}} > /dev/null 2>&1 || ret=$?
-  if [[ "${ret}" -ne 0 ]]; then
-    logStatus "creating test namespace for crds"
-    kubectl create namespace ${TESTNS}
-  fi
-
-  ret=0
-  kubectl get crd devicemodels.devices.kubeedge.io --no-headers --output=go-template={{.metadata.name}} > /dev/null 2>&1 || ret=$?
-  if [[ "${ret}" -ne 0 ]]; then
-    logStatus "Creating device model crd"
-    kubectl create -f "${SCRIPT_ROOT}/build/crds/devices/devices_v1alpha2_devicemodel.yaml"
-  fi
-
-  ret=0
-  kubectl get crd devices.devices.kubeedge.io --no-headers --output=go-template={{.metadata.name}} > /dev/null 2>&1 || ret=$?
-  if [[ "${ret}" -ne 0 ]]; then
-    logStatus "Creating device crd"
-    kubectl create -f "${SCRIPT_ROOT}/build/crds/devices/devices_v1alpha2_device.yaml"
-  fi
-
-  logStatus  "Running integration test cases"
-  export KUBE_RACE="-race"
-  make -C "${SCRIPT_ROOT}/cloud" test \
-      WHAT="${WHAT:-$(findIntegrationTestDirs | paste -sd' ' -)}" \
-      GOFLAGS="${GOFLAGS:-}" \
-      KUBE_TEST_ARGS="--alsologtostderr=true ${KUBE_TEST_ARGS:-} " \
-      KUBE_RACE="$KUBE_RACE" \
-
-  cleanup
-}
-
-findIntegrationTestDirs() {
-  (
-    cd "${SCRIPT_ROOT}/cloud"
-    find test/integration/ -name '*_test.go' -print0 \
-      | xargs -0n1 dirname | LC_ALL=C sort -u
-  )
-}
-
-cleanup() {
-  logStatus "Cleaning up"
-
-  kubectl get device -n${TESTNS} | tail -n+2 | awk -F' ' '{print $1}' | xargs kubectl delete device -n${TESTNS}
-  kubectl get devicemodel -n${TESTNS} | tail -n+2 | awk -F' ' '{print $1}' | xargs kubectl delete devicemodel -n${TESTNS}
-  kubectl get crd | tail -n+2 | awk -F' ' '{print $1}' | xargs kubectl delete crd
-
-  kubectl delete namespace ${TESTNS}
-
-  logStatus "Cleanup complete"
-}
-
-logStatus() {
-  timestamp=$(date +"[%m%d %H:%M:%S]")
-  echo "+++ ${timestamp} ${1}"
-}
-
-runTests
diff --git a/cloud/pkg/admissioncontroller/admission.go b/cloud/pkg/admissioncontroller/admission.go
index 8dd50bb76..579666245 100644
--- a/cloud/pkg/admissioncontroller/admission.go
+++ b/cloud/pkg/admissioncontroller/admission.go
@@ -20,9 +20,9 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/kubeedge/kubeedge/cloud/cmd/admission/app/options"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	"github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 )
 
 const (
diff --git a/cloud/pkg/admissioncontroller/admit_devicemodel.go b/cloud/pkg/admissioncontroller/admit_devicemodel.go
index c6eb1cf51..167bf52ea 100644
--- a/cloud/pkg/admissioncontroller/admit_devicemodel.go
+++ b/cloud/pkg/admissioncontroller/admit_devicemodel.go
@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 )
 
 func admitDeviceModel(review admissionv1beta1.AdmissionReview) *admissionv1beta1.AdmissionResponse {
diff --git a/cloud/pkg/admissioncontroller/admit_rule.go b/cloud/pkg/admissioncontroller/admit_rule.go
index d1f334312..bdeb50958 100644
--- a/cloud/pkg/admissioncontroller/admit_rule.go
+++ b/cloud/pkg/admissioncontroller/admit_rule.go
@@ -7,7 +7,7 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/klog/v2"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 var (
diff --git a/cloud/pkg/admissioncontroller/admit_ruleendpoint.go b/cloud/pkg/admissioncontroller/admit_ruleendpoint.go
index 9b9b415f2..d5deb5b3c 100644
--- a/cloud/pkg/admissioncontroller/admit_ruleendpoint.go
+++ b/cloud/pkg/admissioncontroller/admit_ruleendpoint.go
@@ -7,7 +7,7 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/klog/v2"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 func admitRuleEndpoint(review admissionv1beta1.AdmissionReview) *admissionv1beta1.AdmissionResponse {
diff --git a/cloud/pkg/cloudhub/channelq/channelq.go b/cloud/pkg/cloudhub/channelq/channelq.go
index cd9c5fa7f..1eb9fa3e2 100644
--- a/cloud/pkg/cloudhub/channelq/channelq.go
+++ b/cloud/pkg/cloudhub/channelq/channelq.go
@@ -15,9 +15,6 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	beehiveModel "github.com/kubeedge/beehive/pkg/core/model"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	reliablesyncslisters "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/dynamiccontroller/application"
@@ -25,6 +22,9 @@ import (
 	edgemessagelayer "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/synccontroller"
 	commonconst "github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	reliablesyncslisters "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )
 
diff --git a/cloud/pkg/cloudhub/config/config.go b/cloud/pkg/cloudhub/config/config.go
index a7a2704ed..23741fd06 100644
--- a/cloud/pkg/cloudhub/config/config.go
+++ b/cloud/pkg/cloudhub/config/config.go
@@ -8,10 +8,10 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	syncinformer "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1"
-	synclister "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	syncinformer "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/reliablesyncs/v1alpha1"
+	synclister "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 )
 
 var Config Configure
diff --git a/cloud/pkg/cloudhub/handler/messagehandler.go b/cloud/pkg/cloudhub/handler/messagehandler.go
index 9a0fec516..84e606c60 100644
--- a/cloud/pkg/cloudhub/handler/messagehandler.go
+++ b/cloud/pkg/cloudhub/handler/messagehandler.go
@@ -18,8 +18,6 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	beehiveModel "github.com/kubeedge/beehive/pkg/core/model"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/channelq"
 	hubio "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/io"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/model"
@@ -31,6 +29,8 @@ import (
 	edgemessagelayer "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/synccontroller"
 	"github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 	"github.com/kubeedge/viaduct/pkg/conn"
 	"github.com/kubeedge/viaduct/pkg/mux"
diff --git a/cloud/pkg/common/client/client.go b/cloud/pkg/common/client/client.go
index 67d931e84..5eb582733 100644
--- a/cloud/pkg/common/client/client.go
+++ b/cloud/pkg/common/client/client.go
@@ -27,8 +27,8 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
 	cloudcoreConfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 )
 
 var (
diff --git a/cloud/pkg/common/informers/informers.go b/cloud/pkg/common/informers/informers.go
index 4e15d73e7..01ea75a0e 100644
--- a/cloud/pkg/common/informers/informers.go
+++ b/cloud/pkg/common/informers/informers.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	crdinformers "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
+	crdinformers "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
 )
 
 type newInformer func() cache.SharedIndexInformer
diff --git a/cloud/pkg/devicecontroller/controller/downstream.go b/cloud/pkg/devicecontroller/controller/downstream.go
index 553955dbe..1e74bb2c3 100644
--- a/cloud/pkg/devicecontroller/controller/downstream.go
+++ b/cloud/pkg/devicecontroller/controller/downstream.go
@@ -33,14 +33,14 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	crdinformers "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/manager"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/types"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	crdinformers "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
 )
 
 // Constants for protocol, datatype, configmap, deviceProfile
diff --git a/cloud/pkg/devicecontroller/controller/upstream.go b/cloud/pkg/devicecontroller/controller/upstream.go
index 05a90d3d7..3b25e3e0b 100644
--- a/cloud/pkg/devicecontroller/controller/upstream.go
+++ b/cloud/pkg/devicecontroller/controller/upstream.go
@@ -25,8 +25,6 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
 	keclient "github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/config"
@@ -34,6 +32,8 @@ import (
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/types"
 	commonconst "github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 )
 
 // DeviceStatus is structure to patch device status
diff --git a/cloud/pkg/devicecontroller/types/deviceprofile.go b/cloud/pkg/devicecontroller/types/deviceprofile.go
index d1a62c444..4a7dbb67f 100644
--- a/cloud/pkg/devicecontroller/types/deviceprofile.go
+++ b/cloud/pkg/devicecontroller/types/deviceprofile.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 )
 
 // DeviceProfile is structure to store in configMap. These types would be consumed by mappers to marshal / unmarshal the device profile json
diff --git a/cloud/pkg/edgecontroller/controller/downstream.go b/cloud/pkg/edgecontroller/controller/downstream.go
index 095af4127..806e524b4 100644
--- a/cloud/pkg/edgecontroller/controller/downstream.go
+++ b/cloud/pkg/edgecontroller/controller/downstream.go
@@ -14,8 +14,6 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	routerv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	crdinformers "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/informers"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
@@ -23,6 +21,8 @@ import (
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/manager"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	routerv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	crdinformers "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
 )
 
 // DownstreamController watch kubernetes api server and send change to edge
diff --git a/cloud/pkg/edgecontroller/controller/upstream.go b/cloud/pkg/edgecontroller/controller/upstream.go
index 4fea9b162..b96c64f78 100644
--- a/cloud/pkg/edgecontroller/controller/upstream.go
+++ b/cloud/pkg/edgecontroller/controller/upstream.go
@@ -46,8 +46,6 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/controller"
@@ -58,6 +56,8 @@ import (
 	common "github.com/kubeedge/kubeedge/common/constants"
 	edgeapi "github.com/kubeedge/kubeedge/common/types"
 	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )
 
diff --git a/cloud/pkg/router/provider/eventbus/eventbus.go b/cloud/pkg/router/provider/eventbus/eventbus.go
index 93ae1db19..786ef9e59 100644
--- a/cloud/pkg/router/provider/eventbus/eventbus.go
+++ b/cloud/pkg/router/provider/eventbus/eventbus.go
@@ -10,11 +10,11 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/listener"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/provider"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 const (
diff --git a/cloud/pkg/router/provider/rest/rest.go b/cloud/pkg/router/provider/rest/rest.go
index dc8d521a7..eb379360f 100644
--- a/cloud/pkg/router/provider/rest/rest.go
+++ b/cloud/pkg/router/provider/rest/rest.go
@@ -14,12 +14,12 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/listener"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/provider"
 	httpUtils "github.com/kubeedge/kubeedge/cloud/pkg/router/utils/http"
 	commonType "github.com/kubeedge/kubeedge/common/types"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 var inited int32
diff --git a/cloud/pkg/router/provider/servicebus/servicebus.go b/cloud/pkg/router/provider/servicebus/servicebus.go
index aacc50e19..782cfef49 100644
--- a/cloud/pkg/router/provider/servicebus/servicebus.go
+++ b/cloud/pkg/router/provider/servicebus/servicebus.go
@@ -12,12 +12,12 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/listener"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/provider"
 	commonType "github.com/kubeedge/kubeedge/common/types"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 type servicebusFactory struct{}
diff --git a/cloud/pkg/router/provider/source.go b/cloud/pkg/router/provider/source.go
index f6680cb9f..08373fdf6 100644
--- a/cloud/pkg/router/provider/source.go
+++ b/cloud/pkg/router/provider/source.go
@@ -3,8 +3,8 @@ package provider
 import (
 	"k8s.io/klog/v2"
 
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/listener"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 type SourceFactory interface {
diff --git a/cloud/pkg/router/provider/target.go b/cloud/pkg/router/provider/target.go
index 9dc41537d..e73a29bfb 100644
--- a/cloud/pkg/router/provider/target.go
+++ b/cloud/pkg/router/provider/target.go
@@ -3,7 +3,7 @@ package provider
 import (
 	"k8s.io/klog/v2"
 
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 type TargetFactory interface {
diff --git a/cloud/pkg/router/rule/rule.go b/cloud/pkg/router/rule/rule.go
index 7e4b38a0a..6e61547a6 100644
--- a/cloud/pkg/router/rule/rule.go
+++ b/cloud/pkg/router/rule/rule.go
@@ -8,10 +8,10 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
-	routerv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/listener"
 	"github.com/kubeedge/kubeedge/cloud/pkg/router/provider"
+	routerv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 var (
diff --git a/cloud/pkg/synccontroller/objectsync.go b/cloud/pkg/synccontroller/objectsync.go
index b4ea6fe19..82d867be8 100644
--- a/cloud/pkg/synccontroller/objectsync.go
+++ b/cloud/pkg/synccontroller/objectsync.go
@@ -16,11 +16,11 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	edgectrconst "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/constants"
 	edgectrmessagelayer "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
 	commonconst "github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )
 
diff --git a/cloud/pkg/synccontroller/synccontroller.go b/cloud/pkg/synccontroller/synccontroller.go
index 9c21f0c47..414f5a1e3 100644
--- a/cloud/pkg/synccontroller/synccontroller.go
+++ b/cloud/pkg/synccontroller/synccontroller.go
@@ -16,14 +16,14 @@ import (
 
 	"github.com/kubeedge/beehive/pkg/core"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	reliablesyncslisters "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/reliablesyncs/v1alpha1"
 	keclient "github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/informers"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/synccontroller/config"
 	configv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	reliablesyncslisters "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 )
 
 // SyncController use beehive context message layer
diff --git a/cloud/test/integration/crds/validation_test.go b/cloud/test/integration/crds/validation_test.go
index d340c3b51..e51facdb3 100644
--- a/cloud/test/integration/crds/validation_test.go
+++ b/cloud/test/integration/crds/validation_test.go
@@ -23,11 +23,11 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	crdClientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/test/integration/fixtures"
 	cloudcoreConfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 )
 
 func buildCrdClient(t *testing.T) crdClientset.Interface {
diff --git a/cloud/test/integration/fixtures/device.go b/cloud/test/integration/fixtures/device.go
index 225173c51..79baa9d36 100644
--- a/cloud/test/integration/fixtures/device.go
+++ b/cloud/test/integration/fixtures/device.go
@@ -21,7 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 )
 
 type DeviceOp struct {
diff --git a/cloud/test/integration/fixtures/devicemodel.go b/cloud/test/integration/fixtures/devicemodel.go
index 783cdf753..bb2d33e65 100644
--- a/cloud/test/integration/fixtures/devicemodel.go
+++ b/cloud/test/integration/fixtures/devicemodel.go
@@ -19,7 +19,7 @@ package fixtures
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 )
 
 type DevicePropertyOp struct {
diff --git a/cloud/hack/boilerplate/boilerplate.txt b/hack/boilerplate/boilerplate.txt
index 3a677dd04..3a677dd04 100644
--- a/cloud/hack/boilerplate/boilerplate.txt
+++ b/hack/boilerplate/boilerplate.txt
diff --git a/cloud/hack/generate-groups.sh b/hack/generate-groups.sh
index 44e81f5fc..44e81f5fc 100755
--- a/cloud/hack/generate-groups.sh
+++ b/hack/generate-groups.sh
diff --git a/cloud/hack/tool.go b/hack/tools/tool.go
index 0a0d04f07..0a0d04f07 100644
--- a/cloud/hack/tool.go
+++ b/hack/tools/tool.go
diff --git a/cloud/hack/update-codegen.sh b/hack/update-codegen.sh
index 2134ac94d..e281c06d1 100755
--- a/cloud/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -18,9 +18,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/../.. && pwd)
+KUBEEDGE_ROOT=$(unset CDPATH && cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)
 
-${SCRIPT_ROOT}/cloud/hack/generate-groups.sh "deepcopy,client,informer,lister" \
-github.com/kubeedge/kubeedge/cloud/pkg/client github.com/kubeedge/kubeedge/cloud/pkg/apis \
+${KUBEEDGE_ROOT}/hack/generate-groups.sh "deepcopy,client,informer,lister" \
+github.com/kubeedge/kubeedge/pkg/client github.com/kubeedge/kubeedge/pkg/apis \
 "devices:v1alpha2 reliablesyncs:v1alpha1 rules:v1" \
---go-header-file ${SCRIPT_ROOT}/cloud/hack/boilerplate/boilerplate.txt
+--go-header-file ${KUBEEDGE_ROOT}/hack/boilerplate/boilerplate.txt
diff --git a/cloud/hack/verify-codegen.sh b/hack/verify-codegen.sh
index 71818421d..bc4ca3edb 100755
--- a/cloud/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -18,11 +18,11 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 
-DIFFROOT="${SCRIPT_ROOT}/pkg"
-TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
-_tmp="${SCRIPT_ROOT}/_tmp"
+DIFFROOT="${KUBEEDGE_ROOT}/pkg"
+TMP_DIFFROOT="${KUBEEDGE_ROOT}/_tmp/pkg"
+_tmp="${KUBEEDGE_ROOT}/_tmp"
 
 cleanup() {
   rm -rf "${_tmp}"
@@ -34,7 +34,7 @@ cleanup
 mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
-"${SCRIPT_ROOT}/hack/update-codegen.sh"
+"${KUBEEDGE_ROOT}/hack/update-codegen.sh"
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
@@ -43,6 +43,6 @@ if [[ $ret -eq 0 ]]
 then
   echo "${DIFFROOT} up to date."
 else
-  echo "${DIFFROOT} is out of date. Please run cloud/hack/update-codegen.sh"
+  echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"
   exit 1
 fi
diff --git a/cloud/pkg/apis/devices/v1alpha2/device_instance_types.go b/pkg/apis/devices/v1alpha2/device_instance_types.go
index 5ddcb2c84..5ddcb2c84 100644
--- a/cloud/pkg/apis/devices/v1alpha2/device_instance_types.go
+++ b/pkg/apis/devices/v1alpha2/device_instance_types.go
diff --git a/cloud/pkg/apis/devices/v1alpha2/device_model_types.go b/pkg/apis/devices/v1alpha2/device_model_types.go
index 6d7260251..6d7260251 100644
--- a/cloud/pkg/apis/devices/v1alpha2/device_model_types.go
+++ b/pkg/apis/devices/v1alpha2/device_model_types.go
diff --git a/cloud/pkg/apis/devices/v1alpha2/doc.go b/pkg/apis/devices/v1alpha2/doc.go
index c2df72c1b..c2df72c1b 100644
--- a/cloud/pkg/apis/devices/v1alpha2/doc.go
+++ b/pkg/apis/devices/v1alpha2/doc.go
diff --git a/cloud/pkg/apis/devices/v1alpha2/register.go b/pkg/apis/devices/v1alpha2/register.go
index 6bf94f178..6bf94f178 100644
--- a/cloud/pkg/apis/devices/v1alpha2/register.go
+++ b/pkg/apis/devices/v1alpha2/register.go
diff --git a/cloud/pkg/apis/devices/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/devices/v1alpha2/zz_generated.deepcopy.go
index 3571b3db4..3571b3db4 100644
--- a/cloud/pkg/apis/devices/v1alpha2/zz_generated.deepcopy.go
+++ b/pkg/apis/devices/v1alpha2/zz_generated.deepcopy.go
diff --git a/cloud/pkg/apis/reliablesyncs/v1alpha1/doc.go b/pkg/apis/reliablesyncs/v1alpha1/doc.go
index 4acf68499..4acf68499 100644
--- a/cloud/pkg/apis/reliablesyncs/v1alpha1/doc.go
+++ b/pkg/apis/reliablesyncs/v1alpha1/doc.go
diff --git a/cloud/pkg/apis/reliablesyncs/v1alpha1/register.go b/pkg/apis/reliablesyncs/v1alpha1/register.go
index d68054406..d68054406 100644
--- a/cloud/pkg/apis/reliablesyncs/v1alpha1/register.go
+++ b/pkg/apis/reliablesyncs/v1alpha1/register.go
diff --git a/cloud/pkg/apis/reliablesyncs/v1alpha1/type.go b/pkg/apis/reliablesyncs/v1alpha1/type.go
index 01fac7b27..01fac7b27 100644
--- a/cloud/pkg/apis/reliablesyncs/v1alpha1/type.go
+++ b/pkg/apis/reliablesyncs/v1alpha1/type.go
diff --git a/cloud/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go
index 1a393a194..1a393a194 100644
--- a/cloud/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go
diff --git a/cloud/pkg/apis/rules/v1/doc.go b/pkg/apis/rules/v1/doc.go
index 1461d94a2..1461d94a2 100644
--- a/cloud/pkg/apis/rules/v1/doc.go
+++ b/pkg/apis/rules/v1/doc.go
diff --git a/cloud/pkg/apis/rules/v1/register.go b/pkg/apis/rules/v1/register.go
index 9dbc37fda..9dbc37fda 100644
--- a/cloud/pkg/apis/rules/v1/register.go
+++ b/pkg/apis/rules/v1/register.go
diff --git a/cloud/pkg/apis/rules/v1/types.go b/pkg/apis/rules/v1/types.go
index ebefc975d..ebefc975d 100644
--- a/cloud/pkg/apis/rules/v1/types.go
+++ b/pkg/apis/rules/v1/types.go
diff --git a/cloud/pkg/apis/rules/v1/zz_generated.deepcopy.go b/pkg/apis/rules/v1/zz_generated.deepcopy.go
index c0c8c1222..c0c8c1222 100644
--- a/cloud/pkg/apis/rules/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/rules/v1/zz_generated.deepcopy.go
diff --git a/cloud/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 91aac8352..e200a78f7 100644
--- a/cloud/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -21,9 +21,9 @@ package versioned
 import (
 	"fmt"
 
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2"
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/rules/v1"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/devices/v1alpha2"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/rules/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/cloud/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go
index 50cc25fd6..50cc25fd6 100644
--- a/cloud/pkg/client/clientset/versioned/doc.go
+++ b/pkg/client/clientset/versioned/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index 55f4bc6e5..ad31a1f22 100644
--- a/cloud/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -19,13 +19,13 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2"
-	fakedevicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake"
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
-	fakereliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake"
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/rules/v1"
-	fakerulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake"
+	clientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/devices/v1alpha2"
+	fakedevicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
+	fakereliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/rules/v1"
+	fakerulesv1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/rules/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
diff --git a/cloud/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go
index 2becea535..2becea535 100644
--- a/cloud/pkg/client/clientset/versioned/fake/doc.go
+++ b/pkg/client/clientset/versioned/fake/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index 2c8e4750a..7c02ac6b6 100644
--- a/cloud/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -19,9 +19,9 @@ limitations under the License.
 package fake
 
 import (
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go
index 8379b8ba5..8379b8ba5 100644
--- a/cloud/pkg/client/clientset/versioned/scheme/doc.go
+++ b/pkg/client/clientset/versioned/scheme/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 03debceff..04f21e4ad 100644
--- a/cloud/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -19,9 +19,9 @@ limitations under the License.
 package scheme
 
 import (
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/device.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/device.go
index bd678d9fc..7024737cb 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/device.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/device.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/devicemodel.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/devicemodel.go
index 0a79ecc58..d476e2b5a 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/devicemodel.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/devicemodel.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/devices_client.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/devices_client.go
index 3fb8bf565..05319e5a9 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/devices_client.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/devices_client.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha2
 
 import (
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	"github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/doc.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/doc.go
index 0b41c2cad..0b41c2cad 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/doc.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/doc.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/doc.go
index 937651e2e..937651e2e 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/doc.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_device.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_device.go
index 4484137ea..5809f338a 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_device.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_device.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devicemodel.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devicemodel.go
index e8eb06667..00dc75aa2 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devicemodel.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devicemodel.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devices_client.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devices_client.go
index 537cee54c..f5ea12c17 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devices_client.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/fake/fake_devices_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/devices/v1alpha2"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/generated_expansion.go b/pkg/client/clientset/versioned/typed/devices/v1alpha2/generated_expansion.go
index e0efb8fdc..e0efb8fdc 100644
--- a/cloud/pkg/client/clientset/versioned/typed/devices/v1alpha2/generated_expansion.go
+++ b/pkg/client/clientset/versioned/typed/devices/v1alpha2/generated_expansion.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/clusterobjectsync.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/clusterobjectsync.go
index 5fe19223f..5b2926cd3 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/clusterobjectsync.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/clusterobjectsync.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/doc.go
index 62dbf54f4..62dbf54f4 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/doc.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/doc.go
index 937651e2e..937651e2e 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/doc.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_clusterobjectsync.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_clusterobjectsync.go
index 146e55fda..104e52d39 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_clusterobjectsync.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_clusterobjectsync.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_objectsync.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_objectsync.go
index 4841b4aaa..e1e19bd57 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_objectsync.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_objectsync.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_reliablesyncs_client.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_reliablesyncs_client.go
index 92eb49ac5..c4ed9f915 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_reliablesyncs_client.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/fake/fake_reliablesyncs_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/generated_expansion.go
index 008f1e960..008f1e960 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/generated_expansion.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/generated_expansion.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/objectsync.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/objectsync.go
index 7551fd2d4..c2f733e48 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/objectsync.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/objectsync.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/reliablesyncs_client.go b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/reliablesyncs_client.go
index c742cecfc..270717b7b 100644
--- a/cloud/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/reliablesyncs_client.go
+++ b/pkg/client/clientset/versioned/typed/reliablesyncs/v1alpha1/reliablesyncs_client.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	"github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/doc.go b/pkg/client/clientset/versioned/typed/rules/v1/doc.go
index caf68d6bb..caf68d6bb 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/doc.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/doc.go b/pkg/client/clientset/versioned/typed/rules/v1/fake/doc.go
index 937651e2e..937651e2e 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/doc.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/fake/doc.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rule.go b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rule.go
index 68420b667..445247938 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rule.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rule.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_ruleendpoint.go b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_ruleendpoint.go
index 280656348..eb661dcf2 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_ruleendpoint.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_ruleendpoint.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rules_client.go b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rules_client.go
index aef8d49d3..97112ea07 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rules_client.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/fake/fake_rules_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/typed/rules/v1"
+	v1 "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/typed/rules/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/generated_expansion.go b/pkg/client/clientset/versioned/typed/rules/v1/generated_expansion.go
index 921df2420..921df2420 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/generated_expansion.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/generated_expansion.go
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/rule.go b/pkg/client/clientset/versioned/typed/rules/v1/rule.go
index c77bfad8c..4d0b29d76 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/rule.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/rule.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/ruleendpoint.go b/pkg/client/clientset/versioned/typed/rules/v1/ruleendpoint.go
index 5bc9335f9..9d10d053f 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/ruleendpoint.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/ruleendpoint.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	scheme "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	scheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/clientset/versioned/typed/rules/v1/rules_client.go b/pkg/client/clientset/versioned/typed/rules/v1/rules_client.go
index 106b1f0b6..bbf0f397d 100644
--- a/cloud/pkg/client/clientset/versioned/typed/rules/v1/rules_client.go
+++ b/pkg/client/clientset/versioned/typed/rules/v1/rules_client.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	"github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
diff --git a/cloud/pkg/client/informers/externalversions/devices/interface.go b/pkg/client/informers/externalversions/devices/interface.go
index 0037cf094..6f11ad130 100644
--- a/cloud/pkg/client/informers/externalversions/devices/interface.go
+++ b/pkg/client/informers/externalversions/devices/interface.go
@@ -19,8 +19,8 @@ limitations under the License.
 package devices
 
 import (
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/devices/v1alpha2"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/devices/v1alpha2"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
diff --git a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/device.go b/pkg/client/informers/externalversions/devices/v1alpha2/device.go
index 8f904dd89..5b6052a60 100644
--- a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/device.go
+++ b/pkg/client/informers/externalversions/devices/v1alpha2/device.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/devices/v1alpha2"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/client/listers/devices/v1alpha2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/devicemodel.go b/pkg/client/informers/externalversions/devices/v1alpha2/devicemodel.go
index dbc7fc98e..3f3486293 100644
--- a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/devicemodel.go
+++ b/pkg/client/informers/externalversions/devices/v1alpha2/devicemodel.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/devices/v1alpha2"
+	devicesv1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/client/listers/devices/v1alpha2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/interface.go b/pkg/client/informers/externalversions/devices/v1alpha2/interface.go
index 44c695ba5..28675936d 100644
--- a/cloud/pkg/client/informers/externalversions/devices/v1alpha2/interface.go
+++ b/pkg/client/informers/externalversions/devices/v1alpha2/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
diff --git a/cloud/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
index 9a49ae810..c330ae78f 100644
--- a/cloud/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@@ -23,11 +23,11 @@ import (
 	sync "sync"
 	time "time"
 
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	devices "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/devices"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	reliablesyncs "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/reliablesyncs"
-	rules "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/rules"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	devices "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/devices"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	reliablesyncs "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/reliablesyncs"
+	rules "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/rules"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/cloud/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
index 2437f3732..38fb42ab9 100644
--- a/cloud/pkg/client/informers/externalversions/generic.go
+++ b/pkg/client/informers/externalversions/generic.go
@@ -21,9 +21,9 @@ package externalversions
 import (
 	"fmt"
 
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
diff --git a/cloud/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
index e5e2536cc..b1f833d45 100644
--- a/cloud/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -21,7 +21,7 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/informers/externalversions/reliablesyncs/interface.go b/pkg/client/informers/externalversions/reliablesyncs/interface.go
index a962b9e9e..374c3f317 100644
--- a/cloud/pkg/client/informers/externalversions/reliablesyncs/interface.go
+++ b/pkg/client/informers/externalversions/reliablesyncs/interface.go
@@ -19,8 +19,8 @@ limitations under the License.
 package reliablesyncs
 
 import (
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/reliablesyncs/v1alpha1"
 )
 
 // Interface provides access to each of this group's versions.
diff --git a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/clusterobjectsync.go b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/clusterobjectsync.go
index ce1585339..66005161c 100644
--- a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/clusterobjectsync.go
+++ b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/clusterobjectsync.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/reliablesyncs/v1alpha1"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/interface.go b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/interface.go
index a5f1eb9b0..c426c2f51 100644
--- a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/interface.go
+++ b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
diff --git a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/objectsync.go b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/objectsync.go
index 16c864958..ea137e3e0 100644
--- a/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/objectsync.go
+++ b/pkg/client/informers/externalversions/reliablesyncs/v1alpha1/objectsync.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/reliablesyncs/v1alpha1"
+	reliablesyncsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/informers/externalversions/rules/interface.go b/pkg/client/informers/externalversions/rules/interface.go
index c1d404ebd..d0d8e373c 100644
--- a/cloud/pkg/client/informers/externalversions/rules/interface.go
+++ b/pkg/client/informers/externalversions/rules/interface.go
@@ -19,8 +19,8 @@ limitations under the License.
 package rules
 
 import (
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/rules/v1"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/rules/v1"
 )
 
 // Interface provides access to each of this group's versions.
diff --git a/cloud/pkg/client/informers/externalversions/rules/v1/interface.go b/pkg/client/informers/externalversions/rules/v1/interface.go
index 305163af2..99483461a 100644
--- a/cloud/pkg/client/informers/externalversions/rules/v1/interface.go
+++ b/pkg/client/informers/externalversions/rules/v1/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
diff --git a/cloud/pkg/client/informers/externalversions/rules/v1/rule.go b/pkg/client/informers/externalversions/rules/v1/rule.go
index d43654c78..cc9081906 100644
--- a/cloud/pkg/client/informers/externalversions/rules/v1/rule.go
+++ b/pkg/client/informers/externalversions/rules/v1/rule.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kubeedge/kubeedge/pkg/client/listers/rules/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/informers/externalversions/rules/v1/ruleendpoint.go b/pkg/client/informers/externalversions/rules/v1/ruleendpoint.go
index 25cb431d1..7d9abc9d2 100644
--- a/cloud/pkg/client/informers/externalversions/rules/v1/ruleendpoint.go
+++ b/pkg/client/informers/externalversions/rules/v1/ruleendpoint.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	time "time"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
-	versioned "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/client/listers/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	versioned "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kubeedge/kubeedge/pkg/client/listers/rules/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/client/listers/devices/v1alpha2/device.go b/pkg/client/listers/devices/v1alpha2/device.go
index fa93cd035..f496609e3 100644
--- a/cloud/pkg/client/listers/devices/v1alpha2/device.go
+++ b/pkg/client/listers/devices/v1alpha2/device.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/listers/devices/v1alpha2/devicemodel.go b/pkg/client/listers/devices/v1alpha2/devicemodel.go
index 217c0f962..2409a43a7 100644
--- a/cloud/pkg/client/listers/devices/v1alpha2/devicemodel.go
+++ b/pkg/client/listers/devices/v1alpha2/devicemodel.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	v1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	v1alpha2 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/listers/devices/v1alpha2/expansion_generated.go b/pkg/client/listers/devices/v1alpha2/expansion_generated.go
index a2e0dd906..a2e0dd906 100644
--- a/cloud/pkg/client/listers/devices/v1alpha2/expansion_generated.go
+++ b/pkg/client/listers/devices/v1alpha2/expansion_generated.go
diff --git a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/clusterobjectsync.go b/pkg/client/listers/reliablesyncs/v1alpha1/clusterobjectsync.go
index 567adede7..83425f3ac 100644
--- a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/clusterobjectsync.go
+++ b/pkg/client/listers/reliablesyncs/v1alpha1/clusterobjectsync.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/expansion_generated.go b/pkg/client/listers/reliablesyncs/v1alpha1/expansion_generated.go
index 185c78918..185c78918 100644
--- a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/expansion_generated.go
+++ b/pkg/client/listers/reliablesyncs/v1alpha1/expansion_generated.go
diff --git a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/objectsync.go b/pkg/client/listers/reliablesyncs/v1alpha1/objectsync.go
index fec55197a..8a92ff3d3 100644
--- a/cloud/pkg/client/listers/reliablesyncs/v1alpha1/objectsync.go
+++ b/pkg/client/listers/reliablesyncs/v1alpha1/objectsync.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/reliablesyncs/v1alpha1"
+	v1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/listers/rules/v1/expansion_generated.go b/pkg/client/listers/rules/v1/expansion_generated.go
index 4f50dd151..4f50dd151 100644
--- a/cloud/pkg/client/listers/rules/v1/expansion_generated.go
+++ b/pkg/client/listers/rules/v1/expansion_generated.go
diff --git a/cloud/pkg/client/listers/rules/v1/rule.go b/pkg/client/listers/rules/v1/rule.go
index 42945e086..aedb9cf61 100644
--- a/cloud/pkg/client/listers/rules/v1/rule.go
+++ b/pkg/client/listers/rules/v1/rule.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/cloud/pkg/client/listers/rules/v1/ruleendpoint.go b/pkg/client/listers/rules/v1/ruleendpoint.go
index c26f5f756..281587507 100644
--- a/cloud/pkg/client/listers/rules/v1/ruleendpoint.go
+++ b/pkg/client/listers/rules/v1/ruleendpoint.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/tests/e2e/deployment/device_crd_test.go b/tests/e2e/deployment/device_crd_test.go
index e951e071c..1fb9afc28 100644
--- a/tests/e2e/deployment/device_crd_test.go
+++ b/tests/e2e/deployment/device_crd_test.go
@@ -25,7 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	"github.com/kubeedge/kubeedge/tests/e2e/utils"
 )
 
diff --git a/tests/e2e/deployment/rule_crd_test.go b/tests/e2e/deployment/rule_crd_test.go
index eeababa78..7643f1269 100644
--- a/tests/e2e/deployment/rule_crd_test.go
+++ b/tests/e2e/deployment/rule_crd_test.go
@@ -8,7 +8,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	v1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 	"github.com/kubeedge/kubeedge/tests/e2e/utils"
 )
 
diff --git a/tests/e2e/utils/common.go b/tests/e2e/utils/common.go
index e8b186449..9f98c6e94 100644
--- a/tests/e2e/utils/common.go
+++ b/tests/e2e/utils/common.go
@@ -38,8 +38,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
 	"github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 	"github.com/kubeedge/viaduct/pkg/api"
 )
 
diff --git a/tests/e2e/utils/device.go b/tests/e2e/utils/device.go
index 46696d3ef..22cc15ed2 100644
--- a/tests/e2e/utils/device.go
+++ b/tests/e2e/utils/device.go
@@ -7,8 +7,8 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
 	"github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/types"
+	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1alpha2"
 )
 
 func NewLedDeviceModel() v1alpha2.DeviceModel {
diff --git a/tests/e2e/utils/rule.go b/tests/e2e/utils/rule.go
index 3bd2a02ad..b5442f660 100644
--- a/tests/e2e/utils/rule.go
+++ b/tests/e2e/utils/rule.go
@@ -12,7 +12,7 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	rulesv1 "github.com/kubeedge/kubeedge/cloud/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
 )
 
 func NewRule(sourceType, targetType rulesv1.RuleEndpointTypeDef) *rulesv1.Rule {