diff --git a/gopls/internal/lsp/analysis/deprecated/deprecated.go b/gopls/internal/analysis/deprecated/deprecated.go
similarity index 100%
rename from gopls/internal/lsp/analysis/deprecated/deprecated.go
rename to gopls/internal/analysis/deprecated/deprecated.go
diff --git a/gopls/internal/lsp/analysis/deprecated/deprecated_test.go b/gopls/internal/analysis/deprecated/deprecated_test.go
similarity index 100%
rename from gopls/internal/lsp/analysis/deprecated/deprecated_test.go
rename to gopls/internal/analysis/deprecated/deprecated_test.go
diff --git a/gopls/internal/lsp/analysis/deprecated/testdata/src/a/a.go b/gopls/internal/analysis/deprecated/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/deprecated/testdata/src/a/a.go
rename to gopls/internal/analysis/deprecated/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/deprecated/testdata/src/a/a_test.go b/gopls/internal/analysis/deprecated/testdata/src/a/a_test.go
similarity index 100%
rename from gopls/internal/lsp/analysis/deprecated/testdata/src/a/a_test.go
rename to gopls/internal/analysis/deprecated/testdata/src/a/a_test.go
diff --git a/gopls/internal/lsp/analysis/embeddirective/embeddirective.go b/gopls/internal/analysis/embeddirective/embeddirective.go
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/embeddirective.go
rename to gopls/internal/analysis/embeddirective/embeddirective.go
diff --git a/gopls/internal/lsp/analysis/embeddirective/embeddirective_test.go b/gopls/internal/analysis/embeddirective/embeddirective_test.go
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/embeddirective_test.go
rename to gopls/internal/analysis/embeddirective/embeddirective_test.go
diff --git a/gopls/internal/lsp/analysis/embeddirective/testdata/src/a/embedText b/gopls/internal/analysis/embeddirective/testdata/src/a/embedText
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/testdata/src/a/embedText
rename to gopls/internal/analysis/embeddirective/testdata/src/a/embedText
diff --git a/gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_missing.go b/gopls/internal/analysis/embeddirective/testdata/src/a/import_missing.go
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_missing.go
rename to gopls/internal/analysis/embeddirective/testdata/src/a/import_missing.go
diff --git a/gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_present.go b/gopls/internal/analysis/embeddirective/testdata/src/a/import_present.go
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_present.go
rename to gopls/internal/analysis/embeddirective/testdata/src/a/import_present.go
diff --git a/gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_present_go120.go b/gopls/internal/analysis/embeddirective/testdata/src/a/import_present_go120.go
similarity index 100%
rename from gopls/internal/lsp/analysis/embeddirective/testdata/src/a/import_present_go120.go
rename to gopls/internal/analysis/embeddirective/testdata/src/a/import_present_go120.go
diff --git a/gopls/internal/lsp/analysis/fillreturns/fillreturns.go b/gopls/internal/analysis/fillreturns/fillreturns.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillreturns/fillreturns.go
rename to gopls/internal/analysis/fillreturns/fillreturns.go
diff --git a/gopls/internal/lsp/analysis/fillreturns/fillreturns_test.go b/gopls/internal/analysis/fillreturns/fillreturns_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/fillreturns/fillreturns_test.go
rename to gopls/internal/analysis/fillreturns/fillreturns_test.go
index 1f76275..e57b4b9 100644
--- a/gopls/internal/lsp/analysis/fillreturns/fillreturns_test.go
+++ b/gopls/internal/analysis/fillreturns/fillreturns_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillreturns"
+	"golang.org/x/tools/gopls/internal/analysis/fillreturns"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/fillreturns/testdata/src/a/a.go b/gopls/internal/analysis/fillreturns/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillreturns/testdata/src/a/a.go
rename to gopls/internal/analysis/fillreturns/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/fillreturns/testdata/src/a/a.go.golden b/gopls/internal/analysis/fillreturns/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/fillreturns/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/fillreturns/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/fillreturns/testdata/src/a/typeparams/a.go b/gopls/internal/analysis/fillreturns/testdata/src/a/typeparams/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillreturns/testdata/src/a/typeparams/a.go
rename to gopls/internal/analysis/fillreturns/testdata/src/a/typeparams/a.go
diff --git a/gopls/internal/lsp/analysis/fillreturns/testdata/src/a/typeparams/a.go.golden b/gopls/internal/analysis/fillreturns/testdata/src/a/typeparams/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/fillreturns/testdata/src/a/typeparams/a.go.golden
rename to gopls/internal/analysis/fillreturns/testdata/src/a/typeparams/a.go.golden
diff --git a/gopls/internal/lsp/analysis/fillstruct/fillstruct.go b/gopls/internal/analysis/fillstruct/fillstruct.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillstruct/fillstruct.go
rename to gopls/internal/analysis/fillstruct/fillstruct.go
diff --git a/gopls/internal/lsp/analysis/fillstruct/fillstruct_test.go b/gopls/internal/analysis/fillstruct/fillstruct_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/fillstruct/fillstruct_test.go
rename to gopls/internal/analysis/fillstruct/fillstruct_test.go
index 66642b7..3b1f8fd 100644
--- a/gopls/internal/lsp/analysis/fillstruct/fillstruct_test.go
+++ b/gopls/internal/analysis/fillstruct/fillstruct_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
+	"golang.org/x/tools/gopls/internal/analysis/fillstruct"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/fillstruct/testdata/src/a/a.go b/gopls/internal/analysis/fillstruct/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillstruct/testdata/src/a/a.go
rename to gopls/internal/analysis/fillstruct/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/fillstruct/testdata/src/b/b.go b/gopls/internal/analysis/fillstruct/testdata/src/b/b.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillstruct/testdata/src/b/b.go
rename to gopls/internal/analysis/fillstruct/testdata/src/b/b.go
diff --git a/gopls/internal/lsp/analysis/fillstruct/testdata/src/typeparams/typeparams.go b/gopls/internal/analysis/fillstruct/testdata/src/typeparams/typeparams.go
similarity index 100%
rename from gopls/internal/lsp/analysis/fillstruct/testdata/src/typeparams/typeparams.go
rename to gopls/internal/analysis/fillstruct/testdata/src/typeparams/typeparams.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/infertypeargs.go b/gopls/internal/analysis/infertypeargs/infertypeargs.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/infertypeargs.go
rename to gopls/internal/analysis/infertypeargs/infertypeargs.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/infertypeargs_test.go b/gopls/internal/analysis/infertypeargs/infertypeargs_test.go
similarity index 88%
rename from gopls/internal/lsp/analysis/infertypeargs/infertypeargs_test.go
rename to gopls/internal/analysis/infertypeargs/infertypeargs_test.go
index 70855e1..7d3900f 100644
--- a/gopls/internal/lsp/analysis/infertypeargs/infertypeargs_test.go
+++ b/gopls/internal/analysis/infertypeargs/infertypeargs_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/infertypeargs"
+	"golang.org/x/tools/gopls/internal/analysis/infertypeargs"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/infertypeargs/run_go117.go b/gopls/internal/analysis/infertypeargs/run_go117.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/run_go117.go
rename to gopls/internal/analysis/infertypeargs/run_go117.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/run_go118.go b/gopls/internal/analysis/infertypeargs/run_go118.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/run_go118.go
rename to gopls/internal/analysis/infertypeargs/run_go118.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/basic.go b/gopls/internal/analysis/infertypeargs/testdata/src/a/basic.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/basic.go
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/basic.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/basic.go.golden b/gopls/internal/analysis/infertypeargs/testdata/src/a/basic.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/basic.go.golden
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/basic.go.golden
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported.go b/gopls/internal/analysis/infertypeargs/testdata/src/a/imported.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported.go
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/imported.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported.go.golden b/gopls/internal/analysis/infertypeargs/testdata/src/a/imported.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported.go.golden
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/imported.go.golden
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported/imported.go b/gopls/internal/analysis/infertypeargs/testdata/src/a/imported/imported.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/imported/imported.go
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/imported/imported.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/notypechange.go b/gopls/internal/analysis/infertypeargs/testdata/src/a/notypechange.go
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/notypechange.go
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/notypechange.go
diff --git a/gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/notypechange.go.golden b/gopls/internal/analysis/infertypeargs/testdata/src/a/notypechange.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/infertypeargs/testdata/src/a/notypechange.go.golden
rename to gopls/internal/analysis/infertypeargs/testdata/src/a/notypechange.go.golden
diff --git a/gopls/internal/lsp/analysis/nonewvars/nonewvars.go b/gopls/internal/analysis/nonewvars/nonewvars.go
similarity index 100%
rename from gopls/internal/lsp/analysis/nonewvars/nonewvars.go
rename to gopls/internal/analysis/nonewvars/nonewvars.go
diff --git a/gopls/internal/lsp/analysis/nonewvars/nonewvars_test.go b/gopls/internal/analysis/nonewvars/nonewvars_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/nonewvars/nonewvars_test.go
rename to gopls/internal/analysis/nonewvars/nonewvars_test.go
index 8f6f0a5..a8af6c4 100644
--- a/gopls/internal/lsp/analysis/nonewvars/nonewvars_test.go
+++ b/gopls/internal/analysis/nonewvars/nonewvars_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/nonewvars"
+	"golang.org/x/tools/gopls/internal/analysis/nonewvars"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/nonewvars/testdata/src/a/a.go b/gopls/internal/analysis/nonewvars/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/nonewvars/testdata/src/a/a.go
rename to gopls/internal/analysis/nonewvars/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/nonewvars/testdata/src/a/a.go.golden b/gopls/internal/analysis/nonewvars/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/nonewvars/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/nonewvars/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/nonewvars/testdata/src/typeparams/a.go b/gopls/internal/analysis/nonewvars/testdata/src/typeparams/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/nonewvars/testdata/src/typeparams/a.go
rename to gopls/internal/analysis/nonewvars/testdata/src/typeparams/a.go
diff --git a/gopls/internal/lsp/analysis/nonewvars/testdata/src/typeparams/a.go.golden b/gopls/internal/analysis/nonewvars/testdata/src/typeparams/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/nonewvars/testdata/src/typeparams/a.go.golden
rename to gopls/internal/analysis/nonewvars/testdata/src/typeparams/a.go.golden
diff --git a/gopls/internal/lsp/analysis/noresultvalues/noresultvalues.go b/gopls/internal/analysis/noresultvalues/noresultvalues.go
similarity index 100%
rename from gopls/internal/lsp/analysis/noresultvalues/noresultvalues.go
rename to gopls/internal/analysis/noresultvalues/noresultvalues.go
diff --git a/gopls/internal/lsp/analysis/noresultvalues/noresultvalues_test.go b/gopls/internal/analysis/noresultvalues/noresultvalues_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/noresultvalues/noresultvalues_test.go
rename to gopls/internal/analysis/noresultvalues/noresultvalues_test.go
index 24ce392..b7ced5d 100644
--- a/gopls/internal/lsp/analysis/noresultvalues/noresultvalues_test.go
+++ b/gopls/internal/analysis/noresultvalues/noresultvalues_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/noresultvalues"
+	"golang.org/x/tools/gopls/internal/analysis/noresultvalues"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/noresultvalues/testdata/src/a/a.go b/gopls/internal/analysis/noresultvalues/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/noresultvalues/testdata/src/a/a.go
rename to gopls/internal/analysis/noresultvalues/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/noresultvalues/testdata/src/a/a.go.golden b/gopls/internal/analysis/noresultvalues/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/noresultvalues/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/noresultvalues/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/noresultvalues/testdata/src/typeparams/a.go b/gopls/internal/analysis/noresultvalues/testdata/src/typeparams/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/noresultvalues/testdata/src/typeparams/a.go
rename to gopls/internal/analysis/noresultvalues/testdata/src/typeparams/a.go
diff --git a/gopls/internal/lsp/analysis/noresultvalues/testdata/src/typeparams/a.go.golden b/gopls/internal/analysis/noresultvalues/testdata/src/typeparams/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/noresultvalues/testdata/src/typeparams/a.go.golden
rename to gopls/internal/analysis/noresultvalues/testdata/src/typeparams/a.go.golden
diff --git a/gopls/internal/lsp/analysis/simplifycompositelit/simplifycompositelit.go b/gopls/internal/analysis/simplifycompositelit/simplifycompositelit.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifycompositelit/simplifycompositelit.go
rename to gopls/internal/analysis/simplifycompositelit/simplifycompositelit.go
diff --git a/gopls/internal/lsp/analysis/simplifycompositelit/simplifycompositelit_test.go b/gopls/internal/analysis/simplifycompositelit/simplifycompositelit_test.go
similarity index 85%
rename from gopls/internal/lsp/analysis/simplifycompositelit/simplifycompositelit_test.go
rename to gopls/internal/analysis/simplifycompositelit/simplifycompositelit_test.go
index b0365a6..a355616 100644
--- a/gopls/internal/lsp/analysis/simplifycompositelit/simplifycompositelit_test.go
+++ b/gopls/internal/analysis/simplifycompositelit/simplifycompositelit_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifycompositelit"
+	"golang.org/x/tools/gopls/internal/analysis/simplifycompositelit"
 )
 
 func Test(t *testing.T) {
diff --git a/gopls/internal/lsp/analysis/simplifycompositelit/testdata/src/a/a.go b/gopls/internal/analysis/simplifycompositelit/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifycompositelit/testdata/src/a/a.go
rename to gopls/internal/analysis/simplifycompositelit/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/simplifycompositelit/testdata/src/a/a.go.golden b/gopls/internal/analysis/simplifycompositelit/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifycompositelit/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/simplifycompositelit/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/simplifyrange/simplifyrange.go b/gopls/internal/analysis/simplifyrange/simplifyrange.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyrange/simplifyrange.go
rename to gopls/internal/analysis/simplifyrange/simplifyrange.go
diff --git a/gopls/internal/lsp/analysis/simplifyrange/simplifyrange_test.go b/gopls/internal/analysis/simplifyrange/simplifyrange_test.go
similarity index 86%
rename from gopls/internal/lsp/analysis/simplifyrange/simplifyrange_test.go
rename to gopls/internal/analysis/simplifyrange/simplifyrange_test.go
index fbd57ec..fab1bd5 100644
--- a/gopls/internal/lsp/analysis/simplifyrange/simplifyrange_test.go
+++ b/gopls/internal/analysis/simplifyrange/simplifyrange_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyrange"
+	"golang.org/x/tools/gopls/internal/analysis/simplifyrange"
 )
 
 func Test(t *testing.T) {
diff --git a/gopls/internal/lsp/analysis/simplifyrange/testdata/src/a/a.go b/gopls/internal/analysis/simplifyrange/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyrange/testdata/src/a/a.go
rename to gopls/internal/analysis/simplifyrange/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/simplifyrange/testdata/src/a/a.go.golden b/gopls/internal/analysis/simplifyrange/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyrange/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/simplifyrange/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/simplifyslice/simplifyslice.go b/gopls/internal/analysis/simplifyslice/simplifyslice.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyslice/simplifyslice.go
rename to gopls/internal/analysis/simplifyslice/simplifyslice.go
diff --git a/gopls/internal/lsp/analysis/simplifyslice/simplifyslice_test.go b/gopls/internal/analysis/simplifyslice/simplifyslice_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/simplifyslice/simplifyslice_test.go
rename to gopls/internal/analysis/simplifyslice/simplifyslice_test.go
index 41914ba..dd70b8b 100644
--- a/gopls/internal/lsp/analysis/simplifyslice/simplifyslice_test.go
+++ b/gopls/internal/analysis/simplifyslice/simplifyslice_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyslice"
+	"golang.org/x/tools/gopls/internal/analysis/simplifyslice"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/simplifyslice/testdata/src/a/a.go b/gopls/internal/analysis/simplifyslice/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyslice/testdata/src/a/a.go
rename to gopls/internal/analysis/simplifyslice/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/simplifyslice/testdata/src/a/a.go.golden b/gopls/internal/analysis/simplifyslice/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyslice/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/simplifyslice/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/simplifyslice/testdata/src/typeparams/typeparams.go b/gopls/internal/analysis/simplifyslice/testdata/src/typeparams/typeparams.go
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyslice/testdata/src/typeparams/typeparams.go
rename to gopls/internal/analysis/simplifyslice/testdata/src/typeparams/typeparams.go
diff --git a/gopls/internal/lsp/analysis/simplifyslice/testdata/src/typeparams/typeparams.go.golden b/gopls/internal/analysis/simplifyslice/testdata/src/typeparams/typeparams.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/simplifyslice/testdata/src/typeparams/typeparams.go.golden
rename to gopls/internal/analysis/simplifyslice/testdata/src/typeparams/typeparams.go.golden
diff --git a/gopls/internal/lsp/analysis/stubmethods/stubmethods.go b/gopls/internal/analysis/stubmethods/stubmethods.go
similarity index 100%
rename from gopls/internal/lsp/analysis/stubmethods/stubmethods.go
rename to gopls/internal/analysis/stubmethods/stubmethods.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/a.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/a.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/channels.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/channels.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/channels.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/channels.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/consecutive_params.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/consecutive_params.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/consecutive_params.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/consecutive_params.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/error_param.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/error_param.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/error_param.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/error_param.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/literals.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/literals.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/literals.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/literals.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/operation.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/operation.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/operation.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/operation.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/selector.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/selector.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/selector.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/selector.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/slice.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/slice.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/slice.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/slice.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/tuple.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/tuple.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/tuple.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/tuple.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/unique_params.go b/gopls/internal/analysis/undeclaredname/testdata/src/a/unique_params.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/testdata/src/a/unique_params.go
rename to gopls/internal/analysis/undeclaredname/testdata/src/a/unique_params.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/undeclared.go b/gopls/internal/analysis/undeclaredname/undeclared.go
similarity index 100%
rename from gopls/internal/lsp/analysis/undeclaredname/undeclared.go
rename to gopls/internal/analysis/undeclaredname/undeclared.go
diff --git a/gopls/internal/lsp/analysis/undeclaredname/undeclared_test.go b/gopls/internal/analysis/undeclaredname/undeclared_test.go
similarity index 85%
rename from gopls/internal/lsp/analysis/undeclaredname/undeclared_test.go
rename to gopls/internal/analysis/undeclaredname/undeclared_test.go
index 306c3f0..ea3d724 100644
--- a/gopls/internal/lsp/analysis/undeclaredname/undeclared_test.go
+++ b/gopls/internal/analysis/undeclaredname/undeclared_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/undeclaredname"
+	"golang.org/x/tools/gopls/internal/analysis/undeclaredname"
 )
 
 func Test(t *testing.T) {
diff --git a/gopls/internal/lsp/analysis/unusedparams/cmd/main.go b/gopls/internal/analysis/unusedparams/cmd/main.go
similarity index 84%
rename from gopls/internal/lsp/analysis/unusedparams/cmd/main.go
rename to gopls/internal/analysis/unusedparams/cmd/main.go
index fafb126..2355e3c 100644
--- a/gopls/internal/lsp/analysis/unusedparams/cmd/main.go
+++ b/gopls/internal/analysis/unusedparams/cmd/main.go
@@ -7,7 +7,7 @@
 
 import (
 	"golang.org/x/tools/go/analysis/singlechecker"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/unusedparams"
+	"golang.org/x/tools/gopls/internal/analysis/unusedparams"
 )
 
 func main() { singlechecker.Main(unusedparams.Analyzer) }
diff --git a/gopls/internal/lsp/analysis/unusedparams/testdata/src/a/a.go b/gopls/internal/analysis/unusedparams/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedparams/testdata/src/a/a.go
rename to gopls/internal/analysis/unusedparams/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/unusedparams/testdata/src/a/a.go.golden b/gopls/internal/analysis/unusedparams/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedparams/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/unusedparams/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/unusedparams/testdata/src/typeparams/typeparams.go b/gopls/internal/analysis/unusedparams/testdata/src/typeparams/typeparams.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedparams/testdata/src/typeparams/typeparams.go
rename to gopls/internal/analysis/unusedparams/testdata/src/typeparams/typeparams.go
diff --git a/gopls/internal/lsp/analysis/unusedparams/testdata/src/typeparams/typeparams.go.golden b/gopls/internal/analysis/unusedparams/testdata/src/typeparams/typeparams.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedparams/testdata/src/typeparams/typeparams.go.golden
rename to gopls/internal/analysis/unusedparams/testdata/src/typeparams/typeparams.go.golden
diff --git a/gopls/internal/lsp/analysis/unusedparams/unusedparams.go b/gopls/internal/analysis/unusedparams/unusedparams.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedparams/unusedparams.go
rename to gopls/internal/analysis/unusedparams/unusedparams.go
diff --git a/gopls/internal/lsp/analysis/unusedparams/unusedparams_test.go b/gopls/internal/analysis/unusedparams/unusedparams_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/unusedparams/unusedparams_test.go
rename to gopls/internal/analysis/unusedparams/unusedparams_test.go
index fdd43b8..17c1516 100644
--- a/gopls/internal/lsp/analysis/unusedparams/unusedparams_test.go
+++ b/gopls/internal/analysis/unusedparams/unusedparams_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/unusedparams"
+	"golang.org/x/tools/gopls/internal/analysis/unusedparams"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/analysis/unusedvariable/testdata/src/assign/a.go b/gopls/internal/analysis/unusedvariable/testdata/src/assign/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedvariable/testdata/src/assign/a.go
rename to gopls/internal/analysis/unusedvariable/testdata/src/assign/a.go
diff --git a/gopls/internal/lsp/analysis/unusedvariable/testdata/src/assign/a.go.golden b/gopls/internal/analysis/unusedvariable/testdata/src/assign/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedvariable/testdata/src/assign/a.go.golden
rename to gopls/internal/analysis/unusedvariable/testdata/src/assign/a.go.golden
diff --git a/gopls/internal/lsp/analysis/unusedvariable/testdata/src/decl/a.go b/gopls/internal/analysis/unusedvariable/testdata/src/decl/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedvariable/testdata/src/decl/a.go
rename to gopls/internal/analysis/unusedvariable/testdata/src/decl/a.go
diff --git a/gopls/internal/lsp/analysis/unusedvariable/testdata/src/decl/a.go.golden b/gopls/internal/analysis/unusedvariable/testdata/src/decl/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedvariable/testdata/src/decl/a.go.golden
rename to gopls/internal/analysis/unusedvariable/testdata/src/decl/a.go.golden
diff --git a/gopls/internal/lsp/analysis/unusedvariable/unusedvariable.go b/gopls/internal/analysis/unusedvariable/unusedvariable.go
similarity index 100%
rename from gopls/internal/lsp/analysis/unusedvariable/unusedvariable.go
rename to gopls/internal/analysis/unusedvariable/unusedvariable.go
diff --git a/gopls/internal/lsp/analysis/unusedvariable/unusedvariable_test.go b/gopls/internal/analysis/unusedvariable/unusedvariable_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/unusedvariable/unusedvariable_test.go
rename to gopls/internal/analysis/unusedvariable/unusedvariable_test.go
index 0822315..5dcca00 100644
--- a/gopls/internal/lsp/analysis/unusedvariable/unusedvariable_test.go
+++ b/gopls/internal/analysis/unusedvariable/unusedvariable_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/unusedvariable"
+	"golang.org/x/tools/gopls/internal/analysis/unusedvariable"
 )
 
 func Test(t *testing.T) {
diff --git a/gopls/internal/lsp/analysis/useany/testdata/src/a/a.go b/gopls/internal/analysis/useany/testdata/src/a/a.go
similarity index 100%
rename from gopls/internal/lsp/analysis/useany/testdata/src/a/a.go
rename to gopls/internal/analysis/useany/testdata/src/a/a.go
diff --git a/gopls/internal/lsp/analysis/useany/testdata/src/a/a.go.golden b/gopls/internal/analysis/useany/testdata/src/a/a.go.golden
similarity index 100%
rename from gopls/internal/lsp/analysis/useany/testdata/src/a/a.go.golden
rename to gopls/internal/analysis/useany/testdata/src/a/a.go.golden
diff --git a/gopls/internal/lsp/analysis/useany/useany.go b/gopls/internal/analysis/useany/useany.go
similarity index 100%
rename from gopls/internal/lsp/analysis/useany/useany.go
rename to gopls/internal/analysis/useany/useany.go
diff --git a/gopls/internal/lsp/analysis/useany/useany_test.go b/gopls/internal/analysis/useany/useany_test.go
similarity index 89%
rename from gopls/internal/lsp/analysis/useany/useany_test.go
rename to gopls/internal/analysis/useany/useany_test.go
index 083c3d5..a8c505a 100644
--- a/gopls/internal/lsp/analysis/useany/useany_test.go
+++ b/gopls/internal/analysis/useany/useany_test.go
@@ -8,7 +8,7 @@
 	"testing"
 
 	"golang.org/x/tools/go/analysis/analysistest"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/useany"
+	"golang.org/x/tools/gopls/internal/analysis/useany"
 	"golang.org/x/tools/internal/typeparams"
 )
 
