diff --git a/cmd/ghcs/code.go b/cmd/ghcs/code.go
index 3bd67053d..0ec363a6d 100644
--- a/cmd/ghcs/code.go
+++ b/cmd/ghcs/code.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/github/ghcs/api"
+	"github.com/github/ghcs/internal/api"
 	"github.com/skratchdot/open-golang/open"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/ghcs/common.go b/cmd/ghcs/common.go
index bfcb67496..133e6d1de 100644
--- a/cmd/ghcs/common.go
+++ b/cmd/ghcs/common.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/terminal"
-	"github.com/github/ghcs/api"
+	"github.com/github/ghcs/internal/api"
 	"golang.org/x/term"
 )
 
diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go
index 093450e7d..82414f80e 100644
--- a/cmd/ghcs/create.go
+++ b/cmd/ghcs/create.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/fatih/camelcase"
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/ghcs/internal/codespaces"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/ghcs/delete.go b/cmd/ghcs/delete.go
index 7800a13c0..3f5d68684 100644
--- a/cmd/ghcs/delete.go
+++ b/cmd/ghcs/delete.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/ghcs/list.go b/cmd/ghcs/list.go
index ee26e3013..dee1b0875 100644
--- a/cmd/ghcs/list.go
+++ b/cmd/ghcs/list.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
index a685a364d..8d7dc475e 100644
--- a/cmd/ghcs/logs.go
+++ b/cmd/ghcs/logs.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/ghcs/internal/codespaces"
 	"github.com/github/go-liveshare"
 	"github.com/spf13/cobra"
diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go
index f6d1f6e2a..8256c13e2 100644
--- a/cmd/ghcs/ports.go
+++ b/cmd/ghcs/ports.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/ghcs/internal/codespaces"
 	"github.com/github/go-liveshare"
 	"github.com/muhammadmuzzammil1998/jsonc"
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
index e5289e205..b020a799e 100644
--- a/cmd/ghcs/ssh.go
+++ b/cmd/ghcs/ssh.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/github/ghcs/api"
 	"github.com/github/ghcs/cmd/ghcs/output"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/ghcs/internal/codespaces"
 	"github.com/github/go-liveshare"
 	"github.com/spf13/cobra"
diff --git a/api/api.go b/internal/api/api.go
similarity index 94%
rename from api/api.go
rename to internal/api/api.go
index ad69f23fc..8277e903a 100644
--- a/api/api.go
+++ b/internal/api/api.go
@@ -1,4 +1,3 @@
-// TODO(adonovan): rename to package codespaces, and codespaces.Client.
 package api
 
 // For descriptions of service interfaces, see:
@@ -7,6 +6,24 @@ package api
 // - https://github.com/github/github/blob/master/app/api/codespaces.rb (for vscs_internal)
 // TODO(adonovan): replace the last link with a public doc URL when available.
 
+// TODO(adonovan): a possible reorganization would be to split this
+// file into three internal packages, one per backend service, and to
+// rename api.API to github.Client:
+//
+// - github.GetUser(github.Client)
+// - github.GetRepository(Client)
+// - github.ReadFile(Client, nwo, branch, path) // was GetCodespaceRepositoryContents
+// - codespaces.Create(Client, user, repo, sku, branch, location)
+// - codespaces.Delete(Client, user, token, name)
+// - codespaces.Get(Client, token, owner, name)
+// - codespaces.GetMachineTypes(Client, user, repo, branch, location)
+// - codespaces.GetToken(Client, login, name)
+// - codespaces.List(Client, user)
+// - codespaces.Start(Client, token, codespace)
+// - visualstudio.GetRegionLocation(http.Client) // no dependency on github
+//
+// This would make the meaning of each operation clearer.
+
 import (
 	"bytes"
 	"context"
diff --git a/internal/codespaces/codespaces.go b/internal/codespaces/codespaces.go
index 9aee3564c..804c2dab5 100644
--- a/internal/codespaces/codespaces.go
+++ b/internal/codespaces/codespaces.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/github/ghcs/api"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/go-liveshare"
 )
 
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index 492ce3964..c7a7767ae 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/github/ghcs/api"
+	"github.com/github/ghcs/internal/api"
 	"github.com/github/go-liveshare"
 )