diff --git a/gopls/internal/analysis/fillreturns/fillreturns.go b/gopls/internal/analysis/fillreturns/fillreturns.go
index cc584a7..5e18c1c 100644
--- a/gopls/internal/analysis/fillreturns/fillreturns.go
+++ b/gopls/internal/analysis/fillreturns/fillreturns.go
@@ -16,8 +16,8 @@
 
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 	"golang.org/x/tools/internal/analysisinternal"
-	"golang.org/x/tools/internal/fuzzy"
 )
 
 //go:embed doc.go
diff --git a/gopls/internal/analysis/fillstruct/fillstruct.go b/gopls/internal/analysis/fillstruct/fillstruct.go
index 55f2cec..1428b84 100644
--- a/gopls/internal/analysis/fillstruct/fillstruct.go
+++ b/gopls/internal/analysis/fillstruct/fillstruct.go
@@ -24,10 +24,10 @@
 
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 	"golang.org/x/tools/gopls/internal/util/safetoken"
 	"golang.org/x/tools/internal/aliases"
 	"golang.org/x/tools/internal/analysisinternal"
-	"golang.org/x/tools/internal/fuzzy"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/internal/fuzzy/input.go b/gopls/internal/fuzzy/input.go
similarity index 100%
rename from internal/fuzzy/input.go
rename to gopls/internal/fuzzy/input.go
diff --git a/internal/fuzzy/input_test.go b/gopls/internal/fuzzy/input_test.go
similarity index 98%
rename from internal/fuzzy/input_test.go
rename to gopls/internal/fuzzy/input_test.go
index 64f66e3..4f32393 100644
--- a/internal/fuzzy/input_test.go
+++ b/gopls/internal/fuzzy/input_test.go
@@ -9,7 +9,7 @@
 	"sort"
 	"testing"
 
-	"golang.org/x/tools/internal/fuzzy"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 )
 
 var rolesTests = []struct {
diff --git a/internal/fuzzy/matcher.go b/gopls/internal/fuzzy/matcher.go
similarity index 100%
rename from internal/fuzzy/matcher.go
rename to gopls/internal/fuzzy/matcher.go
diff --git a/internal/fuzzy/matcher_test.go b/gopls/internal/fuzzy/matcher_test.go
similarity index 99%
rename from internal/fuzzy/matcher_test.go
rename to gopls/internal/fuzzy/matcher_test.go
index 2a1b937..056da25 100644
--- a/internal/fuzzy/matcher_test.go
+++ b/gopls/internal/fuzzy/matcher_test.go
@@ -13,7 +13,7 @@
 	"math"
 	"testing"
 
-	"golang.org/x/tools/internal/fuzzy"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 )
 
 type comparator struct {
diff --git a/internal/fuzzy/self_test.go b/gopls/internal/fuzzy/self_test.go
similarity index 94%
rename from internal/fuzzy/self_test.go
rename to gopls/internal/fuzzy/self_test.go
index fae0aea..1c64f19 100644
--- a/internal/fuzzy/self_test.go
+++ b/gopls/internal/fuzzy/self_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	. "golang.org/x/tools/internal/fuzzy"
+	. "golang.org/x/tools/gopls/internal/fuzzy"
 )
 
 func BenchmarkSelf_Matcher(b *testing.B) {
diff --git a/internal/fuzzy/symbol.go b/gopls/internal/fuzzy/symbol.go
similarity index 100%
rename from internal/fuzzy/symbol.go
rename to gopls/internal/fuzzy/symbol.go
diff --git a/internal/fuzzy/symbol_test.go b/gopls/internal/fuzzy/symbol_test.go
similarity index 98%
rename from internal/fuzzy/symbol_test.go
rename to gopls/internal/fuzzy/symbol_test.go
index 43e629d..7204aa6 100644
--- a/internal/fuzzy/symbol_test.go
+++ b/gopls/internal/fuzzy/symbol_test.go
@@ -11,7 +11,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/packages"
-	. "golang.org/x/tools/internal/fuzzy"
+	. "golang.org/x/tools/gopls/internal/fuzzy"
 )
 
 func TestSymbolMatchIndex(t *testing.T) {
diff --git a/gopls/internal/golang/completion/completion.go b/gopls/internal/golang/completion/completion.go
index cc235ce..5e42b72 100644
--- a/gopls/internal/golang/completion/completion.go
+++ b/gopls/internal/golang/completion/completion.go
@@ -32,6 +32,7 @@
 	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/file"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 	"golang.org/x/tools/gopls/internal/golang"
 	"golang.org/x/tools/gopls/internal/golang/completion/snippet"
 	"golang.org/x/tools/gopls/internal/protocol"
@@ -42,7 +43,6 @@
 	"golang.org/x/tools/gopls/internal/util/typesutil"
 	"golang.org/x/tools/internal/aliases"
 	"golang.org/x/tools/internal/event"
-	"golang.org/x/tools/internal/fuzzy"
 	"golang.org/x/tools/internal/imports"
 	"golang.org/x/tools/internal/stdlib"
 	"golang.org/x/tools/internal/typeparams"
diff --git a/gopls/internal/golang/completion/package.go b/gopls/internal/golang/completion/package.go
index 12d4ff0..ba9ddc2 100644
--- a/gopls/internal/golang/completion/package.go
+++ b/gopls/internal/golang/completion/package.go
@@ -21,10 +21,10 @@
 	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/file"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 	"golang.org/x/tools/gopls/internal/golang"
 	"golang.org/x/tools/gopls/internal/protocol"
 	"golang.org/x/tools/gopls/internal/util/safetoken"
-	"golang.org/x/tools/internal/fuzzy"
 )
 
 // packageClauseCompletions offers completions for a package declaration when
diff --git a/gopls/internal/golang/workspace_symbol.go b/gopls/internal/golang/workspace_symbol.go
index 4ab5a21..c80174c 100644
--- a/gopls/internal/golang/workspace_symbol.go
+++ b/gopls/internal/golang/workspace_symbol.go
@@ -15,10 +15,10 @@
 
 	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/fuzzy"
 	"golang.org/x/tools/gopls/internal/protocol"
 	"golang.org/x/tools/gopls/internal/settings"
 	"golang.org/x/tools/internal/event"
-	"golang.org/x/tools/internal/fuzzy"
 )
 
 // maxSymbols defines the maximum number of symbol results that should ever be