diff --git a/app/internal/gpu/gpu.go b/app/internal/gpu/gpu.go
index 56f5eb21..028ef966 100644
--- a/app/internal/gpu/gpu.go
+++ b/app/internal/gpu/gpu.go
@@ -17,7 +17,7 @@ import (
 	"gioui.org/internal/opconst"
 	"gioui.org/internal/ops"
 	"gioui.org/op"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
 	"golang.org/x/image/draw"
 )
 
diff --git a/cmd/gogio/testdata/red.go b/cmd/gogio/testdata/red.go
index ebacea17..cbade070 100644
--- a/cmd/gogio/testdata/red.go
+++ b/cmd/gogio/testdata/red.go
@@ -9,7 +9,8 @@ import (
 
 	"gioui.org/app"
 	"gioui.org/f32"
-	"gioui.org/paint"
+	"gioui.org/op"
+	"gioui.org/op/paint"
 )
 
 func main() {
diff --git a/layout/list.go b/layout/list.go
index 08c41da7..37f03b09 100644
--- a/layout/list.go
+++ b/layout/list.go
@@ -8,7 +8,7 @@ import (
 	"gioui.org/gesture"
 	"gioui.org/io/pointer"
 	"gioui.org/op"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
 )
 
 type scrollChild struct {
diff --git a/measure/measure.go b/measure/measure.go
index 370c1457..e72a0159 100644
--- a/measure/measure.go
+++ b/measure/measure.go
@@ -12,7 +12,7 @@ import (
 
 	"gioui.org/f32"
 	"gioui.org/op"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
 	"gioui.org/text"
 	"gioui.org/ui"
 	"golang.org/x/image/font"
diff --git a/op/op.go b/op/op.go
index 24ce687c..dace4a40 100644
--- a/op/op.go
+++ b/op/op.go
@@ -17,7 +17,7 @@ Drawing a colored square:
 
 	import "gioui.org/ui"
 	import "gioui.org/app"
-	import "gioui.org/paint"
+	import "gioui.org/op/paint"
 
 	var w app.Window
 	ops := new(op.Ops)
diff --git a/paint/doc.go b/op/paint/doc.go
similarity index 100%
rename from paint/doc.go
rename to op/paint/doc.go
diff --git a/paint/paint.go b/op/paint/paint.go
similarity index 100%
rename from paint/paint.go
rename to op/paint/paint.go
diff --git a/paint/path.go b/op/paint/path.go
similarity index 100%
rename from paint/path.go
rename to op/paint/path.go
diff --git a/text/editor.go b/text/editor.go
index da547b82..59c93fc4 100644
--- a/text/editor.go
+++ b/text/editor.go
@@ -15,7 +15,7 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/layout"
 	"gioui.org/op"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
 	"gioui.org/ui"
 
 	"golang.org/x/image/math/fixed"
diff --git a/text/label.go b/text/label.go
index 23a7a3fa..1680d47e 100644
--- a/text/label.go
+++ b/text/label.go
@@ -11,7 +11,7 @@ import (
 	"gioui.org/f32"
 	"gioui.org/layout"
 	"gioui.org/op"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
 
 	"golang.org/x/image/math/fixed"
 )
diff --git a/widget/image.go b/widget/image.go
index 7b3e68d7..a77e1e3f 100644
--- a/widget/image.go
+++ b/widget/image.go
@@ -6,10 +6,10 @@ package widget
 import (
 	"image"
 
-	"gioui.org/ui"
 	"gioui.org/f32"
 	"gioui.org/layout"
-	"gioui.org/paint"
+	"gioui.org/op/paint"
+	"gioui.org/ui"
 )
 
 // Image is a widget that displays an image.