diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 30ec28db..d459563d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,12 +45,12 @@ jobs:
 
     - name: Test
       run: |
-        go test -c ./internal/daemon
+        go test -c ./internals/daemon
         PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E ./daemon.test -check.v -check.f ^execSuite\.TestUserGroup$
         PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E ./daemon.test -check.v -check.f ^execSuite\.TestUserIDGroupID$
         PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E ./daemon.test -check.v -check.f ^filesSuite\.TestWriteUserGroupReal$
         PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E ./daemon.test -check.v -check.f ^filesSuite\.TestMakeDirsUserGroupReal$
-        go test -c ./internal/overlord/servstate/
+        go test -c ./internals/overlord/servstate/
         PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E ./servstate.test -check.v -check.f ^S.TestUserGroup$
 
   format:
diff --git a/client/client.go b/client/client.go
index a9fde3ad..0e9cce91 100644
--- a/client/client.go
+++ b/client/client.go
@@ -31,7 +31,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/canonical/pebble/internal/wsutil"
+	"github.com/canonical/pebble/internals/wsutil"
 )
 
 // SocketNotFoundError is the error type returned when the client fails
diff --git a/client/exec.go b/client/exec.go
index 98c02d63..4b74242d 100644
--- a/client/exec.go
+++ b/client/exec.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/canonical/pebble/internal/wsutil"
+	"github.com/canonical/pebble/internals/wsutil"
 )
 
 type ExecOptions struct {
diff --git a/cmd/pebble/main.go b/cmd/pebble/main.go
index c83224cd..2d874728 100644
--- a/cmd/pebble/main.go
+++ b/cmd/pebble/main.go
@@ -15,424 +15,15 @@
 package main
 
 import (
-	"errors"
 	"fmt"
-	"io"
 	"os"
-	"os/user"
-	"path/filepath"
-	"strings"
-	"unicode"
-	"unicode/utf8"
 
-	"github.com/canonical/go-flags"
-
-	"golang.org/x/crypto/ssh/terminal"
-
-	"github.com/canonical/pebble/client"
-	"github.com/canonical/pebble/internal/logger"
-)
-
-var (
-	// Standard streams, redirected for testing.
-	Stdin  io.Reader = os.Stdin
-	Stdout io.Writer = os.Stdout
-	Stderr io.Writer = os.Stderr
-	// overridden for testing
-	ReadPassword = terminal.ReadPassword
-	// set to logger.Panicf in testing
-	noticef = logger.Noticef
+	"github.com/canonical/pebble/internals/cli"
 )
 
-// defaultPebbleDir is the Pebble directory used if $PEBBLE is not set. It is
-// created by the daemon ("pebble run") if it doesn't exist, and also used by
-// the pebble client.
-const defaultPebbleDir = "/var/lib/pebble/default"
-
-type options struct {
-	Version func() `long:"version"`
-}
-
-type argDesc struct {
-	name string
-	desc string
-}
-
-var optionsData options
-
-// ErrExtraArgs is returned  if extra arguments to a command are found
-var ErrExtraArgs = fmt.Errorf("too many arguments for command")
-
-// cmdInfo holds information needed to call parser.AddCommand(...).
-type cmdInfo struct {
-	name, shortHelp, longHelp string
-	builder                   func() flags.Commander
-	hidden                    bool
-	optDescs                  map[string]string
-	argDescs                  []argDesc
-	alias                     string
-	extra                     func(*flags.Command)
-}
-
-// commands holds information about all non-debug commands.
-var commands []*cmdInfo
-
-// debugCommands holds information about all debug commands.
-var debugCommands []*cmdInfo
-
-// addCommand replaces parser.addCommand() in a way that is compatible with
-// re-constructing a pristine parser.
-func addCommand(name, shortHelp, longHelp string, builder func() flags.Commander, optDescs map[string]string, argDescs []argDesc) *cmdInfo {
-	info := &cmdInfo{
-		name:      name,
-		shortHelp: shortHelp,
-		longHelp:  longHelp,
-		builder:   builder,
-		optDescs:  optDescs,
-		argDescs:  argDescs,
-	}
-	commands = append(commands, info)
-	return info
-}
-
-// addDebugCommand replaces parser.addCommand() in a way that is
-// compatible with re-constructing a pristine parser. It is meant for
-// adding debug commands.
-func addDebugCommand(name, shortHelp, longHelp string, builder func() flags.Commander, optDescs map[string]string, argDescs []argDesc) *cmdInfo {
-	info := &cmdInfo{
-		name:      name,
-		shortHelp: shortHelp,
-		longHelp:  longHelp,
-		builder:   builder,
-		optDescs:  optDescs,
-		argDescs:  argDescs,
-	}
-	debugCommands = append(debugCommands, info)
-	return info
-}
-
-type parserSetter interface {
-	setParser(*flags.Parser)
-}
-
-func lintDesc(cmdName, optName, desc, origDesc string) {
-	if len(optName) == 0 {
-		logger.Panicf("option on %q has no name", cmdName)
-	}
-	if len(origDesc) != 0 {
-		logger.Panicf("description of %s's %q of %q set from tag", cmdName, optName, origDesc)
-	}
-	if len(desc) > 0 {
-		// decode the first rune instead of converting all of desc into []rune
-		r, _ := utf8.DecodeRuneInString(desc)
-		// note IsLower != !IsUpper for runes with no upper/lower.
-		if unicode.IsLower(r) && !strings.HasPrefix(desc, "login.ubuntu.com") && !strings.HasPrefix(desc, cmdName) {
-			noticef("description of %s's %q is lowercase: %q", cmdName, optName, desc)
-		}
-	}
-}
-
-func lintArg(cmdName, optName, desc, origDesc string) {
-	lintDesc(cmdName, optName, desc, origDesc)
-	if len(optName) > 0 && optName[0] == '<' && optName[len(optName)-1] == '>' {
-		return
-	}
-	if len(optName) > 0 && optName[0] == '<' && strings.HasSuffix(optName, ">s") {
-		// see comment in fixupArg about the >s case
-		return
-	}
-	noticef("argument %q's %q should begin with < and end with >", cmdName, optName)
-}
-
-func fixupArg(optName string) string {
-	// Due to misunderstanding some localized versions of option name are
-	// literally "<option>s" instead of "<option>". While translators can
-	// improve this over time we can be smarter and avoid silly messages
-	// logged whenever the command is used.
-	//
-	// See: https://bugs.launchpad.net/snapd/+bug/1806761
-	if strings.HasSuffix(optName, ">s") {
-		return optName[:len(optName)-1]
-	}
-	return optName
-}
-
-type clientSetter interface {
-	setClient(*client.Client)
-}
-
-type clientMixin struct {
-	client *client.Client
-}
-
-func (ch *clientMixin) setClient(cli *client.Client) {
-	ch.client = cli
-}
-
-// Parser creates and populates a fresh parser.
-// Since commands have local state a fresh parser is required to isolate tests
-// from each other.
-func Parser(cli *client.Client) *flags.Parser {
-	optionsData.Version = func() {
-		printVersions(cli)
-		panic(&exitStatus{0})
-	}
-	flagopts := flags.Options(flags.PassDoubleDash)
-	parser := flags.NewParser(&optionsData, flagopts)
-	parser.ShortDescription = "Tool to interact with pebble"
-	parser.LongDescription = longPebbleDescription
-	// hide the unhelpful "[OPTIONS]" from help output
-	parser.Usage = ""
-	if version := parser.FindOptionByLongName("version"); version != nil {
-		version.Description = "Print the version and exit"
-		version.Hidden = true
-	}
-	// add --help like what go-flags would do for us, but hidden
-	addHelp(parser)
-
-	// Add all regular commands
-	for _, c := range commands {
-		obj := c.builder()
-		if x, ok := obj.(clientSetter); ok {
-			x.setClient(cli)
-		}
-		if x, ok := obj.(parserSetter); ok {
-			x.setParser(parser)
-		}
-
-		cmd, err := parser.AddCommand(c.name, c.shortHelp, strings.TrimSpace(c.longHelp), obj)
-		if err != nil {
-			logger.Panicf("cannot add command %q: %v", c.name, err)
-		}
-		cmd.Hidden = c.hidden
-		if c.alias != "" {
-			cmd.Aliases = append(cmd.Aliases, c.alias)
-		}
-
-		opts := cmd.Options()
-		if c.optDescs != nil && len(opts) != len(c.optDescs) {
-			logger.Panicf("wrong number of option descriptions for %s: expected %d, got %d", c.name, len(opts), len(c.optDescs))
-		}
-		for _, opt := range opts {
-			name := opt.LongName
-			if name == "" {
-				name = string(opt.ShortName)
-			}
-			desc, ok := c.optDescs[name]
-			if !(c.optDescs == nil || ok) {
-				logger.Panicf("%s missing description for %s", c.name, name)
-			}
-			lintDesc(c.name, name, desc, opt.Description)
-			if desc != "" {
-				opt.Description = desc
-			}
-		}
-
-		args := cmd.Args()
-		if c.argDescs != nil && len(args) != len(c.argDescs) {
-			logger.Panicf("wrong number of argument descriptions for %s: expected %d, got %d", c.name, len(args), len(c.argDescs))
-		}
-		for i, arg := range args {
-			name, desc := arg.Name, ""
-			if c.argDescs != nil {
-				name = c.argDescs[i].name
-				desc = c.argDescs[i].desc
-			}
-			lintArg(c.name, name, desc, arg.Description)
-			name = fixupArg(name)
-			arg.Name = name
-			arg.Description = desc
-		}
-		if c.extra != nil {
-			c.extra(cmd)
-		}
-	}
-	// Add the debug command
-	debugCommand, err := parser.AddCommand("debug", shortDebugHelp, longDebugHelp, &cmdDebug{})
-	debugCommand.Hidden = true
-	if err != nil {
-		logger.Panicf("cannot add command %q: %v", "debug", err)
-	}
-	// Add all the sub-commands of the debug command
-	for _, c := range debugCommands {
-		obj := c.builder()
-		if x, ok := obj.(clientSetter); ok {
-			x.setClient(cli)
-		}
-		cmd, err := debugCommand.AddCommand(c.name, c.shortHelp, strings.TrimSpace(c.longHelp), obj)
-		if err != nil {
-			logger.Panicf("cannot add debug command %q: %v", c.name, err)
-		}
-		cmd.Hidden = c.hidden
-		opts := cmd.Options()
-		if c.optDescs != nil && len(opts) != len(c.optDescs) {
-			logger.Panicf("wrong number of option descriptions for %s: expected %d, got %d", c.name, len(opts), len(c.optDescs))
-		}
-		for _, opt := range opts {
-			name := opt.LongName
-			if name == "" {
-				name = string(opt.ShortName)
-			}
-			desc, ok := c.optDescs[name]
-			if !(c.optDescs == nil || ok) {
-				logger.Panicf("%s missing description for %s", c.name, name)
-			}
-			lintDesc(c.name, name, desc, opt.Description)
-			if desc != "" {
-				opt.Description = desc
-			}
-		}
-
-		args := cmd.Args()
-		if c.argDescs != nil && len(args) != len(c.argDescs) {
-			logger.Panicf("wrong number of argument descriptions for %s: expected %d, got %d", c.name, len(args), len(c.argDescs))
-		}
-		for i, arg := range args {
-			name, desc := arg.Name, ""
-			if c.argDescs != nil {
-				name = c.argDescs[i].name
-				desc = c.argDescs[i].desc
-			}
-			lintArg(c.name, name, desc, arg.Description)
-			name = fixupArg(name)
-			arg.Name = name
-			arg.Description = desc
-		}
-	}
-	return parser
-}
-
-var (
-	isStdinTTY  = terminal.IsTerminal(0)
-	isStdoutTTY = terminal.IsTerminal(1)
-	osExit      = os.Exit
-)
-
-// ClientConfig is the configuration of the Client used by all commands.
-var clientConfig client.Config
-
 func main() {
-	defer func() {
-		if v := recover(); v != nil {
-			if e, ok := v.(*exitStatus); ok {
-				osExit(e.code)
-			}
-			panic(v)
-		}
-	}()
-
-	if err := run(); err != nil {
-		fmt.Fprintf(Stderr, errorPrefix+"%v\n", err)
-		osExit(1)
-	}
-}
-
-// exitStatus can be used in panic(&exitStatus{code}) to cause Pebble's main
-// function to exit with a given exit code, for the rare cases when you want
-// to return an exit code other than 0 or 1, or when an error return is not
-// possible.
-type exitStatus struct {
-	code int
-}
-
-func (e *exitStatus) Error() string {
-	return fmt.Sprintf("internal error: exitStatus{%d} being handled as normal error", e.code)
-}
-
-func run() error {
-	logger.SetLogger(logger.New(os.Stderr, "[pebble] "))
-
-	_, clientConfig.Socket = getEnvPaths()
-
-	cli, err := client.New(&clientConfig)
-	if err != nil {
-		return fmt.Errorf("cannot create client: %v", err)
-	}
-
-	parser := Parser(cli)
-	xtra, err := parser.Parse()
-	if err != nil {
-		if e, ok := err.(*flags.Error); ok {
-			switch e.Type {
-			case flags.ErrCommandRequired:
-				printShortHelp()
-				return nil
-			case flags.ErrHelp:
-				parser.WriteHelp(Stdout)
-				return nil
-			case flags.ErrUnknownCommand:
-				sub := os.Args[1]
-				sug := "pebble help"
-				if len(xtra) > 0 {
-					sub = xtra[0]
-					if x := parser.Command.Active; x != nil && x.Name != "help" {
-						sug = "pebble help " + x.Name
-					}
-				}
-				return fmt.Errorf("unknown command %q, see '%s'.", sub, sug)
-			}
-		}
-
-		msg, err := errorToMessage(err)
-		if err != nil {
-			return err
-		}
-
-		fmt.Fprintln(Stderr, msg)
-		return nil
-	}
-
-	maybePresentWarnings(cli.WarningsSummary())
-
-	return nil
-}
-
-var errorPrefix = "error: "
-
-func errorToMessage(e error) (normalMessage string, err error) {
-	cerr, ok := e.(*client.Error)
-	if !ok {
-		return "", e
-	}
-
-	logger.Debugf("error: %s", cerr)
-
-	isError := true
-
-	var msg string
-	switch cerr.Kind {
-	case client.ErrorKindLoginRequired:
-		u, _ := user.Current()
-		if u != nil && u.Username == "root" {
-			msg = cerr.Message
-		} else {
-			msg = fmt.Sprintf(`%s (try with sudo)`, cerr.Message)
-		}
-	case client.ErrorKindSystemRestart:
-		isError = false
-		msg = "pebble is about to reboot the system"
-	case client.ErrorKindNoDefaultServices:
-		msg = "no default services"
-	default:
-		msg = cerr.Message
-	}
-
-	msg = fill(msg, len(errorPrefix))
-	if isError {
-		return "", errors.New(msg)
-	}
-
-	return msg, nil
-}
-
-func getEnvPaths() (pebbleDir string, socketPath string) {
-	pebbleDir = os.Getenv("PEBBLE")
-	if pebbleDir == "" {
-		pebbleDir = defaultPebbleDir
-	}
-	socketPath = os.Getenv("PEBBLE_SOCKET")
-	if socketPath == "" {
-		socketPath = filepath.Join(pebbleDir, ".pebble.socket")
+	if err := cli.Run(); err != nil {
+		fmt.Fprintf(cli.Stderr, "error: %v\n", err)
+		os.Exit(1)
 	}
-	return pebbleDir, socketPath
 }
diff --git a/internals/cli/cli.go b/internals/cli/cli.go
new file mode 100644
index 00000000..18a37851
--- /dev/null
+++ b/internals/cli/cli.go
@@ -0,0 +1,431 @@
+// Copyright (c) 2014-2020 Canonical Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package cli
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/user"
+	"path/filepath"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/canonical/go-flags"
+
+	"golang.org/x/crypto/ssh/terminal"
+
+	"github.com/canonical/pebble/client"
+	"github.com/canonical/pebble/internals/logger"
+)
+
+var (
+	// Standard streams, redirected for testing.
+	Stdin  io.Reader = os.Stdin
+	Stdout io.Writer = os.Stdout
+	Stderr io.Writer = os.Stderr
+	// overridden for testing
+	ReadPassword = terminal.ReadPassword
+	// set to logger.Panicf in testing
+	noticef = logger.Noticef
+)
+
+// defaultPebbleDir is the Pebble directory used if $PEBBLE is not set. It is
+// created by the daemon ("pebble run") if it doesn't exist, and also used by
+// the pebble client.
+const defaultPebbleDir = "/var/lib/pebble/default"
+
+type options struct {
+	Version func() `long:"version"`
+}
+
+type argDesc struct {
+	name string
+	desc string
+}
+
+var optionsData options
+
+// ErrExtraArgs is returned  if extra arguments to a command are found
+var ErrExtraArgs = fmt.Errorf("too many arguments for command")
+
+// cmdInfo holds information needed to call parser.AddCommand(...).
+type cmdInfo struct {
+	name, shortHelp, longHelp string
+	builder                   func() flags.Commander
+	hidden                    bool
+	optDescs                  map[string]string
+	argDescs                  []argDesc
+	alias                     string
+	extra                     func(*flags.Command)
+}
+
+// commands holds information about all non-debug commands.
+var commands []*cmdInfo
+
+// debugCommands holds information about all debug commands.
+var debugCommands []*cmdInfo
+
+// addCommand replaces parser.addCommand() in a way that is compatible with
+// re-constructing a pristine parser.
+func addCommand(name, shortHelp, longHelp string, builder func() flags.Commander, optDescs map[string]string, argDescs []argDesc) *cmdInfo {
+	info := &cmdInfo{
+		name:      name,
+		shortHelp: shortHelp,
+		longHelp:  longHelp,
+		builder:   builder,
+		optDescs:  optDescs,
+		argDescs:  argDescs,
+	}
+	commands = append(commands, info)
+	return info
+}
+
+// addDebugCommand replaces parser.addCommand() in a way that is
+// compatible with re-constructing a pristine parser. It is meant for
+// adding debug commands.
+func addDebugCommand(name, shortHelp, longHelp string, builder func() flags.Commander, optDescs map[string]string, argDescs []argDesc) *cmdInfo {
+	info := &cmdInfo{
+		name:      name,
+		shortHelp: shortHelp,
+		longHelp:  longHelp,
+		builder:   builder,
+		optDescs:  optDescs,
+		argDescs:  argDescs,
+	}
+	debugCommands = append(debugCommands, info)
+	return info
+}
+
+type parserSetter interface {
+	setParser(*flags.Parser)
+}
+
+func lintDesc(cmdName, optName, desc, origDesc string) {
+	if len(optName) == 0 {
+		logger.Panicf("option on %q has no name", cmdName)
+	}
+	if len(origDesc) != 0 {
+		logger.Panicf("description of %s's %q of %q set from tag", cmdName, optName, origDesc)
+	}
+	if len(desc) > 0 {
+		// decode the first rune instead of converting all of desc into []rune
+		r, _ := utf8.DecodeRuneInString(desc)
+		// note IsLower != !IsUpper for runes with no upper/lower.
+		if unicode.IsLower(r) && !strings.HasPrefix(desc, "login.ubuntu.com") && !strings.HasPrefix(desc, cmdName) {
+			noticef("description of %s's %q is lowercase: %q", cmdName, optName, desc)
+		}
+	}
+}
+
+func lintArg(cmdName, optName, desc, origDesc string) {
+	lintDesc(cmdName, optName, desc, origDesc)
+	if len(optName) > 0 && optName[0] == '<' && optName[len(optName)-1] == '>' {
+		return
+	}
+	if len(optName) > 0 && optName[0] == '<' && strings.HasSuffix(optName, ">s") {
+		// see comment in fixupArg about the >s case
+		return
+	}
+	noticef("argument %q's %q should begin with < and end with >", cmdName, optName)
+}
+
+func fixupArg(optName string) string {
+	// Due to misunderstanding some localized versions of option name are
+	// literally "<option>s" instead of "<option>". While translators can
+	// improve this over time we can be smarter and avoid silly messages
+	// logged whenever the command is used.
+	//
+	// See: https://bugs.launchpad.net/snapd/+bug/1806761
+	if strings.HasSuffix(optName, ">s") {
+		return optName[:len(optName)-1]
+	}
+	return optName
+}
+
+type clientSetter interface {
+	setClient(*client.Client)
+}
+
+type clientMixin struct {
+	client *client.Client
+}
+
+func (ch *clientMixin) setClient(cli *client.Client) {
+	ch.client = cli
+}
+
+// Parser creates and populates a fresh parser.
+// Since commands have local state a fresh parser is required to isolate tests
+// from each other.
+func Parser(cli *client.Client) *flags.Parser {
+	optionsData.Version = func() {
+		printVersions(cli)
+		panic(&exitStatus{0})
+	}
+	flagopts := flags.Options(flags.PassDoubleDash)
+	parser := flags.NewParser(&optionsData, flagopts)
+	parser.ShortDescription = "Tool to interact with pebble"
+	parser.LongDescription = longPebbleDescription
+	// hide the unhelpful "[OPTIONS]" from help output
+	parser.Usage = ""
+	if version := parser.FindOptionByLongName("version"); version != nil {
+		version.Description = "Print the version and exit"
+		version.Hidden = true
+	}
+	// add --help like what go-flags would do for us, but hidden
+	addHelp(parser)
+
+	// Add all regular commands
+	for _, c := range commands {
+		obj := c.builder()
+		if x, ok := obj.(clientSetter); ok {
+			x.setClient(cli)
+		}
+		if x, ok := obj.(parserSetter); ok {
+			x.setParser(parser)
+		}
+
+		cmd, err := parser.AddCommand(c.name, c.shortHelp, strings.TrimSpace(c.longHelp), obj)
+		if err != nil {
+			logger.Panicf("cannot add command %q: %v", c.name, err)
+		}
+		cmd.Hidden = c.hidden
+		if c.alias != "" {
+			cmd.Aliases = append(cmd.Aliases, c.alias)
+		}
+
+		opts := cmd.Options()
+		if c.optDescs != nil && len(opts) != len(c.optDescs) {
+			logger.Panicf("wrong number of option descriptions for %s: expected %d, got %d", c.name, len(opts), len(c.optDescs))
+		}
+		for _, opt := range opts {
+			name := opt.LongName
+			if name == "" {
+				name = string(opt.ShortName)
+			}
+			desc, ok := c.optDescs[name]
+			if !(c.optDescs == nil || ok) {
+				logger.Panicf("%s missing description for %s", c.name, name)
+			}
+			lintDesc(c.name, name, desc, opt.Description)
+			if desc != "" {
+				opt.Description = desc
+			}
+		}
+
+		args := cmd.Args()
+		if c.argDescs != nil && len(args) != len(c.argDescs) {
+			logger.Panicf("wrong number of argument descriptions for %s: expected %d, got %d", c.name, len(args), len(c.argDescs))
+		}
+		for i, arg := range args {
+			name, desc := arg.Name, ""
+			if c.argDescs != nil {
+				name = c.argDescs[i].name
+				desc = c.argDescs[i].desc
+			}
+			lintArg(c.name, name, desc, arg.Description)
+			name = fixupArg(name)
+			arg.Name = name
+			arg.Description = desc
+		}
+		if c.extra != nil {
+			c.extra(cmd)
+		}
+	}
+	// Add the debug command
+	debugCommand, err := parser.AddCommand("debug", shortDebugHelp, longDebugHelp, &cmdDebug{})
+	debugCommand.Hidden = true
+	if err != nil {
+		logger.Panicf("cannot add command %q: %v", "debug", err)
+	}
+	// Add all the sub-commands of the debug command
+	for _, c := range debugCommands {
+		obj := c.builder()
+		if x, ok := obj.(clientSetter); ok {
+			x.setClient(cli)
+		}
+		cmd, err := debugCommand.AddCommand(c.name, c.shortHelp, strings.TrimSpace(c.longHelp), obj)
+		if err != nil {
+			logger.Panicf("cannot add debug command %q: %v", c.name, err)
+		}
+		cmd.Hidden = c.hidden
+		opts := cmd.Options()
+		if c.optDescs != nil && len(opts) != len(c.optDescs) {
+			logger.Panicf("wrong number of option descriptions for %s: expected %d, got %d", c.name, len(opts), len(c.optDescs))
+		}
+		for _, opt := range opts {
+			name := opt.LongName
+			if name == "" {
+				name = string(opt.ShortName)
+			}
+			desc, ok := c.optDescs[name]
+			if !(c.optDescs == nil || ok) {
+				logger.Panicf("%s missing description for %s", c.name, name)
+			}
+			lintDesc(c.name, name, desc, opt.Description)
+			if desc != "" {
+				opt.Description = desc
+			}
+		}
+
+		args := cmd.Args()
+		if c.argDescs != nil && len(args) != len(c.argDescs) {
+			logger.Panicf("wrong number of argument descriptions for %s: expected %d, got %d", c.name, len(args), len(c.argDescs))
+		}
+		for i, arg := range args {
+			name, desc := arg.Name, ""
+			if c.argDescs != nil {
+				name = c.argDescs[i].name
+				desc = c.argDescs[i].desc
+			}
+			lintArg(c.name, name, desc, arg.Description)
+			name = fixupArg(name)
+			arg.Name = name
+			arg.Description = desc
+		}
+	}
+	return parser
+}
+
+var (
+	isStdinTTY  = terminal.IsTerminal(0)
+	isStdoutTTY = terminal.IsTerminal(1)
+	osExit      = os.Exit
+)
+
+// ClientConfig is the configuration of the Client used by all commands.
+var clientConfig client.Config
+
+// exitStatus can be used in panic(&exitStatus{code}) to cause Pebble's main
+// function to exit with a given exit code, for the rare cases when you want
+// to return an exit code other than 0 or 1, or when an error return is not
+// possible.
+type exitStatus struct {
+	code int
+}
+
+func (e *exitStatus) Error() string {
+	return fmt.Sprintf("internal error: exitStatus{%d} being handled as normal error", e.code)
+}
+
+func Run() error {
+	defer func() {
+		if v := recover(); v != nil {
+			if e, ok := v.(*exitStatus); ok {
+				osExit(e.code)
+			}
+			panic(v)
+		}
+	}()
+
+	logger.SetLogger(logger.New(os.Stderr, "[pebble] "))
+
+	_, clientConfig.Socket = getEnvPaths()
+
+	cli, err := client.New(&clientConfig)
+	if err != nil {
+		return fmt.Errorf("cannot create client: %v", err)
+	}
+
+	parser := Parser(cli)
+	xtra, err := parser.Parse()
+	if err != nil {
+		if e, ok := err.(*flags.Error); ok {
+			switch e.Type {
+			case flags.ErrCommandRequired:
+				printShortHelp()
+				return nil
+			case flags.ErrHelp:
+				parser.WriteHelp(Stdout)
+				return nil
+			case flags.ErrUnknownCommand:
+				sub := os.Args[1]
+				sug := "pebble help"
+				if len(xtra) > 0 {
+					sub = xtra[0]
+					if x := parser.Command.Active; x != nil && x.Name != "help" {
+						sug = "pebble help " + x.Name
+					}
+				}
+				return fmt.Errorf("unknown command %q, see '%s'.", sub, sug)
+			}
+		}
+
+		msg, err := errorToMessage(err)
+		if err != nil {
+			return err
+		}
+
+		fmt.Fprintln(Stderr, msg)
+		return nil
+	}
+
+	maybePresentWarnings(cli.WarningsSummary())
+
+	return nil
+}
+
+var errorPrefix = "error: "
+
+func errorToMessage(e error) (normalMessage string, err error) {
+	cerr, ok := e.(*client.Error)
+	if !ok {
+		return "", e
+	}
+
+	logger.Debugf("error: %s", cerr)
+
+	isError := true
+
+	var msg string
+	switch cerr.Kind {
+	case client.ErrorKindLoginRequired:
+		u, _ := user.Current()
+		if u != nil && u.Username == "root" {
+			msg = cerr.Message
+		} else {
+			msg = fmt.Sprintf(`%s (try with sudo)`, cerr.Message)
+		}
+	case client.ErrorKindSystemRestart:
+		isError = false
+		msg = "pebble is about to reboot the system"
+	case client.ErrorKindNoDefaultServices:
+		msg = "no default services"
+	default:
+		msg = cerr.Message
+	}
+
+	msg = fill(msg, len(errorPrefix))
+	if isError {
+		return "", errors.New(msg)
+	}
+
+	return msg, nil
+}
+
+func getEnvPaths() (pebbleDir string, socketPath string) {
+	pebbleDir = os.Getenv("PEBBLE")
+	if pebbleDir == "" {
+		pebbleDir = defaultPebbleDir
+	}
+	socketPath = os.Getenv("PEBBLE_SOCKET")
+	if socketPath == "" {
+		socketPath = filepath.Join(pebbleDir, ".pebble.socket")
+	}
+	return pebbleDir, socketPath
+}
diff --git a/cmd/pebble/main_test.go b/internals/cli/cli_test.go
similarity index 82%
rename from cmd/pebble/main_test.go
rename to internals/cli/cli_test.go
index 252171da..45943c92 100644
--- a/cmd/pebble/main_test.go
+++ b/internals/cli/cli_test.go
@@ -1,4 +1,4 @@
-package main_test
+package cli_test
 
 import (
 	"bytes"
@@ -15,9 +15,8 @@ import (
 	. "gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/cmd"
-	"github.com/canonical/pebble/internal/testutil"
-
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 // Hook up check.v1 into the "go test" runner
@@ -49,13 +48,13 @@ func (s *BasePebbleSuite) SetUpTest(c *C) {
 	s.stderr = bytes.NewBuffer(nil)
 	s.password = ""
 
-	pebble.Stdin = s.stdin
-	pebble.Stdout = s.stdout
-	pebble.Stderr = s.stderr
-	pebble.ReadPassword = s.readPassword
+	cli.Stdin = s.stdin
+	cli.Stdout = s.stdout
+	cli.Stderr = s.stderr
+	cli.ReadPassword = s.readPassword
 
-	s.AddCleanup(pebble.FakeIsStdoutTTY(false))
-	s.AddCleanup(pebble.FakeIsStdinTTY(false))
+	s.AddCleanup(cli.FakeIsStdoutTTY(false))
+	s.AddCleanup(cli.FakeIsStdinTTY(false))
 
 	os.Setenv("PEBBLE_LAST_WARNING_TIMESTAMP_FILENAME", filepath.Join(c.MkDir(), "warnings.json"))
 }
@@ -64,10 +63,10 @@ func (s *BasePebbleSuite) TearDownTest(c *C) {
 	os.Setenv("PEBBLE", "")
 	os.Setenv("PEBBLE_SOCKET", "")
 
-	pebble.Stdin = os.Stdin
-	pebble.Stdout = os.Stdout
-	pebble.Stderr = os.Stderr
-	pebble.ReadPassword = terminal.ReadPassword
+	cli.Stdin = os.Stdin
+	cli.Stdout = os.Stdout
+	cli.Stderr = os.Stderr
+	cli.ReadPassword = terminal.ReadPassword
 
 	os.Setenv("PEBBLE_LAST_WARNING_TIMESTAMP_FILENAME", "")
 
@@ -91,8 +90,8 @@ func (s *BasePebbleSuite) ResetStdStreams() {
 func (s *BasePebbleSuite) RedirectClientToTestServer(handler func(http.ResponseWriter, *http.Request)) {
 	server := httptest.NewServer(http.HandlerFunc(handler))
 	s.BaseTest.AddCleanup(func() { server.Close() })
-	pebble.ClientConfig.BaseURL = server.URL
-	s.BaseTest.AddCleanup(func() { pebble.ClientConfig.BaseURL = "" })
+	cli.ClientConfig.BaseURL = server.URL
+	s.BaseTest.AddCleanup(func() { cli.ClientConfig.BaseURL = "" })
 }
 
 // DecodedRequestBody returns the JSON-decoded body of the request.
@@ -138,25 +137,25 @@ func (s *PebbleSuite) TestErrorResult(c *C) {
 	restore := fakeArgs("pebble", "warnings")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, ErrorMatches, `cannot do something`)
 }
 
 func (s *PebbleSuite) TestGetEnvPaths(c *C) {
 	os.Setenv("PEBBLE", "")
 	os.Setenv("PEBBLE_SOCKET", "")
-	pebbleDir, socketPath := pebble.GetEnvPaths()
+	pebbleDir, socketPath := cli.GetEnvPaths()
 	c.Assert(pebbleDir, Equals, "/var/lib/pebble/default")
 	c.Assert(socketPath, Equals, "/var/lib/pebble/default/.pebble.socket")
 
 	os.Setenv("PEBBLE", "/foo")
-	pebbleDir, socketPath = pebble.GetEnvPaths()
+	pebbleDir, socketPath = cli.GetEnvPaths()
 	c.Assert(pebbleDir, Equals, "/foo")
 	c.Assert(socketPath, Equals, "/foo/.pebble.socket")
 
 	os.Setenv("PEBBLE", "/bar")
 	os.Setenv("PEBBLE_SOCKET", "/path/to/socket")
-	pebbleDir, socketPath = pebble.GetEnvPaths()
+	pebbleDir, socketPath = cli.GetEnvPaths()
 	c.Assert(pebbleDir, Equals, "/bar")
 	c.Assert(socketPath, Equals, "/path/to/socket")
 }
diff --git a/cmd/pebble/cmd_add.go b/internals/cli/cmd_add.go
similarity index 99%
rename from cmd/pebble/cmd_add.go
rename to internals/cli/cmd_add.go
index 4d6a67e4..521f1c4c 100644
--- a/cmd/pebble/cmd_add.go
+++ b/internals/cli/cmd_add.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_add_test.go b/internals/cli/cmd_add_test.go
similarity index 92%
rename from cmd/pebble/cmd_add_test.go
rename to internals/cli/cmd_add_test.go
index 53655a71..48a215c7 100644
--- a/cmd/pebble/cmd_add_test.go
+++ b/internals/cli/cmd_add_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestAdd(c *check.C) {
@@ -90,7 +90,7 @@ services:
 				args = append(args, "--combine")
 			}
 			args = append(args, "foo", path)
-			rest, err := pebble.Parser(pebble.Client()).ParseArgs(args)
+			rest, err := cli.Parser(cli.Client()).ParseArgs(args)
 
 			if path == layerPath {
 				c.Assert(err, check.IsNil)
@@ -106,7 +106,7 @@ services:
 		}
 
 		args = append(args, "extra", "arguments", "invalid")
-		_, err = pebble.Parser(pebble.Client()).ParseArgs(args)
-		c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+		_, err = cli.Parser(cli.Client()).ParseArgs(args)
+		c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	}
 }
diff --git a/cmd/pebble/cmd_autostart.go b/internals/cli/cmd_autostart.go
similarity index 99%
rename from cmd/pebble/cmd_autostart.go
rename to internals/cli/cmd_autostart.go
index 35d03ad3..229691f4 100644
--- a/cmd/pebble/cmd_autostart.go
+++ b/internals/cli/cmd_autostart.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
diff --git a/cmd/pebble/cmd_autostart_test.go b/internals/cli/cmd_autostart_test.go
similarity index 88%
rename from cmd/pebble/cmd_autostart_test.go
rename to internals/cli/cmd_autostart_test.go
index 4872f938..c812adb6 100644
--- a/cmd/pebble/cmd_autostart_test.go
+++ b/internals/cli/cmd_autostart_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,12 +20,12 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestAutostartExtraArgs(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"autostart", "extra", "args"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"autostart", "extra", "args"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
 	c.Check(s.Stderr(), check.Equals, "")
@@ -67,7 +67,7 @@ func (s *PebbleSuite) TestAutostart(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"autostart"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"autostart"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -91,7 +91,7 @@ func (s *PebbleSuite) TestAutostartFailsNoDefaultServices(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"autostart"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"autostart"})
 	c.Assert(err, check.ErrorMatches, "no default services")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -117,7 +117,7 @@ func (s *PebbleSuite) TestAutostartNoWait(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"autostart", "--no-wait"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"autostart", "--no-wait"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "42\n")
@@ -148,7 +148,7 @@ func (s *PebbleSuite) TestAutostartFailsGetChange(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"autostart"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"autostart"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_changes.go b/internals/cli/cmd_changes.go
similarity index 99%
rename from cmd/pebble/cmd_changes.go
rename to internals/cli/cmd_changes.go
index 8b9038ac..b3888548 100644
--- a/cmd/pebble/cmd_changes.go
+++ b/internals/cli/cmd_changes.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_changes_test.go b/internals/cli/cmd_changes_test.go
similarity index 86%
rename from cmd/pebble/cmd_changes_test.go
rename to internals/cli/cmd_changes_test.go
index 23bde3bd..bd6e38d0 100644
--- a/cmd/pebble/cmd_changes_test.go
+++ b/internals/cli/cmd_changes_test.go
@@ -17,7 +17,7 @@
  *
  */
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -27,19 +27,19 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestChangesExtraArgs(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes", "extra", "args"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes", "extra", "args"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Check(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
 	c.Check(s.Stderr(), check.Equals, "")
 }
 
 func (s *PebbleSuite) TestChangesAllDigitsSuggestion(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes", "42"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes", "42"})
 	c.Assert(err, check.ErrorMatches, `'pebble changes' command expects a service name, try 'pebble tasks 42'`)
 	c.Check(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -54,7 +54,7 @@ func (s *PebbleSuite) TestNoChanges(c *check.C) {
 		fmt.Fprintln(w, `{"type":"sync", "result": []}"`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes", "svc1"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes", "svc1"})
 	c.Assert(err, check.ErrorMatches, "no changes found")
 	c.Check(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -69,7 +69,7 @@ func (s *PebbleSuite) TestGetChangesFails(c *check.C) {
 		fmt.Fprintln(w, `{"type":"error", "result": {"message": "could not foo"}}"`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes", "svc1"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes", "svc1"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Check(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -91,7 +91,7 @@ one +Do +2016-03-21 +2016-03-21 +...
 two +Do +2016-04-21 +2016-04-21 +...
 `
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Matches, expectedChanges)
@@ -107,7 +107,7 @@ func (s *PebbleSuite) TestChangesUnknownMaintenance(c *check.C) {
 		fmt.Fprintln(w, json)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"changes"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"changes"})
 	c.Assert(err, check.ErrorMatches, "unknown maintenance reason")
 	c.Check(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Matches, "")
@@ -140,7 +140,7 @@ func (s *PebbleSuite) TestChangeSimple(c *check.C) {
 	expectedChange := `(?ms)Status +Spawn +Ready +Summary
 Do +2016-04-21T01:02:03Z +- +some summary
 `
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Matches, expectedChange)
@@ -154,7 +154,7 @@ func (s *PebbleSuite) TestChangeSimpleFails(c *check.C) {
 		fmt.Fprintln(w, `{"type": "error", "result": {"message": "could not bar"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
 	c.Assert(err, check.ErrorMatches, "could not bar")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Matches, "")
@@ -175,7 +175,7 @@ func (s *PebbleSuite) TestChangeSimpleRebooting(c *check.C) {
 		n++
 	})
 
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "42"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "42"})
 	c.Assert(err, check.IsNil)
 	c.Check(s.Stderr(), check.Equals, "WARNING: pebble is about to reboot the system\n")
 }
@@ -187,7 +187,7 @@ func (s *PebbleSuite) TestChangeSimpleUnknownMaintenance(c *check.C) {
 		fmt.Fprintln(w, strings.Replace(fakeChangeJSON, `"type": "sync"`, `"type": "sync", "maintenance": {"kind": "dachshund", "message": "unknown maintenance reason"}`, 1))
 	})
 
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "42"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "42"})
 	c.Assert(err, check.ErrorMatches, "unknown maintenance reason")
 	c.Check(s.Stderr(), check.Equals, "")
 }
@@ -247,13 +247,13 @@ func (s *PebbleSuite) TestTasksLast(c *check.C) {
 	expectedChange := `(?ms)Status +Spawn +Ready +Summary
 Do +2016-04-21T01:02:03Z +- +some summary
 `
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=install"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=install"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.DeepEquals, []string{})
 	c.Check(s.Stdout(), check.Matches, expectedChange)
 	c.Check(s.Stderr(), check.Equals, "")
 
-	_, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=foobar"})
+	_, err = cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=foobar"})
 	c.Assert(err, check.NotNil)
 	c.Assert(err, check.ErrorMatches, `no changes of type "foobar" found`)
 }
@@ -274,13 +274,13 @@ func (s *PebbleSuite) TestTasksLastQuestionmark(c *check.C) {
 		}
 	})
 	for i := 0; i < 2; i++ {
-		rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--last=foobar?"})
+		rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--last=foobar?"})
 		c.Assert(err, check.IsNil)
 		c.Assert(rest, check.DeepEquals, []string{})
 		c.Check(s.Stdout(), check.Matches, "")
 		c.Check(s.Stderr(), check.Equals, "")
 
-		_, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--last=foobar"})
+		_, err = cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--last=foobar"})
 		if i == 0 {
 			c.Assert(err, check.ErrorMatches, `no changes found`)
 		} else {
@@ -292,11 +292,11 @@ func (s *PebbleSuite) TestTasksLastQuestionmark(c *check.C) {
 }
 
 func (s *PebbleSuite) TestTasksSyntaxError(c *check.C) {
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=install", "42"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "--last=install", "42"})
 	c.Assert(err, check.NotNil)
 	c.Assert(err, check.ErrorMatches, `cannot use change ID and type together`)
 
-	_, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks"})
+	_, err = cli.Parser(cli.Client()).ParseArgs([]string{"tasks"})
 	c.Assert(err, check.NotNil)
 	c.Assert(err, check.ErrorMatches, `please provide change ID or type with --last=<type>`)
 }
@@ -326,7 +326,7 @@ func (s *PebbleSuite) TestChangeProgress(c *check.C) {
 
 		n++
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"tasks", "--abs-time", "42"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.DeepEquals, []string{})
 	c.Check(s.Stdout(), check.Matches, `(?ms)Status +Spawn +Ready +Summary
diff --git a/cmd/pebble/cmd_checks.go b/internals/cli/cmd_checks.go
similarity index 99%
rename from cmd/pebble/cmd_checks.go
rename to internals/cli/cmd_checks.go
index 1526e64a..4ee1af84 100644
--- a/cmd/pebble/cmd_checks.go
+++ b/internals/cli/cmd_checks.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_checks_test.go b/internals/cli/cmd_checks_test.go
similarity index 88%
rename from cmd/pebble/cmd_checks_test.go
rename to internals/cli/cmd_checks_test.go
index 288e9ed3..1be1d40f 100644
--- a/cmd/pebble/cmd_checks_test.go
+++ b/internals/cli/cmd_checks_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestChecks(c *check.C) {
@@ -39,7 +39,7 @@ func (s *PebbleSuite) TestChecks(c *check.C) {
 	]
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"checks"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"checks"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, `
@@ -62,7 +62,7 @@ func (s *PebbleSuite) TestPlanNoChecks(c *check.C) {
     "result": []
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"checks"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"checks"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -80,7 +80,7 @@ func (s *PebbleSuite) TestNoMatchingChecks(c *check.C) {
     "result": []
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"checks", "--level=alive", "chk1", "chk3"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"checks", "--level=alive", "chk1", "chk3"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -101,7 +101,7 @@ func (s *PebbleSuite) TestChecksFiltering(c *check.C) {
 	]
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"checks", "--level=alive", "chk1", "chk3"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"checks", "--level=alive", "chk1", "chk3"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, `
@@ -122,7 +122,7 @@ func (s *PebbleSuite) TestChecksFails(c *check.C) {
     "result": {"message": "could not bar"}
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"checks"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"checks"})
 	c.Assert(err, check.ErrorMatches, "could not bar")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_debug.go b/internals/cli/cmd_debug.go
similarity index 98%
rename from cmd/pebble/cmd_debug.go
rename to internals/cli/cmd_debug.go
index e1ffde79..201a0a1e 100644
--- a/cmd/pebble/cmd_debug.go
+++ b/internals/cli/cmd_debug.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 type cmdDebug struct{}
 
diff --git a/cmd/pebble/cmd_enter.go b/internals/cli/cmd_enter.go
similarity index 98%
rename from cmd/pebble/cmd_enter.go
rename to internals/cli/cmd_enter.go
index be3b1070..981d4034 100644
--- a/cmd/pebble/cmd_enter.go
+++ b/internals/cli/cmd_enter.go
@@ -1,10 +1,11 @@
-package main
+package cli
 
 import (
 	"fmt"
 
 	"github.com/canonical/go-flags"
-	"github.com/canonical/pebble/internal/logger"
+
+	"github.com/canonical/pebble/internals/logger"
 )
 
 const shortEnterHelp = "Run subcommand under a container environment"
diff --git a/cmd/pebble/cmd_enter_test.go b/internals/cli/cmd_enter_test.go
similarity index 93%
rename from cmd/pebble/cmd_enter_test.go
rename to internals/cli/cmd_enter_test.go
index 5634a6e0..efcb76c5 100644
--- a/cmd/pebble/cmd_enter_test.go
+++ b/internals/cli/cmd_enter_test.go
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2023 Canonical Ltd
 // SPDX-License-Identifier: GPL-3.0-only
 
-package main_test
+package cli_test
 
 import (
 	"io/ioutil"
@@ -12,7 +12,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func dumbDedent(s string) string {
@@ -76,7 +76,7 @@ func (s *PebbleSuite) TestEnterHelpCommand(c *C) {
 	restore := fakeArgs("pebble", "enter", "help")
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "")
 	c.Check(s.Stdout(), Matches, "(?s)Pebble lets you control services.*Commands can be classified as follows.*")
 	c.Check(s.Stdout(), Not(Matches), "^(?s)Usage:\n  pebble enter \\[enter-OPTIONS\\] \\[<subcommand>\\.\\.\\.\\].*")
@@ -87,7 +87,7 @@ func (s *PebbleSuite) TestEnterHelpOption(c *C) {
 	restore := fakeArgs("pebble", "enter", "--help")
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "")
 	c.Check(s.Stdout(), Not(Matches), "(?s)Pebble lets you control services.*Commands can be classified as follows.*")
 	c.Check(s.Stdout(), Matches, "^(?s)Usage:\n  pebble enter \\[enter-OPTIONS\\] \\[<subcommand>\\.\\.\\.\\].*")
@@ -98,7 +98,7 @@ func (s *PebbleSuite) TestEnterUnknownCommand(c *C) {
 	restore := fakeArgs("pebble", "enter", "foo")
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "error: unknown command \"foo\", see 'pebble help'.\n")
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(exitCode, Equals, 1)
@@ -116,7 +116,7 @@ func (s *PebbleSuite) TestEnterServicesStatus(c *C) {
 	restore := fakeArgs("pebble", "enter", "services")
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "")
 	c.Check(s.Stdout(), Equals, expectedOutput)
 	c.Check(exitCode, Equals, 0)
@@ -126,7 +126,7 @@ func (s *PebbleSuite) TestEnterServicesNoRun(c *C) {
 	restore := fakeArgs("pebble", "enter", "--run", "services")
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "error: enter: cannot provide --run before \"services\" subcommand\n")
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(exitCode, Equals, 1)
@@ -144,7 +144,7 @@ func (s *PebbleSuite) TestEnterExecListDir(c *C) {
 	restore := fakeArgs("pebble", "enter", "exec", "ls", s.pebbleDir)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	c.Check(s.Stderr(), Equals, "")
 	c.Check(s.Stdout(), Equals, "bar\nbaz\nfoo\n")
 	c.Check(exitCode, Equals, 0)
@@ -164,7 +164,7 @@ func (s *PebbleSuite) TestEnterExecReadServiceOutputFile(c *C) {
 	restore := fakeArgs(cmd...)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	// stderr is written to stdout buffer because of "combine stderr" mode,
 	// see cmd/pebble/cmd_exec.go:163
 	c.Check(s.Stderr(), Equals, "")
@@ -177,7 +177,7 @@ func (s *PebbleSuite) TestEnterExecCommandHelpOption(c *C) {
 	restore := fakeArgs(cmd...)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	// stderr is written to stdout buffer because of "combine stderr" mode,
 	// see cmd/pebble/cmd_exec.go:163
 	c.Check(s.Stderr(), Equals, "")
@@ -192,7 +192,7 @@ func (s *PebbleSuite) TestEnterHelpCommandHelpOption(c *C) {
 	restore := fakeArgs(cmd...)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	// stderr is written to stdout buffer because of "combine stderr" mode,
 	// see cmd/pebble/cmd_exec.go:163
 	c.Check(s.Stderr(), Equals, "")
@@ -207,7 +207,7 @@ func (s *PebbleSuite) TestEnterHelpCommandExecArg(c *C) {
 	restore := fakeArgs(cmd...)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	// stderr is written to stdout buffer because of "combine stderr" mode,
 	// see cmd/pebble/cmd_exec.go:163
 	c.Check(s.Stderr(), Equals, "")
@@ -222,7 +222,7 @@ func (s *PebbleSuite) TestEnterHelpCommandHelpArg(c *C) {
 	restore := fakeArgs(cmd...)
 	defer restore()
 
-	exitCode := pebble.PebbleMain()
+	exitCode := cli.PebbleMain()
 	// stderr is written to stdout buffer because of "combine stderr" mode,
 	// see cmd/pebble/cmd_exec.go:163
 	c.Check(s.Stderr(), Equals, "")
diff --git a/cmd/pebble/cmd_exec.go b/internals/cli/cmd_exec.go
similarity index 98%
rename from cmd/pebble/cmd_exec.go
rename to internals/cli/cmd_exec.go
index 43aedab8..0298f2b2 100644
--- a/cmd/pebble/cmd_exec.go
+++ b/internals/cli/cmd_exec.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"errors"
@@ -26,8 +26,8 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/canonical/pebble/client"
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/ptyutil"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/ptyutil"
 )
 
 type cmdExec struct {
diff --git a/cmd/pebble/cmd_help.go b/internals/cli/cmd_help.go
similarity index 99%
rename from cmd/pebble/cmd_help.go
rename to internals/cli/cmd_help.go
index 09798b7a..02b787f3 100644
--- a/cmd/pebble/cmd_help.go
+++ b/internals/cli/cmd_help.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"bytes"
diff --git a/cmd/pebble/cmd_help_test.go b/internals/cli/cmd_help_test.go
similarity index 91%
rename from cmd/pebble/cmd_help_test.go
rename to internals/cli/cmd_help_test.go
index e30f120e..077ca256 100644
--- a/cmd/pebble/cmd_help_test.go
+++ b/internals/cli/cmd_help_test.go
@@ -12,19 +12,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	. "gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestHelpCommand(c *C) {
 	restore := fakeArgs("pebble", "help")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, "(?s)Pebble lets you control services.*Commands can be classified as follows.*")
 	c.Check(s.Stderr(), Equals, "")
@@ -34,7 +34,7 @@ func (s *PebbleSuite) TestHelpAll(c *C) {
 	restore := fakeArgs("pebble", "help", "--all")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, "(?s)Pebble lets you control services.*run.*help.*version.*warnings.*")
 	c.Check(s.Stderr(), Equals, "")
@@ -44,7 +44,7 @@ func (s *PebbleSuite) TestHelpAllWithCommand(c *C) {
 	restore := fakeArgs("pebble", "help", "help", "--all")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, ErrorMatches, `help accepts a command, or '--all', but not both.`)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -54,7 +54,7 @@ func (s *PebbleSuite) TestHelpMan(c *C) {
 	restore := fakeArgs("pebble", "help", "--man")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, `(?s)\.TH.*\.SH NAME.*pebble \\- Tool to interact with pebble.*`)
 	c.Check(s.Stderr(), Equals, "")
@@ -64,7 +64,7 @@ func (s *PebbleSuite) TestHelpOption(c *C) {
 	restore := fakeArgs("pebble", "--help")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, "(?s)Pebble lets you control services.*Commands can be classified as follows.*")
 	c.Check(s.Stderr(), Equals, "")
@@ -74,7 +74,7 @@ func (s *PebbleSuite) TestHelpWithCommand(c *C) {
 	restore := fakeArgs("pebble", "help", "help")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, "(?s)Usage.*pebble help.*The help command.*help command options.*")
 	c.Check(s.Stderr(), Equals, "")
@@ -84,7 +84,7 @@ func (s *PebbleSuite) TestHelpWithUnknownCommand(c *C) {
 	restore := fakeArgs("pebble", "help", "dachshund")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, ErrorMatches, `unknown command "dachshund", see 'pebble help'.`)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -94,7 +94,7 @@ func (s *PebbleSuite) TestHelpWithUnknownSubcommand(c *C) {
 	restore := fakeArgs("pebble", "help", "add", "dachshund")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, ErrorMatches, `unknown command "dachshund", see 'pebble help add'.`)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -104,7 +104,7 @@ func (s *PebbleSuite) TestCommandWithHelpOption(c *C) {
 	restore := fakeArgs("pebble", "help", "--help")
 	defer restore()
 
-	err := pebble.RunMain()
+	err := cli.RunMain()
 	c.Assert(err, Equals, nil)
 	c.Check(s.Stdout(), Matches, "(?s)Usage.*pebble help.*The help command.*help command options.*")
 	c.Check(s.Stderr(), Equals, "")
diff --git a/cmd/pebble/cmd_logs.go b/internals/cli/cmd_logs.go
similarity index 99%
rename from cmd/pebble/cmd_logs.go
rename to internals/cli/cmd_logs.go
index f2dd09de..b5896c03 100644
--- a/cmd/pebble/cmd_logs.go
+++ b/internals/cli/cmd_logs.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"context"
diff --git a/cmd/pebble/cmd_logs_test.go b/internals/cli/cmd_logs_test.go
similarity index 87%
rename from cmd/pebble/cmd_logs_test.go
rename to internals/cli/cmd_logs_test.go
index 0d4a5ca8..69b33cbf 100644
--- a/cmd/pebble/cmd_logs_test.go
+++ b/internals/cli/cmd_logs_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestLogsText(c *C) {
@@ -37,7 +37,7 @@ func (s *PebbleSuite) TestLogsText(c *C) {
 {"time":"2021-05-03T03:55:50.076800988Z","service":"thing","message":"the third"}
 `[1:])
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, `
@@ -61,7 +61,7 @@ func (s *PebbleSuite) TestLogsJSON(c *C) {
 {"time":"2021-05-03T03:55:50.076800988Z","service":"thing","message":"the third"}
 `[1:])
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "--format", "json"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "--format", "json"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, `
@@ -73,7 +73,7 @@ func (s *PebbleSuite) TestLogsJSON(c *C) {
 }
 
 func (s *PebbleSuite) TestLogsInvalidFormat(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "--format", "invalid"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "--format", "invalid"})
 	c.Assert(err.Error(), Equals, `invalid output format (expected "json" or "text", not "invalid")`)
 	c.Assert(rest, HasLen, 1)
 }
@@ -90,7 +90,7 @@ func (s *PebbleSuite) TestLogsN(c *C) {
 {"time":"2021-05-03T03:55:49.654334232Z","service":"snappass","message":"log two"}
 `[1:])
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "-n2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "-n2"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, `
@@ -112,7 +112,7 @@ func (s *PebbleSuite) TestLogsAll(c *C) {
 {"time":"2021-05-03T03:55:49.654334232Z","service":"snappass","message":"log two"}
 `[1:])
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "-nall"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "-nall"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, `
@@ -123,7 +123,7 @@ func (s *PebbleSuite) TestLogsAll(c *C) {
 }
 
 func (s *PebbleSuite) TestLogsInvalidNumber(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "-ninvalid"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "-ninvalid"})
 	c.Assert(err.Error(), Equals, `expected n to be a non-negative integer or "all", not "invalid"`)
 	c.Assert(rest, HasLen, 1)
 }
@@ -142,7 +142,7 @@ func (s *PebbleSuite) TestLogsFollow(c *C) {
 {"time":"2021-05-03T03:55:49.360994155Z","service":"thing","message":"log 1"}
 `[1:])
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"logs", "-f"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"logs", "-f"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, `
diff --git a/cmd/pebble/cmd_ls.go b/internals/cli/cmd_ls.go
similarity index 99%
rename from cmd/pebble/cmd_ls.go
rename to internals/cli/cmd_ls.go
index bb2d7fa4..163620c2 100644
--- a/cmd/pebble/cmd_ls.go
+++ b/internals/cli/cmd_ls.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"errors"
diff --git a/cmd/pebble/cmd_ls_test.go b/internals/cli/cmd_ls_test.go
similarity index 85%
rename from cmd/pebble/cmd_ls_test.go
rename to internals/cli/cmd_ls_test.go
index 71926a86..a3ea00ff 100644
--- a/cmd/pebble/cmd_ls_test.go
+++ b/internals/cli/cmd_ls_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,12 +21,12 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestLsExtraArgs(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "extra", "args"})
-	c.Assert(err, Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "extra", "args"})
+	c.Assert(err, Equals, cli.ErrExtraArgs)
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -53,7 +53,7 @@ func (s *PebbleSuite) TestLsDirectory(c *C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "-d", "/"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "-d", "/"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 
@@ -96,7 +96,7 @@ func (s *PebbleSuite) TestLsLongFormat(c *C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "-l", "/"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "-l", "/"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 
@@ -113,7 +113,7 @@ func (s *PebbleSuite) TestLsFails(c *C) {
 		c.Assert(r.URL.Query(), DeepEquals, url.Values{"path": {"/"}, "action": {"list"}, "itself": {"true"}})
 		fmt.Fprintln(w, `{"type":"error","result":{"message":"could not foo"}}`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "-d", "/"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "-d", "/"})
 	c.Assert(err, ErrorMatches, "could not foo")
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
@@ -128,7 +128,7 @@ func (s *PebbleSuite) TestLsPattern(c *C) {
 		fmt.Fprintln(w, `{"type":"sync","result":[]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "/foo/bar.*"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "/foo/bar.*"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -136,7 +136,7 @@ func (s *PebbleSuite) TestLsPattern(c *C) {
 }
 
 func (s *PebbleSuite) TestLsInvalidPattern(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"ls", "/foo/ba[rz]/fail"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"ls", "/foo/ba[rz]/fail"})
 	c.Assert(err, ErrorMatches, "can only use globs on the last path element")
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
diff --git a/cmd/pebble/cmd_mkdir.go b/internals/cli/cmd_mkdir.go
similarity index 99%
rename from cmd/pebble/cmd_mkdir.go
rename to internals/cli/cmd_mkdir.go
index 32844955..995c71dd 100644
--- a/cmd/pebble/cmd_mkdir.go
+++ b/internals/cli/cmd_mkdir.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_mkdir_test.go b/internals/cli/cmd_mkdir_test.go
similarity index 87%
rename from cmd/pebble/cmd_mkdir_test.go
rename to internals/cli/cmd_mkdir_test.go
index 57042f60..ef72ca62 100644
--- a/cmd/pebble/cmd_mkdir_test.go
+++ b/internals/cli/cmd_mkdir_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"encoding/json"
@@ -22,12 +22,12 @@ import (
 	. "gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/client"
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestMkdirExtraArgs(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "/foo", "extra", "args"})
-	c.Assert(err, Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "/foo", "extra", "args"})
+	c.Assert(err, Equals, cli.ErrExtraArgs)
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -57,7 +57,7 @@ func (s *PebbleSuite) TestMkdir(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "/foo"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "/foo"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -65,7 +65,7 @@ func (s *PebbleSuite) TestMkdir(c *C) {
 }
 
 func (s *PebbleSuite) TestMkdirFailsParsingPermissions(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "-m", "foobar", "/foo"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "-m", "foobar", "/foo"})
 	c.Assert(err, ErrorMatches, `invalid mode for directory: "foobar"`)
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
@@ -96,7 +96,7 @@ func (s *PebbleSuite) TestMkdirMakeParents(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "-p", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "-p", "/foo/bar"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -127,7 +127,7 @@ func (s *PebbleSuite) TestMkdirPermissions(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "-m", "755", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "-m", "755", "/foo/bar"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -158,7 +158,7 @@ func (s *PebbleSuite) TestMkdirOwnerIDs(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "--uid", "1000", "--gid", "1000", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "--uid", "1000", "--gid", "1000", "/foo/bar"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -189,7 +189,7 @@ func (s *PebbleSuite) TestMkdirOwnerNames(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "--user", "root", "--group", "wheel", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "--user", "root", "--group", "wheel", "/foo/bar"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -220,7 +220,7 @@ func (s *PebbleSuite) TestMkdirFails(c *C) {
 		fmt.Fprintln(w, `{"type": "error", "result": {"message": "could not foo"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "/foo"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "/foo"})
 	c.Assert(err, ErrorMatches, "could not foo")
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
@@ -261,7 +261,7 @@ func (s *PebbleSuite) TestMkdirFailsOnDirectory(c *C) {
 		}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"mkdir", "/foobar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"mkdir", "/foobar"})
 
 	clientErr, ok := err.(*client.Error)
 	c.Assert(ok, Equals, true)
diff --git a/cmd/pebble/cmd_plan.go b/internals/cli/cmd_plan.go
similarity index 99%
rename from cmd/pebble/cmd_plan.go
rename to internals/cli/cmd_plan.go
index fcb5094c..f899339d 100644
--- a/cmd/pebble/cmd_plan.go
+++ b/internals/cli/cmd_plan.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
diff --git a/cmd/pebble/cmd_plan_test.go b/internals/cli/cmd_plan_test.go
similarity index 85%
rename from cmd/pebble/cmd_plan_test.go
rename to internals/cli/cmd_plan_test.go
index 74188d54..35f5dd35 100644
--- a/cmd/pebble/cmd_plan_test.go
+++ b/internals/cli/cmd_plan_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestGetPlan(c *check.C) {
@@ -36,7 +36,7 @@ func (s *PebbleSuite) TestGetPlan(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"plan"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"plan"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Assert(s.Stdout(), check.Equals, `
@@ -59,7 +59,7 @@ func (s *PebbleSuite) TestGetPlanFails(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"plan"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"plan"})
 	c.Assert(err.Error(), check.Equals, "could not do the thing")
 	c.Assert(rest, check.HasLen, 1)
 	c.Assert(s.Stdout(), check.Equals, ``)
@@ -67,7 +67,7 @@ func (s *PebbleSuite) TestGetPlanFails(c *check.C) {
 }
 
 func (s *PebbleSuite) TestPlanExtraArgs(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"plan", "extra", "args"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"plan", "extra", "args"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Check(rest, check.HasLen, 1)
 }
diff --git a/cmd/pebble/cmd_replan.go b/internals/cli/cmd_replan.go
similarity index 99%
rename from cmd/pebble/cmd_replan.go
rename to internals/cli/cmd_replan.go
index c82a0830..3bcc7350 100644
--- a/cmd/pebble/cmd_replan.go
+++ b/internals/cli/cmd_replan.go
@@ -12,10 +12,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
+
 	"github.com/canonical/pebble/client"
 )
 
diff --git a/cmd/pebble/cmd_replan_test.go b/internals/cli/cmd_replan_test.go
similarity index 88%
rename from cmd/pebble/cmd_replan_test.go
rename to internals/cli/cmd_replan_test.go
index da13fdb0..ca38d4e3 100644
--- a/cmd/pebble/cmd_replan_test.go
+++ b/internals/cli/cmd_replan_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,12 +20,12 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestReplanExtraArgs(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"replan", "extra", "args"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"replan", "extra", "args"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
 	c.Check(s.Stderr(), check.Equals, "")
@@ -67,7 +67,7 @@ func (s *PebbleSuite) TestReplan(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"replan"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"replan"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -91,7 +91,7 @@ func (s *PebbleSuite) TestReplanFailsNoDefaultServices(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"replan"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"replan"})
 	c.Assert(err, check.ErrorMatches, "no default services")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -117,7 +117,7 @@ func (s *PebbleSuite) TestReplanNoWait(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"replan", "--no-wait"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"replan", "--no-wait"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "43\n")
@@ -148,7 +148,7 @@ func (s *PebbleSuite) TestReplanFailsGetChange(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"replan"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"replan"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_restart.go b/internals/cli/cmd_restart.go
similarity index 99%
rename from cmd/pebble/cmd_restart.go
rename to internals/cli/cmd_restart.go
index adf711f3..b99cd4ad 100644
--- a/cmd/pebble/cmd_restart.go
+++ b/internals/cli/cmd_restart.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
diff --git a/cmd/pebble/cmd_restart_test.go b/internals/cli/cmd_restart_test.go
similarity index 89%
rename from cmd/pebble/cmd_restart_test.go
rename to internals/cli/cmd_restart_test.go
index 624fdc2d..18135690 100644
--- a/cmd/pebble/cmd_restart_test.go
+++ b/internals/cli/cmd_restart_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestRestart(c *check.C) {
@@ -59,7 +59,7 @@ func (s *PebbleSuite) TestRestart(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"restart", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"restart", "srv1", "srv2"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -80,7 +80,7 @@ func (s *PebbleSuite) TestRestartFails(c *check.C) {
 		fmt.Fprintf(w, `{"type": "error", "result": {"message": "could not foo"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"restart", "srv1", "srv3"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"restart", "srv1", "srv3"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -106,7 +106,7 @@ func (s *PebbleSuite) TestRestartNoWait(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"restart", "srv1", "srv2", "--no-wait"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"restart", "srv1", "srv2", "--no-wait"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "44\n")
@@ -137,7 +137,7 @@ func (s *PebbleSuite) TestRestartFailsGetChange(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"restart", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"restart", "srv1", "srv2"})
 	c.Assert(err, check.ErrorMatches, "could not bar")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_rm.go b/internals/cli/cmd_rm.go
similarity index 99%
rename from cmd/pebble/cmd_rm.go
rename to internals/cli/cmd_rm.go
index cdb50e00..930e5835 100644
--- a/cmd/pebble/cmd_rm.go
+++ b/internals/cli/cmd_rm.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
diff --git a/cmd/pebble/cmd_rm_test.go b/internals/cli/cmd_rm_test.go
similarity index 87%
rename from cmd/pebble/cmd_rm_test.go
rename to internals/cli/cmd_rm_test.go
index bb8d4fa7..a6aed32b 100644
--- a/cmd/pebble/cmd_rm_test.go
+++ b/internals/cli/cmd_rm_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,12 +21,12 @@ import (
 	. "gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/client"
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestRmExtraArgs(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"rm", "extra", "args"})
-	c.Assert(err, Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"rm", "extra", "args"})
+	c.Assert(err, Equals, cli.ErrExtraArgs)
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
 	c.Check(s.Stderr(), Equals, "")
@@ -51,7 +51,7 @@ func (s *PebbleSuite) TestRm(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar.baz"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"rm", "/foo/bar.baz"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"rm", "/foo/bar.baz"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -77,7 +77,7 @@ func (s *PebbleSuite) TestRmRecursive(c *C) {
 		fmt.Fprintln(w, `{"type": "sync", "result": [{"path": "/foo/bar"}]}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"rm", "-r", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"rm", "-r", "/foo/bar"})
 	c.Assert(err, IsNil)
 	c.Assert(rest, HasLen, 0)
 	c.Check(s.Stdout(), Equals, "")
@@ -103,7 +103,7 @@ func (s *PebbleSuite) TestRmFails(c *C) {
 		fmt.Fprintln(w, `{"type": "error", "result": {"message": "could not foo"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"rm", "/foo/bar.baz"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"rm", "/foo/bar.baz"})
 	c.Assert(err, ErrorMatches, "could not foo")
 	c.Assert(rest, HasLen, 1)
 	c.Check(s.Stdout(), Equals, "")
@@ -139,7 +139,7 @@ func (s *PebbleSuite) TestRmFailsOnPath(c *C) {
 		}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"rm", "-r", "/foo/bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"rm", "-r", "/foo/bar"})
 
 	clientErr, ok := err.(*client.Error)
 	c.Assert(ok, Equals, true)
diff --git a/cmd/pebble/cmd_run.go b/internals/cli/cmd_run.go
similarity index 97%
rename from cmd/pebble/cmd_run.go
rename to internals/cli/cmd_run.go
index 4b56113c..2c1f2083 100644
--- a/cmd/pebble/cmd_run.go
+++ b/internals/cli/cmd_run.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
@@ -26,9 +26,9 @@ import (
 
 	"github.com/canonical/pebble/client"
 	"github.com/canonical/pebble/cmd"
-	"github.com/canonical/pebble/internal/daemon"
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/systemd"
+	"github.com/canonical/pebble/internals/daemon"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/systemd"
 )
 
 var shortRunHelp = "Run the pebble environment"
diff --git a/cmd/pebble/cmd_services.go b/internals/cli/cmd_services.go
similarity index 99%
rename from cmd/pebble/cmd_services.go
rename to internals/cli/cmd_services.go
index 3db674ee..348956b9 100644
--- a/cmd/pebble/cmd_services.go
+++ b/internals/cli/cmd_services.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_services_test.go b/internals/cli/cmd_services_test.go
similarity index 89%
rename from cmd/pebble/cmd_services_test.go
rename to internals/cli/cmd_services_test.go
index 583ca5c1..6e2e241e 100644
--- a/cmd/pebble/cmd_services_test.go
+++ b/internals/cli/cmd_services_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestServices(c *check.C) {
@@ -39,7 +39,7 @@ func (s *PebbleSuite) TestServices(c *check.C) {
 	]
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"services"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"services"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, `
@@ -62,7 +62,7 @@ func (s *PebbleSuite) TestPlanNoServices(c *check.C) {
     "result": []
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"services"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"services"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -80,7 +80,7 @@ func (s *PebbleSuite) TestNoMatchingServices(c *check.C) {
     "result": []
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"services", "foo", "bar"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"services", "foo", "bar"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -101,7 +101,7 @@ func (s *PebbleSuite) TestServicesNames(c *check.C) {
 	]
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"services", "foo", "bar", "--abs-time"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"services", "foo", "bar", "--abs-time"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, `
@@ -122,7 +122,7 @@ func (s *PebbleSuite) TestServicesFail(c *check.C) {
     "result": {"message": "could not foo"}
 }`)
 	})
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"services"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"services"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_signal.go b/internals/cli/cmd_signal.go
similarity index 99%
rename from cmd/pebble/cmd_signal.go
rename to internals/cli/cmd_signal.go
index dd2785a2..19264728 100644
--- a/cmd/pebble/cmd_signal.go
+++ b/internals/cli/cmd_signal.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_signal_test.go b/internals/cli/cmd_signal_test.go
similarity index 85%
rename from cmd/pebble/cmd_signal_test.go
rename to internals/cli/cmd_signal_test.go
index a913bdc6..e0c7d5ba 100644
--- a/cmd/pebble/cmd_signal_test.go
+++ b/internals/cli/cmd_signal_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestSignalShortName(c *check.C) {
@@ -39,7 +39,7 @@ func (s *PebbleSuite) TestSignalShortName(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"signal", "HUP", "s1"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"signal", "HUP", "s1"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 }
@@ -60,7 +60,7 @@ func (s *PebbleSuite) TestSignalFullName(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"signal", "SIGHUP", "s2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"signal", "SIGHUP", "s2"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 }
@@ -81,13 +81,13 @@ func (s *PebbleSuite) TestSignalMultipleServices(c *check.C) {
 }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"signal", "SIGHUP", "s1", "s2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"signal", "SIGHUP", "s1", "s2"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 }
 
 func (s *PebbleSuite) TestSignalErrorLowercase(c *check.C) {
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"signal", "hup", "s1"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"signal", "hup", "s1"})
 	c.Assert(err, check.ErrorMatches, "signal name must be uppercase, for example HUP")
 }
 
@@ -108,6 +108,6 @@ func (s *PebbleSuite) TestSignalServerError(c *check.C) {
 		}`)
 	})
 
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"signal", "HUP", "s1"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"signal", "HUP", "s1"})
 	c.Assert(err, check.ErrorMatches, `invalid signal name "SIGFOO"`)
 }
diff --git a/cmd/pebble/cmd_start.go b/internals/cli/cmd_start.go
similarity index 99%
rename from cmd/pebble/cmd_start.go
rename to internals/cli/cmd_start.go
index 0083c5b0..9c719f97 100644
--- a/cmd/pebble/cmd_start.go
+++ b/internals/cli/cmd_start.go
@@ -12,10 +12,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
+
 	"github.com/canonical/pebble/client"
 )
 
diff --git a/cmd/pebble/cmd_start_test.go b/internals/cli/cmd_start_test.go
similarity index 89%
rename from cmd/pebble/cmd_start_test.go
rename to internals/cli/cmd_start_test.go
index 4cd0f2e7..8618091e 100644
--- a/cmd/pebble/cmd_start_test.go
+++ b/internals/cli/cmd_start_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestStart(c *check.C) {
@@ -59,7 +59,7 @@ func (s *PebbleSuite) TestStart(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"start", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"start", "srv1", "srv2"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -80,7 +80,7 @@ func (s *PebbleSuite) TestStartFails(c *check.C) {
 		fmt.Fprintf(w, `{"type": "error", "result": {"message": "could not foo"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"start", "srv1", "srv3"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"start", "srv1", "srv3"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -106,7 +106,7 @@ func (s *PebbleSuite) TestStartNoWait(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"start", "srv1", "srv2", "--no-wait"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"start", "srv1", "srv2", "--no-wait"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "45\n")
@@ -137,7 +137,7 @@ func (s *PebbleSuite) TestStartFailsGetChange(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"start", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"start", "srv1", "srv2"})
 	c.Assert(err, check.ErrorMatches, "could not bar")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_stop.go b/internals/cli/cmd_stop.go
similarity index 99%
rename from cmd/pebble/cmd_stop.go
rename to internals/cli/cmd_stop.go
index 1321d27c..b5d3411d 100644
--- a/cmd/pebble/cmd_stop.go
+++ b/internals/cli/cmd_stop.go
@@ -12,10 +12,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"github.com/canonical/go-flags"
+
 	"github.com/canonical/pebble/client"
 )
 
diff --git a/cmd/pebble/cmd_stop_test.go b/internals/cli/cmd_stop_test.go
similarity index 89%
rename from cmd/pebble/cmd_stop_test.go
rename to internals/cli/cmd_stop_test.go
index 8e4c1c83..8e5e493b 100644
--- a/cmd/pebble/cmd_stop_test.go
+++ b/internals/cli/cmd_stop_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestStop(c *check.C) {
@@ -59,7 +59,7 @@ func (s *PebbleSuite) TestStop(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"stop", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"stop", "srv1", "srv2"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -80,7 +80,7 @@ func (s *PebbleSuite) TestStopFails(c *check.C) {
 		fmt.Fprintf(w, `{"type": "error", "result": {"message": "could not foo"}}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"stop", "srv1", "srv3"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"stop", "srv1", "srv3"})
 	c.Assert(err, check.ErrorMatches, "could not foo")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
@@ -106,7 +106,7 @@ func (s *PebbleSuite) TestStopNoWait(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"stop", "srv1", "srv2", "--no-wait"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"stop", "srv1", "srv2", "--no-wait"})
 	c.Assert(err, check.IsNil)
 	c.Assert(rest, check.HasLen, 0)
 	c.Check(s.Stdout(), check.Equals, "46\n")
@@ -137,7 +137,7 @@ func (s *PebbleSuite) TestStopFailsGetChange(c *check.C) {
  }`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"stop", "srv1", "srv2"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"stop", "srv1", "srv2"})
 	c.Assert(err, check.ErrorMatches, "could not bar")
 	c.Assert(rest, check.HasLen, 1)
 	c.Check(s.Stdout(), check.Equals, "")
diff --git a/cmd/pebble/cmd_version.go b/internals/cli/cmd_version.go
similarity index 99%
rename from cmd/pebble/cmd_version.go
rename to internals/cli/cmd_version.go
index 7658025d..9e07f0e5 100644
--- a/cmd/pebble/cmd_version.go
+++ b/internals/cli/cmd_version.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/pebble/cmd_version_test.go b/internals/cli/cmd_version_test.go
similarity index 78%
rename from cmd/pebble/cmd_version_test.go
rename to internals/cli/cmd_version_test.go
index 5e9a497b..93244133 100644
--- a/cmd/pebble/cmd_version_test.go
+++ b/internals/cli/cmd_version_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func (s *PebbleSuite) TestVersion(c *C) {
@@ -31,7 +31,7 @@ func (s *PebbleSuite) TestVersion(c *C) {
 	restore := fakeVersion("4.56")
 	defer restore()
 
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"version"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"version"})
 	c.Assert(err, IsNil)
 	c.Check(s.Stdout(), Equals, "client  4.56\nserver  7.89\n")
 	c.Check(s.Stderr(), Equals, "")
@@ -41,14 +41,14 @@ func (s *PebbleSuite) TestVersionClientOnly(c *C) {
 	restore := fakeVersion("v1.2.3")
 	defer restore()
 
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"version", "--client"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"version", "--client"})
 	c.Assert(err, IsNil)
 	c.Check(s.Stdout(), Equals, "v1.2.3\n")
 	c.Check(s.Stderr(), Equals, "")
 }
 
 func (s *PebbleSuite) TestVersionExtraArgs(c *C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"version", "extra", "args"})
-	c.Assert(err, Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"version", "extra", "args"})
+	c.Assert(err, Equals, cli.ErrExtraArgs)
 	c.Assert(rest, HasLen, 1)
 }
diff --git a/cmd/pebble/cmd_warnings.go b/internals/cli/cmd_warnings.go
similarity index 99%
rename from cmd/pebble/cmd_warnings.go
rename to internals/cli/cmd_warnings.go
index 833f7c80..192f97a0 100644
--- a/cmd/pebble/cmd_warnings.go
+++ b/internals/cli/cmd_warnings.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"encoding/json"
@@ -28,7 +28,7 @@ import (
 	"github.com/canonical/x-go/strutil/quantity"
 
 	"github.com/canonical/pebble/client"
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type cmdWarnings struct {
diff --git a/cmd/pebble/cmd_warnings_test.go b/internals/cli/cmd_warnings_test.go
similarity index 85%
rename from cmd/pebble/cmd_warnings_test.go
rename to internals/cli/cmd_warnings_test.go
index 4c450f02..fd71fe61 100644
--- a/cmd/pebble/cmd_warnings_test.go
+++ b/internals/cli/cmd_warnings_test.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -24,7 +24,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 type warningSuite struct {
@@ -85,7 +85,7 @@ func mkWarningsFakeHandler(c *check.C, body string) func(w http.ResponseWriter,
 func (s *warningSuite) TestNoWarningsEver(c *check.C) {
 	s.RedirectClientToTestServer(mkWarningsFakeHandler(c, `{"type": "sync", "status-code": 200, "result": []}`))
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"warnings", "--abs-time"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"warnings", "--abs-time"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stderr(), check.Equals, "")
@@ -93,11 +93,11 @@ func (s *warningSuite) TestNoWarningsEver(c *check.C) {
 }
 
 func (s *warningSuite) TestNoFurtherWarnings(c *check.C) {
-	pebble.WriteWarningTimestamp(time.Now())
+	cli.WriteWarningTimestamp(time.Now())
 
 	s.RedirectClientToTestServer(mkWarningsFakeHandler(c, `{"type": "sync", "status-code": 200, "result": []}`))
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"warnings", "--abs-time"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"warnings", "--abs-time"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stderr(), check.Equals, "")
@@ -107,7 +107,7 @@ func (s *warningSuite) TestNoFurtherWarnings(c *check.C) {
 func (s *warningSuite) TestWarnings(c *check.C) {
 	s.RedirectClientToTestServer(mkWarningsFakeHandler(c, twoWarnings))
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"warnings", "--abs-time", "--unicode=never"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"warnings", "--abs-time", "--unicode=never"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stderr(), check.Equals, "")
@@ -129,7 +129,7 @@ warning: |
 func (s *warningSuite) TestVerboseWarnings(c *check.C) {
 	s.RedirectClientToTestServer(mkWarningsFakeHandler(c, twoWarnings))
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"warnings", "--abs-time", "--verbose", "--unicode=never"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"warnings", "--abs-time", "--verbose", "--unicode=never"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stderr(), check.Equals, "")
@@ -162,7 +162,7 @@ warning: |
 
 func (s *warningSuite) TestOkay(c *check.C) {
 	t0 := time.Now()
-	pebble.WriteWarningTimestamp(t0)
+	cli.WriteWarningTimestamp(t0)
 
 	var n int
 	s.RedirectClientToTestServer(func(w http.ResponseWriter, r *http.Request) {
@@ -182,7 +182,7 @@ func (s *warningSuite) TestOkay(c *check.C) {
 		}`)
 	})
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"okay"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"okay"})
 	c.Assert(err, check.IsNil)
 	c.Check(rest, check.HasLen, 0)
 	c.Check(s.Stderr(), check.Equals, "")
