diff --git a/apps/go.mod b/apps/go.mod
index 7d3ac1ed..e4f2a95b 100644
--- a/apps/go.mod
+++ b/apps/go.mod
@@ -3,7 +3,7 @@ module gioui.org/apps
 go 1.13
 
 require (
-	gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5
+	gioui.org v0.0.0-20190930103706-22cd88df9f7f
 	github.com/google/go-github/v24 v24.0.1
 	golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
 	golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
diff --git a/apps/go.sum b/apps/go.sum
index e40bd073..fe16d666 100644
--- a/apps/go.sum
+++ b/apps/go.sum
@@ -1,6 +1,6 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5 h1:Rj12+5VLuFgEvzbmHQ/PuzmoZ3CBc9jvVyPe5UkFWpQ=
-gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5/go.mod h1:PssKPKlqVIeyaed+0w492Xc2NgX5M3n6oZKOAj5rxoE=
+gioui.org v0.0.0-20190930103706-22cd88df9f7f h1:otoFx7x89sR0tUt1bVccsTw78tk36PbVqaoyTjUZKQ4=
+gioui.org v0.0.0-20190930103706-22cd88df9f7f/go.mod h1:+CEjc9B//HrBfWsQOVxjCyih7HGIj3Pww1xFHVDZyyk=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
diff --git a/apps/gophers/main.go b/apps/gophers/main.go
index ba9b0985..e443b92f 100644
--- a/apps/gophers/main.go
+++ b/apps/gophers/main.go
@@ -21,10 +21,10 @@ import (
 	_ "net/http/pprof"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/gesture"
-	"gioui.org/ui/key"
-	"gioui.org/ui/layout"
+	"gioui.org/app"
+	"gioui.org/gesture"
+	"gioui.org/key"
+	"gioui.org/layout"
 
 	"github.com/google/go-github/v24/github"
 )
diff --git a/apps/gophers/main_test.go b/apps/gophers/main_test.go
index fa67321d..6b1357dc 100644
--- a/apps/gophers/main_test.go
+++ b/apps/gophers/main_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"gioui.org/layout"
 	"gioui.org/ui"
-	"gioui.org/ui/layout"
 )
 
 type queue struct{}
diff --git a/apps/gophers/ui.go b/apps/gophers/ui.go
index f99eac51..9b716267 100644
--- a/apps/gophers/ui.go
+++ b/apps/gophers/ui.go
@@ -18,16 +18,16 @@ import (
 	_ "net/http/pprof"
 
 	"gioui.org/ui"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/gesture"
-	"gioui.org/ui/key"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/paint"
-	"gioui.org/ui/pointer"
-	"gioui.org/ui/system"
-	"gioui.org/ui/text"
-	"gioui.org/ui/widget"
+	"gioui.org/f32"
+	"gioui.org/gesture"
+	"gioui.org/key"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/paint"
+	"gioui.org/pointer"
+	"gioui.org/system"
+	"gioui.org/text"
+	"gioui.org/widget"
 	"golang.org/x/exp/shiny/iconvg"
 
 	"github.com/google/go-github/v24/github"
diff --git a/apps/hello/hello.go b/apps/hello/hello.go
index 6f000fe9..9ea3325b 100644
--- a/apps/hello/hello.go
+++ b/apps/hello/hello.go
@@ -9,11 +9,11 @@ import (
 	"log"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/paint"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/paint"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"
diff --git a/cmd/go.mod b/cmd/go.mod
index 737eabe0..936bd259 100644
--- a/cmd/go.mod
+++ b/cmd/go.mod
@@ -3,7 +3,7 @@ module gioui.org/cmd
 go 1.13
 
 require (
-	gioui.org/ui v0.0.0-20190922141907-2d8072fbbbc6
+	gioui.org v0.0.0-20190930103706-22cd88df9f7f
 	github.com/chromedp/chromedp v0.4.0
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
 	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
diff --git a/cmd/go.sum b/cmd/go.sum
index 31bb2db4..9b7eae36 100644
--- a/cmd/go.sum
+++ b/cmd/go.sum
@@ -1,5 +1,5 @@
-gioui.org/ui v0.0.0-20190922141907-2d8072fbbbc6 h1:zK+bNIQHKtFYsK8WjI3A+mChXOoHpQbmSzTXFvZg+2o=
-gioui.org/ui v0.0.0-20190922141907-2d8072fbbbc6/go.mod h1:PssKPKlqVIeyaed+0w492Xc2NgX5M3n6oZKOAj5rxoE=
+gioui.org v0.0.0-20190930103706-22cd88df9f7f h1:otoFx7x89sR0tUt1bVccsTw78tk36PbVqaoyTjUZKQ4=
+gioui.org v0.0.0-20190930103706-22cd88df9f7f/go.mod h1:+CEjc9B//HrBfWsQOVxjCyih7HGIj3Pww1xFHVDZyyk=
 github.com/chromedp/cdproto v0.0.0-20190812224334-39ef923dcb8d h1:00kLGv5nKzpFchNhGDXDRbKtYx/WoT983Ka2t8/pzRE=
 github.com/chromedp/cdproto v0.0.0-20190812224334-39ef923dcb8d/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0=
 github.com/chromedp/chromedp v0.4.0 h1:0AJC5ejETuh/6n7Tcsw4u4G0eKZkI9aVRwckWaImLUE=
diff --git a/cmd/gogio/androidbuild.go b/cmd/gogio/androidbuild.go
index 5802fa83..bab42aef 100644
--- a/cmd/gogio/androidbuild.go
+++ b/cmd/gogio/androidbuild.go
@@ -124,7 +124,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 			return err
 		})
 	}
-	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/ui/app"))
+	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app"))
 	if err != nil {
 		return err
 	}
diff --git a/cmd/gogio/iosbuild.go b/cmd/gogio/iosbuild.go
index 9cb84f9d..75b1de8a 100644
--- a/cmd/gogio/iosbuild.go
+++ b/cmd/gogio/iosbuild.go
@@ -432,7 +432,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 	if _, err := runCmd(lipo); err != nil {
 		return err
 	}
-	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/ui/app"))
+	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app"))
 	if err != nil {
 		return err
 	}
diff --git a/cmd/gogio/testdata/red.go b/cmd/gogio/testdata/red.go
index 0de41e65..ed2d525b 100644
--- a/cmd/gogio/testdata/red.go
+++ b/cmd/gogio/testdata/red.go
@@ -8,9 +8,9 @@ import (
 	"log"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/paint"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/paint"
 )
 
 func main() {