diff --git a/gopls/internal/lsp/cache/errors.go b/gopls/internal/lsp/cache/errors.go
index 1c7f290..24e0029 100644
--- a/gopls/internal/lsp/cache/errors.go
+++ b/gopls/internal/lsp/cache/errors.go
@@ -21,8 +21,8 @@
 	"strings"
 
 	"golang.org/x/tools/go/packages"
+	"golang.org/x/tools/gopls/internal/analysis/embeddirective"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/embeddirective"
 	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
diff --git a/gopls/internal/lsp/source/fix.go b/gopls/internal/lsp/source/fix.go
index 7f255e3..aad19b6 100644
--- a/gopls/internal/lsp/source/fix.go
+++ b/gopls/internal/lsp/source/fix.go
@@ -12,9 +12,9 @@
 	"go/types"
 
 	"golang.org/x/tools/go/analysis"
+	"golang.org/x/tools/gopls/internal/analysis/fillstruct"
+	"golang.org/x/tools/gopls/internal/analysis/undeclaredname"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/undeclaredname"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"
diff --git a/gopls/internal/lsp/source/stub.go b/gopls/internal/lsp/source/stub.go
index d851f90..606f4cb 100644
--- a/gopls/internal/lsp/source/stub.go
+++ b/gopls/internal/lsp/source/stub.go
@@ -18,8 +18,8 @@
 
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/gopls/internal/analysis/stubmethods"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/stubmethods"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
diff --git a/gopls/internal/server/code_action.go b/gopls/internal/server/code_action.go
index edd4979..875f0a4 100644
--- a/gopls/internal/server/code_action.go
+++ b/gopls/internal/server/code_action.go
@@ -12,10 +12,10 @@
 	"strings"
 
 	"golang.org/x/tools/go/ast/inspector"
