Re-organize Go code

271 files changed, 302 insertions, 302 deletions

diff --git a/client/go/defaults/defaults.go b/client/go/internal/admin/defaults/defaults.go
index db03e783d58..10dfe5cb16b 100644
--- a/client/go/defaults/defaults.go
+++ b/client/go/internal/admin/defaults/defaults.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 const (
diff --git a/client/go/defaults/defaults_test.go b/client/go/internal/admin/defaults/defaults_test.go
index 3a566052797..f900a844285 100644
--- a/client/go/defaults/defaults_test.go
+++ b/client/go/internal/admin/defaults/defaults_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func setup(t *testing.T) {
diff --git a/client/go/envvars/env_vars.go b/client/go/internal/admin/envvars/env_vars.go
index ad58338254c..ad58338254c 100644
--- a/client/go/envvars/env_vars.go
+++ b/client/go/internal/admin/envvars/env_vars.go
diff --git a/client/go/jvm/application_container.go b/client/go/internal/admin/jvm/application_container.go
index bb2e34b6c76..59e87d22ead 100644
--- a/client/go/jvm/application_container.go
+++ b/client/go/internal/admin/jvm/application_container.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/prog"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/jvm/configproxy_jvm.go b/client/go/internal/admin/jvm/configproxy_jvm.go
index 6381ebf6429..1c274d8b889 100644
--- a/client/go/jvm/configproxy_jvm.go
+++ b/client/go/internal/admin/jvm/configproxy_jvm.go
@@ -6,7 +6,7 @@ package jvm
 import (
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 )
 
 const (
diff --git a/client/go/jvm/container.go b/client/go/internal/admin/jvm/container.go
index f52a34a6f6d..d7bdeae43b6 100644
--- a/client/go/jvm/container.go
+++ b/client/go/internal/admin/jvm/container.go
@@ -8,9 +8,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/prog"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 type Container interface {
diff --git a/client/go/jvm/env.go b/client/go/internal/admin/jvm/env.go
index d2f0b2e6616..7b1ce97a40a 100644
--- a/client/go/jvm/env.go
+++ b/client/go/internal/admin/jvm/env.go
@@ -6,10 +6,10 @@ package jvm
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/prog"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func (opts *Options) exportEnvSettings(ps *prog.Spec) {
diff --git a/client/go/jvm/jdisc_options.go b/client/go/internal/admin/jvm/jdisc_options.go
index 8d06f5c5a6c..3e6c5b6003d 100644
--- a/client/go/jvm/jdisc_options.go
+++ b/client/go/internal/admin/jvm/jdisc_options.go
@@ -4,7 +4,7 @@
 package jvm
 
 import (
-	"github.com/vespa-engine/vespa/client/go/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
 )
 
 const (
diff --git a/client/go/jvm/jdk_properties.go b/client/go/internal/admin/jvm/jdk_properties.go
index 70888bf49c7..120771234de 100644
--- a/client/go/jvm/jdk_properties.go
+++ b/client/go/internal/admin/jvm/jdk_properties.go
@@ -6,8 +6,8 @@ package jvm
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 )
 
 func (opts *Options) AddCommonJdkProperties() {
diff --git a/client/go/jvm/mem_avail.go b/client/go/internal/admin/jvm/mem_avail.go
index 21c68d14b39..11203b9aecf 100644
--- a/client/go/jvm/mem_avail.go
+++ b/client/go/internal/admin/jvm/mem_avail.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func parseFree(txt string) AmountOfMemory {
diff --git a/client/go/jvm/mem_avail_test.go b/client/go/internal/admin/jvm/mem_avail_test.go
index e85f2876d3a..ea92fbfa858 100644
--- a/client/go/jvm/mem_avail_test.go
+++ b/client/go/internal/admin/jvm/mem_avail_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func TestCg2Get(t *testing.T) {
diff --git a/client/go/jvm/mem_options.go b/client/go/internal/admin/jvm/mem_options.go
index e8299ca8449..f58bb141587 100644
--- a/client/go/jvm/mem_options.go
+++ b/client/go/internal/admin/jvm/mem_options.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func (opts *Options) getOrSetHeapSize(prefix string, heapSize AmountOfMemory) AmountOfMemory {
diff --git a/client/go/jvm/mem_options_test.go b/client/go/internal/admin/jvm/mem_options_test.go
index c15143d4758..c15143d4758 100644
--- a/client/go/jvm/mem_options_test.go
+++ b/client/go/internal/admin/jvm/mem_options_test.go
diff --git a/client/go/jvm/memory.go b/client/go/internal/admin/jvm/memory.go
index 8caa1a3be22..8caa1a3be22 100644
--- a/client/go/jvm/memory.go
+++ b/client/go/internal/admin/jvm/memory.go
diff --git a/client/go/jvm/memory_test.go b/client/go/internal/admin/jvm/memory_test.go
index c898606a2db..c898606a2db 100644
--- a/client/go/jvm/memory_test.go
+++ b/client/go/internal/admin/jvm/memory_test.go
diff --git a/client/go/jvm/mock-cg2/a/proc/self/cgroup b/client/go/internal/admin/jvm/mock-cg2/a/proc/self/cgroup
index 2cc2de315da..2cc2de315da 100644
--- a/client/go/jvm/mock-cg2/a/proc/self/cgroup
+++ b/client/go/internal/admin/jvm/mock-cg2/a/proc/self/cgroup
diff --git a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/cgroup.controllers b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/cgroup.controllers
index acb4d263e65..acb4d263e65 100644
--- a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/cgroup.controllers
+++ b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/cgroup.controllers
diff --git a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/memory.max b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/memory.max
index 355295a05af..355295a05af 100644
--- a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/memory.max
diff --git a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/memory.max b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/memory.max
index 190a18037c6..190a18037c6 100644
--- a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/memory.max
diff --git a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/sshd.service/memory.max b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/sshd.service/memory.max
index 355295a05af..355295a05af 100644
--- a/client/go/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/sshd.service/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/a/sys/fs/cgroup/system.slice/sshd.service/memory.max
diff --git a/client/go/jvm/mock-cg2/b/proc/self/cgroup b/client/go/internal/admin/jvm/mock-cg2/b/proc/self/cgroup
index 8dc7ddcf52f..8dc7ddcf52f 100644
--- a/client/go/jvm/mock-cg2/b/proc/self/cgroup
+++ b/client/go/internal/admin/jvm/mock-cg2/b/proc/self/cgroup
diff --git a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/cgroup.controllers b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/cgroup.controllers
index acb4d263e65..acb4d263e65 100644
--- a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/cgroup.controllers
+++ b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/cgroup.controllers
diff --git a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/memory.max b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/memory.max
index 355295a05af..355295a05af 100644
--- a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/memory.max
diff --git a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/sshd.service/memory.max b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/sshd.service/memory.max
index 355295a05af..355295a05af 100644
--- a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/sshd.service/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/init.scope/sshd.service/memory.max
diff --git a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/memory.max b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/memory.max
index ca65b2abde1..ca65b2abde1 100644
--- a/client/go/jvm/mock-cg2/b/sys/fs/cgroup/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/b/sys/fs/cgroup/memory.max
diff --git a/client/go/jvm/mock-cg2/c/proc/self/cgroup b/client/go/internal/admin/jvm/mock-cg2/c/proc/self/cgroup
index c76235307d0..c76235307d0 100644
--- a/client/go/jvm/mock-cg2/c/proc/self/cgroup
+++ b/client/go/internal/admin/jvm/mock-cg2/c/proc/self/cgroup
diff --git a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/cgroup.controllers b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/cgroup.controllers
index acb4d263e65..acb4d263e65 100644
--- a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/cgroup.controllers
+++ b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/cgroup.controllers
diff --git a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/memory.max b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/memory.max
index ca65b2abde1..ca65b2abde1 100644
--- a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/memory.max
diff --git a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/memory.max b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/memory.max
index 355295a05af..355295a05af 100644
--- a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/memory.max
diff --git a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/vespa.service/memory.max b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/vespa.service/memory.max
index 8061635036a..8061635036a 100644
--- a/client/go/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/vespa.service/memory.max
+++ b/client/go/internal/admin/jvm/mock-cg2/c/sys/fs/cgroup/system.slice/vespa.service/memory.max
diff --git a/client/go/jvm/opens_options.go b/client/go/internal/admin/jvm/opens_options.go
index bfc4e519787..bfc4e519787 100644
--- a/client/go/jvm/opens_options.go
+++ b/client/go/internal/admin/jvm/opens_options.go
diff --git a/client/go/jvm/options.go b/client/go/internal/admin/jvm/options.go
index 4ece59caa31..f509b4d44d1 100644
--- a/client/go/jvm/options.go
+++ b/client/go/internal/admin/jvm/options.go
@@ -8,10 +8,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 type Options struct {
diff --git a/client/go/jvm/options_test.go b/client/go/internal/admin/jvm/options_test.go
index a2763223611..0f781756dde 100644
--- a/client/go/jvm/options_test.go
+++ b/client/go/internal/admin/jvm/options_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 )
 
 type dummyContainer struct{ containerBase }
diff --git a/client/go/jvm/properties.go b/client/go/internal/admin/jvm/properties.go
index 6d944c82c2a..9aae550b10a 100644
--- a/client/go/jvm/properties.go
+++ b/client/go/internal/admin/jvm/properties.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // quote as specified in JDK source file java.base/share/classes/java/util/Properties.java
diff --git a/client/go/jvm/properties_test.go b/client/go/internal/admin/jvm/properties_test.go
index c417319a51e..c417319a51e 100644
--- a/client/go/jvm/properties_test.go
+++ b/client/go/internal/admin/jvm/properties_test.go
diff --git a/client/go/jvm/qr_start_cfg.go b/client/go/internal/admin/jvm/qr_start_cfg.go
index 9b47b9b1a97..86e05c64418 100644
--- a/client/go/jvm/qr_start_cfg.go
+++ b/client/go/internal/admin/jvm/qr_start_cfg.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 type QrStartConfig struct {
diff --git a/client/go/jvm/run.go b/client/go/internal/admin/jvm/run.go
index eb728cabdea..30d5b61a063 100644
--- a/client/go/jvm/run.go
+++ b/client/go/internal/admin/jvm/run.go
@@ -6,8 +6,8 @@ package jvm
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func RunApplicationContainer(extraArgs []string) int {
diff --git a/client/go/jvm/standalone_container.go b/client/go/internal/admin/jvm/standalone_container.go
index 06d8f041169..7bbf03e83e8 100644
--- a/client/go/jvm/standalone_container.go
+++ b/client/go/internal/admin/jvm/standalone_container.go
@@ -6,10 +6,10 @@ package jvm
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/prog"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/jvm/xx_options.go b/client/go/internal/admin/jvm/xx_options.go
index 9a4662f49a8..ea984df1dfe 100644
--- a/client/go/jvm/xx_options.go
+++ b/client/go/internal/admin/jvm/xx_options.go
@@ -4,7 +4,7 @@
 package jvm
 
 import (
-	"github.com/vespa-engine/vespa/client/go/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
 )
 
 func (opts *Options) AddCommonXX() {
diff --git a/client/go/jvm/zk_locks.go b/client/go/internal/admin/jvm/zk_locks.go
index 869525d895f..39b8dd0c64b 100644
--- a/client/go/jvm/zk_locks.go
+++ b/client/go/internal/admin/jvm/zk_locks.go
@@ -6,9 +6,9 @@ package jvm
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/prog/common_env.go b/client/go/internal/admin/prog/common_env.go
index 150a4aaa38f..f743716a64e 100644
--- a/client/go/prog/common_env.go
+++ b/client/go/internal/admin/prog/common_env.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func (spec *Spec) configureCommonEnv() {
diff --git a/client/go/prog/hugepages.go b/client/go/internal/admin/prog/hugepages.go
index 1ca345c0d54..c6f019937ff 100644
--- a/client/go/prog/hugepages.go
+++ b/client/go/internal/admin/prog/hugepages.go
@@ -4,8 +4,8 @@
 package prog
 
 import (
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func (spec *Spec) ConfigureHugePages() {
diff --git a/client/go/prog/madvise.go b/client/go/internal/admin/prog/madvise.go
index 7312e345e8d..48986a12182 100644
--- a/client/go/prog/madvise.go
+++ b/client/go/internal/admin/prog/madvise.go
@@ -4,8 +4,8 @@
 package prog
 
 import (
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func (spec *Spec) ConfigureUseMadvise() {
diff --git a/client/go/prog/mockbin/bad-numactl b/client/go/internal/admin/prog/mockbin/bad-numactl
index 1b08bb19b95..1b08bb19b95 100755
--- a/client/go/prog/mockbin/bad-numactl
+++ b/client/go/internal/admin/prog/mockbin/bad-numactl
diff --git a/client/go/prog/mockbin/good-numactl b/client/go/internal/admin/prog/mockbin/good-numactl
index f861809b382..f861809b382 100755
--- a/client/go/prog/mockbin/good-numactl
+++ b/client/go/internal/admin/prog/mockbin/good-numactl
diff --git a/client/go/prog/mockbin/has-valgrind b/client/go/internal/admin/prog/mockbin/has-valgrind
index 83601cd64d1..83601cd64d1 100755
--- a/client/go/prog/mockbin/has-valgrind
+++ b/client/go/internal/admin/prog/mockbin/has-valgrind
diff --git a/client/go/prog/mockbin/no-numactl b/client/go/internal/admin/prog/mockbin/no-numactl
index dfe583abaca..dfe583abaca 100755
--- a/client/go/prog/mockbin/no-numactl
+++ b/client/go/internal/admin/prog/mockbin/no-numactl
diff --git a/client/go/prog/mockbin/no-valgrind b/client/go/internal/admin/prog/mockbin/no-valgrind
index 09a2e517c37..09a2e517c37 100755
--- a/client/go/prog/mockbin/no-valgrind
+++ b/client/go/internal/admin/prog/mockbin/no-valgrind
diff --git a/client/go/prog/numactl.go b/client/go/internal/admin/prog/numactl.go
index becf6329f27..e53b4feb3d8 100644
--- a/client/go/prog/numactl.go
+++ b/client/go/internal/admin/prog/numactl.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/prog/numactl_test.go b/client/go/internal/admin/prog/numactl_test.go
index b6f6a7d8506..569219f5b7c 100644
--- a/client/go/prog/numactl_test.go
+++ b/client/go/internal/admin/prog/numactl_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func setup(t *testing.T, testFileName string) {
diff --git a/client/go/prog/run.go b/client/go/internal/admin/prog/run.go
index 0d11cef4d30..f1a2e979600 100644
--- a/client/go/prog/run.go
+++ b/client/go/internal/admin/prog/run.go
@@ -4,8 +4,8 @@
 package prog
 
 import (
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func (spec *Spec) Run() error {
diff --git a/client/go/prog/spec.go b/client/go/internal/admin/prog/spec.go
index cf553470a44..cf553470a44 100644
--- a/client/go/prog/spec.go
+++ b/client/go/internal/admin/prog/spec.go
diff --git a/client/go/prog/spec_env.go b/client/go/internal/admin/prog/spec_env.go
index 748b262b0d4..4fa40695acb 100644
--- a/client/go/prog/spec_env.go
+++ b/client/go/internal/admin/prog/spec_env.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func (p *Spec) Setenv(k, v string) {
diff --git a/client/go/prog/spec_test.go b/client/go/internal/admin/prog/spec_test.go
index 0e5d3fb50ba..0e5d3fb50ba 100644
--- a/client/go/prog/spec_test.go
+++ b/client/go/internal/admin/prog/spec_test.go
diff --git a/client/go/prog/valgrind.go b/client/go/internal/admin/prog/valgrind.go
index 1a282edd1ae..7d3fb059f8f 100644
--- a/client/go/prog/valgrind.go
+++ b/client/go/internal/admin/prog/valgrind.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/prog/valgrind_test.go b/client/go/internal/admin/prog/valgrind_test.go
index 786efcebd0c..6ec622277c6 100644
--- a/client/go/prog/valgrind_test.go
+++ b/client/go/internal/admin/prog/valgrind_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 var tmpBin string
diff --git a/client/go/prog/vespamalloc.go b/client/go/internal/admin/prog/vespamalloc.go
index 34c98349415..439935770d7 100644
--- a/client/go/prog/vespamalloc.go
+++ b/client/go/internal/admin/prog/vespamalloc.go
@@ -6,9 +6,9 @@ package prog
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func vespaMallocLib(suf string) string {
diff --git a/client/go/script-utils/configserver/check.go b/client/go/internal/admin/script-utils/configserver/check.go
index 450a81104a4..a0248dd128f 100644
--- a/client/go/script-utils/configserver/check.go
+++ b/client/go/internal/admin/script-utils/configserver/check.go
@@ -6,9 +6,9 @@ package configserver
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func checkIsConfigserver(myname string) {
diff --git a/client/go/script-utils/configserver/env.go b/client/go/internal/admin/script-utils/configserver/env.go
index c2607d293d6..1c4c33f5628 100644
--- a/client/go/script-utils/configserver/env.go
+++ b/client/go/internal/admin/script-utils/configserver/env.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func exportSettings(vespaHome string) {
diff --git a/client/go/script-utils/configserver/fix_dirs_and_files.go b/client/go/internal/admin/script-utils/configserver/fix_dirs_and_files.go
index 4fcafd80202..8410d3f657c 100644
--- a/client/go/script-utils/configserver/fix_dirs_and_files.go
+++ b/client/go/internal/admin/script-utils/configserver/fix_dirs_and_files.go
@@ -4,8 +4,8 @@
 package configserver
 
 import (
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func makeFixSpec() util.FixSpec {
diff --git a/client/go/script-utils/configserver/logd.go b/client/go/internal/admin/script-utils/configserver/logd.go
index 676c96d037d..39a2100b20f 100644
--- a/client/go/script-utils/configserver/logd.go
+++ b/client/go/internal/admin/script-utils/configserver/logd.go
@@ -6,9 +6,9 @@ package configserver
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func maybeStartLogd() {
diff --git a/client/go/script-utils/configserver/runserver.go b/client/go/internal/admin/script-utils/configserver/runserver.go
index 9afa154cc06..bef50009d8d 100644
--- a/client/go/script-utils/configserver/runserver.go
+++ b/client/go/internal/admin/script-utils/configserver/runserver.go
@@ -6,9 +6,9 @@ package configserver
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/script-utils/configserver/start.go b/client/go/internal/admin/script-utils/configserver/start.go
index 02d0d0061ca..8ea3e9603a2 100644
--- a/client/go/script-utils/configserver/start.go
+++ b/client/go/internal/admin/script-utils/configserver/start.go
@@ -6,11 +6,11 @@ package configserver
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/jvm"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/script-utils/configserver/zk.go b/client/go/internal/admin/script-utils/configserver/zk.go
index f8a8514364d..91ddf522848 100644
--- a/client/go/script-utils/configserver/zk.go
+++ b/client/go/internal/admin/script-utils/configserver/zk.go
@@ -6,8 +6,8 @@ package configserver
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/script-utils/logfmt/cmd.go b/client/go/internal/admin/script-utils/logfmt/cmd.go
index 84322c7ff08..a8675c37356 100644
--- a/client/go/script-utils/logfmt/cmd.go
+++ b/client/go/internal/admin/script-utils/logfmt/cmd.go
@@ -6,7 +6,7 @@ package logfmt
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
 )
 
 func NewLogfmtCmd() *cobra.Command {
diff --git a/client/go/script-utils/logfmt/formatflags.go b/client/go/internal/admin/script-utils/logfmt/formatflags.go
index 097746d696f..097746d696f 100644
--- a/client/go/script-utils/logfmt/formatflags.go
+++ b/client/go/internal/admin/script-utils/logfmt/formatflags.go
diff --git a/client/go/script-utils/logfmt/formatflags_test.go b/client/go/internal/admin/script-utils/logfmt/formatflags_test.go
index 53c47d24208..53c47d24208 100644
--- a/client/go/script-utils/logfmt/formatflags_test.go
+++ b/client/go/internal/admin/script-utils/logfmt/formatflags_test.go
diff --git a/client/go/script-utils/logfmt/handleline.go b/client/go/internal/admin/script-utils/logfmt/handleline.go
index 813ca82acb4..813ca82acb4 100644
--- a/client/go/script-utils/logfmt/handleline.go
+++ b/client/go/internal/admin/script-utils/logfmt/handleline.go
diff --git a/client/go/script-utils/logfmt/internal.go b/client/go/internal/admin/script-utils/logfmt/internal.go
index 992c537f939..992c537f939 100644
--- a/client/go/script-utils/logfmt/internal.go
+++ b/client/go/internal/admin/script-utils/logfmt/internal.go
diff --git a/client/go/script-utils/logfmt/internal_names.txt b/client/go/internal/admin/script-utils/logfmt/internal_names.txt
index cc554546fcc..cc554546fcc 100644
--- a/client/go/script-utils/logfmt/internal_names.txt
+++ b/client/go/internal/admin/script-utils/logfmt/internal_names.txt
diff --git a/client/go/script-utils/logfmt/internal_notnames.txt b/client/go/internal/admin/script-utils/logfmt/internal_notnames.txt
index 49543758ac3..49543758ac3 100644
--- a/client/go/script-utils/logfmt/internal_notnames.txt
+++ b/client/go/internal/admin/script-utils/logfmt/internal_notnames.txt
diff --git a/client/go/script-utils/logfmt/internal_test.go b/client/go/internal/admin/script-utils/logfmt/internal_test.go
index 9b6b0f8404c..9b6b0f8404c 100644
--- a/client/go/script-utils/logfmt/internal_test.go
+++ b/client/go/internal/admin/script-utils/logfmt/internal_test.go
diff --git a/client/go/script-utils/logfmt/levelflags.go b/client/go/internal/admin/script-utils/logfmt/levelflags.go
index 4e6c1284753..4e6c1284753 100644
--- a/client/go/script-utils/logfmt/levelflags.go
+++ b/client/go/internal/admin/script-utils/logfmt/levelflags.go
diff --git a/client/go/script-utils/logfmt/levelflags_test.go b/client/go/internal/admin/script-utils/logfmt/levelflags_test.go
index 186ea2d96b0..186ea2d96b0 100644
--- a/client/go/script-utils/logfmt/levelflags_test.go
+++ b/client/go/internal/admin/script-utils/logfmt/levelflags_test.go
diff --git a/client/go/script-utils/logfmt/options.go b/client/go/internal/admin/script-utils/logfmt/options.go
index 864868d4ce5..864868d4ce5 100644
--- a/client/go/script-utils/logfmt/options.go
+++ b/client/go/internal/admin/script-utils/logfmt/options.go
diff --git a/client/go/script-utils/logfmt/plusminusflag.go b/client/go/internal/admin/script-utils/logfmt/plusminusflag.go
index 1768cf0e7be..1768cf0e7be 100644
--- a/client/go/script-utils/logfmt/plusminusflag.go
+++ b/client/go/internal/admin/script-utils/logfmt/plusminusflag.go
diff --git a/client/go/script-utils/logfmt/regexflag.go b/client/go/internal/admin/script-utils/logfmt/regexflag.go
index 8f7d2a91373..8f7d2a91373 100644
--- a/client/go/script-utils/logfmt/regexflag.go
+++ b/client/go/internal/admin/script-utils/logfmt/regexflag.go
diff --git a/client/go/script-utils/logfmt/regexflag_test.go b/client/go/internal/admin/script-utils/logfmt/regexflag_test.go
index 489439863a2..489439863a2 100644
--- a/client/go/script-utils/logfmt/regexflag_test.go
+++ b/client/go/internal/admin/script-utils/logfmt/regexflag_test.go
diff --git a/client/go/script-utils/logfmt/runlogfmt.go b/client/go/internal/admin/script-utils/logfmt/runlogfmt.go
index 5b9a3ac0870..6557461598e 100644
--- a/client/go/script-utils/logfmt/runlogfmt.go
+++ b/client/go/internal/admin/script-utils/logfmt/runlogfmt.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func inputIsPipe() bool {
diff --git a/client/go/script-utils/logfmt/showflags.go b/client/go/internal/admin/script-utils/logfmt/showflags.go
index b69860e0312..b69860e0312 100644
--- a/client/go/script-utils/logfmt/showflags.go
+++ b/client/go/internal/admin/script-utils/logfmt/showflags.go
diff --git a/client/go/script-utils/logfmt/showflags_test.go b/client/go/internal/admin/script-utils/logfmt/showflags_test.go
index d1b66118afd..d1b66118afd 100644
--- a/client/go/script-utils/logfmt/showflags_test.go
+++ b/client/go/internal/admin/script-utils/logfmt/showflags_test.go
diff --git a/client/go/script-utils/logfmt/tail.go b/client/go/internal/admin/script-utils/logfmt/tail.go
index 75e7cbb0693..75e7cbb0693 100644
--- a/client/go/script-utils/logfmt/tail.go
+++ b/client/go/internal/admin/script-utils/logfmt/tail.go
diff --git a/client/go/script-utils/logfmt/tail_not_unix.go b/client/go/internal/admin/script-utils/logfmt/tail_not_unix.go
index 7030572575d..7030572575d 100644
--- a/client/go/script-utils/logfmt/tail_not_unix.go
+++ b/client/go/internal/admin/script-utils/logfmt/tail_not_unix.go
diff --git a/client/go/script-utils/logfmt/tail_unix.go b/client/go/internal/admin/script-utils/logfmt/tail_unix.go
index 7703844da48..7703844da48 100644
--- a/client/go/script-utils/logfmt/tail_unix.go
+++ b/client/go/internal/admin/script-utils/logfmt/tail_unix.go
diff --git a/client/go/script-utils/main.go b/client/go/internal/admin/script-utils/main.go
index b0b7edd6f6c..a6016c86291 100644
--- a/client/go/script-utils/main.go
+++ b/client/go/internal/admin/script-utils/main.go
@@ -8,16 +8,16 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/cmd/clusterstate"
-	"github.com/vespa-engine/vespa/client/go/cmd/deploy"
-	"github.com/vespa-engine/vespa/client/go/jvm"
-	"github.com/vespa-engine/vespa/client/go/script-utils/configserver"
-	"github.com/vespa-engine/vespa/client/go/script-utils/logfmt"
-	"github.com/vespa-engine/vespa/client/go/script-utils/services"
-	"github.com/vespa-engine/vespa/client/go/script-utils/standalone"
-	"github.com/vespa-engine/vespa/client/go/script-utils/startcbinary"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/configserver"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/logfmt"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/services"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/standalone"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/startcbinary"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/cmd/clusterstate"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/cmd/deploy"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func basename(s string) string {
diff --git a/client/go/script-utils/services/configproxy.go b/client/go/internal/admin/script-utils/services/configproxy.go
index 9714d9af284..877de387efd 100644
--- a/client/go/script-utils/services/configproxy.go
+++ b/client/go/internal/admin/script-utils/services/configproxy.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/defaults"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/jvm"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/script-utils/services/env.go b/client/go/internal/admin/script-utils/services/env.go
index 1a51d1a21c7..65dd583b766 100644
--- a/client/go/script-utils/services/env.go
+++ b/client/go/internal/admin/script-utils/services/env.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func exportSettings(vespaHome string) {
diff --git a/client/go/script-utils/services/prechecks.go b/client/go/internal/admin/script-utils/services/prechecks.go
index b41837a8270..690447a9fee 100644
--- a/client/go/script-utils/services/prechecks.go
+++ b/client/go/internal/admin/script-utils/services/prechecks.go
@@ -6,10 +6,10 @@ package services
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func commonPreChecks() (veHome, veHost string) {
diff --git a/client/go/script-utils/services/sentinel.go b/client/go/internal/admin/script-utils/services/sentinel.go
index 352acde38bd..1017924263b 100644
--- a/client/go/script-utils/services/sentinel.go
+++ b/client/go/internal/admin/script-utils/services/sentinel.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/script-utils/services/start.go b/client/go/internal/admin/script-utils/services/start.go
index 78375498005..f47d99714f1 100644
--- a/client/go/script-utils/services/start.go
+++ b/client/go/internal/admin/script-utils/services/start.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func StartServices() int {
diff --git a/client/go/script-utils/services/stop.go b/client/go/internal/admin/script-utils/services/stop.go
index c2ad332a89d..f5b764d122e 100644
--- a/client/go/script-utils/services/stop.go
+++ b/client/go/internal/admin/script-utils/services/stop.go
@@ -6,10 +6,10 @@ package services
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func VespaStopServices() int {
diff --git a/client/go/script-utils/services/tuning.go b/client/go/internal/admin/script-utils/services/tuning.go
index ed0ff509a3d..f922495812f 100644
--- a/client/go/script-utils/services/tuning.go
+++ b/client/go/internal/admin/script-utils/services/tuning.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 const (
diff --git a/client/go/script-utils/standalone/start.go b/client/go/internal/admin/script-utils/standalone/start.go
index 111b1baeccc..a26ac8e9d8c 100644
--- a/client/go/script-utils/standalone/start.go
+++ b/client/go/internal/admin/script-utils/standalone/start.go
@@ -7,10 +7,10 @@ package standalone
 import (
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/jvm"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func commonPreChecks() {
diff --git a/client/go/script-utils/startcbinary/cmd.go b/client/go/internal/admin/script-utils/startcbinary/cmd.go
index 730d7b10c37..9580a9240bb 100644
--- a/client/go/script-utils/startcbinary/cmd.go
+++ b/client/go/internal/admin/script-utils/startcbinary/cmd.go
@@ -7,10 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func Run(args []string) int {
diff --git a/client/go/script-utils/startcbinary/common_env.go b/client/go/internal/admin/script-utils/startcbinary/common_env.go
index eee7500f5d2..6bc730b5119 100644
--- a/client/go/script-utils/startcbinary/common_env.go
+++ b/client/go/internal/admin/script-utils/startcbinary/common_env.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func (spec *ProgSpec) considerFallback(varName, varValue string) {
diff --git a/client/go/script-utils/startcbinary/mockbin/bad-numactl b/client/go/internal/admin/script-utils/startcbinary/mockbin/bad-numactl
index 1b08bb19b95..1b08bb19b95 100755
--- a/client/go/script-utils/startcbinary/mockbin/bad-numactl
+++ b/client/go/internal/admin/script-utils/startcbinary/mockbin/bad-numactl
diff --git a/client/go/script-utils/startcbinary/mockbin/good-numactl b/client/go/internal/admin/script-utils/startcbinary/mockbin/good-numactl
index f861809b382..f861809b382 100755
--- a/client/go/script-utils/startcbinary/mockbin/good-numactl
+++ b/client/go/internal/admin/script-utils/startcbinary/mockbin/good-numactl
diff --git a/client/go/script-utils/startcbinary/mockbin/has-valgrind b/client/go/internal/admin/script-utils/startcbinary/mockbin/has-valgrind
index 8716209928e..8716209928e 100755
--- a/client/go/script-utils/startcbinary/mockbin/has-valgrind
+++ b/client/go/internal/admin/script-utils/startcbinary/mockbin/has-valgrind
diff --git a/client/go/script-utils/startcbinary/mockbin/no-numactl b/client/go/internal/admin/script-utils/startcbinary/mockbin/no-numactl
index dfe583abaca..dfe583abaca 100755
--- a/client/go/script-utils/startcbinary/mockbin/no-numactl
+++ b/client/go/internal/admin/script-utils/startcbinary/mockbin/no-numactl
diff --git a/client/go/script-utils/startcbinary/mockbin/no-valgrind b/client/go/internal/admin/script-utils/startcbinary/mockbin/no-valgrind
index 7a74e29b84b..7a74e29b84b 100755
--- a/client/go/script-utils/startcbinary/mockbin/no-valgrind
+++ b/client/go/internal/admin/script-utils/startcbinary/mockbin/no-valgrind
diff --git a/client/go/script-utils/startcbinary/numactl.go b/client/go/internal/admin/script-utils/startcbinary/numactl.go
index 1585d8ddf81..fe091dedba9 100644
--- a/client/go/script-utils/startcbinary/numactl.go
+++ b/client/go/internal/admin/script-utils/startcbinary/numactl.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func (p *ProgSpec) configureNumaCtl() {
diff --git a/client/go/script-utils/startcbinary/numactl_test.go b/client/go/internal/admin/script-utils/startcbinary/numactl_test.go
index 0671a0a7fbc..65f52be988e 100644
--- a/client/go/script-utils/startcbinary/numactl_test.go
+++ b/client/go/internal/admin/script-utils/startcbinary/numactl_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func setup(t *testing.T, testFileName string) {
diff --git a/client/go/script-utils/startcbinary/progspec.go b/client/go/internal/admin/script-utils/startcbinary/progspec.go
index 242cb846587..9975f6c3c90 100644
--- a/client/go/script-utils/startcbinary/progspec.go
+++ b/client/go/internal/admin/script-utils/startcbinary/progspec.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 type ProgSpec struct {
diff --git a/client/go/script-utils/startcbinary/progspec_test.go b/client/go/internal/admin/script-utils/startcbinary/progspec_test.go
index be113e4e350..be113e4e350 100644
--- a/client/go/script-utils/startcbinary/progspec_test.go
+++ b/client/go/internal/admin/script-utils/startcbinary/progspec_test.go
diff --git a/client/go/script-utils/startcbinary/startcbinary.go b/client/go/internal/admin/script-utils/startcbinary/startcbinary.go
index 142217c1fe8..f5e58e59808 100644
--- a/client/go/script-utils/startcbinary/startcbinary.go
+++ b/client/go/internal/admin/script-utils/startcbinary/startcbinary.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func startCbinary(spec *ProgSpec) int {
diff --git a/client/go/script-utils/startcbinary/tuning.go b/client/go/internal/admin/script-utils/startcbinary/tuning.go
index 950842babd6..57230629d7a 100644
--- a/client/go/script-utils/startcbinary/tuning.go
+++ b/client/go/internal/admin/script-utils/startcbinary/tuning.go
@@ -4,7 +4,7 @@
 package startcbinary
 
 import (
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func (spec *ProgSpec) configureTuning() {
diff --git a/client/go/script-utils/startcbinary/valgrind.go b/client/go/internal/admin/script-utils/startcbinary/valgrind.go
index ffbbd8cca8d..43a1ed602bd 100644
--- a/client/go/script-utils/startcbinary/valgrind.go
+++ b/client/go/internal/admin/script-utils/startcbinary/valgrind.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func (p *ProgSpec) configureValgrind() {
diff --git a/client/go/script-utils/startcbinary/valgrind_test.go b/client/go/internal/admin/script-utils/startcbinary/valgrind_test.go
index 85d1fe05737..48cc78474ed 100644
--- a/client/go/script-utils/startcbinary/valgrind_test.go
+++ b/client/go/internal/admin/script-utils/startcbinary/valgrind_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 var tmpBin string
diff --git a/client/go/script-utils/startcbinary/vespamalloc.go b/client/go/internal/admin/script-utils/startcbinary/vespamalloc.go
index 6c0bd3ea9db..c6d53e1d03c 100644
--- a/client/go/script-utils/startcbinary/vespamalloc.go
+++ b/client/go/internal/admin/script-utils/startcbinary/vespamalloc.go
@@ -6,9 +6,9 @@ package startcbinary
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func vespaMallocLib(suf string) string {
diff --git a/client/go/trace/log.go b/client/go/internal/admin/trace/log.go
index b89b1f82322..0254d0e4f4a 100644
--- a/client/go/trace/log.go
+++ b/client/go/internal/admin/trace/log.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 )
 
 // make a vespa-format log line
diff --git a/client/go/trace/trace.go b/client/go/internal/admin/trace/trace.go
index bf180e80dad..bf180e80dad 100644
--- a/client/go/trace/trace.go
+++ b/client/go/internal/admin/trace/trace.go
diff --git a/client/go/auth/auth.go b/client/go/internal/cli/auth/auth.go
index 100af7ea1d2..100af7ea1d2 100644
--- a/client/go/auth/auth.go
+++ b/client/go/internal/cli/auth/auth.go
diff --git a/client/go/auth/auth0/auth0.go b/client/go/internal/cli/auth/auth0/auth0.go
index 6c31b3ba8e4..36dc0b8871c 100644
--- a/client/go/auth/auth0/auth0.go
+++ b/client/go/internal/cli/auth/auth0/auth0.go
@@ -13,8 +13,8 @@ import (
 	"sort"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/auth"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/auth/auth0/auth0_test.go b/client/go/internal/cli/auth/auth0/auth0_test.go
index 2616a62ef55..39393bbdfc1 100644
--- a/client/go/auth/auth0/auth0_test.go
+++ b/client/go/internal/cli/auth/auth0/auth0_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestConfigWriting(t *testing.T) {
diff --git a/client/go/auth/secrets.go b/client/go/internal/cli/auth/secrets.go
index e38d8c56595..e38d8c56595 100644
--- a/client/go/auth/secrets.go
+++ b/client/go/internal/cli/auth/secrets.go
diff --git a/client/go/auth/token.go b/client/go/internal/cli/auth/token.go
index d6f5e6dfa43..d6f5e6dfa43 100644
--- a/client/go/auth/token.go
+++ b/client/go/internal/cli/auth/token.go
diff --git a/client/go/auth/zts/zts.go b/client/go/internal/cli/auth/zts/zts.go
index d288c2050d9..9fabe219209 100644
--- a/client/go/auth/zts/zts.go
+++ b/client/go/internal/cli/auth/zts/zts.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const DefaultURL = "https://zts.athenz.ouroath.com:4443"
diff --git a/client/go/auth/zts/zts_test.go b/client/go/internal/cli/auth/zts/zts_test.go
index 504f29e9808..6c6ced9bb33 100644
--- a/client/go/auth/zts/zts_test.go
+++ b/client/go/internal/cli/auth/zts/zts_test.go
@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"testing"
 
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestAccessToken(t *testing.T) {
diff --git a/client/go/build/build.go b/client/go/internal/cli/build/build.go
index a8342a9fb1e..a8342a9fb1e 100644
--- a/client/go/build/build.go
+++ b/client/go/internal/cli/build/build.go
diff --git a/client/go/cmd/api_key.go b/client/go/internal/cli/cmd/api_key.go
index 0b55b43a756..367a515f3c3 100644
--- a/client/go/cmd/api_key.go
+++ b/client/go/internal/cli/cmd/api_key.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newAPIKeyCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/api_key_test.go b/client/go/internal/cli/cmd/api_key_test.go
index 9c14033f85b..9c14033f85b 100644
--- a/client/go/cmd/api_key_test.go
+++ b/client/go/internal/cli/cmd/api_key_test.go
diff --git a/client/go/cmd/auth.go b/client/go/internal/cli/cmd/auth.go
index 453d2296b08..453d2296b08 100644
--- a/client/go/cmd/auth.go
+++ b/client/go/internal/cli/cmd/auth.go
diff --git a/client/go/cmd/cert.go b/client/go/internal/cli/cmd/cert.go
index e1907737105..7f79a9db358 100644
--- a/client/go/cmd/cert.go
+++ b/client/go/internal/cli/cmd/cert.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newCertCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/cert_test.go b/client/go/internal/cli/cmd/cert_test.go
index fe983e0ad5a..d6b47083e7b 100644
--- a/client/go/cmd/cert_test.go
+++ b/client/go/internal/cli/cmd/cert_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestCert(t *testing.T) {
diff --git a/client/go/cmd/clone.go b/client/go/internal/cli/cmd/clone.go
index 6fb97581ea3..6fb97581ea3 100644
--- a/client/go/cmd/clone.go
+++ b/client/go/internal/cli/cmd/clone.go
diff --git a/client/go/cmd/clone_list.go b/client/go/internal/cli/cmd/clone_list.go
index 1d37c0a8617..826aea7b75e 100644
--- a/client/go/cmd/clone_list.go
+++ b/client/go/internal/cli/cmd/clone_list.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func listSampleApps(client util.HTTPClient) ([]string, error) {
diff --git a/client/go/cmd/clone_list_test.go b/client/go/internal/cli/cmd/clone_list_test.go
index 737adeaac43..f69ad2be8cf 100644
--- a/client/go/cmd/clone_list_test.go
+++ b/client/go/internal/cli/cmd/clone_list_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestListSampleApps(t *testing.T) {
diff --git a/client/go/cmd/clone_test.go b/client/go/internal/cli/cmd/clone_test.go
index 1971e0032a4..f136299db85 100644
--- a/client/go/cmd/clone_test.go
+++ b/client/go/internal/cli/cmd/clone_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func TestClone(t *testing.T) {
diff --git a/client/go/cmd/clusterstate/cluster_state.go b/client/go/internal/cli/cmd/clusterstate/cluster_state.go
index 2849e1aaf95..7317e9a8a3a 100644
--- a/client/go/cmd/clusterstate/cluster_state.go
+++ b/client/go/internal/cli/cmd/clusterstate/cluster_state.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // common struct used various places in the clustercontroller REST api:
diff --git a/client/go/cmd/clusterstate/detect_model.go b/client/go/internal/cli/cmd/clusterstate/detect_model.go
index 61af9c03e21..bb1192d4106 100644
--- a/client/go/cmd/clusterstate/detect_model.go
+++ b/client/go/internal/cli/cmd/clusterstate/detect_model.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func getConfigServerHosts(s string) []string {
diff --git a/client/go/cmd/clusterstate/get_cluster_state.go b/client/go/internal/cli/cmd/clusterstate/get_cluster_state.go
index cb8c0b97d04..505235a284e 100644
--- a/client/go/cmd/clusterstate/get_cluster_state.go
+++ b/client/go/internal/cli/cmd/clusterstate/get_cluster_state.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
 )
 
 func NewGetClusterStateCmd() *cobra.Command {
diff --git a/client/go/cmd/clusterstate/get_node_state.go b/client/go/internal/cli/cmd/clusterstate/get_node_state.go
index 23eac74fed1..6d45e377a72 100644
--- a/client/go/cmd/clusterstate/get_node_state.go
+++ b/client/go/internal/cli/cmd/clusterstate/get_node_state.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
 )
 
 const (
diff --git a/client/go/cmd/clusterstate/known_state.go b/client/go/internal/cli/cmd/clusterstate/known_state.go
index 60a4ada7711..60a4ada7711 100644
--- a/client/go/cmd/clusterstate/known_state.go
+++ b/client/go/internal/cli/cmd/clusterstate/known_state.go
diff --git a/client/go/cmd/clusterstate/model_config.go b/client/go/internal/cli/cmd/clusterstate/model_config.go
index 9a7510eba79..5d0e9d98200 100644
--- a/client/go/cmd/clusterstate/model_config.go
+++ b/client/go/internal/cli/cmd/clusterstate/model_config.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 type VespaModelConfig struct {
diff --git a/client/go/cmd/clusterstate/options.go b/client/go/internal/cli/cmd/clusterstate/options.go
index b2537a52766..b58562f9abe 100644
--- a/client/go/cmd/clusterstate/options.go
+++ b/client/go/internal/cli/cmd/clusterstate/options.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/cmd/clusterstate/run_curl.go b/client/go/internal/cli/cmd/clusterstate/run_curl.go
index 9275c558c6d..1dcb31528e1 100644
--- a/client/go/cmd/clusterstate/run_curl.go
+++ b/client/go/internal/cli/cmd/clusterstate/run_curl.go
@@ -12,9 +12,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/curl"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/curl"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func curlCommand(url string, args []string) (*curl.Command, error) {
diff --git a/client/go/cmd/clusterstate/set_node_state.go b/client/go/internal/cli/cmd/clusterstate/set_node_state.go
index aed5b21eecb..2a6869c84f5 100644
--- a/client/go/cmd/clusterstate/set_node_state.go
+++ b/client/go/internal/cli/cmd/clusterstate/set_node_state.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/cmd/clusterstate/show_hidden.go b/client/go/internal/cli/cmd/clusterstate/show_hidden.go
index 8c0ef61bf18..8c0ef61bf18 100644
--- a/client/go/cmd/clusterstate/show_hidden.go
+++ b/client/go/internal/cli/cmd/clusterstate/show_hidden.go
diff --git a/client/go/cmd/config.go b/client/go/internal/cli/cmd/config.go
index acca161727b..e5124962831 100644
--- a/client/go/cmd/config.go
+++ b/client/go/internal/cli/cmd/config.go
@@ -19,9 +19,9 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/vespa-engine/vespa/client/go/auth/auth0"
-	"github.com/vespa-engine/vespa/client/go/config"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth/auth0"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/config"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/cmd/config_test.go b/client/go/internal/cli/cmd/config_test.go
index 7d701931a04..c76277119a0 100644
--- a/client/go/cmd/config_test.go
+++ b/client/go/internal/cli/cmd/config_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestConfig(t *testing.T) {
diff --git a/client/go/cmd/curl.go b/client/go/internal/cli/cmd/curl.go
index 4b2eb9ba987..8fcd1fa6ef7 100644
--- a/client/go/cmd/curl.go
+++ b/client/go/internal/cli/cmd/curl.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/curl"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/curl"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newCurlCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/curl_test.go b/client/go/internal/cli/cmd/curl_test.go
index 3eca0726bb4..3eca0726bb4 100644
--- a/client/go/cmd/curl_test.go
+++ b/client/go/internal/cli/cmd/curl_test.go
diff --git a/client/go/cmd/deploy.go b/client/go/internal/cli/cmd/deploy.go
index df08c90768b..76027744268 100644
--- a/client/go/cmd/deploy.go
+++ b/client/go/internal/cli/cmd/deploy.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/version"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newDeployCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/deploy/activate.go b/client/go/internal/cli/cmd/deploy/activate.go
index 1f475ff0461..1f475ff0461 100644
--- a/client/go/cmd/deploy/activate.go
+++ b/client/go/internal/cli/cmd/deploy/activate.go
diff --git a/client/go/cmd/deploy/cmd.go b/client/go/internal/cli/cmd/deploy/cmd.go
index 39111b80d01..c4489d11771 100644
--- a/client/go/cmd/deploy/cmd.go
+++ b/client/go/internal/cli/cmd/deploy/cmd.go
@@ -9,10 +9,10 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func reallySimpleHelp(cmd *cobra.Command, args []string) {
diff --git a/client/go/cmd/deploy/curl.go b/client/go/internal/cli/cmd/deploy/curl.go
index 92b5cead0e9..b46d4e361a9 100644
--- a/client/go/cmd/deploy/curl.go
+++ b/client/go/internal/cli/cmd/deploy/curl.go
@@ -12,10 +12,10 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/curl"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/curl"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func curlPutNothing(url string) (string, error) {
diff --git a/client/go/cmd/deploy/fetch.go b/client/go/internal/cli/cmd/deploy/fetch.go
index 3936ecd5ecb..47eeb8631c6 100644
--- a/client/go/cmd/deploy/fetch.go
+++ b/client/go/internal/cli/cmd/deploy/fetch.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // main entry point for vespa-deploy fetch
diff --git a/client/go/cmd/deploy/options.go b/client/go/internal/cli/cmd/deploy/options.go
index 21ee8c902ed..21ee8c902ed 100644
--- a/client/go/cmd/deploy/options.go
+++ b/client/go/internal/cli/cmd/deploy/options.go
diff --git a/client/go/cmd/deploy/persist.go b/client/go/internal/cli/cmd/deploy/persist.go
index 1ccb24f437e..e52642693fb 100644
--- a/client/go/cmd/deploy/persist.go
+++ b/client/go/internal/cli/cmd/deploy/persist.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/cmd/deploy/prepare.go b/client/go/internal/cli/cmd/deploy/prepare.go
index 4e048883746..4e048883746 100644
--- a/client/go/cmd/deploy/prepare.go
+++ b/client/go/internal/cli/cmd/deploy/prepare.go
diff --git a/client/go/cmd/deploy/results.go b/client/go/internal/cli/cmd/deploy/results.go
index 47a05e45ab7..47a05e45ab7 100644
--- a/client/go/cmd/deploy/results.go
+++ b/client/go/internal/cli/cmd/deploy/results.go
diff --git a/client/go/cmd/deploy/upload.go b/client/go/internal/cli/cmd/deploy/upload.go
index 9041fbad3f7..9e963338bf7 100644
--- a/client/go/cmd/deploy/upload.go
+++ b/client/go/internal/cli/cmd/deploy/upload.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 // main entry point for vespa-deploy upload
diff --git a/client/go/cmd/deploy/urls.go b/client/go/internal/cli/cmd/deploy/urls.go
index b2a1f622490..ff43bbe29d5 100644
--- a/client/go/cmd/deploy/urls.go
+++ b/client/go/internal/cli/cmd/deploy/urls.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func makeConfigsourceUrl(opts *Options) string {
diff --git a/client/go/cmd/deploy_test.go b/client/go/internal/cli/cmd/deploy_test.go
index e231591f94e..9eaf878bc5e 100644
--- a/client/go/cmd/deploy_test.go
+++ b/client/go/internal/cli/cmd/deploy_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestPrepareZip(t *testing.T) {
diff --git a/client/go/cmd/document.go b/client/go/internal/cli/cmd/document.go
index 9fe1492fed9..b5b63fd32df 100644
--- a/client/go/cmd/document.go
+++ b/client/go/internal/cli/cmd/document.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func addDocumentFlags(cmd *cobra.Command, printCurl *bool, timeoutSecs *int) {
diff --git a/client/go/cmd/document_test.go b/client/go/internal/cli/cmd/document_test.go
index 320165493ba..bf9cc0404dc 100644
--- a/client/go/cmd/document_test.go
+++ b/client/go/internal/cli/cmd/document_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestDocumentSendPut(t *testing.T) {
diff --git a/client/go/cmd/log.go b/client/go/internal/cli/cmd/log.go
index dffad8896fc..fa07e33538c 100644
--- a/client/go/cmd/log.go
+++ b/client/go/internal/cli/cmd/log.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newLogCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/log_test.go b/client/go/internal/cli/cmd/log_test.go
index d7b5e20fab5..8727c82fede 100644
--- a/client/go/cmd/log_test.go
+++ b/client/go/internal/cli/cmd/log_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 func TestLog(t *testing.T) {
diff --git a/client/go/cmd/login.go b/client/go/internal/cli/cmd/login.go
index 6ccad31248d..aa6a18b3b38 100644
--- a/client/go/cmd/login.go
+++ b/client/go/internal/cli/cmd/login.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/auth"
-	"github.com/vespa-engine/vespa/client/go/auth/auth0"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth/auth0"
 )
 
 // newLoginCmd runs the login flow guiding the user through the process
diff --git a/client/go/cmd/logout.go b/client/go/internal/cli/cmd/logout.go
index de9005c34d8..f2ee6e87ac7 100644
--- a/client/go/cmd/logout.go
+++ b/client/go/internal/cli/cmd/logout.go
@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/auth/auth0"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth/auth0"
 )
 
 func newLogoutCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/man.go b/client/go/internal/cli/cmd/man.go
index 4d139adb244..4d139adb244 100644
--- a/client/go/cmd/man.go
+++ b/client/go/internal/cli/cmd/man.go
diff --git a/client/go/cmd/man_test.go b/client/go/internal/cli/cmd/man_test.go
index b885d6a8fac..0c214698047 100644
--- a/client/go/cmd/man_test.go
+++ b/client/go/internal/cli/cmd/man_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func TestMan(t *testing.T) {
diff --git a/client/go/cmd/prod.go b/client/go/internal/cli/cmd/prod.go
index 6b5470aaa6c..57b7abe5b6e 100644
--- a/client/go/cmd/prod.go
+++ b/client/go/internal/cli/cmd/prod.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
-	"github.com/vespa-engine/vespa/client/go/vespa/xml"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa/xml"
 )
 
 func newProdCmd() *cobra.Command {
diff --git a/client/go/cmd/prod_test.go b/client/go/internal/cli/cmd/prod_test.go
index c9584511203..b04e7861080 100644
--- a/client/go/cmd/prod_test.go
+++ b/client/go/internal/cli/cmd/prod_test.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestProdInit(t *testing.T) {
diff --git a/client/go/cmd/query.go b/client/go/internal/cli/cmd/query.go
index d147e986cec..a14e2d51036 100644
--- a/client/go/cmd/query.go
+++ b/client/go/internal/cli/cmd/query.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/curl"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/curl"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newQueryCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/query_test.go b/client/go/internal/cli/cmd/query_test.go
index d024ca5189e..94b5a485b9d 100644
--- a/client/go/cmd/query_test.go
+++ b/client/go/internal/cli/cmd/query_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestQuery(t *testing.T) {
diff --git a/client/go/cmd/root.go b/client/go/internal/cli/cmd/root.go
index d41be3fa097..faba6bbbfd4 100644
--- a/client/go/cmd/root.go
+++ b/client/go/internal/cli/cmd/root.go
@@ -16,10 +16,10 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 const (
diff --git a/client/go/cmd/status.go b/client/go/internal/cli/cmd/status.go
index 56f394d94ee..ab98a4da160 100644
--- a/client/go/cmd/status.go
+++ b/client/go/internal/cli/cmd/status.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newStatusCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/status_test.go b/client/go/internal/cli/cmd/status_test.go
index 7dc2aeace84..a3cae7c3fe4 100644
--- a/client/go/cmd/status_test.go
+++ b/client/go/internal/cli/cmd/status_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestStatusDeployCommand(t *testing.T) {
diff --git a/client/go/cmd/test.go b/client/go/internal/cli/cmd/test.go
index 1c452acd7f6..d071f9556a2 100644
--- a/client/go/cmd/test.go
+++ b/client/go/internal/cli/cmd/test.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func newTestCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/test_test.go b/client/go/internal/cli/cmd/test_test.go
index 1eef816d983..5d6bb441b2a 100644
--- a/client/go/cmd/test_test.go
+++ b/client/go/internal/cli/cmd/test_test.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 func TestSuite(t *testing.T) {
diff --git a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Put.json b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Put.json
index c67b90664d6..c67b90664d6 100644
--- a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Put.json
+++ b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Put.json
diff --git a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Remove.json b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Remove.json
index 8eeb19cbaa6..8eeb19cbaa6 100644
--- a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Remove.json
+++ b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Remove.json
diff --git a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Update.json b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Update.json
index 0f5e35c3fd5..0f5e35c3fd5 100644
--- a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Update.json
+++ b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Update.json
diff --git a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Without-Operation.json b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Without-Operation.json
index b68872a961e..b68872a961e 100644
--- a/client/go/cmd/testdata/A-Head-Full-of-Dreams-Without-Operation.json
+++ b/client/go/internal/cli/cmd/testdata/A-Head-Full-of-Dreams-Without-Operation.json
diff --git a/client/go/cmd/testdata/applications/withDeployment/target/application-test.zip b/client/go/internal/cli/cmd/testdata/applications/withDeployment/target/application-test.zip
index 8a1707b9cee..8a1707b9cee 100644
--- a/client/go/cmd/testdata/applications/withDeployment/target/application-test.zip
+++ b/client/go/internal/cli/cmd/testdata/applications/withDeployment/target/application-test.zip
diff --git a/client/go/cmd/testdata/applications/withDeployment/target/application.zip b/client/go/internal/cli/cmd/testdata/applications/withDeployment/target/application.zip
index da23c2ff437..da23c2ff437 100644
--- a/client/go/cmd/testdata/applications/withDeployment/target/application.zip
+++ b/client/go/internal/cli/cmd/testdata/applications/withDeployment/target/application.zip
diff --git a/client/go/cmd/testdata/applications/withEmptyTarget/pom.xml b/client/go/internal/cli/cmd/testdata/applications/withEmptyTarget/pom.xml
index bb7a232ea2a..bb7a232ea2a 100644
--- a/client/go/cmd/testdata/applications/withEmptyTarget/pom.xml
+++ b/client/go/internal/cli/cmd/testdata/applications/withEmptyTarget/pom.xml
diff --git a/client/go/cmd/testdata/applications/withEmptyTarget/target/placeholder b/client/go/internal/cli/cmd/testdata/applications/withEmptyTarget/target/placeholder
index e69de29bb2d..e69de29bb2d 100644
--- a/client/go/cmd/testdata/applications/withEmptyTarget/target/placeholder
+++ b/client/go/internal/cli/cmd/testdata/applications/withEmptyTarget/target/placeholder
diff --git a/client/go/cmd/testdata/applications/withInvalidEntries/target/application-test.zip b/client/go/internal/cli/cmd/testdata/applications/withInvalidEntries/target/application-test.zip
index 3e4e8c23f9b..3e4e8c23f9b 100644
--- a/client/go/cmd/testdata/applications/withInvalidEntries/target/application-test.zip
+++ b/client/go/internal/cli/cmd/testdata/applications/withInvalidEntries/target/application-test.zip
diff --git a/client/go/cmd/testdata/applications/withInvalidEntries/target/application.zip b/client/go/internal/cli/cmd/testdata/applications/withInvalidEntries/target/application.zip
index 3e4e8c23f9b..3e4e8c23f9b 100644
--- a/client/go/cmd/testdata/applications/withInvalidEntries/target/application.zip
+++ b/client/go/internal/cli/cmd/testdata/applications/withInvalidEntries/target/application.zip
diff --git a/client/go/cmd/testdata/applications/withSource/src/main/application/hosts.xml b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/hosts.xml
index 4b4f607ea95..4b4f607ea95 100644
--- a/client/go/cmd/testdata/applications/withSource/src/main/application/hosts.xml
+++ b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/hosts.xml
diff --git a/client/go/cmd/testdata/applications/withSource/src/main/application/schemas/msmarco.sd b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/schemas/msmarco.sd
index 3c481edc10d..3c481edc10d 100644
--- a/client/go/cmd/testdata/applications/withSource/src/main/application/schemas/msmarco.sd
+++ b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/schemas/msmarco.sd
diff --git a/client/go/cmd/testdata/applications/withSource/src/main/application/services.xml b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/services.xml
index 60267517c33..60267517c33 100644
--- a/client/go/cmd/testdata/applications/withSource/src/main/application/services.xml
+++ b/client/go/internal/cli/cmd/testdata/applications/withSource/src/main/application/services.xml
diff --git a/client/go/cmd/testdata/applications/withTarget/pom.xml b/client/go/internal/cli/cmd/testdata/applications/withTarget/pom.xml
index bb7a232ea2a..bb7a232ea2a 100644
--- a/client/go/cmd/testdata/applications/withTarget/pom.xml
+++ b/client/go/internal/cli/cmd/testdata/applications/withTarget/pom.xml
diff --git a/client/go/cmd/testdata/applications/withTarget/target/application.zip b/client/go/internal/cli/cmd/testdata/applications/withTarget/target/application.zip
index b017db6472d..b017db6472d 100644
--- a/client/go/cmd/testdata/applications/withTarget/target/application.zip
+++ b/client/go/internal/cli/cmd/testdata/applications/withTarget/target/application.zip
diff --git a/client/go/cmd/testdata/empty.json b/client/go/internal/cli/cmd/testdata/empty.json
index 9e26dfeeb6e..9e26dfeeb6e 100644
--- a/client/go/cmd/testdata/empty.json
+++ b/client/go/internal/cli/cmd/testdata/empty.json
diff --git a/client/go/cmd/testdata/sample-apps-contents.json b/client/go/internal/cli/cmd/testdata/sample-apps-contents.json
index 02824f01147..02824f01147 100644
--- a/client/go/cmd/testdata/sample-apps-contents.json
+++ b/client/go/internal/cli/cmd/testdata/sample-apps-contents.json
diff --git a/client/go/cmd/testdata/sample-apps-master.zip b/client/go/internal/cli/cmd/testdata/sample-apps-master.zip
index c8fb40af713..c8fb40af713 100644
--- a/client/go/cmd/testdata/sample-apps-master.zip
+++ b/client/go/internal/cli/cmd/testdata/sample-apps-master.zip
diff --git a/client/go/cmd/testdata/sample-apps-news.json b/client/go/internal/cli/cmd/testdata/sample-apps-news.json
index 495f2cf1294..495f2cf1294 100644
--- a/client/go/cmd/testdata/sample-apps-news.json
+++ b/client/go/internal/cli/cmd/testdata/sample-apps-news.json
diff --git a/client/go/cmd/testdata/sample-apps-operations.json b/client/go/internal/cli/cmd/testdata/sample-apps-operations.json
index 9dc4fb39ddb..9dc4fb39ddb 100644
--- a/client/go/cmd/testdata/sample-apps-operations.json
+++ b/client/go/internal/cli/cmd/testdata/sample-apps-operations.json
diff --git a/client/go/cmd/testdata/sample-apps-vespa-cloud.json b/client/go/internal/cli/cmd/testdata/sample-apps-vespa-cloud.json
index 3aa932c348f..3aa932c348f 100644
--- a/client/go/cmd/testdata/sample-apps-vespa-cloud.json
+++ b/client/go/internal/cli/cmd/testdata/sample-apps-vespa-cloud.json
diff --git a/client/go/cmd/testdata/tests/body.json b/client/go/internal/cli/cmd/testdata/tests/body.json
index 767330b1a2d..767330b1a2d 100644
--- a/client/go/cmd/testdata/tests/body.json
+++ b/client/go/internal/cli/cmd/testdata/tests/body.json
diff --git a/client/go/cmd/testdata/tests/expected-suite.out b/client/go/internal/cli/cmd/testdata/tests/expected-suite.out
index df916f50a95..df916f50a95 100644
--- a/client/go/cmd/testdata/tests/expected-suite.out
+++ b/client/go/internal/cli/cmd/testdata/tests/expected-suite.out
diff --git a/client/go/cmd/testdata/tests/expected.out b/client/go/internal/cli/cmd/testdata/tests/expected.out
index 2ca35fe6a37..2ca35fe6a37 100644
--- a/client/go/cmd/testdata/tests/expected.out
+++ b/client/go/internal/cli/cmd/testdata/tests/expected.out
diff --git a/client/go/cmd/testdata/tests/production-test/external.json b/client/go/internal/cli/cmd/testdata/tests/production-test/external.json
index af288bc8b1b..af288bc8b1b 100644
--- a/client/go/cmd/testdata/tests/production-test/external.json
+++ b/client/go/internal/cli/cmd/testdata/tests/production-test/external.json
diff --git a/client/go/cmd/testdata/tests/production-test/illegal-reference.json b/client/go/internal/cli/cmd/testdata/tests/production-test/illegal-reference.json
index ced4a86dd6c..ced4a86dd6c 100644
--- a/client/go/cmd/testdata/tests/production-test/illegal-reference.json
+++ b/client/go/internal/cli/cmd/testdata/tests/production-test/illegal-reference.json
diff --git a/client/go/cmd/testdata/tests/production-test/illegal-uri.json b/client/go/internal/cli/cmd/testdata/tests/production-test/illegal-uri.json
index fe4fadfa93d..fe4fadfa93d 100644
--- a/client/go/cmd/testdata/tests/production-test/illegal-uri.json
+++ b/client/go/internal/cli/cmd/testdata/tests/production-test/illegal-uri.json
diff --git a/client/go/cmd/testdata/tests/response.json b/client/go/internal/cli/cmd/testdata/tests/response.json
index 48368b935a8..48368b935a8 100644
--- a/client/go/cmd/testdata/tests/response.json
+++ b/client/go/internal/cli/cmd/testdata/tests/response.json
diff --git a/client/go/cmd/testdata/tests/staging-test/not-json b/client/go/internal/cli/cmd/testdata/tests/staging-test/not-json
index b6fc4c620b6..b6fc4c620b6 100644
--- a/client/go/cmd/testdata/tests/staging-test/not-json
+++ b/client/go/internal/cli/cmd/testdata/tests/staging-test/not-json
diff --git a/client/go/cmd/testdata/tests/system-test/foo/body.json b/client/go/internal/cli/cmd/testdata/tests/system-test/foo/body.json
index 0bbf626eafe..0bbf626eafe 100644
--- a/client/go/cmd/testdata/tests/system-test/foo/body.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/foo/body.json
diff --git a/client/go/cmd/testdata/tests/system-test/foo/query.json b/client/go/internal/cli/cmd/testdata/tests/system-test/foo/query.json
index 25b8c5b0039..25b8c5b0039 100644
--- a/client/go/cmd/testdata/tests/system-test/foo/query.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/foo/query.json
diff --git a/client/go/cmd/testdata/tests/system-test/test.json b/client/go/internal/cli/cmd/testdata/tests/system-test/test.json
index 2e327b5e5df..2e327b5e5df 100644
--- a/client/go/cmd/testdata/tests/system-test/test.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/test.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-bool-value.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-bool-value.json
index c594a206347..c594a206347 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-bool-value.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-bool-value.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-code.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-code.json
index c325054faa1..c325054faa1 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-code.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-code.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-element-count.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-element-count.json
index a772af67a78..a772af67a78 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-element-count.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-element-count.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-field-name.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-field-name.json
index 6ce3d055584..6ce3d055584 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-field-name.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-field-name.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-float-value.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-float-value.json
index 6a1b221a91a..6a1b221a91a 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-float-value.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-float-value.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-int-value.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-int-value.json
index d61a8b002c2..d61a8b002c2 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-int-value.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-int-value.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-null-value.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-null-value.json
index ea78357c99e..ea78357c99e 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-null-value.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-null-value.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-string-value.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-string-value.json
index 5f56ebaab6d..5f56ebaab6d 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-string-value.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-string-value.json
diff --git a/client/go/cmd/testdata/tests/system-test/wrong-type.json b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-type.json
index 6be28ff68ff..6be28ff68ff 100644
--- a/client/go/cmd/testdata/tests/system-test/wrong-type.json
+++ b/client/go/internal/cli/cmd/testdata/tests/system-test/wrong-type.json
diff --git a/client/go/cmd/testutil_test.go b/client/go/internal/cli/cmd/testutil_test.go
index 09c0478a45a..6eade6edd86 100644
--- a/client/go/cmd/testutil_test.go
+++ b/client/go/internal/cli/cmd/testutil_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func newTestCLI(t *testing.T, envVars ...string) (*CLI, *bytes.Buffer, *bytes.Buffer) {
diff --git a/client/go/cmd/version.go b/client/go/internal/cli/cmd/version.go
index 3189b573059..864c0668eda 100644
--- a/client/go/cmd/version.go
+++ b/client/go/internal/cli/cmd/version.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/vespa-engine/vespa/client/go/build"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 func newVersionCmd(cli *CLI) *cobra.Command {
diff --git a/client/go/cmd/version_test.go b/client/go/internal/cli/cmd/version_test.go
index 404aa9ac1e1..70eaf1814e7 100644
--- a/client/go/cmd/version_test.go
+++ b/client/go/internal/cli/cmd/version_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
 )
 
 func TestVersion(t *testing.T) {
diff --git a/client/go/cmd/vespa/main.go b/client/go/internal/cli/cmd/vespa/main.go
index 5e49f633877..cca35ba8368 100644
--- a/client/go/cmd/vespa/main.go
+++ b/client/go/internal/cli/cmd/vespa/main.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/cmd"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/cmd"
 )
 
 func fatal(status int, err error) {
diff --git a/client/go/config/config.go b/client/go/internal/cli/config/config.go
index beffff6e257..beffff6e257 100644
--- a/client/go/config/config.go
+++ b/client/go/internal/cli/config/config.go
diff --git a/client/go/config/config_test.go b/client/go/internal/cli/config/config_test.go
index 1458771a5f5..1458771a5f5 100644
--- a/client/go/config/config_test.go
+++ b/client/go/internal/cli/config/config_test.go
diff --git a/client/go/curl/curl.go b/client/go/internal/curl/curl.go
index f3f956ed619..b70e0f824a3 100644
--- a/client/go/curl/curl.go
+++ b/client/go/internal/curl/curl.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 
 	"github.com/kballard/go-shellquote"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 type header struct {
diff --git a/client/go/curl/curl_test.go b/client/go/internal/curl/curl_test.go
index 448e1e5199f..448e1e5199f 100644
--- a/client/go/curl/curl_test.go
+++ b/client/go/internal/curl/curl_test.go
diff --git a/client/go/mock/http.go b/client/go/internal/mock/http.go
index 84718e846c1..84718e846c1 100644
--- a/client/go/mock/http.go
+++ b/client/go/internal/mock/http.go
diff --git a/client/go/mock/process.go b/client/go/internal/mock/process.go
index 5105bed8b0c..5105bed8b0c 100644
--- a/client/go/mock/process.go
+++ b/client/go/internal/mock/process.go
diff --git a/client/go/mock/vespa.go b/client/go/internal/mock/vespa.go
index ca09a389360..ca09a389360 100644
--- a/client/go/mock/vespa.go
+++ b/client/go/internal/mock/vespa.go
diff --git a/client/go/util/array_list.go b/client/go/internal/util/array_list.go
index 2e74d30fcec..2e74d30fcec 100644
--- a/client/go/util/array_list.go
+++ b/client/go/internal/util/array_list.go
diff --git a/client/go/util/array_list_test.go b/client/go/internal/util/array_list_test.go
index 79eab4f8ef2..79eab4f8ef2 100644
--- a/client/go/util/array_list_test.go
+++ b/client/go/internal/util/array_list_test.go
diff --git a/client/go/util/execvp.go b/client/go/internal/util/execvp.go
index 9ee7d7deb6c..60f81380573 100644
--- a/client/go/util/execvp.go
+++ b/client/go/internal/util/execvp.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/client/go/util/execvp_windows.go b/client/go/internal/util/execvp_windows.go
index 24b67e221c8..24b67e221c8 100644
--- a/client/go/util/execvp_windows.go
+++ b/client/go/internal/util/execvp_windows.go
diff --git a/client/go/util/fix_fs.go b/client/go/internal/util/fix_fs.go
index 57caa7f1158..f7b5f767456 100644
--- a/client/go/util/fix_fs.go
+++ b/client/go/internal/util/fix_fs.go
@@ -10,7 +10,7 @@ import (
 	"os/user"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 type FixSpec struct {
diff --git a/client/go/util/fix_fs_test.go b/client/go/internal/util/fix_fs_test.go
index 1f0d317957d..0d65f43576b 100644
--- a/client/go/util/fix_fs_test.go
+++ b/client/go/internal/util/fix_fs_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func setup(t *testing.T) string {
diff --git a/client/go/util/http.go b/client/go/internal/util/http.go
index 056ca4ae2b6..53e3c4b36c2 100644
--- a/client/go/util/http.go
+++ b/client/go/internal/util/http.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/build"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/build"
 )
 
 type HTTPClient interface {
diff --git a/client/go/util/io.go b/client/go/internal/util/io.go
index 41f1aeb0aea..41f1aeb0aea 100644
--- a/client/go/util/io.go
+++ b/client/go/internal/util/io.go
diff --git a/client/go/util/io_test.go b/client/go/internal/util/io_test.go
index 42ee04f1dc6..42ee04f1dc6 100644
--- a/client/go/util/io_test.go
+++ b/client/go/internal/util/io_test.go
diff --git a/client/go/util/just_exit.go b/client/go/internal/util/just_exit.go
index 1fab6cf0b4f..b05430adcde 100644
--- a/client/go/util/just_exit.go
+++ b/client/go/internal/util/just_exit.go
@@ -6,7 +6,7 @@ package util
 import (
 	"fmt"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 type JustExitError struct {
diff --git a/client/go/util/md5.go b/client/go/internal/util/md5.go
index 84c7d5d5e1d..84c7d5d5e1d 100644
--- a/client/go/util/md5.go
+++ b/client/go/internal/util/md5.go
diff --git a/client/go/util/md5_test.go b/client/go/internal/util/md5_test.go
index 6c9302e18cf..6c9302e18cf 100644
--- a/client/go/util/md5_test.go
+++ b/client/go/internal/util/md5_test.go
diff --git a/client/go/util/operation_result.go b/client/go/internal/util/operation_result.go
index 5e79f727d4e..5e79f727d4e 100644
--- a/client/go/util/operation_result.go
+++ b/client/go/internal/util/operation_result.go
diff --git a/client/go/util/run_cmd.go b/client/go/internal/util/run_cmd.go
index bbdda0915fd..5d146a3e604 100644
--- a/client/go/util/run_cmd.go
+++ b/client/go/internal/util/run_cmd.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 type BackTicks int
diff --git a/client/go/util/setrlimit.go b/client/go/internal/util/setrlimit.go
index ba4d84fb18f..ec8769bfc6c 100644
--- a/client/go/util/setrlimit.go
+++ b/client/go/internal/util/setrlimit.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/client/go/util/setrlimit_windows.go b/client/go/internal/util/setrlimit_windows.go
index c40b1cb1364..c40b1cb1364 100644
--- a/client/go/util/setrlimit_windows.go
+++ b/client/go/internal/util/setrlimit_windows.go
diff --git a/client/go/util/spinner.go b/client/go/internal/util/spinner.go
index 39b00352c32..39b00352c32 100644
--- a/client/go/util/spinner.go
+++ b/client/go/internal/util/spinner.go
diff --git a/client/go/util/tune_logctl.go b/client/go/internal/util/tune_logctl.go
index 1ab87bed52c..1ab87bed52c 100644
--- a/client/go/util/tune_logctl.go
+++ b/client/go/internal/util/tune_logctl.go
diff --git a/client/go/util/tuning.go b/client/go/internal/util/tuning.go
index d727df42631..0cfa8810846 100644
--- a/client/go/util/tuning.go
+++ b/client/go/internal/util/tuning.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func OptionallyReduceTimerFrequency() {
diff --git a/client/go/version/version.go b/client/go/internal/version/version.go
index 256754e1157..27a923c0ca4 100644
--- a/client/go/version/version.go
+++ b/client/go/internal/version/version.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // Version represents a semantic version number.
diff --git a/client/go/version/version_test.go b/client/go/internal/version/version_test.go
index 1caf99a1dd4..1caf99a1dd4 100644
--- a/client/go/version/version_test.go
+++ b/client/go/internal/version/version_test.go
diff --git a/client/go/vespa/application.go b/client/go/internal/vespa/application.go
index d382b0998bf..b31dde54d67 100644
--- a/client/go/vespa/application.go
+++ b/client/go/internal/vespa/application.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 type ApplicationPackage struct {
diff --git a/client/go/vespa/crypto.go b/client/go/internal/vespa/crypto.go
index 30d951c2350..9621d0c1180 100644
--- a/client/go/vespa/crypto.go
+++ b/client/go/internal/vespa/crypto.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/vespa/crypto_test.go b/client/go/internal/vespa/crypto_test.go
index 89d50d15d70..89d50d15d70 100644
--- a/client/go/vespa/crypto_test.go
+++ b/client/go/internal/vespa/crypto_test.go
diff --git a/client/go/vespa/deploy.go b/client/go/internal/vespa/deploy.go
index c257ff4cd7d..687bfc46124 100644
--- a/client/go/vespa/deploy.go
+++ b/client/go/internal/vespa/deploy.go
@@ -17,8 +17,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 var DefaultApplication = ApplicationID{Tenant: "default", Application: "application", Instance: "default"}
diff --git a/client/go/vespa/deploy_test.go b/client/go/internal/vespa/deploy_test.go
index a56d537026c..3e74e9ab3b6 100644
--- a/client/go/vespa/deploy_test.go
+++ b/client/go/internal/vespa/deploy_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 func TestDeploy(t *testing.T) {
diff --git a/client/go/vespa/detect_hostname.go b/client/go/internal/vespa/detect_hostname.go
index 0462665caf1..9729fd80400 100644
--- a/client/go/vespa/detect_hostname.go
+++ b/client/go/internal/vespa/detect_hostname.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // detect if this host is IPv6-only, in which case we want to pass
diff --git a/client/go/vespa/detect_hostname_test.go b/client/go/internal/vespa/detect_hostname_test.go
index b25fbfcd30e..324701efb6f 100644
--- a/client/go/vespa/detect_hostname_test.go
+++ b/client/go/internal/vespa/detect_hostname_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func TestDetectHostname(t *testing.T) {
diff --git a/client/go/vespa/document.go b/client/go/internal/vespa/document.go
index e8620c59033..9e4c8e7d136 100644
--- a/client/go/vespa/document.go
+++ b/client/go/internal/vespa/document.go
@@ -14,8 +14,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/curl"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/curl"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 // Sends the operation given in the file
diff --git a/client/go/vespa/find_home.go b/client/go/internal/vespa/find_home.go
index a5ce8134477..672d3d18724 100644
--- a/client/go/vespa/find_home.go
+++ b/client/go/internal/vespa/find_home.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/vespa/find_user.go b/client/go/internal/vespa/find_user.go
index 4441871ef24..8385e5e1e71 100644
--- a/client/go/vespa/find_user.go
+++ b/client/go/internal/vespa/find_user.go
@@ -9,7 +9,7 @@ import (
 	"os/user"
 	"strconv"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 )
 
 // Which user should vespa services run as?  If current user is root,
diff --git a/client/go/vespa/find_user_test.go b/client/go/internal/vespa/find_user_test.go
index 3d533b08c56..3d533b08c56 100644
--- a/client/go/vespa/find_user_test.go
+++ b/client/go/internal/vespa/find_user_test.go
diff --git a/client/go/vespa/id.go b/client/go/internal/vespa/id.go
index b0dc770ad52..b0dc770ad52 100644
--- a/client/go/vespa/id.go
+++ b/client/go/internal/vespa/id.go
diff --git a/client/go/vespa/id_test.go b/client/go/internal/vespa/id_test.go
index 343affc1602..343affc1602 100644
--- a/client/go/vespa/id_test.go
+++ b/client/go/internal/vespa/id_test.go
diff --git a/client/go/vespa/load_env.go b/client/go/internal/vespa/load_env.go
index 3c73f7aaf53..6c41c1fece5 100644
--- a/client/go/vespa/load_env.go
+++ b/client/go/internal/vespa/load_env.go
@@ -11,9 +11,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const (
diff --git a/client/go/vespa/load_env_test.go b/client/go/internal/vespa/load_env_test.go
index fd2b2862c2f..8c3ef3ab3ab 100644
--- a/client/go/vespa/load_env_test.go
+++ b/client/go/internal/vespa/load_env_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
 
 func setup(t *testing.T, contents string) string {
diff --git a/client/go/vespa/log.go b/client/go/internal/vespa/log.go
index 0e2cb5d0bfd..0e2cb5d0bfd 100644
--- a/client/go/vespa/log.go
+++ b/client/go/internal/vespa/log.go
diff --git a/client/go/vespa/log_test.go b/client/go/internal/vespa/log_test.go
index 2d0c75d0a0a..2d0c75d0a0a 100644
--- a/client/go/vespa/log_test.go
+++ b/client/go/internal/vespa/log_test.go
diff --git a/client/go/vespa/prestart.go b/client/go/internal/vespa/prestart.go
index 6995129ae20..d2b0909693e 100644
--- a/client/go/vespa/prestart.go
+++ b/client/go/internal/vespa/prestart.go
@@ -7,8 +7,8 @@ import (
 	"io/fs"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 func RunPreStart() error {
diff --git a/client/go/vespa/switch_user.go b/client/go/internal/vespa/switch_user.go
index 9e3d8b25276..01e8794953d 100644
--- a/client/go/vespa/switch_user.go
+++ b/client/go/internal/vespa/switch_user.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"os/user"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
-	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
 )
 
 const ENV_CHECK = envvars.VESPA_ALREADY_SWITCHED_USER_TO
diff --git a/client/go/vespa/system.go b/client/go/internal/vespa/system.go
index b8263dbdec0..b8263dbdec0 100644
--- a/client/go/vespa/system.go
+++ b/client/go/internal/vespa/system.go
diff --git a/client/go/vespa/target.go b/client/go/internal/vespa/target.go
index 34dda889c5a..446b02c05cf 100644
--- a/client/go/vespa/target.go
+++ b/client/go/internal/vespa/target.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 const (
diff --git a/client/go/vespa/target_cloud.go b/client/go/internal/vespa/target_cloud.go
index c025fc153a2..eb9cc41014a 100644
--- a/client/go/vespa/target_cloud.go
+++ b/client/go/internal/vespa/target_cloud.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/auth/auth0"
-	"github.com/vespa-engine/vespa/client/go/auth/zts"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth/auth0"
+	"github.com/vespa-engine/vespa/client/go/internal/cli/auth/zts"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 // CloudOptions configures URL and authentication for a cloud target.
diff --git a/client/go/vespa/target_custom.go b/client/go/internal/vespa/target_custom.go
index 19fd56e7568..848d19f0a90 100644
--- a/client/go/vespa/target_custom.go
+++ b/client/go/internal/vespa/target_custom.go
@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 type customTarget struct {
diff --git a/client/go/vespa/target_test.go b/client/go/internal/vespa/target_test.go
index 9f6846ba8a7..f7731611deb 100644
--- a/client/go/vespa/target_test.go
+++ b/client/go/internal/vespa/target_test.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/version"
+	"github.com/vespa-engine/vespa/client/go/internal/mock"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/version"
 )
 
 type mockVespaApi struct {
diff --git a/client/go/vespa/tls_options.go b/client/go/internal/vespa/tls_options.go
index 7476d62db02..6d5657f49e7 100644
--- a/client/go/vespa/tls_options.go
+++ b/client/go/internal/vespa/tls_options.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/vespa-engine/vespa/client/go/envvars"
+	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 )
 
 type VespaTlsConfig struct {
diff --git a/client/go/vespa/xml/config.go b/client/go/internal/vespa/xml/config.go
index c2bd88307e5..0ce7413d671 100644
--- a/client/go/vespa/xml/config.go
+++ b/client/go/internal/vespa/xml/config.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
+	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
 var DefaultDeployment Deployment
diff --git a/client/go/vespa/xml/config_test.go b/client/go/internal/vespa/xml/config_test.go
index 0180a243406..0180a243406 100644
--- a/client/go/vespa/xml/config_test.go
+++ b/client/go/internal/vespa/xml/config_test.go