diff --git a/pkg/kubelet/deviceplugin/BUILD b/pkg/kubelet/cm/deviceplugin/BUILD
similarity index 100%
rename from pkg/kubelet/deviceplugin/BUILD
rename to pkg/kubelet/cm/deviceplugin/BUILD
diff --git a/pkg/kubelet/deviceplugin/OWNERS b/pkg/kubelet/cm/deviceplugin/OWNERS
similarity index 100%
rename from pkg/kubelet/deviceplugin/OWNERS
rename to pkg/kubelet/cm/deviceplugin/OWNERS
diff --git a/pkg/kubelet/cm/device_plugin_handler.go b/pkg/kubelet/cm/deviceplugin/device_plugin_handler.go
similarity index 100%
rename from pkg/kubelet/cm/device_plugin_handler.go
rename to pkg/kubelet/cm/deviceplugin/device_plugin_handler.go
diff --git a/pkg/kubelet/cm/device_plugin_handler_stub.go b/pkg/kubelet/cm/deviceplugin/device_plugin_handler_stub.go
similarity index 100%
rename from pkg/kubelet/cm/device_plugin_handler_stub.go
rename to pkg/kubelet/cm/deviceplugin/device_plugin_handler_stub.go
diff --git a/pkg/kubelet/cm/device_plugin_handler_test.go b/pkg/kubelet/cm/deviceplugin/device_plugin_handler_test.go
similarity index 100%
rename from pkg/kubelet/cm/device_plugin_handler_test.go
rename to pkg/kubelet/cm/deviceplugin/device_plugin_handler_test.go
diff --git a/pkg/kubelet/deviceplugin/device_plugin_stub.go b/pkg/kubelet/cm/deviceplugin/device_plugin_stub.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/device_plugin_stub.go
rename to pkg/kubelet/cm/deviceplugin/device_plugin_stub.go
diff --git a/pkg/kubelet/deviceplugin/endpoint.go b/pkg/kubelet/cm/deviceplugin/endpoint.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/endpoint.go
rename to pkg/kubelet/cm/deviceplugin/endpoint.go
diff --git a/pkg/kubelet/deviceplugin/endpoint_test.go b/pkg/kubelet/cm/deviceplugin/endpoint_test.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/endpoint_test.go
rename to pkg/kubelet/cm/deviceplugin/endpoint_test.go
diff --git a/pkg/kubelet/deviceplugin/manager.go b/pkg/kubelet/cm/deviceplugin/manager.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/manager.go
rename to pkg/kubelet/cm/deviceplugin/manager.go
diff --git a/pkg/kubelet/deviceplugin/manager_test.go b/pkg/kubelet/cm/deviceplugin/manager_test.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/manager_test.go
rename to pkg/kubelet/cm/deviceplugin/manager_test.go
diff --git a/pkg/kubelet/deviceplugin/types.go b/pkg/kubelet/cm/deviceplugin/types.go
similarity index 100%
rename from pkg/kubelet/deviceplugin/types.go
rename to pkg/kubelet/cm/deviceplugin/types.go