diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go
index 2faefcdd9..bd6298281 100644
--- a/cmd/containerd/builtins/builtins_windows.go
+++ b/cmd/containerd/builtins/builtins_windows.go
@@ -17,8 +17,8 @@
 package builtins
 
 import (
-	_ "github.com/containerd/containerd/v2/diff/windows"
 	_ "github.com/containerd/containerd/v2/plugins/diff/lcow"
+	_ "github.com/containerd/containerd/v2/plugins/diff/windows"
 	_ "github.com/containerd/containerd/v2/snapshots/lcow"
 	_ "github.com/containerd/containerd/v2/snapshots/windows"
 )
diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go
index bbb8c9d62..fdcd94f35 100644
--- a/contrib/fuzz/builtins_windows.go
+++ b/contrib/fuzz/builtins_windows.go
@@ -18,8 +18,8 @@ package fuzz
 
 import (
 	// Windows specific imports
-	_ "github.com/containerd/containerd/v2/diff/windows"
 	_ "github.com/containerd/containerd/v2/plugins/diff/lcow"
+	_ "github.com/containerd/containerd/v2/plugins/diff/windows"
 	_ "github.com/containerd/containerd/v2/snapshots/lcow"
 	_ "github.com/containerd/containerd/v2/snapshots/windows"
 )
diff --git a/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go
similarity index 100%
rename from diff/windows/cimfs.go
rename to plugins/diff/windows/cimfs.go
diff --git a/diff/windows/windows.go b/plugins/diff/windows/windows.go
similarity index 100%
rename from diff/windows/windows.go
rename to plugins/diff/windows/windows.go