diff --git a/gopls/doc/design/implementation.md b/gopls/doc/design/implementation.md
index cd15b890e69..0efdf4da3bf 100644
--- a/gopls/doc/design/implementation.md
+++ b/gopls/doc/design/implementation.md
@@ -156,7 +156,7 @@ provided as a debugging aid (but see
 [gopls]: https://pkg.go.dev/golang.org/x/tools/gopls@master
 [jsonrpc2]: https://pkg.go.dev/golang.org/x/tools@master/internal/jsonrpc2
 [lsp]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp
-[lsprpc]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/lsprpc
+[lsprpc]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsprpc
 [memoize]: https://github.com/golang/tools/tree/master/internal/memoize
 [metadata]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/metadata
 [methodsets]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/methodsets
diff --git a/gopls/internal/cmd/cmd.go b/gopls/internal/cmd/cmd.go
index 93d53d2e64a..4577e50a27a 100644
--- a/gopls/internal/cmd/cmd.go
+++ b/gopls/internal/cmd/cmd.go
@@ -25,8 +25,8 @@ import (
 	"golang.org/x/tools/gopls/internal/filecache"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/command"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/server"
 	"golang.org/x/tools/gopls/internal/settings"
 	"golang.org/x/tools/gopls/internal/util/browser"
diff --git a/gopls/internal/cmd/remote.go b/gopls/internal/cmd/remote.go
index 684981cfff8..58e7c2ffb85 100644
--- a/gopls/internal/cmd/remote.go
+++ b/gopls/internal/cmd/remote.go
@@ -14,7 +14,7 @@ import (
 	"os"
 
 	"golang.org/x/tools/gopls/internal/lsp/command"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 )
 
 type remote struct {
diff --git a/gopls/internal/cmd/serve.go b/gopls/internal/cmd/serve.go
index 03eb4520ff0..8b9bb762c2f 100644
--- a/gopls/internal/cmd/serve.go
+++ b/gopls/internal/cmd/serve.go
@@ -16,8 +16,8 @@ import (
 
 	"golang.org/x/tools/gopls/internal/debug"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/telemetry"
 	"golang.org/x/tools/internal/fakenet"
 	"golang.org/x/tools/internal/jsonrpc2"
diff --git a/gopls/internal/lsp/lsprpc/autostart_default.go b/gopls/internal/lsprpc/autostart_default.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/autostart_default.go
rename to gopls/internal/lsprpc/autostart_default.go
diff --git a/gopls/internal/lsp/lsprpc/autostart_posix.go b/gopls/internal/lsprpc/autostart_posix.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/autostart_posix.go
rename to gopls/internal/lsprpc/autostart_posix.go
diff --git a/gopls/internal/lsp/lsprpc/binder.go b/gopls/internal/lsprpc/binder.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/binder.go
rename to gopls/internal/lsprpc/binder.go
diff --git a/gopls/internal/lsp/lsprpc/binder_test.go b/gopls/internal/lsprpc/binder_test.go
similarity index 99%
rename from gopls/internal/lsp/lsprpc/binder_test.go
rename to gopls/internal/lsprpc/binder_test.go
index 19698f939b8..e702cefbe3b 100644
--- a/gopls/internal/lsp/lsprpc/binder_test.go
+++ b/gopls/internal/lsprpc/binder_test.go
@@ -14,7 +14,7 @@ import (
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	jsonrpc2_v2 "golang.org/x/tools/internal/jsonrpc2_v2"
 
-	. "golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	. "golang.org/x/tools/gopls/internal/lsprpc"
 )
 
 // ServerBinder binds incoming connections to a new server.
diff --git a/gopls/internal/lsp/lsprpc/commandinterceptor_test.go b/gopls/internal/lsprpc/commandinterceptor_test.go
similarity index 97%
rename from gopls/internal/lsp/lsprpc/commandinterceptor_test.go
rename to gopls/internal/lsprpc/commandinterceptor_test.go
index fb29650b601..75e19c9a35e 100644
--- a/gopls/internal/lsp/lsprpc/commandinterceptor_test.go
+++ b/gopls/internal/lsprpc/commandinterceptor_test.go
@@ -12,7 +12,7 @@ import (
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	jsonrpc2_v2 "golang.org/x/tools/internal/jsonrpc2_v2"
 
-	. "golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	. "golang.org/x/tools/gopls/internal/lsprpc"
 )
 
 func CommandInterceptor(command string, run func(*protocol.ExecuteCommandParams) (interface{}, error)) Middleware {
diff --git a/gopls/internal/lsp/lsprpc/dialer.go b/gopls/internal/lsprpc/dialer.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/dialer.go
rename to gopls/internal/lsprpc/dialer.go
diff --git a/gopls/internal/lsp/lsprpc/export_test.go b/gopls/internal/lsprpc/export_test.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/export_test.go
rename to gopls/internal/lsprpc/export_test.go
diff --git a/gopls/internal/lsp/lsprpc/goenv.go b/gopls/internal/lsprpc/goenv.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/goenv.go
rename to gopls/internal/lsprpc/goenv.go
diff --git a/gopls/internal/lsp/lsprpc/goenv_test.go b/gopls/internal/lsprpc/goenv_test.go
similarity index 98%
rename from gopls/internal/lsp/lsprpc/goenv_test.go
rename to gopls/internal/lsprpc/goenv_test.go
index 535e62f14ae..c2ea92a4c62 100644
--- a/gopls/internal/lsp/lsprpc/goenv_test.go
+++ b/gopls/internal/lsprpc/goenv_test.go
@@ -16,7 +16,7 @@ import (
 	jsonrpc2_v2 "golang.org/x/tools/internal/jsonrpc2_v2"
 	"golang.org/x/tools/internal/testenv"
 
-	. "golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	. "golang.org/x/tools/gopls/internal/lsprpc"
 )
 
 func GoEnvMiddleware() (Middleware, error) {
diff --git a/gopls/internal/lsp/lsprpc/lsprpc.go b/gopls/internal/lsprpc/lsprpc.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/lsprpc.go
rename to gopls/internal/lsprpc/lsprpc.go
diff --git a/gopls/internal/lsp/lsprpc/lsprpc_test.go b/gopls/internal/lsprpc/lsprpc_test.go
similarity index 100%
rename from gopls/internal/lsp/lsprpc/lsprpc_test.go
rename to gopls/internal/lsprpc/lsprpc_test.go
diff --git a/gopls/internal/lsp/lsprpc/middleware_test.go b/gopls/internal/lsprpc/middleware_test.go
similarity index 99%
rename from gopls/internal/lsp/lsprpc/middleware_test.go
rename to gopls/internal/lsprpc/middleware_test.go
index eb109686957..526c7343b78 100644
--- a/gopls/internal/lsp/lsprpc/middleware_test.go
+++ b/gopls/internal/lsprpc/middleware_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	. "golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	. "golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/internal/event"
 	jsonrpc2_v2 "golang.org/x/tools/internal/jsonrpc2_v2"
 )
diff --git a/gopls/internal/test/integration/bench/stress_test.go b/gopls/internal/test/integration/bench/stress_test.go
index af72739875d..e0bd305907a 100644
--- a/gopls/internal/test/integration/bench/stress_test.go
+++ b/gopls/internal/test/integration/bench/stress_test.go
@@ -13,7 +13,7 @@ import (
 
 	"golang.org/x/tools/gopls/internal/hooks"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/test/integration/fake"
 	"golang.org/x/tools/internal/jsonrpc2"
 	"golang.org/x/tools/internal/jsonrpc2/servertest"
diff --git a/gopls/internal/test/integration/runner.go b/gopls/internal/test/integration/runner.go
index b468b6bbe15..626b03b4784 100644
--- a/gopls/internal/test/integration/runner.go
+++ b/gopls/internal/test/integration/runner.go
@@ -22,8 +22,8 @@ import (
 
 	"golang.org/x/tools/gopls/internal/debug"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/settings"
 	"golang.org/x/tools/gopls/internal/test/integration/fake"
 	"golang.org/x/tools/internal/jsonrpc2"
diff --git a/gopls/internal/test/marker/marker_test.go b/gopls/internal/test/marker/marker_test.go
index 3440fa098a0..8c540079bf0 100644
--- a/gopls/internal/test/marker/marker_test.go
+++ b/gopls/internal/test/marker/marker_test.go
@@ -33,8 +33,8 @@ import (
 	"golang.org/x/tools/gopls/internal/debug"
 	"golang.org/x/tools/gopls/internal/hooks"
 	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/lsprpc"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
+	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/test/compare"
 	"golang.org/x/tools/gopls/internal/test/integration"
 	"golang.org/x/tools/gopls/internal/test/integration/fake"