@@ -190,7 +190,7 @@ func (s *warningSuite) TestOkay(c *check.C) {
 }
 
 func (s *warningSuite) TestOkayBeforeWarnings(c *check.C) {
-	_, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"okay"})
+	_, err := cli.Parser(cli.Client()).ParseArgs([]string{"okay"})
 	c.Assert(err, check.ErrorMatches, "you must have looked at the warnings before acknowledging them. Try 'pebble warnings'.")
 	c.Check(s.Stderr(), check.Equals, "")
 	c.Check(s.Stdout(), check.Equals, "")
@@ -221,7 +221,7 @@ func (s *warningSuite) TestCommandWithWarnings(c *check.C) {
 			}\n`, responseWarningCount, responseTimestamp.Format(time.RFC3339Nano))
 	})
 
-	cli := pebble.Client()
+	client := cli.Client()
 	expectedWarnings := map[int]string{
 		0: "",
 		1: "WARNING: There is 1 new warning. See 'pebble warnings'.\n",
@@ -231,14 +231,14 @@ func (s *warningSuite) TestCommandWithWarnings(c *check.C) {
 	responseTimestamp = time.Date(2018, 9, 19, 12, 44, 19, 680362867, time.UTC)
 	for warningCount, expectedWarning := range expectedWarnings {
 		responseWarningCount = warningCount
-		rest, err := pebble.Parser(cli).ParseArgs([]string{"version"})
+		rest, err := cli.Parser(client).ParseArgs([]string{"version"})
 		c.Assert(err, check.IsNil)
 
-		count, stamp := cli.WarningsSummary()
+		count, stamp := client.WarningsSummary()
 		c.Check(count, check.Equals, warningCount)
 		c.Check(stamp, check.Equals, responseTimestamp)
 
-		pebble.MaybePresentWarnings(count, stamp)
+		cli.MaybePresentWarnings(count, stamp)
 
 		c.Check(rest, check.HasLen, 0)
 		c.Check(s.Stdout(), check.Matches, `(?s)client.*server.*`)
@@ -250,12 +250,12 @@ func (s *warningSuite) TestCommandWithWarnings(c *check.C) {
 }
 
 func (s *warningSuite) TestExtraArgs(c *check.C) {
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"warnings", "extra", "args"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"warnings", "extra", "args"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Check(rest, check.HasLen, 1)
 
-	rest, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"okay", "extra", "invalid arg"})
-	c.Assert(err, check.Equals, pebble.ErrExtraArgs)
+	rest, err = cli.Parser(cli.Client()).ParseArgs([]string{"okay", "extra", "invalid arg"})
+	c.Assert(err, check.Equals, cli.ErrExtraArgs)
 	c.Check(rest, check.HasLen, 1)
 }
 
@@ -271,7 +271,7 @@ func (s *warningSuite) TestLastWarningTimestamp(c *check.C) {
 	err := ioutil.WriteFile(newWarnPath, []byte("invalid JSON"), 0755)
 	c.Assert(err, check.IsNil)
 
-	rest, err := pebble.Parser(pebble.Client()).ParseArgs([]string{"okay"})
+	rest, err := cli.Parser(cli.Client()).ParseArgs([]string{"okay"})
 	c.Assert(err.Error(), check.Equals, "cannot decode timestamp file: invalid character 'i' looking for beginning of value")
 	c.Check(rest, check.HasLen, 1)
 
@@ -279,7 +279,7 @@ func (s *warningSuite) TestLastWarningTimestamp(c *check.C) {
 	err = ioutil.WriteFile(newWarnPath, []byte("{}extra"), 0755)
 	c.Assert(err, check.IsNil)
 
-	rest, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"okay"})
+	rest, err = cli.Parser(cli.Client()).ParseArgs([]string{"okay"})
 	c.Assert(err.Error(), check.Equals, "spurious extra data in timestamp file")
 	c.Check(rest, check.HasLen, 1)
 
@@ -287,7 +287,7 @@ func (s *warningSuite) TestLastWarningTimestamp(c *check.C) {
 	err = os.Chmod(newWarnPath, 0055)
 	c.Assert(err, check.IsNil)
 
-	rest, err = pebble.Parser(pebble.Client()).ParseArgs([]string{"okay"})
+	rest, err = cli.Parser(cli.Client()).ParseArgs([]string{"okay"})
 	c.Assert(err.Error(), check.Equals, fmt.Sprintf("cannot open timestamp file: open %s: permission denied", newWarnPath))
 	c.Check(rest, check.HasLen, 1)
 }
@@ -305,6 +305,6 @@ func (s *warningSuite) TestWriteWarningTimestamp(c *check.C) {
 	err := os.Chmod(tempDir, 0600)
 	c.Assert(err, check.IsNil)
 
-	err = pebble.WriteWarningTimestamp(time.Now())
+	err = cli.WriteWarningTimestamp(time.Now())
 	c.Assert(os.IsPermission(err), check.Equals, true)
 }
diff --git a/cmd/pebble/export_test.go b/internals/cli/export_test.go
similarity index 93%
rename from cmd/pebble/export_test.go
rename to internals/cli/export_test.go
index 85c7f3fb..e85d6845 100644
--- a/cmd/pebble/export_test.go
+++ b/internals/cli/export_test.go
@@ -12,13 +12,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
+	"fmt"
+
 	"github.com/canonical/pebble/client"
 )
 
-var RunMain = run
+var RunMain = Run
 
 var ClientConfig = &clientConfig
 
@@ -74,6 +76,9 @@ func PebbleMain() (exitCode int) {
 			}
 		}
 	}()
-	main()
+	if err := Run(); err != nil {
+		fmt.Fprintf(Stderr, "error: %v\n", err)
+		osExit(1)
+	}
 	return
 }
diff --git a/cmd/pebble/format.go b/internals/cli/format.go
similarity index 99%
rename from cmd/pebble/format.go
rename to internals/cli/format.go
index 53481b28..e0c2050d 100644
--- a/cmd/pebble/format.go
+++ b/internals/cli/format.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"bytes"
diff --git a/cmd/pebble/format_test.go b/internals/cli/format_test.go
similarity index 64%
rename from cmd/pebble/format_test.go
rename to internals/cli/format_test.go
index e5f75409..3b92d37a 100644
--- a/cmd/pebble/format_test.go
+++ b/internals/cli/format_test.go
@@ -12,17 +12,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main_test
+package cli_test
 
 import (
 	"os"
 	"runtime"
+
 	// "fmt"
 	// "net/http"
 
 	"gopkg.in/check.v1"
 
-	pebble "github.com/canonical/pebble/cmd/pebble"
+	"github.com/canonical/pebble/internals/cli"
 )
 
 func setEnviron(env map[string]string) func() {
@@ -74,12 +75,12 @@ func (s *PebbleSuite) TestCanUnicode(c *check.C) {
 		{lang: "C.utf8", expected: true}, // deals with a bit of rando weirdness
 	} {
 		restore := setEnviron(map[string]string{"LANG": t.lang, "LC_ALL": t.lcAll, "LC_MESSAGES": t.lcMsg})
-		c.Check(pebble.CanUnicode("never"), check.Equals, false)
-		c.Check(pebble.CanUnicode("always"), check.Equals, true)
-		restoreIsTTY := pebble.FakeIsStdoutTTY(true)
-		c.Check(pebble.CanUnicode("auto"), check.Equals, t.expected)
-		pebble.FakeIsStdoutTTY(false)
-		c.Check(pebble.CanUnicode("auto"), check.Equals, false)
+		c.Check(cli.CanUnicode("never"), check.Equals, false)
+		c.Check(cli.CanUnicode("always"), check.Equals, true)
+		restoreIsTTY := cli.FakeIsStdoutTTY(true)
+		c.Check(cli.CanUnicode("auto"), check.Equals, t.expected)
+		cli.FakeIsStdoutTTY(false)
+		c.Check(cli.CanUnicode("auto"), check.Equals, false)
 		restoreIsTTY()
 		restore()
 	}
@@ -98,19 +99,19 @@ func (s *PebbleSuite) TestColorTable(c *check.C) {
 	}
 
 	for _, t := range []T{
-		{isTTY: false, expected: pebble.NoEscColorTable, desc: "not a tty"},
-		{isTTY: false, noColor: "1", expected: pebble.NoEscColorTable, desc: "no tty *and* NO_COLOR set"},
-		{isTTY: false, term: "linux-m", expected: pebble.NoEscColorTable, desc: "no tty *and* mono term set"},
-		{isTTY: true, expected: pebble.ColorColorTable, desc: "is a tty"},
-		{isTTY: true, noColor: "1", expected: pebble.MonoColorTable, desc: "is a tty, but NO_COLOR set"},
-		{isTTY: true, term: "linux-m", expected: pebble.MonoColorTable, desc: "is a tty, but TERM=linux-m"},
-		{isTTY: true, term: "xterm-mono", expected: pebble.MonoColorTable, desc: "is a tty, but TERM=xterm-mono"},
+		{isTTY: false, expected: cli.NoEscColorTable, desc: "not a tty"},
+		{isTTY: false, noColor: "1", expected: cli.NoEscColorTable, desc: "no tty *and* NO_COLOR set"},
+		{isTTY: false, term: "linux-m", expected: cli.NoEscColorTable, desc: "no tty *and* mono term set"},
+		{isTTY: true, expected: cli.ColorColorTable, desc: "is a tty"},
+		{isTTY: true, noColor: "1", expected: cli.MonoColorTable, desc: "is a tty, but NO_COLOR set"},
+		{isTTY: true, term: "linux-m", expected: cli.MonoColorTable, desc: "is a tty, but TERM=linux-m"},
+		{isTTY: true, term: "xterm-mono", expected: cli.MonoColorTable, desc: "is a tty, but TERM=xterm-mono"},
 	} {
-		restoreIsTTY := pebble.FakeIsStdoutTTY(t.isTTY)
+		restoreIsTTY := cli.FakeIsStdoutTTY(t.isTTY)
 		restoreEnv := setEnviron(map[string]string{"NO_COLOR": t.noColor, "TERM": t.term})
-		c.Check(pebble.ColorTable("never"), check.DeepEquals, pebble.NoEscColorTable, check.Commentf(t.desc))
-		c.Check(pebble.ColorTable("always"), check.DeepEquals, pebble.ColorColorTable, check.Commentf(t.desc))
-		c.Check(pebble.ColorTable("auto"), check.DeepEquals, t.expected, check.Commentf(t.desc))
+		c.Check(cli.ColorTable("never"), check.DeepEquals, cli.NoEscColorTable, check.Commentf(t.desc))
+		c.Check(cli.ColorTable("always"), check.DeepEquals, cli.ColorColorTable, check.Commentf(t.desc))
+		c.Check(cli.ColorTable("auto"), check.DeepEquals, t.expected, check.Commentf(t.desc))
 		restoreEnv()
 		restoreIsTTY()
 	}
diff --git a/cmd/pebble/last.go b/internals/cli/last.go
similarity index 99%
rename from cmd/pebble/last.go
rename to internals/cli/last.go
index d6928d8f..0114edb9 100644
--- a/cmd/pebble/last.go
+++ b/internals/cli/last.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"errors"
diff --git a/cmd/pebble/times.go b/internals/cli/times.go
similarity index 96%
rename from cmd/pebble/times.go
rename to internals/cli/times.go
index 1c9e852f..612b7bbe 100644
--- a/cmd/pebble/times.go
+++ b/internals/cli/times.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"strings"
@@ -20,7 +20,7 @@ import (
 
 	"github.com/canonical/x-go/strutil/quantity"
 
-	"github.com/canonical/pebble/internal/timeutil"
+	"github.com/canonical/pebble/internals/timeutil"
 )
 
 var timeutilHuman = timeutil.Human
diff --git a/cmd/pebble/wait.go b/internals/cli/wait.go
similarity index 98%
rename from cmd/pebble/wait.go
rename to internals/cli/wait.go
index 3f2d244e..ef2ba0d4 100644
--- a/cmd/pebble/wait.go
+++ b/internals/cli/wait.go
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package cli
 
 import (
 	"errors"
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/canonical/pebble/client"
-	"github.com/canonical/pebble/internal/progress"
+	"github.com/canonical/pebble/internals/progress"
 )
 
 var (
diff --git a/internal/daemon/api.go b/internals/daemon/api.go
similarity index 94%
rename from internal/daemon/api.go
rename to internals/daemon/api.go
index 2a994707..565b9002 100644
--- a/internal/daemon/api.go
+++ b/internals/daemon/api.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 var api = []*Command{{
diff --git a/internal/daemon/api_changes.go b/internals/daemon/api_changes.go
similarity index 98%
rename from internal/daemon/api_changes.go
rename to internals/daemon/api_changes.go
index 9b2b9426..6705cc50 100644
--- a/internal/daemon/api_changes.go
+++ b/internals/daemon/api_changes.go
@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type changeInfo struct {
diff --git a/internal/daemon/api_changes_test.go b/internals/daemon/api_changes_test.go
similarity index 99%
rename from internal/daemon/api_changes_test.go
rename to internals/daemon/api_changes_test.go
index 2764b61f..0f5f6228 100644
--- a/internal/daemon/api_changes_test.go
+++ b/internals/daemon/api_changes_test.go
@@ -23,7 +23,7 @@ import (
 	"net/http/httptest"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	"gopkg.in/check.v1"
 )
diff --git a/internal/daemon/api_checks.go b/internals/daemon/api_checks.go
similarity index 97%
rename from internal/daemon/api_checks.go
rename to internals/daemon/api_checks.go
index 16aa7bed..d8588fc2 100644
--- a/internal/daemon/api_checks.go
+++ b/internals/daemon/api_checks.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/canonical/x-go/strutil"
 
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 type checkInfo struct {
diff --git a/internal/daemon/api_checks_test.go b/internals/daemon/api_checks_test.go
similarity index 100%
rename from internal/daemon/api_checks_test.go
rename to internals/daemon/api_checks_test.go
diff --git a/internal/daemon/api_exec.go b/internals/daemon/api_exec.go
similarity index 95%
rename from internal/daemon/api_exec.go
rename to internals/daemon/api_exec.go
index de44ff43..41c9d189 100644
--- a/internal/daemon/api_exec.go
+++ b/internals/daemon/api_exec.go
@@ -21,9 +21,9 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord/cmdstate"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord/cmdstate"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type execPayload struct {
diff --git a/internal/daemon/api_exec_test.go b/internals/daemon/api_exec_test.go
similarity index 99%
rename from internal/daemon/api_exec_test.go
rename to internals/daemon/api_exec_test.go
index bed1c5e7..3f1e6659 100644
--- a/internal/daemon/api_exec_test.go
+++ b/internals/daemon/api_exec_test.go
@@ -30,7 +30,7 @@ import (
 	. "gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/client"
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 var _ = Suite(&execSuite{})
diff --git a/internal/daemon/api_files.go b/internals/daemon/api_files.go
similarity index 99%
rename from internal/daemon/api_files.go
rename to internals/daemon/api_files.go
index 41e18375..bf8062db 100644
--- a/internal/daemon/api_files.go
+++ b/internals/daemon/api_files.go
@@ -31,8 +31,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/sys"
 )
 
 const minBoundaryLength = 32
diff --git a/internal/daemon/api_files_test.go b/internals/daemon/api_files_test.go
similarity index 99%
rename from internal/daemon/api_files_test.go
rename to internals/daemon/api_files_test.go
index fd284ed5..ab41554d 100644
--- a/internal/daemon/api_files_test.go
+++ b/internals/daemon/api_files_test.go
@@ -32,8 +32,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/sys"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/internal/daemon/api_health.go b/internals/daemon/api_health.go
similarity index 92%
rename from internal/daemon/api_health.go
rename to internals/daemon/api_health.go
index 04a96f02..3b1c3960 100644
--- a/internal/daemon/api_health.go
+++ b/internals/daemon/api_health.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/canonical/x-go/strutil"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 type healthInfo struct {
diff --git a/internal/daemon/api_health_test.go b/internals/daemon/api_health_test.go
similarity index 97%
rename from internal/daemon/api_health_test.go
rename to internals/daemon/api_health_test.go
index a2a96b53..0f6adbac 100644
--- a/internal/daemon/api_health_test.go
+++ b/internals/daemon/api_health_test.go
@@ -23,9 +23,9 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 var _ = Suite(&healthSuite{})
diff --git a/internal/daemon/api_logs.go b/internals/daemon/api_logs.go
similarity index 98%
rename from internal/daemon/api_logs.go
rename to internals/daemon/api_logs.go
index 11e981b4..7dc0354f 100644
--- a/internal/daemon/api_logs.go
+++ b/internals/daemon/api_logs.go
@@ -27,9 +27,9 @@ import (
 
 	"github.com/canonical/x-go/strutil"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 const (
diff --git a/internal/daemon/api_logs_test.go b/internals/daemon/api_logs_test.go
similarity index 99%
rename from internal/daemon/api_logs_test.go
rename to internals/daemon/api_logs_test.go
index 17740a4b..5378c803 100644
--- a/internal/daemon/api_logs_test.go
+++ b/internals/daemon/api_logs_test.go
@@ -29,8 +29,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 var _ = Suite(&logsSuite{})
diff --git a/internal/daemon/api_plan.go b/internals/daemon/api_plan.go
similarity index 95%
rename from internal/daemon/api_plan.go
rename to internals/daemon/api_plan.go
index 8d49214e..0d765f83 100644
--- a/internal/daemon/api_plan.go
+++ b/internals/daemon/api_plan.go
@@ -20,8 +20,8 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 func v1GetPlan(c *Command, r *http.Request, _ *userState) Response {
diff --git a/internal/daemon/api_plan_test.go b/internals/daemon/api_plan_test.go
similarity index 100%
rename from internal/daemon/api_plan_test.go
rename to internals/daemon/api_plan_test.go
diff --git a/internal/daemon/api_services.go b/internals/daemon/api_services.go
similarity index 98%
rename from internal/daemon/api_services.go
rename to internals/daemon/api_services.go
index 711142fc..961204db 100644
--- a/internal/daemon/api_services.go
+++ b/internals/daemon/api_services.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/canonical/x-go/strutil"
 
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type serviceInfo struct {
diff --git a/internal/daemon/api_services_test.go b/internals/daemon/api_services_test.go
similarity index 99%
rename from internal/daemon/api_services_test.go
rename to internals/daemon/api_services_test.go
index 44b8e1c6..e0501712 100644
--- a/internal/daemon/api_services_test.go
+++ b/internals/daemon/api_services_test.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/internal/daemon/api_signals.go b/internals/daemon/api_signals.go
similarity index 100%
rename from internal/daemon/api_signals.go
rename to internals/daemon/api_signals.go
diff --git a/internal/daemon/api_signals_test.go b/internals/daemon/api_signals_test.go
similarity index 98%
rename from internal/daemon/api_signals_test.go
rename to internals/daemon/api_signals_test.go
index d343d44e..2548746d 100644
--- a/internal/daemon/api_signals_test.go
+++ b/internals/daemon/api_signals_test.go
@@ -22,7 +22,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/servstate"
 )
 
 func (s *apiSuite) TestSignalsSend(c *C) {
diff --git a/internal/daemon/api_tasks.go b/internals/daemon/api_tasks.go
similarity index 96%
rename from internal/daemon/api_tasks.go
rename to internals/daemon/api_tasks.go
index 8ece1300..bdc0721c 100644
--- a/internal/daemon/api_tasks.go
+++ b/internals/daemon/api_tasks.go
@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func v1GetTaskWebsocket(c *Command, req *http.Request, _ *userState) Response {
diff --git a/internal/daemon/api_test.go b/internals/daemon/api_test.go
similarity index 97%
rename from internal/daemon/api_test.go
rename to internals/daemon/api_test.go
index c7be1e85..737b22fa 100644
--- a/internal/daemon/api_test.go
+++ b/internals/daemon/api_test.go
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/restart"
 )
 
 var _ = check.Suite(&apiSuite{})
diff --git a/internal/daemon/api_warnings.go b/internals/daemon/api_warnings.go
similarity index 97%
rename from internal/daemon/api_warnings.go
rename to internals/daemon/api_warnings.go
index dadaab70..26718375 100644
--- a/internal/daemon/api_warnings.go
+++ b/internals/daemon/api_warnings.go
@@ -19,7 +19,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func v1AckWarnings(c *Command, r *http.Request, _ *userState) Response {
diff --git a/internal/daemon/api_warnings_test.go b/internals/daemon/api_warnings_test.go
similarity index 97%
rename from internal/daemon/api_warnings_test.go
rename to internals/daemon/api_warnings_test.go
index 08f008e2..e8318f60 100644
--- a/internal/daemon/api_warnings_test.go
+++ b/internals/daemon/api_warnings_test.go
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	"gopkg.in/check.v1"
 )
diff --git a/internal/daemon/daemon.go b/internals/daemon/daemon.go
similarity index 97%
rename from internal/daemon/daemon.go
rename to internals/daemon/daemon.go
index c755f19d..b7405ee0 100644
--- a/internal/daemon/daemon.go
+++ b/internals/daemon/daemon.go
@@ -35,16 +35,16 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/sys"
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/overlord/standby"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/systemd"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/sys"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/standby"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/systemd"
 )
 
 var (
diff --git a/internal/daemon/daemon_test.go b/internals/daemon/daemon_test.go
similarity index 98%
rename from internal/daemon/daemon_test.go
rename to internals/daemon/daemon_test.go
index 870b5c36..c10d04d9 100644
--- a/internal/daemon/daemon_test.go
+++ b/internals/daemon/daemon_test.go
@@ -36,13 +36,13 @@ import (
 	// XXX Delete import above and make this file like the other ones.
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord/patch"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/standby"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/systemd"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord/patch"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/standby"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/systemd"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 // Hook up check.v1 into the "go test" runner
diff --git a/internal/daemon/export_test.go b/internals/daemon/export_test.go
similarity index 87%
rename from internal/daemon/export_test.go
rename to internals/daemon/export_test.go
index 8388978a..f57d36d0 100644
--- a/internal/daemon/export_test.go
+++ b/internals/daemon/export_test.go
@@ -18,9 +18,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func FakeMuxVars(f func(*http.Request) map[string]string) (restore func()) {
diff --git a/internal/daemon/response.go b/internals/daemon/response.go
similarity index 99%
rename from internal/daemon/response.go
rename to internals/daemon/response.go
index 5282ae20..56b2ab12 100644
--- a/internal/daemon/response.go
+++ b/internals/daemon/response.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 type ResponseType string
diff --git a/internal/daemon/response_test.go b/internals/daemon/response_test.go
similarity index 100%
rename from internal/daemon/response_test.go
rename to internals/daemon/response_test.go
diff --git a/internal/daemon/ucrednet.go b/internals/daemon/ucrednet.go
similarity index 100%
rename from internal/daemon/ucrednet.go
rename to internals/daemon/ucrednet.go
diff --git a/internal/daemon/ucrednet_test.go b/internals/daemon/ucrednet_test.go
similarity index 100%
rename from internal/daemon/ucrednet_test.go
rename to internals/daemon/ucrednet_test.go
diff --git a/internal/logger/logger.go b/internals/logger/logger.go
similarity index 100%
rename from internal/logger/logger.go
rename to internals/logger/logger.go
diff --git a/internal/logger/logger_test.go b/internals/logger/logger_test.go
similarity index 97%
rename from internal/logger/logger_test.go
rename to internals/logger/logger_test.go
index 9b6f4ff2..e6d63c21 100644
--- a/internal/logger/logger_test.go
+++ b/internals/logger/logger_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 // Hook up check.v1 into the "go test" runner
diff --git a/internal/osutil/bootid.go b/internals/osutil/bootid.go
similarity index 100%
rename from internal/osutil/bootid.go
rename to internals/osutil/bootid.go
diff --git a/internal/osutil/bootid_test.go b/internals/osutil/bootid_test.go
similarity index 94%
rename from internal/osutil/bootid_test.go
rename to internals/osutil/bootid_test.go
index 38bf78b2..48f5b61b 100644
--- a/internal/osutil/bootid_test.go
+++ b/internals/osutil/bootid_test.go
@@ -20,7 +20,7 @@
 package osutil_test
 
 import (
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/internal/osutil/exec.go b/internals/osutil/exec.go
similarity index 100%
rename from internal/osutil/exec.go
rename to internals/osutil/exec.go
diff --git a/internal/osutil/exec_test.go b/internals/osutil/exec_test.go
similarity index 98%
rename from internal/osutil/exec_test.go
rename to internals/osutil/exec_test.go
index abc2a8c9..fd708d08 100644
--- a/internal/osutil/exec_test.go
+++ b/internals/osutil/exec_test.go
@@ -26,7 +26,7 @@ import (
 	. "gopkg.in/check.v1"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type execSuite struct{}
diff --git a/internal/osutil/exitcode.go b/internals/osutil/exitcode.go
similarity index 100%
rename from internal/osutil/exitcode.go
rename to internals/osutil/exitcode.go
diff --git a/internal/osutil/exitcode_test.go b/internals/osutil/exitcode_test.go
similarity index 100%
rename from internal/osutil/exitcode_test.go
rename to internals/osutil/exitcode_test.go
diff --git a/internal/osutil/export_test.go b/internals/osutil/export_test.go
similarity index 98%
rename from internal/osutil/export_test.go
rename to internals/osutil/export_test.go
index 9cd8c4b5..cb50d07e 100644
--- a/internal/osutil/export_test.go
+++ b/internals/osutil/export_test.go
@@ -24,7 +24,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil/sys"
 )
 
 func FakeUserCurrent(f func() (*user.User, error)) func() {
diff --git a/internal/osutil/io.go b/internals/osutil/io.go
similarity index 99%
rename from internal/osutil/io.go
rename to internals/osutil/io.go
index dd7317d1..420411c7 100644
--- a/internal/osutil/io.go
+++ b/internals/osutil/io.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/canonical/x-go/randutil"
 
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil/sys"
 )
 
 // AtomicWriteFlags are a bitfield of flags for AtomicWriteFile
diff --git a/internal/osutil/io_test.go b/internals/osutil/io_test.go
similarity index 98%
rename from internal/osutil/io_test.go
rename to internals/osutil/io_test.go
index 343b3ee1..a57d88a1 100644
--- a/internal/osutil/io_test.go
+++ b/internals/osutil/io_test.go
@@ -30,9 +30,9 @@ import (
 	"github.com/canonical/x-go/randutil"
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/sys"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/sys"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 type AtomicWriteTestSuite struct{}
diff --git a/internal/osutil/mkdirallchown.go b/internals/osutil/mkdirallchown.go
similarity index 98%
rename from internal/osutil/mkdirallchown.go
rename to internals/osutil/mkdirallchown.go
index 955f78c9..dd139244 100644
--- a/internal/osutil/mkdirallchown.go
+++ b/internals/osutil/mkdirallchown.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil/sys"
 )
 
 // XXX: we need to come back and fix this; this is a hack to unblock us.
diff --git a/internal/osutil/mkdirallchown_test.go b/internals/osutil/mkdirallchown_test.go
similarity index 97%
rename from internal/osutil/mkdirallchown_test.go
rename to internals/osutil/mkdirallchown_test.go
index 5351405f..0150b9f6 100644
--- a/internal/osutil/mkdirallchown_test.go
+++ b/internals/osutil/mkdirallchown_test.go
@@ -19,7 +19,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type mkdacSuite struct{}
diff --git a/internal/osutil/mount_darwin.go b/internals/osutil/mount_darwin.go
similarity index 100%
rename from internal/osutil/mount_darwin.go
rename to internals/osutil/mount_darwin.go
diff --git a/internal/osutil/mount_linux.go b/internals/osutil/mount_linux.go
similarity index 100%
rename from internal/osutil/mount_linux.go
rename to internals/osutil/mount_linux.go
diff --git a/internal/osutil/mount_linux_test.go b/internals/osutil/mount_linux_test.go
similarity index 97%
rename from internal/osutil/mount_linux_test.go
rename to internals/osutil/mount_linux_test.go
index 32e910a7..c050b707 100644
--- a/internal/osutil/mount_linux_test.go
+++ b/internals/osutil/mount_linux_test.go
@@ -17,7 +17,7 @@ package osutil_test
 import (
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type mountSuite struct{}
diff --git a/internal/osutil/mountentry_linux.go b/internals/osutil/mountentry_linux.go
similarity index 100%
rename from internal/osutil/mountentry_linux.go
rename to internals/osutil/mountentry_linux.go
diff --git a/internal/osutil/mountentry_linux_test.go b/internals/osutil/mountentry_linux_test.go
similarity index 99%
rename from internal/osutil/mountentry_linux_test.go
rename to internals/osutil/mountentry_linux_test.go
index 7261ec28..50ff9ee3 100644
--- a/internal/osutil/mountentry_linux_test.go
+++ b/internals/osutil/mountentry_linux_test.go
@@ -19,7 +19,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type entrySuite struct{}
diff --git a/internal/osutil/mountinfo_linux.go b/internals/osutil/mountinfo_linux.go
similarity index 100%
rename from internal/osutil/mountinfo_linux.go
rename to internals/osutil/mountinfo_linux.go
diff --git a/internal/osutil/mountinfo_linux_test.go b/internals/osutil/mountinfo_linux_test.go
similarity index 99%
rename from internal/osutil/mountinfo_linux_test.go
rename to internals/osutil/mountinfo_linux_test.go
index 767d82b7..ed444363 100644
--- a/internal/osutil/mountinfo_linux_test.go
+++ b/internals/osutil/mountinfo_linux_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type mountinfoSuite struct{}
diff --git a/internal/osutil/osutil_darwin.go b/internals/osutil/osutil_darwin.go
similarity index 100%
rename from internal/osutil/osutil_darwin.go
rename to internals/osutil/osutil_darwin.go
diff --git a/internal/osutil/osutil_test.go b/internals/osutil/osutil_test.go
similarity index 100%
rename from internal/osutil/osutil_test.go
rename to internals/osutil/osutil_test.go
diff --git a/internal/osutil/outputerr.go b/internals/osutil/outputerr.go
similarity index 100%
rename from internal/osutil/outputerr.go
rename to internals/osutil/outputerr.go
diff --git a/internal/osutil/outputerr_test.go b/internals/osutil/outputerr_test.go
similarity index 100%
rename from internal/osutil/outputerr_test.go
rename to internals/osutil/outputerr_test.go
diff --git a/internal/osutil/squashfs/fstype.go b/internals/osutil/squashfs/fstype.go
similarity index 97%
rename from internal/osutil/squashfs/fstype.go
rename to internals/osutil/squashfs/fstype.go
index 15ecccfe..07a8b8d5 100644
--- a/internal/osutil/squashfs/fstype.go
+++ b/internals/osutil/squashfs/fstype.go
@@ -18,7 +18,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 // useFuse detects if we should be using squashfuse instead
diff --git a/internal/osutil/stat.go b/internals/osutil/stat.go
similarity index 100%
rename from internal/osutil/stat.go
rename to internals/osutil/stat.go
diff --git a/internal/osutil/stat_test.go b/internals/osutil/stat_test.go
similarity index 100%
rename from internal/osutil/stat_test.go
rename to internals/osutil/stat_test.go
diff --git a/internal/osutil/sys/syscall.go b/internals/osutil/sys/syscall.go
similarity index 100%
rename from internal/osutil/sys/syscall.go
rename to internals/osutil/sys/syscall.go
diff --git a/internal/osutil/sys/sysnum_16_linux.go b/internals/osutil/sys/sysnum_16_linux.go
similarity index 100%
rename from internal/osutil/sys/sysnum_16_linux.go
rename to internals/osutil/sys/sysnum_16_linux.go
diff --git a/internal/osutil/sys/sysnum_32_linux.go b/internals/osutil/sys/sysnum_32_linux.go
similarity index 100%
rename from internal/osutil/sys/sysnum_32_linux.go
rename to internals/osutil/sys/sysnum_32_linux.go
diff --git a/internal/osutil/sys/sysnum_darwin.go b/internals/osutil/sys/sysnum_darwin.go
similarity index 100%
rename from internal/osutil/sys/sysnum_darwin.go
rename to internals/osutil/sys/sysnum_darwin.go
diff --git a/internal/osutil/sys/sysnum_linux.go b/internals/osutil/sys/sysnum_linux.go
similarity index 100%
rename from internal/osutil/sys/sysnum_linux.go
rename to internals/osutil/sys/sysnum_linux.go
diff --git a/internal/osutil/user.go b/internals/osutil/user.go
similarity index 98%
rename from internal/osutil/user.go
rename to internals/osutil/user.go
index 4fe20e42..052ec590 100644
--- a/internal/osutil/user.go
+++ b/internals/osutil/user.go
@@ -20,7 +20,7 @@ import (
 	"os/user"
 	"strconv"
 
-	"github.com/canonical/pebble/internal/osutil/sys"
+	"github.com/canonical/pebble/internals/osutil/sys"
 )
 
 var (
diff --git a/internal/osutil/user_test.go b/internals/osutil/user_test.go
similarity index 96%
rename from internal/osutil/user_test.go
rename to internals/osutil/user_test.go
index 66fb4e45..60b504b1 100644
--- a/internal/osutil/user_test.go
+++ b/internals/osutil/user_test.go
@@ -22,9 +22,9 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/sys"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/sys"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 type userSuite struct {
diff --git a/internal/overlord/backend.go b/internals/overlord/backend.go
similarity index 90%
rename from internal/overlord/backend.go
rename to internals/overlord/backend.go
index 5ea083d4..d57c7511 100644
--- a/internal/overlord/backend.go
+++ b/internals/overlord/backend.go
@@ -17,8 +17,8 @@ package overlord
 import (
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord/restart"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord/restart"
 )
 
 type overlordStateBackend struct {
diff --git a/internal/overlord/checkstate/checkers.go b/internals/overlord/checkstate/checkers.go
similarity index 96%
rename from internal/overlord/checkstate/checkers.go
rename to internals/overlord/checkstate/checkers.go
index 2dc44211..9525745a 100644
--- a/internal/overlord/checkstate/checkers.go
+++ b/internals/overlord/checkstate/checkers.go
@@ -29,10 +29,10 @@ import (
 
 	"github.com/canonical/x-go/strutil/shlex"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/reaper"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/reaper"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 const (
diff --git a/internal/overlord/checkstate/checkers_test.go b/internals/overlord/checkstate/checkers_test.go
similarity index 99%
rename from internal/overlord/checkstate/checkers_test.go
rename to internals/overlord/checkstate/checkers_test.go
index 72192b50..81a4fff0 100644
--- a/internal/overlord/checkstate/checkers_test.go
+++ b/internals/overlord/checkstate/checkers_test.go
@@ -26,7 +26,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/reaper"
+	"github.com/canonical/pebble/internals/reaper"
 )
 
 type CheckersSuite struct{}
diff --git a/internal/overlord/checkstate/manager.go b/internals/overlord/checkstate/manager.go
similarity index 98%
rename from internal/overlord/checkstate/manager.go
rename to internals/overlord/checkstate/manager.go
index 20d95a11..abbde8e7 100644
--- a/internal/overlord/checkstate/manager.go
+++ b/internals/overlord/checkstate/manager.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 // CheckManager starts and manages the health checks.
diff --git a/internal/overlord/checkstate/manager_test.go b/internals/overlord/checkstate/manager_test.go
similarity index 98%
rename from internal/overlord/checkstate/manager_test.go
rename to internals/overlord/checkstate/manager_test.go
index eb9ea812..62ee24ab 100644
--- a/internal/overlord/checkstate/manager_test.go
+++ b/internals/overlord/checkstate/manager_test.go
@@ -25,9 +25,9 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/plan"
-	"github.com/canonical/pebble/internal/reaper"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/plan"
+	"github.com/canonical/pebble/internals/reaper"
 )
 
 func Test(t *testing.T) {
diff --git a/internal/overlord/cmdstate/handlers.go b/internals/overlord/cmdstate/handlers.go
similarity index 98%
rename from internal/overlord/cmdstate/handlers.go
rename to internals/overlord/cmdstate/handlers.go
index acc40e97..58dfdb4f 100644
--- a/internal/overlord/cmdstate/handlers.go
+++ b/internals/overlord/cmdstate/handlers.go
@@ -31,11 +31,11 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/ptyutil"
-	"github.com/canonical/pebble/internal/reaper"
-	"github.com/canonical/pebble/internal/wsutil"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/ptyutil"
+	"github.com/canonical/pebble/internals/reaper"
+	"github.com/canonical/pebble/internals/wsutil"
 )
 
 const (
diff --git a/internal/overlord/cmdstate/manager.go b/internals/overlord/cmdstate/manager.go
similarity index 97%
rename from internal/overlord/cmdstate/manager.go
rename to internals/overlord/cmdstate/manager.go
index 61103550..2fdd06b4 100644
--- a/internal/overlord/cmdstate/manager.go
+++ b/internals/overlord/cmdstate/manager.go
@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type CommandManager struct {
diff --git a/internal/overlord/cmdstate/request.go b/internals/overlord/cmdstate/request.go
similarity index 97%
rename from internal/overlord/cmdstate/request.go
rename to internals/overlord/cmdstate/request.go
index 1dc514b3..18cf88ab 100644
--- a/internal/overlord/cmdstate/request.go
+++ b/internals/overlord/cmdstate/request.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // ExecArgs holds the arguments for a command execution.
diff --git a/internal/overlord/export_test.go b/internals/overlord/export_test.go
similarity index 100%
rename from internal/overlord/export_test.go
rename to internals/overlord/export_test.go
diff --git a/internal/overlord/logstate/manager.go b/internals/overlord/logstate/manager.go
similarity index 93%
rename from internal/overlord/logstate/manager.go
rename to internals/overlord/logstate/manager.go
index e067eb33..4ee2b235 100644
--- a/internal/overlord/logstate/manager.go
+++ b/internals/overlord/logstate/manager.go
@@ -15,8 +15,8 @@
 package logstate
 
 import (
-	"github.com/canonical/pebble/internal/plan"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/plan"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type LogManager struct{}
diff --git a/internal/overlord/managers_test.go b/internals/overlord/managers_test.go
similarity index 91%
rename from internal/overlord/managers_test.go
rename to internals/overlord/managers_test.go
index c177b31c..7b59191f 100644
--- a/internal/overlord/managers_test.go
+++ b/internals/overlord/managers_test.go
@@ -21,8 +21,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 type mgrsSuite struct {
diff --git a/internal/overlord/overlord.go b/internals/overlord/overlord.go
similarity index 96%
rename from internal/overlord/overlord.go
rename to internals/overlord/overlord.go
index 5be84c82..771a670d 100644
--- a/internal/overlord/overlord.go
+++ b/internals/overlord/overlord.go
@@ -27,15 +27,15 @@ import (
 	"github.com/canonical/x-go/randutil"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/overlord/cmdstate"
-	"github.com/canonical/pebble/internal/overlord/logstate"
-	"github.com/canonical/pebble/internal/overlord/patch"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/timing"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/overlord/cmdstate"
+	"github.com/canonical/pebble/internals/overlord/logstate"
+	"github.com/canonical/pebble/internals/overlord/patch"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/timing"
 )
 
 var (
diff --git a/internal/overlord/overlord_test.go b/internals/overlord/overlord_test.go
similarity index 98%
rename from internal/overlord/overlord_test.go
rename to internals/overlord/overlord_test.go
index 3b182d43..c6b9cc7e 100644
--- a/internal/overlord/overlord_test.go
+++ b/internals/overlord/overlord_test.go
@@ -29,12 +29,12 @@ import (
 	"gopkg.in/tomb.v2"
 
 	"github.com/canonical/pebble/cmd"
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/patch"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/patch"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 func TestOverlord(t *testing.T) { TestingT(t) }
diff --git a/internal/overlord/patch/export_test.go b/internals/overlord/patch/export_test.go
similarity index 100%
rename from internal/overlord/patch/export_test.go
rename to internals/overlord/patch/export_test.go
diff --git a/internal/overlord/patch/patch.go b/internals/overlord/patch/patch.go
similarity index 97%
rename from internal/overlord/patch/patch.go
rename to internals/overlord/patch/patch.go
index 8f7a6987..afc93186 100644
--- a/internal/overlord/patch/patch.go
+++ b/internals/overlord/patch/patch.go
@@ -22,8 +22,8 @@ package patch
 import (
 	"fmt"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // Level is the current implemented patch level of the state format and content.
diff --git a/internal/overlord/patch/patch1.go b/internals/overlord/patch/patch1.go
similarity index 97%
rename from internal/overlord/patch/patch1.go
rename to internals/overlord/patch/patch1.go
index a478df29..ad820c73 100644
--- a/internal/overlord/patch/patch1.go
+++ b/internals/overlord/patch/patch1.go
@@ -15,7 +15,7 @@
 package patch
 
 import (
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func init() {
diff --git a/internal/overlord/patch/patch1_test.go b/internals/overlord/patch/patch1_test.go
similarity index 94%
rename from internal/overlord/patch/patch1_test.go
rename to internals/overlord/patch/patch1_test.go
index fb539f49..2492c66e 100644
--- a/internal/overlord/patch/patch1_test.go
+++ b/internals/overlord/patch/patch1_test.go
@@ -21,8 +21,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/patch"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/patch"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // Analogous to patch1.go itself, this is available as inspiration for actual patch tests.
diff --git a/internal/overlord/patch/patch_test.go b/internals/overlord/patch/patch_test.go
similarity index 98%
rename from internal/overlord/patch/patch_test.go
rename to internals/overlord/patch/patch_test.go
index b2cc4282..ea858ce5 100644
--- a/internal/overlord/patch/patch_test.go
+++ b/internals/overlord/patch/patch_test.go
@@ -24,8 +24,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/canonical/pebble/internal/overlord/patch"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/patch"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/internal/overlord/restart/restart.go b/internals/overlord/restart/restart.go
similarity index 98%
rename from internal/overlord/restart/restart.go
rename to internals/overlord/restart/restart.go
index dca2d03d..0c1a8840 100644
--- a/internal/overlord/restart/restart.go
+++ b/internals/overlord/restart/restart.go
@@ -16,7 +16,7 @@
 package restart
 
 import (
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type RestartType int
diff --git a/internal/overlord/restart/restart_test.go b/internals/overlord/restart/restart_test.go
similarity index 96%
rename from internal/overlord/restart/restart_test.go
rename to internals/overlord/restart/restart_test.go
index 0acc70f5..8a8617ed 100644
--- a/internal/overlord/restart/restart_test.go
+++ b/internals/overlord/restart/restart_test.go
@@ -19,8 +19,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func TestRestart(t *testing.T) { TestingT(t) }
diff --git a/internal/overlord/servstate/export_test.go b/internals/overlord/servstate/export_test.go
similarity index 97%
rename from internal/overlord/servstate/export_test.go
rename to internals/overlord/servstate/export_test.go
index 495dd682..fe4603d7 100644
--- a/internal/overlord/servstate/export_test.go
+++ b/internals/overlord/servstate/export_test.go
@@ -19,7 +19,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 var CalculateNextBackoff = calculateNextBackoff
diff --git a/internal/overlord/servstate/handlers.go b/internals/overlord/servstate/handlers.go
similarity index 98%
rename from internal/overlord/servstate/handlers.go
rename to internals/overlord/servstate/handlers.go
index d0b7a66f..d8276c20 100644
--- a/internal/overlord/servstate/handlers.go
+++ b/internals/overlord/servstate/handlers.go
@@ -13,13 +13,13 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/plan"
-	"github.com/canonical/pebble/internal/reaper"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/plan"
+	"github.com/canonical/pebble/internals/reaper"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 // TaskServiceRequest extracts the *ServiceRequest that was associated
diff --git a/internal/overlord/servstate/manager.go b/internals/overlord/servstate/manager.go
similarity index 97%
rename from internal/overlord/servstate/manager.go
rename to internals/overlord/servstate/manager.go
index 691f0a54..ad99bef2 100644
--- a/internal/overlord/servstate/manager.go
+++ b/internals/overlord/servstate/manager.go
@@ -9,12 +9,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/plan"
-	"github.com/canonical/pebble/internal/reaper"
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/plan"
+	"github.com/canonical/pebble/internals/reaper"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type ServiceManager struct {
diff --git a/internal/overlord/servstate/manager_test.go b/internals/overlord/servstate/manager_test.go
similarity index 99%
rename from internal/overlord/servstate/manager_test.go
rename to internals/overlord/servstate/manager_test.go
index 6a07c156..8a7c78a5 100644
--- a/internal/overlord/servstate/manager_test.go
+++ b/internals/overlord/servstate/manager_test.go
@@ -36,14 +36,14 @@ import (
 	. "gopkg.in/check.v1"
 	"gopkg.in/yaml.v3"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/checkstate"
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/servstate"
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/plan"
-	"github.com/canonical/pebble/internal/servicelog"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/checkstate"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/plan"
+	"github.com/canonical/pebble/internals/servicelog"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 const (
diff --git a/internal/overlord/servstate/request.go b/internals/overlord/servstate/request.go
similarity index 96%
rename from internal/overlord/servstate/request.go
rename to internals/overlord/servstate/request.go
index b224335c..0d525a87 100644
--- a/internal/overlord/servstate/request.go
+++ b/internals/overlord/servstate/request.go
@@ -1,7 +1,7 @@
 package servstate
 
 import (
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	"fmt"
 )
diff --git a/internal/overlord/servstate/request_test.go b/internals/overlord/servstate/request_test.go
similarity index 96%
rename from internal/overlord/servstate/request_test.go
rename to internals/overlord/servstate/request_test.go
index 434fc853..b915ee47 100644
--- a/internal/overlord/servstate/request_test.go
+++ b/internals/overlord/servstate/request_test.go
@@ -17,7 +17,7 @@ package servstate_test
 import (
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/servstate"
+	"github.com/canonical/pebble/internals/overlord/servstate"
 )
 
 func (s *S) TestStart(c *C) {
diff --git a/internal/overlord/servstate/servstatetest/restart.go b/internals/overlord/servstate/servstatetest/restart.go
similarity index 90%
rename from internal/overlord/servstate/servstatetest/restart.go
rename to internals/overlord/servstate/servstatetest/restart.go
index 539d25a0..005ae0ef 100644
--- a/internal/overlord/servstate/servstatetest/restart.go
+++ b/internals/overlord/servstate/servstatetest/restart.go
@@ -15,8 +15,8 @@
 package servstatetest
 
 import (
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // FakeRestartHandler fakes a restart.Handler based on a function
diff --git a/internal/overlord/servstate/state-diagram.dot b/internals/overlord/servstate/state-diagram.dot
similarity index 100%
rename from internal/overlord/servstate/state-diagram.dot
rename to internals/overlord/servstate/state-diagram.dot
diff --git a/internal/overlord/servstate/state-diagram.svg b/internals/overlord/servstate/state-diagram.svg
similarity index 100%
rename from internal/overlord/servstate/state-diagram.svg
rename to internals/overlord/servstate/state-diagram.svg
diff --git a/internal/overlord/standby/export_test.go b/internals/overlord/standby/export_test.go
similarity index 100%
rename from internal/overlord/standby/export_test.go
rename to internals/overlord/standby/export_test.go
diff --git a/internal/overlord/standby/standby.go b/internals/overlord/standby/standby.go
similarity index 96%
rename from internal/overlord/standby/standby.go
rename to internals/overlord/standby/standby.go
index c8b2c359..2ae0b789 100644
--- a/internal/overlord/standby/standby.go
+++ b/internals/overlord/standby/standby.go
@@ -17,8 +17,8 @@ package standby
 import (
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 var standbyWait = 5 * time.Second
diff --git a/internal/overlord/standby/standby_test.go b/internals/overlord/standby/standby_test.go
similarity index 94%
rename from internal/overlord/standby/standby_test.go
rename to internals/overlord/standby/standby_test.go
index b630ea0e..3cefcc0e 100644
--- a/internal/overlord/standby/standby_test.go
+++ b/internals/overlord/standby/standby_test.go
@@ -23,10 +23,10 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/servstate/servstatetest"
-	"github.com/canonical/pebble/internal/overlord/standby"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/servstate/servstatetest"
+	"github.com/canonical/pebble/internals/overlord/standby"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // Hook up v1 into the "go test" runner
diff --git a/internal/overlord/state/change.go b/internals/overlord/state/change.go
similarity index 100%
rename from internal/overlord/state/change.go
rename to internals/overlord/state/change.go
diff --git a/internal/overlord/state/change_test.go b/internals/overlord/state/change_test.go
similarity index 99%
rename from internal/overlord/state/change_test.go
rename to internals/overlord/state/change_test.go
index 8094c9bb..52b77bfc 100644
--- a/internal/overlord/state/change_test.go
+++ b/internals/overlord/state/change_test.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/internal/overlord/state/export_test.go b/internals/overlord/state/export_test.go
similarity index 100%
rename from internal/overlord/state/export_test.go
rename to internals/overlord/state/export_test.go
diff --git a/internal/overlord/state/state.go b/internals/overlord/state/state.go
similarity index 99%
rename from internal/overlord/state/state.go
rename to internals/overlord/state/state.go
index a29e7228..660a8a64 100644
--- a/internal/overlord/state/state.go
+++ b/internals/overlord/state/state.go
@@ -31,7 +31,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 // A Backend is used by State to checkpoint on every unlock operation
diff --git a/internal/overlord/state/state_test.go b/internals/overlord/state/state_test.go
similarity index 99%
rename from internal/overlord/state/state_test.go
rename to internals/overlord/state/state_test.go
index ec70a8cc..e1e8a707 100644
--- a/internal/overlord/state/state_test.go
+++ b/internals/overlord/state/state_test.go
@@ -28,7 +28,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func TestState(t *testing.T) { TestingT(t) }
diff --git a/internal/overlord/state/task.go b/internals/overlord/state/task.go
similarity index 99%
rename from internal/overlord/state/task.go
rename to internals/overlord/state/task.go
index a9fd0f93..a3e2a486 100644
--- a/internal/overlord/state/task.go
+++ b/internals/overlord/state/task.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 type progress struct {
diff --git a/internal/overlord/state/task_test.go b/internals/overlord/state/task_test.go
similarity index 99%
rename from internal/overlord/state/task_test.go
rename to internals/overlord/state/task_test.go
index 65c7f3c3..9c073d80 100644
--- a/internal/overlord/state/task_test.go
+++ b/internals/overlord/state/task_test.go
@@ -26,8 +26,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 type taskSuite struct{}
diff --git a/internal/overlord/state/taskrunner.go b/internals/overlord/state/taskrunner.go
similarity index 99%
rename from internal/overlord/state/taskrunner.go
rename to internals/overlord/state/taskrunner.go
index b828dff6..5d9ff244 100644
--- a/internal/overlord/state/taskrunner.go
+++ b/internals/overlord/state/taskrunner.go
@@ -25,7 +25,7 @@ import (
 
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 // HandlerFunc is the type of function for the handlers
diff --git a/internal/overlord/state/taskrunner_test.go b/internals/overlord/state/taskrunner_test.go
similarity index 99%
rename from internal/overlord/state/taskrunner_test.go
rename to internals/overlord/state/taskrunner_test.go
index 559b6214..38c5685a 100644
--- a/internal/overlord/state/taskrunner_test.go
+++ b/internals/overlord/state/taskrunner_test.go
@@ -31,8 +31,8 @@ import (
 	. "gopkg.in/check.v1"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/overlord/restart"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/restart"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type taskRunnerSuite struct{}
diff --git a/internal/overlord/state/warning.go b/internals/overlord/state/warning.go
similarity index 99%
rename from internal/overlord/state/warning.go
rename to internals/overlord/state/warning.go
index b115190f..69dac7c8 100644
--- a/internal/overlord/state/warning.go
+++ b/internals/overlord/state/warning.go
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 var (
diff --git a/internal/overlord/state/warning_test.go b/internals/overlord/state/warning_test.go
similarity index 99%
rename from internal/overlord/state/warning_test.go
rename to internals/overlord/state/warning_test.go
index d1b5fb9d..bf30f69e 100644
--- a/internal/overlord/state/warning_test.go
+++ b/internals/overlord/state/warning_test.go
@@ -27,7 +27,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 var never time.Time
diff --git a/internal/overlord/stateengine.go b/internals/overlord/stateengine.go
similarity index 97%
rename from internal/overlord/stateengine.go
rename to internals/overlord/stateengine.go
index 6bb38490..25710333 100644
--- a/internal/overlord/stateengine.go
+++ b/internals/overlord/stateengine.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/canonical/pebble/internal/logger"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/logger"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // StateManager is implemented by types responsible for observing
diff --git a/internal/overlord/stateengine_test.go b/internals/overlord/stateengine_test.go
similarity index 96%
rename from internal/overlord/stateengine_test.go
rename to internals/overlord/stateengine_test.go
index c4c6cb91..f12ed98b 100644
--- a/internal/overlord/stateengine_test.go
+++ b/internals/overlord/stateengine_test.go
@@ -19,8 +19,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord"
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type stateEngineSuite struct{}
diff --git a/internal/overlord/unknowntask.go b/internals/overlord/unknowntask.go
similarity index 93%
rename from internal/overlord/unknowntask.go
rename to internals/overlord/unknowntask.go
index d72cf24c..19b43a46 100644
--- a/internal/overlord/unknowntask.go
+++ b/internals/overlord/unknowntask.go
@@ -17,7 +17,7 @@ package overlord
 import (
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/overlord/state"
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func handleUnknownTask(task *state.Task, tomb *tomb.Tomb) error {
diff --git a/internal/plan/plan.go b/internals/plan/plan.go
similarity index 99%
rename from internal/plan/plan.go
rename to internals/plan/plan.go
index e12389c8..d142e184 100644
--- a/internal/plan/plan.go
+++ b/internals/plan/plan.go
@@ -29,7 +29,7 @@ import (
 	"github.com/canonical/x-go/strutil/shlex"
 	"gopkg.in/yaml.v3"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 const (
diff --git a/internal/plan/plan_test.go b/internals/plan/plan_test.go
similarity index 99%
rename from internal/plan/plan_test.go
rename to internals/plan/plan_test.go
index f44dc003..bc76513a 100644
--- a/internal/plan/plan_test.go
+++ b/internals/plan/plan_test.go
@@ -26,7 +26,7 @@ import (
 	. "gopkg.in/check.v1"
 	"gopkg.in/yaml.v3"
 
-	"github.com/canonical/pebble/internal/plan"
+	"github.com/canonical/pebble/internals/plan"
 )
 
 const (
diff --git a/internal/plan/suite_test.go b/internals/plan/suite_test.go
similarity index 100%
rename from internal/plan/suite_test.go
rename to internals/plan/suite_test.go
diff --git a/internal/plan/tarjan.go b/internals/plan/tarjan.go
similarity index 100%
rename from internal/plan/tarjan.go
rename to internals/plan/tarjan.go
diff --git a/internal/plan/tarjan_test.go b/internals/plan/tarjan_test.go
similarity index 100%
rename from internal/plan/tarjan_test.go
rename to internals/plan/tarjan_test.go
diff --git a/internal/plan/types.go b/internals/plan/types.go
similarity index 100%
rename from internal/plan/types.go
rename to internals/plan/types.go
diff --git a/internal/progress/ansimeter.go b/internals/progress/ansimeter.go
similarity index 100%
rename from internal/progress/ansimeter.go
rename to internals/progress/ansimeter.go
diff --git a/internal/progress/ansimeter_test.go b/internals/progress/ansimeter_test.go
similarity index 99%
rename from internal/progress/ansimeter_test.go
rename to internals/progress/ansimeter_test.go
index d324e373..568d2f92 100644
--- a/internal/progress/ansimeter_test.go
+++ b/internals/progress/ansimeter_test.go
@@ -23,7 +23,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/progress"
+	"github.com/canonical/pebble/internals/progress"
 )
 
 type ansiSuite struct {
diff --git a/internal/progress/export_test.go b/internals/progress/export_test.go
similarity index 100%
rename from internal/progress/export_test.go
rename to internals/progress/export_test.go
diff --git a/internal/progress/progress.go b/internals/progress/progress.go
similarity index 100%
rename from internal/progress/progress.go
rename to internals/progress/progress.go
diff --git a/internal/progress/progress_test.go b/internals/progress/progress_test.go
similarity index 93%
rename from internal/progress/progress_test.go
rename to internals/progress/progress_test.go
index 6334c0e2..5578bbdf 100644
--- a/internal/progress/progress_test.go
+++ b/internals/progress/progress_test.go
@@ -21,8 +21,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/progress"
-	"github.com/canonical/pebble/internal/progress/progresstest"
+	"github.com/canonical/pebble/internals/progress"
+	"github.com/canonical/pebble/internals/progress/progresstest"
 )
 
 // Hook up check.v1 into the "go test" runner
diff --git a/internal/progress/progresstest/progresstest.go b/internals/progress/progresstest/progresstest.go
similarity index 96%
rename from internal/progress/progresstest/progresstest.go
rename to internals/progress/progresstest/progresstest.go
index d3c6e549..9f9f706c 100644
--- a/internal/progress/progresstest/progresstest.go
+++ b/internals/progress/progresstest/progresstest.go
@@ -15,7 +15,7 @@
 package progresstest
 
 import (
-	"github.com/canonical/pebble/internal/progress"
+	"github.com/canonical/pebble/internals/progress"
 )
 
 type Meter struct {
diff --git a/internal/ptyutil/ptyutil.go b/internals/ptyutil/ptyutil.go
similarity index 100%
rename from internal/ptyutil/ptyutil.go
rename to internals/ptyutil/ptyutil.go
diff --git a/internal/ptyutil/ptyutil_linux.go b/internals/ptyutil/ptyutil_linux.go
similarity index 100%
rename from internal/ptyutil/ptyutil_linux.go
rename to internals/ptyutil/ptyutil_linux.go
diff --git a/internal/reaper/reaper.go b/internals/reaper/reaper.go
similarity index 99%
rename from internal/reaper/reaper.go
rename to internals/reaper/reaper.go
index 35af087e..dbe7f90e 100644
--- a/internal/reaper/reaper.go
+++ b/internals/reaper/reaper.go
@@ -25,7 +25,7 @@ import (
 	"golang.org/x/sys/unix"
 	"gopkg.in/tomb.v2"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 var (
diff --git a/internal/servicelog/formatter.go b/internals/servicelog/formatter.go
similarity index 100%
rename from internal/servicelog/formatter.go
rename to internals/servicelog/formatter.go
diff --git a/internal/servicelog/formatter_test.go b/internals/servicelog/formatter_test.go
similarity index 96%
rename from internal/servicelog/formatter_test.go
rename to internals/servicelog/formatter_test.go
index 99845671..d8dd77cc 100644
--- a/internal/servicelog/formatter_test.go
+++ b/internals/servicelog/formatter_test.go
@@ -20,7 +20,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 const (
diff --git a/internal/servicelog/iterator.go b/internals/servicelog/iterator.go
similarity index 100%
rename from internal/servicelog/iterator.go
rename to internals/servicelog/iterator.go
diff --git a/internal/servicelog/iterator_test.go b/internals/servicelog/iterator_test.go
similarity index 99%
rename from internal/servicelog/iterator_test.go
rename to internals/servicelog/iterator_test.go
index bd307a3f..89d64db5 100644
--- a/internal/servicelog/iterator_test.go
+++ b/internals/servicelog/iterator_test.go
@@ -26,7 +26,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type iteratorSuite struct{}
diff --git a/internal/servicelog/lastlines.go b/internals/servicelog/lastlines.go
similarity index 100%
rename from internal/servicelog/lastlines.go
rename to internals/servicelog/lastlines.go
diff --git a/internal/servicelog/lastlines_test.go b/internals/servicelog/lastlines_test.go
similarity index 97%
rename from internal/servicelog/lastlines_test.go
rename to internals/servicelog/lastlines_test.go
index c26050f4..197b341c 100644
--- a/internal/servicelog/lastlines_test.go
+++ b/internals/servicelog/lastlines_test.go
@@ -19,7 +19,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type lastLinesSuite struct{}
diff --git a/internal/servicelog/package_test.go b/internals/servicelog/package_test.go
similarity index 100%
rename from internal/servicelog/package_test.go
rename to internals/servicelog/package_test.go
diff --git a/internal/servicelog/parser.go b/internals/servicelog/parser.go
similarity index 100%
rename from internal/servicelog/parser.go
rename to internals/servicelog/parser.go
diff --git a/internal/servicelog/parser_test.go b/internals/servicelog/parser_test.go
similarity index 99%
rename from internal/servicelog/parser_test.go
rename to internals/servicelog/parser_test.go
index 23421ea6..b4d8d1a9 100644
--- a/internal/servicelog/parser_test.go
+++ b/internals/servicelog/parser_test.go
@@ -23,7 +23,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type parserSuite struct{}
diff --git a/internal/servicelog/ringbuffer.go b/internals/servicelog/ringbuffer.go
similarity index 100%
rename from internal/servicelog/ringbuffer.go
rename to internals/servicelog/ringbuffer.go
diff --git a/internal/servicelog/ringbuffer_benchmark_test.go b/internals/servicelog/ringbuffer_benchmark_test.go
similarity index 97%
rename from internal/servicelog/ringbuffer_benchmark_test.go
rename to internals/servicelog/ringbuffer_benchmark_test.go
index fec1f097..3ec68754 100644
--- a/internal/servicelog/ringbuffer_benchmark_test.go
+++ b/internals/servicelog/ringbuffer_benchmark_test.go
@@ -17,7 +17,7 @@ package servicelog_test
 import (
 	"testing"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 func BenchmarkRingBufferWriteSmall(b *testing.B) {
diff --git a/internal/servicelog/ringbuffer_test.go b/internals/servicelog/ringbuffer_test.go
similarity index 99%
rename from internal/servicelog/ringbuffer_test.go
rename to internals/servicelog/ringbuffer_test.go
index 03c6c46a..08b27eb5 100644
--- a/internal/servicelog/ringbuffer_test.go
+++ b/internals/servicelog/ringbuffer_test.go
@@ -20,7 +20,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/canonical/pebble/internal/servicelog"
+	"github.com/canonical/pebble/internals/servicelog"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/internal/systemd/escape.go b/internals/systemd/escape.go
similarity index 100%
rename from internal/systemd/escape.go
rename to internals/systemd/escape.go
diff --git a/internal/systemd/escape_test.go b/internals/systemd/escape_test.go
similarity index 95%
rename from internal/systemd/escape_test.go
rename to internals/systemd/escape_test.go
index e3963290..97e21957 100644
--- a/internal/systemd/escape_test.go
+++ b/internals/systemd/escape_test.go
@@ -17,7 +17,7 @@ package systemd_test
 import (
 	. "gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/systemd"
+	. "github.com/canonical/pebble/internals/systemd"
 )
 
 func (s *SystemdTestSuite) TestEscape(c *C) {
diff --git a/internal/systemd/export_test.go b/internals/systemd/export_test.go
similarity index 100%
rename from internal/systemd/export_test.go
rename to internals/systemd/export_test.go
diff --git a/internal/systemd/journal.go b/internals/systemd/journal.go
similarity index 100%
rename from internal/systemd/journal.go
rename to internals/systemd/journal.go
diff --git a/internal/systemd/journal_test.go b/internals/systemd/journal_test.go
similarity index 97%
rename from internal/systemd/journal_test.go
rename to internals/systemd/journal_test.go
index 4e371c3c..05fa5099 100644
--- a/internal/systemd/journal_test.go
+++ b/internals/systemd/journal_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/systemd"
+	. "github.com/canonical/pebble/internals/systemd"
 )
 
 type journalTestSuite struct{}
diff --git a/internal/systemd/sdnotify.go b/internals/systemd/sdnotify.go
similarity index 97%
rename from internal/systemd/sdnotify.go
rename to internals/systemd/sdnotify.go
index b2c34c82..5f1279cf 100644
--- a/internal/systemd/sdnotify.go
+++ b/internals/systemd/sdnotify.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/canonical/pebble/internal/osutil"
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 var osGetenv = os.Getenv
diff --git a/internal/systemd/sdnotify_test.go b/internals/systemd/sdnotify_test.go
similarity index 98%
rename from internal/systemd/sdnotify_test.go
rename to internals/systemd/sdnotify_test.go
index da29a272..ad19dabe 100644
--- a/internal/systemd/sdnotify_test.go
+++ b/internals/systemd/sdnotify_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/systemd"
+	"github.com/canonical/pebble/internals/systemd"
 )
 
 type sdNotifyTestSuite struct {
diff --git a/internal/systemd/systemd.go b/internals/systemd/systemd.go
similarity index 99%
rename from internal/systemd/systemd.go
rename to internals/systemd/systemd.go
index 97110b7f..c5e11114 100644
--- a/internal/systemd/systemd.go
+++ b/internals/systemd/systemd.go
@@ -33,8 +33,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/squashfs"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/squashfs"
 )
 
 var (
diff --git a/internal/systemd/systemd_test.go b/internals/systemd/systemd_test.go
similarity index 99%
rename from internal/systemd/systemd_test.go
rename to internals/systemd/systemd_test.go
index 59e22775..f32c363d 100644
--- a/internal/systemd/systemd_test.go
+++ b/internals/systemd/systemd_test.go
@@ -32,11 +32,11 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/osutil"
-	"github.com/canonical/pebble/internal/osutil/squashfs"
-	"github.com/canonical/pebble/internal/testutil"
+	"github.com/canonical/pebble/internals/osutil"
+	"github.com/canonical/pebble/internals/osutil/squashfs"
+	"github.com/canonical/pebble/internals/testutil"
 
-	"github.com/canonical/pebble/internal/systemd"
+	"github.com/canonical/pebble/internals/systemd"
 )
 
 type testreporter struct {
diff --git a/internal/testutil/base.go b/internals/testutil/base.go
similarity index 100%
rename from internal/testutil/base.go
rename to internals/testutil/base.go
diff --git a/internal/testutil/containschecker.go b/internals/testutil/containschecker.go
similarity index 100%
rename from internal/testutil/containschecker.go
rename to internals/testutil/containschecker.go
diff --git a/internal/testutil/containschecker_test.go b/internals/testutil/containschecker_test.go
similarity index 99%
rename from internal/testutil/containschecker_test.go
rename to internals/testutil/containschecker_test.go
index 05d3a2ec..86c5c0cc 100644
--- a/internal/testutil/containschecker_test.go
+++ b/internals/testutil/containschecker_test.go
@@ -19,7 +19,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/testutil"
+	. "github.com/canonical/pebble/internals/testutil"
 )
 
 type containsCheckerSuite struct{}
diff --git a/internal/testutil/exec.go b/internals/testutil/exec.go
similarity index 99%
rename from internal/testutil/exec.go
rename to internals/testutil/exec.go
index 3de77b1f..113f7ceb 100644
--- a/internal/testutil/exec.go
+++ b/internals/testutil/exec.go
@@ -28,7 +28,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/reaper"
+	"github.com/canonical/pebble/internals/reaper"
 )
 
 var shellcheckPath string
diff --git a/internal/testutil/exec_test.go b/internals/testutil/exec_test.go
similarity index 100%
rename from internal/testutil/exec_test.go
rename to internals/testutil/exec_test.go
diff --git a/internal/testutil/export_test.go b/internals/testutil/export_test.go
similarity index 100%
rename from internal/testutil/export_test.go
rename to internals/testutil/export_test.go
diff --git a/internal/testutil/filecontentchecker.go b/internals/testutil/filecontentchecker.go
similarity index 100%
rename from internal/testutil/filecontentchecker.go
rename to internals/testutil/filecontentchecker.go
diff --git a/internal/testutil/filecontentchecker_test.go b/internals/testutil/filecontentchecker_test.go
similarity index 98%
rename from internal/testutil/filecontentchecker_test.go
rename to internals/testutil/filecontentchecker_test.go
index 3bce5bfb..c41b4767 100644
--- a/internal/testutil/filecontentchecker_test.go
+++ b/internals/testutil/filecontentchecker_test.go
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/testutil"
+	. "github.com/canonical/pebble/internals/testutil"
 )
 
 type fileContentCheckerSuite struct{}
diff --git a/internal/testutil/filepresencechecker.go b/internals/testutil/filepresencechecker.go
similarity index 100%
rename from internal/testutil/filepresencechecker.go
rename to internals/testutil/filepresencechecker.go
diff --git a/internal/testutil/filepresencechecker_test.go b/internals/testutil/filepresencechecker_test.go
similarity index 97%
rename from internal/testutil/filepresencechecker_test.go
rename to internals/testutil/filepresencechecker_test.go
index 24b89008..3f75df88 100644
--- a/internal/testutil/filepresencechecker_test.go
+++ b/internals/testutil/filepresencechecker_test.go
@@ -21,7 +21,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/testutil"
+	. "github.com/canonical/pebble/internals/testutil"
 )
 
 type filePresenceCheckerSuite struct{}
diff --git a/internal/testutil/intcheckers.go b/internals/testutil/intcheckers.go
similarity index 100%
rename from internal/testutil/intcheckers.go
rename to internals/testutil/intcheckers.go
diff --git a/internal/testutil/intcheckers_test.go b/internals/testutil/intcheckers_test.go
similarity index 97%
rename from internal/testutil/intcheckers_test.go
rename to internals/testutil/intcheckers_test.go
index ca4ae326..421a0443 100644
--- a/internal/testutil/intcheckers_test.go
+++ b/internals/testutil/intcheckers_test.go
@@ -17,7 +17,7 @@ package testutil_test
 import (
 	"gopkg.in/check.v1"
 
-	. "github.com/canonical/pebble/internal/testutil"
+	. "github.com/canonical/pebble/internals/testutil"
 )
 
 type intCheckersSuite struct{}
diff --git a/internal/testutil/testutil_test.go b/internals/testutil/testutil_test.go
similarity index 100%
rename from internal/testutil/testutil_test.go
rename to internals/testutil/testutil_test.go
diff --git a/internal/timeutil/export_test.go b/internals/timeutil/export_test.go
similarity index 100%
rename from internal/timeutil/export_test.go
rename to internals/timeutil/export_test.go
diff --git a/internal/timeutil/human.go b/internals/timeutil/human.go
similarity index 100%
rename from internal/timeutil/human.go
rename to internals/timeutil/human.go
diff --git a/internal/timeutil/human_test.go b/internals/timeutil/human_test.go
similarity index 98%
rename from internal/timeutil/human_test.go
rename to internals/timeutil/human_test.go
index 359d9122..84837e4f 100644
--- a/internal/timeutil/human_test.go
+++ b/internals/timeutil/human_test.go
@@ -19,7 +19,7 @@ import (
 
 	"gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/timeutil"
+	"github.com/canonical/pebble/internals/timeutil"
 )
 
 type humanSuite struct {
diff --git a/internal/timeutil/schedule.go b/internals/timeutil/schedule.go
similarity index 100%
rename from internal/timeutil/schedule.go
rename to internals/timeutil/schedule.go
diff --git a/internal/timeutil/schedule_test.go b/internals/timeutil/schedule_test.go
similarity index 99%
rename from internal/timeutil/schedule_test.go
rename to internals/timeutil/schedule_test.go
index 61c248b8..6e5ca595 100644
--- a/internal/timeutil/schedule_test.go
+++ b/internals/timeutil/schedule_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/timeutil"
+	"github.com/canonical/pebble/internals/timeutil"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/internal/timing/export_test.go b/internals/timing/export_test.go
similarity index 100%
rename from internal/timing/export_test.go
rename to internals/timing/export_test.go
diff --git a/internal/timing/span.go b/internals/timing/span.go
similarity index 100%
rename from internal/timing/span.go
rename to internals/timing/span.go
diff --git a/internal/timing/span_test.go b/internals/timing/span_test.go
similarity index 97%
rename from internal/timing/span_test.go
rename to internals/timing/span_test.go
index 72db0eb2..8e2faaed 100644
--- a/internal/timing/span_test.go
+++ b/internals/timing/span_test.go
@@ -23,9 +23,9 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/pebble/internal/overlord/state"
-	"github.com/canonical/pebble/internal/testutil"
-	"github.com/canonical/pebble/internal/timing"
+	"github.com/canonical/pebble/internals/overlord/state"
+	"github.com/canonical/pebble/internals/testutil"
+	"github.com/canonical/pebble/internals/timing"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/internal/wsutil/wsutil.go b/internals/wsutil/wsutil.go
similarity index 98%
rename from internal/wsutil/wsutil.go
rename to internals/wsutil/wsutil.go
index bd65d83f..89f9304b 100644
--- a/internal/wsutil/wsutil.go
+++ b/internals/wsutil/wsutil.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 // MessageReader is an interface that wraps websocket message reading.
diff --git a/internal/wsutil/wsutil_linux.go b/internals/wsutil/wsutil_linux.go
similarity index 99%
rename from internal/wsutil/wsutil_linux.go
rename to internals/wsutil/wsutil_linux.go
index b1204080..dd2ba57a 100644
--- a/internal/wsutil/wsutil_linux.go
+++ b/internals/wsutil/wsutil_linux.go
@@ -23,7 +23,7 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/sys/unix"
 
-	"github.com/canonical/pebble/internal/logger"
+	"github.com/canonical/pebble/internals/logger"
 )
 
 // MirrorToWebsocket mirrors PTY output from r (file descriptor fd) to the websocket.