diff --git a/src/commands/gxgames/command.ts b/src/commands/gxgames/command.ts
index ec04666..db4dbff 100644
--- a/src/commands/gxgames/command.ts
+++ b/src/commands/gxgames/command.ts
@@ -17,7 +17,7 @@
 import { buildCommand, buildRouteMap } from "@stricli/core";
 
 const gxgamesLinkCommand = buildCommand({
-  loader: async () => import("./link-impl"),
+  loader: async () => import("./commands/link-impl"),
   parameters: {
     positional: { kind: "tuple", parameters: [] },
     flags: {
@@ -41,7 +41,7 @@ const gxgamesLinkCommand = buildCommand({
 });
 
 const gxgamesUploadCommand = buildCommand({
-  loader: async () => import("./upload-impl"),
+  loader: async () => import("./commands/upload-impl"),
   parameters: {
     positional: {
       kind: "tuple",
@@ -71,7 +71,7 @@ const gxgamesUploadCommand = buildCommand({
 });
 
 const gxgamesMetaCommand = buildCommand({
-  loader: async () => import("./meta-impl"),
+  loader: async () => import("./commands/meta-impl"),
   parameters: {
     positional: { kind: "tuple", parameters: [] },
     flags: {
@@ -124,7 +124,7 @@ const gxgamesMetaCommand = buildCommand({
 });
 
 const gxgamesPublishCommand = buildCommand({
-  loader: async () => import("./publish-impl"),
+  loader: async () => import("./commands/publish-impl"),
   parameters: {
     positional: { kind: "tuple", parameters: [] },
   },
diff --git a/src/commands/gxgames/link-impl.ts b/src/commands/gxgames/commands/link-impl.ts
similarity index 95%
rename from src/commands/gxgames/link-impl.ts
rename to src/commands/gxgames/commands/link-impl.ts
index 399b2d9..9c74467 100644
--- a/src/commands/gxgames/link-impl.ts
+++ b/src/commands/gxgames/commands/link-impl.ts
@@ -17,10 +17,10 @@
 import * as p from "@clack/prompts";
 import type { Context } from "~/context";
 import { KnownError } from "~/error";
-import { createAuthManager } from "./auth";
-import { getApiClient } from "./client";
-import { writeLink } from "./link";
 import { Cache } from "~/cache";
+import { createAuthManager } from "../auth";
+import { getApiClient } from "../client";
+import { writeLink } from "../link";
 
 export default async function (
   this: Context,
diff --git a/src/commands/gxgames/meta-impl.ts b/src/commands/gxgames/commands/meta-impl.ts
similarity index 97%
rename from src/commands/gxgames/meta-impl.ts
rename to src/commands/gxgames/commands/meta-impl.ts
index c993d50..9e8e0e2 100644
--- a/src/commands/gxgames/meta-impl.ts
+++ b/src/commands/gxgames/commands/meta-impl.ts
@@ -17,14 +17,14 @@
 import type { Context } from "~/context";
 import * as p from "@clack/prompts";
 import { KnownError } from "~/error";
-import { readLink } from "./link";
-import { createAuthManager } from "./auth";
-import { getApiClient } from "./client";
 import { Cache } from "~/cache";
+import { readLink } from "../link";
+import { createAuthManager } from "../auth";
+import { getApiClient } from "../client";
 import type {
   GameDevUpdateGameRequestAgeRatingEnum,
   GameDevUpdateGameRequestPlatformsEnum,
-} from "./api/generated/data-contracts";
+} from "../api/generated/data-contracts";
 
 const AGE_RATING_OPTIONS: {
   value: GameDevUpdateGameRequestAgeRatingEnum;
diff --git a/src/commands/gxgames/publish-impl.ts b/src/commands/gxgames/commands/publish-impl.ts
similarity index 92%
rename from src/commands/gxgames/publish-impl.ts
rename to src/commands/gxgames/commands/publish-impl.ts
index 70a2afe..b05e254 100644
--- a/src/commands/gxgames/publish-impl.ts
+++ b/src/commands/gxgames/commands/publish-impl.ts
@@ -17,10 +17,10 @@
 import type { Context } from "~/context";
 import * as p from "@clack/prompts";
 import { KnownError } from "~/error";
-import { readLink } from "./link";
-import { createAuthManager } from "./auth";
-import { getApiClient } from "./client";
 import { Cache } from "~/cache";
+import { readLink } from "../link";
+import { createAuthManager } from "../auth";
+import { getApiClient } from "../client";
 
 export default async function (
   this: Context,
diff --git a/src/commands/gxgames/upload-impl.ts b/src/commands/gxgames/commands/upload-impl.ts
similarity index 94%
rename from src/commands/gxgames/upload-impl.ts
rename to src/commands/gxgames/commands/upload-impl.ts
index 965e0db..693eefd 100644
--- a/src/commands/gxgames/upload-impl.ts
+++ b/src/commands/gxgames/commands/upload-impl.ts
@@ -16,11 +16,11 @@
 
 import type { Context } from "~/context";
 import * as p from "@clack/prompts";
-import { getApiClient } from "./client";
-import { createAuthManager } from "./auth";
+import { getApiClient } from "../client";
+import { createAuthManager } from "../auth";
 import { KnownError } from "~/error";
-import { readLink } from "./link";
 import { Cache } from "~/cache";
+import { readLink } from "../link";
 
 export default async function (
   this: Context,