diff --git a/go/gcexportdata/gcexportdata.go b/go/gcexportdata/gcexportdata.go
index 42adb8f697..620446207e 100644
--- a/go/gcexportdata/gcexportdata.go
+++ b/go/gcexportdata/gcexportdata.go
@@ -30,7 +30,7 @@ import (
 	"io/ioutil"
 	"os/exec"
 
-	"golang.org/x/tools/go/internal/gcimporter"
+	"golang.org/x/tools/internal/gcimporter"
 )
 
 // Find returns the name of an object (.o) or archive (.a) file
diff --git a/go/internal/gcimporter/bexport.go b/internal/gcimporter/bexport.go
similarity index 100%
rename from go/internal/gcimporter/bexport.go
rename to internal/gcimporter/bexport.go
diff --git a/go/internal/gcimporter/bexport_test.go b/internal/gcimporter/bexport_test.go
similarity index 99%
rename from go/internal/gcimporter/bexport_test.go
rename to internal/gcimporter/bexport_test.go
index 3da5397eb5..93ee3cd21a 100644
--- a/go/internal/gcimporter/bexport_test.go
+++ b/internal/gcimporter/bexport_test.go
@@ -21,8 +21,8 @@ import (
 
 	"golang.org/x/tools/go/ast/inspector"
 	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/internal/gcimporter"
 	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/internal/gcimporter"
 	"golang.org/x/tools/internal/typeparams"
 	"golang.org/x/tools/internal/typeparams/genericfeatures"
 )
diff --git a/go/internal/gcimporter/bimport.go b/internal/gcimporter/bimport.go
similarity index 100%
rename from go/internal/gcimporter/bimport.go
rename to internal/gcimporter/bimport.go
diff --git a/go/internal/gcimporter/exportdata.go b/internal/gcimporter/exportdata.go
similarity index 100%
rename from go/internal/gcimporter/exportdata.go
rename to internal/gcimporter/exportdata.go
diff --git a/go/internal/gcimporter/gcimporter.go b/internal/gcimporter/gcimporter.go
similarity index 99%
rename from go/internal/gcimporter/gcimporter.go
rename to internal/gcimporter/gcimporter.go
index 85a801c6a3..f8369cdc52 100644
--- a/go/internal/gcimporter/gcimporter.go
+++ b/internal/gcimporter/gcimporter.go
@@ -9,7 +9,7 @@
 // Package gcimporter provides various functions for reading
 // gc-generated object files that can be used to implement the
 // Importer interface defined by the Go 1.5 standard library package.
-package gcimporter // import "golang.org/x/tools/go/internal/gcimporter"
+package gcimporter // import "golang.org/x/tools/internal/gcimporter"
 
 import (
 	"bufio"
diff --git a/go/internal/gcimporter/gcimporter_test.go b/internal/gcimporter/gcimporter_test.go
similarity index 100%
rename from go/internal/gcimporter/gcimporter_test.go
rename to internal/gcimporter/gcimporter_test.go
diff --git a/go/internal/gcimporter/iexport.go b/internal/gcimporter/iexport.go
similarity index 100%
rename from go/internal/gcimporter/iexport.go
rename to internal/gcimporter/iexport.go
diff --git a/go/internal/gcimporter/iexport_common_test.go b/internal/gcimporter/iexport_common_test.go
similarity index 100%
rename from go/internal/gcimporter/iexport_common_test.go
rename to internal/gcimporter/iexport_common_test.go
diff --git a/go/internal/gcimporter/iexport_go118_test.go b/internal/gcimporter/iexport_go118_test.go
similarity index 99%
rename from go/internal/gcimporter/iexport_go118_test.go
rename to internal/gcimporter/iexport_go118_test.go
index 5dfa2580f6..27ba8cec5a 100644
--- a/go/internal/gcimporter/iexport_go118_test.go
+++ b/internal/gcimporter/iexport_go118_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"golang.org/x/tools/go/internal/gcimporter"
+	"golang.org/x/tools/internal/gcimporter"
 )
 
 // TODO(rfindley): migrate this to testdata, as has been done in the standard library.
diff --git a/go/internal/gcimporter/iexport_test.go b/internal/gcimporter/iexport_test.go
similarity index 99%
rename from go/internal/gcimporter/iexport_test.go
rename to internal/gcimporter/iexport_test.go
index 899c9af7a4..702528aef3 100644
--- a/go/internal/gcimporter/iexport_test.go
+++ b/internal/gcimporter/iexport_test.go
@@ -31,8 +31,8 @@ import (
 	"golang.org/x/tools/go/ast/inspector"
 	"golang.org/x/tools/go/buildutil"
 	"golang.org/x/tools/go/gcexportdata"
-	"golang.org/x/tools/go/internal/gcimporter"
 	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/internal/gcimporter"
 	"golang.org/x/tools/internal/typeparams/genericfeatures"
 )
 
