diff --git a/cmd/tailscale/cli/dns-query.go b/cmd/tailscale/cli/dns-query.go
index 2993441b3..e1b4277db 100644
--- a/cmd/tailscale/cli/dns-query.go
+++ b/cmd/tailscale/cli/dns-query.go
@@ -15,7 +15,8 @@ import (
 
 	"github.com/peterbourgon/ff/v3/ffcli"
 	"golang.org/x/net/dns/dnsmessage"
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 var dnsQueryArgs struct {
diff --git a/cmd/tailscale/cli/dns-status.go b/cmd/tailscale/cli/dns-status.go
index 91a62f996..2e13131a1 100644
--- a/cmd/tailscale/cli/dns-status.go
+++ b/cmd/tailscale/cli/dns-status.go
@@ -13,7 +13,8 @@ import (
 	"strings"
 
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+
+	"tailscale.com/cmd/tailscale/jsonoutput"
 	"tailscale.com/types/dnstype"
 )
 
diff --git a/cmd/tailscale/cli/routecheck.go b/cmd/tailscale/cli/routecheck.go
index ade301c70..c5162f98f 100644
--- a/cmd/tailscale/cli/routecheck.go
+++ b/cmd/tailscale/cli/routecheck.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-json-experiment/json/jsontext"
 	"github.com/peterbourgon/ff/v3/ffcli"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 	"tailscale.com/cmd/tailscale/tsroutecheckjsonv0"
 	"tailscale.com/net/routecheck"
 	"tailscale.com/tstime"
diff --git a/cmd/tailscale/cli/tailnet-lock.go b/cmd/tailscale/cli/tailnet-lock.go
index 43df1a7f1..2a9331954 100644
--- a/cmd/tailscale/cli/tailnet-lock.go
+++ b/cmd/tailscale/cli/tailnet-lock.go
@@ -22,7 +22,8 @@ import (
 
 	"github.com/mattn/go-isatty"
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+
+	"tailscale.com/cmd/tailscale/jsonoutput"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tka"
 	"tailscale.com/tsconst"
diff --git a/cmd/tailscale/cli/tailnet-lock_test.go b/cmd/tailscale/cli/tailnet-lock_test.go
index f5822226c..76fba6517 100644
--- a/cmd/tailscale/cli/tailnet-lock_test.go
+++ b/cmd/tailscale/cli/tailnet-lock_test.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"go4.org/mem"
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+
+	"tailscale.com/cmd/tailscale/jsonoutput"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tailcfg"
 	"tailscale.com/tka"
diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt
index f3273d63e..057a59e5f 100644
--- a/cmd/tailscale/depaware.txt
+++ b/cmd/tailscale/depaware.txt
@@ -186,7 +186,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
         tailscale.com/cmd/tailscale/cli                              from tailscale.com/cmd/tailscale
         tailscale.com/cmd/tailscale/cli/ffcomplete                   from tailscale.com/cmd/tailscale/cli
         tailscale.com/cmd/tailscale/cli/ffcomplete/internal          from tailscale.com/cmd/tailscale/cli/ffcomplete
-        tailscale.com/cmd/tailscale/cli/jsonoutput                   from tailscale.com/cmd/tailscale/cli
+        tailscale.com/cmd/tailscale/jsonoutput                       from tailscale.com/cmd/tailscale/cli
         tailscale.com/cmd/tailscale/tsroutecheckjsonv0               from tailscale.com/cmd/tailscale/cli
         tailscale.com/control/controlbase                            from tailscale.com/control/controlhttp+
         tailscale.com/control/controlhttp                            from tailscale.com/control/ts2021
diff --git a/cmd/tailscale/cli/jsonoutput/dns.go b/cmd/tailscale/jsonoutput/dns.go
similarity index 100%
rename from cmd/tailscale/cli/jsonoutput/dns.go
rename to cmd/tailscale/jsonoutput/dns.go
diff --git a/cmd/tailscale/cli/jsonoutput/example_dnsqueryresult_test.go b/cmd/tailscale/jsonoutput/example_dnsqueryresult_test.go
similarity index 93%
rename from cmd/tailscale/cli/jsonoutput/example_dnsqueryresult_test.go
rename to cmd/tailscale/jsonoutput/example_dnsqueryresult_test.go
index f4f38d74c..2cfc5111a 100644
--- a/cmd/tailscale/cli/jsonoutput/example_dnsqueryresult_test.go
+++ b/cmd/tailscale/jsonoutput/example_dnsqueryresult_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"os/exec"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 func ExampleDNSQueryResult() {
diff --git a/cmd/tailscale/cli/jsonoutput/example_dnsstatusresult_test.go b/cmd/tailscale/jsonoutput/example_dnsstatusresult_test.go
similarity index 93%
rename from cmd/tailscale/cli/jsonoutput/example_dnsstatusresult_test.go
rename to cmd/tailscale/jsonoutput/example_dnsstatusresult_test.go
index ca53c6002..5b6a35a0c 100644
--- a/cmd/tailscale/cli/jsonoutput/example_dnsstatusresult_test.go
+++ b/cmd/tailscale/jsonoutput/example_dnsstatusresult_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"os/exec"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 func ExampleDNSStatusResult() {
diff --git a/cmd/tailscale/cli/jsonoutput/example_format_test.go b/cmd/tailscale/jsonoutput/example_format_test.go
similarity index 96%
rename from cmd/tailscale/cli/jsonoutput/example_format_test.go
rename to cmd/tailscale/jsonoutput/example_format_test.go
index bea6a722a..e9f60336c 100644
--- a/cmd/tailscale/cli/jsonoutput/example_format_test.go
+++ b/cmd/tailscale/jsonoutput/example_format_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"fmt"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 func ExampleFormat_JSONBool() {
diff --git a/cmd/tailscale/cli/jsonoutput/example_responseenvelope_test.go b/cmd/tailscale/jsonoutput/example_responseenvelope_test.go
similarity index 92%
rename from cmd/tailscale/cli/jsonoutput/example_responseenvelope_test.go
rename to cmd/tailscale/jsonoutput/example_responseenvelope_test.go
index b48edef6d..38f27af7d 100644
--- a/cmd/tailscale/cli/jsonoutput/example_responseenvelope_test.go
+++ b/cmd/tailscale/jsonoutput/example_responseenvelope_test.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 type Hello struct {
diff --git a/cmd/tailscale/cli/jsonoutput/example_schemaversion_test.go b/cmd/tailscale/jsonoutput/example_schemaversion_test.go
similarity index 91%
rename from cmd/tailscale/cli/jsonoutput/example_schemaversion_test.go
rename to cmd/tailscale/jsonoutput/example_schemaversion_test.go
index 2e9bc2e77..a198d2528 100644
--- a/cmd/tailscale/cli/jsonoutput/example_schemaversion_test.go
+++ b/cmd/tailscale/jsonoutput/example_schemaversion_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"fmt"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 var args struct {
diff --git a/cmd/tailscale/cli/jsonoutput/format.go b/cmd/tailscale/jsonoutput/format.go
similarity index 100%
rename from cmd/tailscale/cli/jsonoutput/format.go
rename to cmd/tailscale/jsonoutput/format.go
diff --git a/cmd/tailscale/cli/jsonoutput/format_test.go b/cmd/tailscale/jsonoutput/format_test.go
similarity index 99%
rename from cmd/tailscale/cli/jsonoutput/format_test.go
rename to cmd/tailscale/jsonoutput/format_test.go
index 2b324aa56..c072a8746 100644
--- a/cmd/tailscale/cli/jsonoutput/format_test.go
+++ b/cmd/tailscale/jsonoutput/format_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 func TestFormat(t *testing.T) {
diff --git a/cmd/tailscale/cli/jsonoutput/jsonoutput.go b/cmd/tailscale/jsonoutput/jsonoutput.go
similarity index 100%
rename from cmd/tailscale/cli/jsonoutput/jsonoutput.go
rename to cmd/tailscale/jsonoutput/jsonoutput.go
diff --git a/cmd/tailscale/cli/jsonoutput/jsonoutput_test.go b/cmd/tailscale/jsonoutput/jsonoutput_test.go
similarity index 98%
rename from cmd/tailscale/cli/jsonoutput/jsonoutput_test.go
rename to cmd/tailscale/jsonoutput/jsonoutput_test.go
index 595fe2a12..b66f5a12e 100644
--- a/cmd/tailscale/cli/jsonoutput/jsonoutput_test.go
+++ b/cmd/tailscale/jsonoutput/jsonoutput_test.go
@@ -11,7 +11,7 @@ import (
 	gcmp "github.com/google/go-cmp/cmp"
 	"github.com/kballard/go-shellquote"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 )
 
 func TestSchemaVersion(t *testing.T) {
diff --git a/cmd/tailscale/cli/jsonoutput/tailnet-lock-log.go b/cmd/tailscale/jsonoutput/tailnet-lock-log.go
similarity index 100%
rename from cmd/tailscale/cli/jsonoutput/tailnet-lock-log.go
rename to cmd/tailscale/jsonoutput/tailnet-lock-log.go
diff --git a/cmd/tailscale/cli/jsonoutput/tailnet-lock-status.go b/cmd/tailscale/jsonoutput/tailnet-lock-status.go
similarity index 100%
rename from cmd/tailscale/cli/jsonoutput/tailnet-lock-status.go
rename to cmd/tailscale/jsonoutput/tailnet-lock-status.go
diff --git a/cmd/tailscaled/depaware-minbox.txt b/cmd/tailscaled/depaware-minbox.txt
index e045c0090..8058d6dd1 100644
--- a/cmd/tailscaled/depaware-minbox.txt
+++ b/cmd/tailscaled/depaware-minbox.txt
@@ -55,7 +55,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
         tailscale.com/cmd/tailscale/cli                              from tailscale.com/cmd/tailscaled
         tailscale.com/cmd/tailscale/cli/ffcomplete                   from tailscale.com/cmd/tailscale/cli
         tailscale.com/cmd/tailscale/cli/ffcomplete/internal          from tailscale.com/cmd/tailscale/cli/ffcomplete
-        tailscale.com/cmd/tailscale/cli/jsonoutput                   from tailscale.com/cmd/tailscale/cli
+        tailscale.com/cmd/tailscale/jsonoutput                       from tailscale.com/cmd/tailscale/cli
         tailscale.com/cmd/tailscaled/childproc                       from tailscale.com/cmd/tailscaled
         tailscale.com/control/controlbase                            from tailscale.com/control/controlhttp+
         tailscale.com/control/controlclient                          from tailscale.com/cmd/tailscaled+
diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt
index 80aa3899c..27fe06551 100644
--- a/cmd/tailscaled/depaware.txt
+++ b/cmd/tailscaled/depaware.txt
@@ -267,7 +267,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
         tailscale.com/client/web                                     from tailscale.com/ipn/ipnlocal
         tailscale.com/clientupdate                                   from tailscale.com/feature/clientupdate
   LW    tailscale.com/clientupdate/distsign                          from tailscale.com/clientupdate
-        tailscale.com/cmd/tailscale/cli/jsonoutput                   from tailscale.com/feature/tailnetlock
+        tailscale.com/cmd/tailscale/jsonoutput                       from tailscale.com/feature/tailnetlock
         tailscale.com/cmd/tailscaled/childproc                       from tailscale.com/cmd/tailscaled+
         tailscale.com/cmd/tailscaled/tailscaledhooks                 from tailscale.com/cmd/tailscaled+
         tailscale.com/control/controlbase                            from tailscale.com/control/controlhttp+
diff --git a/feature/tailnetlock/tailnetlock.go b/feature/tailnetlock/tailnetlock.go
index fbfd8d983..06ed23d4f 100644
--- a/feature/tailnetlock/tailnetlock.go
+++ b/feature/tailnetlock/tailnetlock.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"tailscale.com/cmd/tailscale/cli/jsonoutput"
+	"tailscale.com/cmd/tailscale/jsonoutput"
 	"tailscale.com/feature"
 	"tailscale.com/feature/buildfeatures"
 	"tailscale.com/ipn/ipnlocal"