+	"golang.org/x/tools/gopls/internal/analysis/fillstruct"
+	"golang.org/x/tools/gopls/internal/analysis/infertypeargs"
+	"golang.org/x/tools/gopls/internal/analysis/stubmethods"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/infertypeargs"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/stubmethods"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
 	"golang.org/x/tools/gopls/internal/lsp/command"
diff --git a/gopls/internal/settings/settings.go b/gopls/internal/settings/settings.go
index 5cae01d..d906bbe 100644
--- a/gopls/internal/settings/settings.go
+++ b/gopls/internal/settings/settings.go
@@ -51,22 +51,22 @@
 	"golang.org/x/tools/go/analysis/passes/unsafeptr"
 	"golang.org/x/tools/go/analysis/passes/unusedresult"
 	"golang.org/x/tools/go/analysis/passes/unusedwrite"
+	"golang.org/x/tools/gopls/internal/analysis/deprecated"
+	"golang.org/x/tools/gopls/internal/analysis/embeddirective"
+	"golang.org/x/tools/gopls/internal/analysis/fillreturns"
+	"golang.org/x/tools/gopls/internal/analysis/fillstruct"
+	"golang.org/x/tools/gopls/internal/analysis/infertypeargs"
+	"golang.org/x/tools/gopls/internal/analysis/nonewvars"
+	"golang.org/x/tools/gopls/internal/analysis/noresultvalues"
+	"golang.org/x/tools/gopls/internal/analysis/simplifycompositelit"
+	"golang.org/x/tools/gopls/internal/analysis/simplifyrange"
+	"golang.org/x/tools/gopls/internal/analysis/simplifyslice"
+	"golang.org/x/tools/gopls/internal/analysis/stubmethods"
+	"golang.org/x/tools/gopls/internal/analysis/undeclaredname"
+	"golang.org/x/tools/gopls/internal/analysis/unusedparams"
+	"golang.org/x/tools/gopls/internal/analysis/unusedvariable"
+	"golang.org/x/tools/gopls/internal/analysis/useany"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/deprecated"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/embeddirective"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillreturns"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/infertypeargs"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/nonewvars"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/noresultvalues"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifycompositelit"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyrange"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyslice"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/stubmethods"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/undeclaredname"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/unusedparams"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/unusedvariable"
-	"golang.org/x/tools/gopls/internal/lsp/analysis/useany"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/internal/diff"