diff --git a/go/internal/gcimporter/iimport.go b/internal/gcimporter/iimport.go
similarity index 100%
rename from go/internal/gcimporter/iimport.go
rename to internal/gcimporter/iimport.go
diff --git a/go/internal/gcimporter/israce_test.go b/internal/gcimporter/israce_test.go
similarity index 100%
rename from go/internal/gcimporter/israce_test.go
rename to internal/gcimporter/israce_test.go
diff --git a/go/internal/gcimporter/newInterface10.go b/internal/gcimporter/newInterface10.go
similarity index 100%
rename from go/internal/gcimporter/newInterface10.go
rename to internal/gcimporter/newInterface10.go
diff --git a/go/internal/gcimporter/newInterface11.go b/internal/gcimporter/newInterface11.go
similarity index 100%
rename from go/internal/gcimporter/newInterface11.go
rename to internal/gcimporter/newInterface11.go
diff --git a/go/internal/gcimporter/stdlib_test.go b/internal/gcimporter/stdlib_test.go
similarity index 100%
rename from go/internal/gcimporter/stdlib_test.go
rename to internal/gcimporter/stdlib_test.go
diff --git a/go/internal/gcimporter/support_go117.go b/internal/gcimporter/support_go117.go
similarity index 100%
rename from go/internal/gcimporter/support_go117.go
rename to internal/gcimporter/support_go117.go
diff --git a/go/internal/gcimporter/support_go118.go b/internal/gcimporter/support_go118.go
similarity index 100%
rename from go/internal/gcimporter/support_go118.go
rename to internal/gcimporter/support_go118.go
diff --git a/go/internal/gcimporter/testdata/a.go b/internal/gcimporter/testdata/a.go
similarity index 100%
rename from go/internal/gcimporter/testdata/a.go
rename to internal/gcimporter/testdata/a.go
diff --git a/go/internal/gcimporter/testdata/b.go b/internal/gcimporter/testdata/b.go
similarity index 100%
rename from go/internal/gcimporter/testdata/b.go
rename to internal/gcimporter/testdata/b.go
diff --git a/go/internal/gcimporter/testdata/exports.go b/internal/gcimporter/testdata/exports.go
similarity index 100%
rename from go/internal/gcimporter/testdata/exports.go
rename to internal/gcimporter/testdata/exports.go
diff --git a/go/internal/gcimporter/testdata/issue15920.go b/internal/gcimporter/testdata/issue15920.go
similarity index 100%
rename from go/internal/gcimporter/testdata/issue15920.go
rename to internal/gcimporter/testdata/issue15920.go
diff --git a/go/internal/gcimporter/testdata/issue20046.go b/internal/gcimporter/testdata/issue20046.go
similarity index 100%
rename from go/internal/gcimporter/testdata/issue20046.go
rename to internal/gcimporter/testdata/issue20046.go
diff --git a/go/internal/gcimporter/testdata/issue25301.go b/internal/gcimporter/testdata/issue25301.go
similarity index 100%
rename from go/internal/gcimporter/testdata/issue25301.go
rename to internal/gcimporter/testdata/issue25301.go
diff --git a/go/internal/gcimporter/testdata/issue51836/a.go b/internal/gcimporter/testdata/issue51836/a.go
similarity index 100%
rename from go/internal/gcimporter/testdata/issue51836/a.go
rename to internal/gcimporter/testdata/issue51836/a.go
diff --git a/go/internal/gcimporter/testdata/issue51836/aa.go b/internal/gcimporter/testdata/issue51836/aa.go
similarity index 100%
rename from go/internal/gcimporter/testdata/issue51836/aa.go
rename to internal/gcimporter/testdata/issue51836/aa.go
diff --git a/go/internal/gcimporter/testdata/p.go b/internal/gcimporter/testdata/p.go
similarity index 100%
rename from go/internal/gcimporter/testdata/p.go
rename to internal/gcimporter/testdata/p.go
diff --git a/go/internal/gcimporter/testdata/versions/test.go b/internal/gcimporter/testdata/versions/test.go
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test.go
rename to internal/gcimporter/testdata/versions/test.go
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.11_0i.a b/internal/gcimporter/testdata/versions/test_go1.11_0i.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.11_0i.a
rename to internal/gcimporter/testdata/versions/test_go1.11_0i.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.11_6b.a b/internal/gcimporter/testdata/versions/test_go1.11_6b.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.11_6b.a
rename to internal/gcimporter/testdata/versions/test_go1.11_6b.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.11_999b.a b/internal/gcimporter/testdata/versions/test_go1.11_999b.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.11_999b.a
rename to internal/gcimporter/testdata/versions/test_go1.11_999b.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.11_999i.a b/internal/gcimporter/testdata/versions/test_go1.11_999i.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.11_999i.a
rename to internal/gcimporter/testdata/versions/test_go1.11_999i.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.7_0.a b/internal/gcimporter/testdata/versions/test_go1.7_0.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.7_0.a
rename to internal/gcimporter/testdata/versions/test_go1.7_0.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.7_1.a b/internal/gcimporter/testdata/versions/test_go1.7_1.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.7_1.a
rename to internal/gcimporter/testdata/versions/test_go1.7_1.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.8_4.a b/internal/gcimporter/testdata/versions/test_go1.8_4.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.8_4.a
rename to internal/gcimporter/testdata/versions/test_go1.8_4.a
diff --git a/go/internal/gcimporter/testdata/versions/test_go1.8_5.a b/internal/gcimporter/testdata/versions/test_go1.8_5.a
similarity index 100%
rename from go/internal/gcimporter/testdata/versions/test_go1.8_5.a
rename to internal/gcimporter/testdata/versions/test_go1.8_5.a
diff --git a/go/internal/gcimporter/unified_no.go b/internal/gcimporter/unified_no.go
similarity index 100%
rename from go/internal/gcimporter/unified_no.go
rename to internal/gcimporter/unified_no.go
diff --git a/go/internal/gcimporter/unified_yes.go b/internal/gcimporter/unified_yes.go
similarity index 100%
rename from go/internal/gcimporter/unified_yes.go
rename to internal/gcimporter/unified_yes.go
diff --git a/go/internal/gcimporter/ureader_no.go b/internal/gcimporter/ureader_no.go
similarity index 100%
rename from go/internal/gcimporter/ureader_no.go
rename to internal/gcimporter/ureader_no.go
diff --git a/go/internal/gcimporter/ureader_yes.go b/internal/gcimporter/ureader_yes.go
similarity index 99%
rename from go/internal/gcimporter/ureader_yes.go
rename to internal/gcimporter/ureader_yes.go
index e8dff0d853..e09053bd37 100644
--- a/go/internal/gcimporter/ureader_yes.go
+++ b/internal/gcimporter/ureader_yes.go
@@ -14,7 +14,7 @@ import (
 	"go/types"
 	"strings"
 
-	"golang.org/x/tools/go/internal/pkgbits"
+	"golang.org/x/tools/internal/pkgbits"
 )
 
 // A pkgReader holds the shared state for reading a unified IR package
