diff --git a/dial.go b/dial.go
index 7b85f556..b166352b 100644
--- a/dial.go
+++ b/dial.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package cloudsqlconn contains methods for creating secure, authorized connections to a Cloud SQL instance.
 package cloudsqlconn
 
 import (
diff --git a/dialer.go b/dialer.go
index 2de30c8c..700fe388 100644
--- a/dialer.go
+++ b/dialer.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"cloud.google.com/cloudsqlconn/internal/cloudsql"
+	"cloud.google.com/go/cloudsqlconn/internal/cloudsql"
 	"golang.org/x/net/proxy"
 	"google.golang.org/api/option"
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
diff --git a/dialer_test.go b/dialer_test.go
index f56025a1..6efc260d 100644
--- a/dialer_test.go
+++ b/dialer_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"cloud.google.com/cloudsqlconn/internal/mock"
+	"cloud.google.com/go/cloudsqlconn/internal/mock"
 	"google.golang.org/api/option"
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
diff --git a/doc.go b/doc.go
new file mode 100644
index 00000000..ff5b6499
--- /dev/null
+++ b/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2021 Google LLC
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     https://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package cloudsqlconn contains methods for creating secure, authorized
+// connections to a Cloud SQL instance.
+package cloudsqlconn // import "cloud.google.com/go/cloudsqlconn
diff --git a/e2e_postgres_test.go b/e2e_postgres_test.go
index d77d730e..f5ad40c2 100644
--- a/e2e_postgres_test.go
+++ b/e2e_postgres_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"cloud.google.com/cloudsqlconn"
+	"cloud.google.com/go/cloudsqlconn"
 	"github.com/jackc/pgx/v4"
 )
 
diff --git a/go.mod b/go.mod
index ea3872cb..21cfcf2e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module cloud.google.com/cloudsqlconn
+module cloud.google.com/go/cloudsqlconn
 
 go 1.15
 
diff --git a/internal/cloudsql/doc.go b/internal/cloudsql/doc.go
new file mode 100644
index 00000000..29682024
--- /dev/null
+++ b/internal/cloudsql/doc.go
@@ -0,0 +1,16 @@
+// Copyright 2021 Google LLC
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     https://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package cloudsql supports Cloud SQL Admin API operations.
+package cloudsql // import "cloud.google.com/go/cloudsqlconn/internal/cloudsql"
diff --git a/internal/cloudsql/instance_test.go b/internal/cloudsql/instance_test.go
index 8b0e3ecd..16708d74 100644
--- a/internal/cloudsql/instance_test.go
+++ b/internal/cloudsql/instance_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"cloud.google.com/cloudsqlconn/internal/mock"
+	"cloud.google.com/go/cloudsqlconn/internal/mock"
 	"google.golang.org/api/option"
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
diff --git a/internal/cloudsql/refresh_test.go b/internal/cloudsql/refresh_test.go
index 3fb553fd..9804a761 100644
--- a/internal/cloudsql/refresh_test.go
+++ b/internal/cloudsql/refresh_test.go
@@ -20,7 +20,7 @@ import (
 	"crypto/rsa"
 	"testing"
 
-	"cloud.google.com/cloudsqlconn/internal/mock"
+	"cloud.google.com/go/cloudsqlconn/internal/mock"
 	"google.golang.org/api/option"
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
diff --git a/internal/mock/doc.go b/internal/mock/doc.go
new file mode 100644
index 00000000..30fafec4
--- /dev/null
+++ b/internal/mock/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2021 Google LLC
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     https://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package mock provides a number of test utilities to mock Cloud SQL backend
+// components.
+package mock // import "cloud.google.com/go/cloudsqlconn/internal/mock"
diff --git a/options.go b/options.go
index e4a4d34f..044c58f3 100644
--- a/options.go
+++ b/options.go
@@ -18,7 +18,7 @@ import (
 	"crypto/rsa"
 	"time"
 
-	"cloud.google.com/cloudsqlconn/internal/cloudsql"
+	"cloud.google.com/go/cloudsqlconn/internal/cloudsql"
 	"golang.org/x/oauth2"
 	apiopt "google.golang.org/api/option"
 )