diff --git a/content/2013/bestpractices/funcdraw/cmd/funcdraw.go b/content/2013/bestpractices/funcdraw/cmd/funcdraw.go
index 47dcca7..96959ea 100644
--- a/content/2013/bestpractices/funcdraw/cmd/funcdraw.go
+++ b/content/2013/bestpractices/funcdraw/cmd/funcdraw.go
@@ -11,8 +11,8 @@
 
 // IMPORT OMIT
 import (
-	"golang.org/x/talks/2013/bestpractices/funcdraw/drawer"
-	"golang.org/x/talks/2013/bestpractices/funcdraw/parser"
+	"golang.org/x/talks/content/2013/bestpractices/funcdraw/drawer"
+	"golang.org/x/talks/content/2013/bestpractices/funcdraw/parser"
 )
 
 // ENDIMPORT OMIT
diff --git a/content/2013/bestpractices/funcdraw/drawer/dependent.go b/content/2013/bestpractices/funcdraw/drawer/dependent.go
index d181265..1ad6626 100644
--- a/content/2013/bestpractices/funcdraw/drawer/dependent.go
+++ b/content/2013/bestpractices/funcdraw/drawer/dependent.go
@@ -6,7 +6,7 @@
 import (
 	"image"
 
-	"golang.org/x/talks/2013/bestpractices/funcdraw/parser"
+	"golang.org/x/talks/content/2013/bestpractices/funcdraw/parser"
 )
 
 // Draw draws an image showing a rendering of the passed ParsedFunc.
diff --git a/content/2015/gotham-grpc.slide b/content/2015/gotham-grpc.slide
index 6f7d37f..7415de0 100644
--- a/content/2015/gotham-grpc.slide
+++ b/content/2015/gotham-grpc.slide
@@ -113,7 +113,7 @@
 
 * Client code (main)
 
-  import pb "golang.org/x/talks/2015/gotham-grpc/search"
+  import pb "golang.org/x/talks/content/2015/gotham-grpc/search"
 
 .code gotham-grpc/client/client.go /func main/,/^}/
 
diff --git a/content/2015/gotham-grpc/backend/backend.go b/content/2015/gotham-grpc/backend/backend.go
index 3381f6c..3ae0f2d 100644
--- a/content/2015/gotham-grpc/backend/backend.go
+++ b/content/2015/gotham-grpc/backend/backend.go
@@ -15,7 +15,7 @@
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
-	pb "golang.org/x/talks/2015/gotham-grpc/search"
+	pb "golang.org/x/talks/content/2015/gotham-grpc/search"
 	"google.golang.org/grpc"
 )
 
diff --git a/content/2015/gotham-grpc/client/client.go b/content/2015/gotham-grpc/client/client.go
index f917846..fd3aa62 100644
--- a/content/2015/gotham-grpc/client/client.go
+++ b/content/2015/gotham-grpc/client/client.go
@@ -18,7 +18,7 @@
 	"time"
 
 	"golang.org/x/net/context"
-	pb "golang.org/x/talks/2015/gotham-grpc/search"
+	pb "golang.org/x/talks/content/2015/gotham-grpc/search"
 	"google.golang.org/grpc"
 )
 
diff --git a/content/2015/gotham-grpc/frontend/frontend.go b/content/2015/gotham-grpc/frontend/frontend.go
index 4f917d4..1d6c1fb 100644
--- a/content/2015/gotham-grpc/frontend/frontend.go
+++ b/content/2015/gotham-grpc/frontend/frontend.go
@@ -14,7 +14,7 @@
 	"sync"
 
 	"golang.org/x/net/context"
-	pb "golang.org/x/talks/2015/gotham-grpc/search"
+	pb "golang.org/x/talks/content/2015/gotham-grpc/search"
 	"google.golang.org/grpc"
 )
 
diff --git a/content/2016/applicative.slide b/content/2016/applicative.slide
index 54d8657..dbbdae1 100644
--- a/content/2016/applicative.slide
+++ b/content/2016/applicative.slide
@@ -202,8 +202,8 @@
 
 * Fetch the search results
 
-  import "golang.org/x/talks/2016/applicative/google"
-  
+  import "golang.org/x/talks/content/2016/applicative/google"
+
 .code applicative/frontend.go /Run the Google search/,/ENDSEARCH/
 
 `Search` returns two values, a slice of results and an error.
@@ -224,7 +224,7 @@
 The `google.Result` type is exported from package `google`:
 
   package google
-  
+
   type Result struct { Title, URL string }
 
 The `resp` variable is initialized to a `response` value using a composite struct literal.
@@ -431,7 +431,7 @@
 - Integrate with build & test & deploy
 - Learn how to debug & profile your program
 
-3. Compare Go to what you use today 
+3. Compare Go to what you use today
 
 - Isolate the language change; try not to change anything else.
 
diff --git a/content/2016/applicative/first.go b/content/2016/applicative/first.go
index 6f1d186..07ee445 100644
--- a/content/2016/applicative/first.go
+++ b/content/2016/applicative/first.go
@@ -7,7 +7,7 @@
 	"math/rand"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func init() {
diff --git a/content/2016/applicative/frontend.go b/content/2016/applicative/frontend.go
index 5fc4685..2baae76 100644
--- a/content/2016/applicative/frontend.go
+++ b/content/2016/applicative/frontend.go
@@ -17,7 +17,7 @@
 	"net/http"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func main() {
diff --git a/content/2016/applicative/google-parallel.go b/content/2016/applicative/google-parallel.go
index 77f8457..3411951 100644
--- a/content/2016/applicative/google-parallel.go
+++ b/content/2016/applicative/google-parallel.go
@@ -5,7 +5,7 @@
 	"math/rand"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func init() {
diff --git a/content/2016/applicative/google-replicated.go b/content/2016/applicative/google-replicated.go
index 5c1c593..3d8a37b 100644
--- a/content/2016/applicative/google-replicated.go
+++ b/content/2016/applicative/google-replicated.go
@@ -7,7 +7,7 @@
 	"math/rand"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func init() {
diff --git a/content/2016/applicative/google-serial.go b/content/2016/applicative/google-serial.go
index 89fd63c..fcf3d3b 100644
--- a/content/2016/applicative/google-serial.go
+++ b/content/2016/applicative/google-serial.go
@@ -7,7 +7,7 @@
 	"math/rand"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func init() {
diff --git a/content/2016/applicative/google-timeout.go b/content/2016/applicative/google-timeout.go
index ea43b05..00d3ed9 100644
--- a/content/2016/applicative/google-timeout.go
+++ b/content/2016/applicative/google-timeout.go
@@ -7,7 +7,7 @@
 	"math/rand"
 	"time"
 
-	"golang.org/x/talks/2016/applicative/google"
+	"golang.org/x/talks/content/2016/applicative/google"
 )
 
 func init() {
diff --git a/content/2017/state-of-go/stdlib/http2/http2.go b/content/2017/state-of-go/stdlib/http2/http2.go
index fb4eca4..3c6406d 100644
--- a/content/2017/state-of-go/stdlib/http2/http2.go
+++ b/content/2017/state-of-go/stdlib/http2/http2.go
@@ -13,7 +13,7 @@
 var cert, key string
 
 func init() {
-	pkg, err := build.Import("golang.org/x/talks/2017/state-of-go/stdlib/http2", ".", build.FindOnly)
+	pkg, err := build.Import("golang.org/x/talks/content/2017/state-of-go/stdlib/http2", ".", build.FindOnly)
 	if err != nil {
 		log.Fatal(err)
 	}