diff --git a/go/internal/pkgbits/codes.go b/internal/pkgbits/codes.go
similarity index 100%
rename from go/internal/pkgbits/codes.go
rename to internal/pkgbits/codes.go
diff --git a/go/internal/pkgbits/decoder.go b/internal/pkgbits/decoder.go
similarity index 100%
rename from go/internal/pkgbits/decoder.go
rename to internal/pkgbits/decoder.go
diff --git a/go/internal/pkgbits/doc.go b/internal/pkgbits/doc.go
similarity index 100%
rename from go/internal/pkgbits/doc.go
rename to internal/pkgbits/doc.go
diff --git a/go/internal/pkgbits/encoder.go b/internal/pkgbits/encoder.go
similarity index 100%
rename from go/internal/pkgbits/encoder.go
rename to internal/pkgbits/encoder.go
diff --git a/go/internal/pkgbits/flags.go b/internal/pkgbits/flags.go
similarity index 100%
rename from go/internal/pkgbits/flags.go
rename to internal/pkgbits/flags.go
diff --git a/go/internal/pkgbits/frames_go1.go b/internal/pkgbits/frames_go1.go
similarity index 100%
rename from go/internal/pkgbits/frames_go1.go
rename to internal/pkgbits/frames_go1.go
diff --git a/go/internal/pkgbits/frames_go17.go b/internal/pkgbits/frames_go17.go
similarity index 100%
rename from go/internal/pkgbits/frames_go17.go
rename to internal/pkgbits/frames_go17.go
diff --git a/go/internal/pkgbits/reloc.go b/internal/pkgbits/reloc.go
similarity index 100%
rename from go/internal/pkgbits/reloc.go
rename to internal/pkgbits/reloc.go
diff --git a/go/internal/pkgbits/support.go b/internal/pkgbits/support.go
similarity index 100%
rename from go/internal/pkgbits/support.go
rename to internal/pkgbits/support.go
diff --git a/go/internal/pkgbits/sync.go b/internal/pkgbits/sync.go
similarity index 100%
rename from go/internal/pkgbits/sync.go
rename to internal/pkgbits/sync.go
diff --git a/go/internal/pkgbits/syncmarker_string.go b/internal/pkgbits/syncmarker_string.go
similarity index 100%
rename from go/internal/pkgbits/syncmarker_string.go
rename to internal/pkgbits/syncmarker_string.go