diff --git a/.changeset/gamut-codemods-deep-imports.md b/.changeset/gamut-codemods-deep-imports.md
new file mode 100644
index 0000000000..9c62c709cd
--- /dev/null
+++ b/.changeset/gamut-codemods-deep-imports.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut-codemods': minor
+---
+
+`scope-swap` now rewrites `/dist/` deep imports that have a public replacement to the package root, and merges them into an existing import from the same package. Renamed exports keep their local name, so `import { List } from '@codecademy/gamut/dist/Menu/elements'` becomes `import { MenuList as List } from '@skillsoft/gamut'`. Imports of names that stayed internal, deep imports with no public replacement (`ButtonBase`), unknown deep imports, and deep paths in mocks or `require()` get a warning.
diff --git a/.changeset/gamut-codemods-scope-swap.md b/.changeset/gamut-codemods-scope-swap.md
new file mode 100644
index 0000000000..e6581a6692
--- /dev/null
+++ b/.changeset/gamut-codemods-scope-swap.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut-codemods': minor
+---
+
+Add `@skillsoft/gamut-codemods`, a CLI for moving a repo from `@codecademy/gamut*` to `@skillsoft/gamut*`. Run `npx @skillsoft/gamut-codemods scope-swap .` from a clean working tree. This release adds the runner and the `scope-swap` preset with no migrations yet: a run lists every line that still names an old package and prints next steps. Pass `--dry` to preview, `--only=a,b` to pick migrations, and `--no-report` to skip the leftovers list.
diff --git a/.changeset/gamut-root-exports.md b/.changeset/gamut-root-exports.md
new file mode 100644
index 0000000000..e61364305e
--- /dev/null
+++ b/.changeset/gamut-root-exports.md
@@ -0,0 +1,22 @@
+---
+'@skillsoft/gamut': minor
+---
+
+**Breaking:** export Menu's list elements and SelectDropdown's option component from the package root, under new names that don't collide with the public `List` component and `IconOption` type.
+
+| Old (`dist/Menu/elements`, `dist/Form/SelectDropdown/elements`) | New (`@skillsoft/gamut`)            |
+| --------------------------------------------------------------- | ----------------------------------- |
+| `List`, `ListProps`                                             | `MenuList`, `MenuListProps`         |
+| `ListItem`, `ListItemProps`                                     | `MenuListItem`, `MenuListItemProps` |
+| `ListLink`, `ListLinkProps`                                     | `MenuListLink`, `MenuListLinkProps` |
+| `ListButton`                                                    | `MenuListButton`                    |
+| `IconOption` (the component)                                    | `IconOptionComponent`               |
+
+`MenuToolTipWrapper` is now exported from the root too. The `IconOption` type is unchanged.
+
+Also new at the root:
+
+- `formFieldStyles`, `formFieldPaddingStyles`, and `conditionalStyles`, for custom inputs that should look like `Input`, such as third-party hosted payment fields. The rest of `Form/styles` stays internal.
+- The `HTMLToReactNode` and `ButtonBaseProps` types.
+
+Coming from `@codecademy/gamut`, `npx @skillsoft/gamut-codemods scope-swap .` rewrites imports of all of these, including from their old `/dist/` paths.
diff --git a/packages/gamut-codemods/README.md b/packages/gamut-codemods/README.md
index 4b130ca39c..cdf0c44d2f 100644
--- a/packages/gamut-codemods/README.md
+++ b/packages/gamut-codemods/README.md
@@ -56,6 +56,7 @@ Every skillsoft-gamut pull request publishes installable previews through pkg.pr
 
 | Migration                  | What it does                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `deep-imports`             | `@codecademy/gamut/dist/PopoverContainer/types` → `@codecademy/gamut`, and the rest of the promoted deep imports. Menu's `List*` and SelectDropdown's `IconOption` component were renamed on the way to the root.                                                                                                                                                                                                                                                                                                                          |
 | `moved-exports`            | Moves `Video` and `VideoProps` off the root import onto `/Video`. Warns on namespace imports, `export *`, and mocks that stub `Video`.                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `markdown-video-overrides` | Markdown no longer renders `<iframe>` and `<video>` through `Video` by default. Adds `iframeOverride` / `videoOverride` to each `<Markdown>` that didn't skip them, importing `Iframe` and `MarkdownVideo` from `/Video`. Drops the removed `skipDefaultOverrides.iframe` / `.video` keys, writing `iframeOverride={undefined}` where they were `true`. Warns on a `skipDefaultOverrides` it can't read. Skipped when every `@codecademy/gamut` range in the repo is already 74.0.0 or newer, since that release made the change upstream. |
 | `mf-shared`                | Replaces `@codecademy/gamut-kit` in Module Federation `shared` config with the packages it bundled. Gamut becomes a real singleton, so test the host and remotes together.                                                                                                                                                                                                                                                                                                                                                                 |
diff --git a/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.input.tsx b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.input.tsx
new file mode 100644
index 0000000000..457f6b3a07
--- /dev/null
+++ b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.input.tsx
@@ -0,0 +1,5 @@
+import { Box } from '@codecademy/gamut';
+import { PopoverContainerProps } from '@codecademy/gamut/dist/PopoverContainer/types';
+import { List } from '@codecademy/gamut/dist/Menu/elements';
+
+export const Thing = (p: PopoverContainerProps) => <Box><List /></Box>;
diff --git a/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.output.tsx b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.output.tsx
new file mode 100644
index 0000000000..cfb308a2cb
--- /dev/null
+++ b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-deep-imports.output.tsx
@@ -0,0 +1,3 @@
+import { Box, PopoverContainerProps, MenuList as List } from '@skillsoft/gamut';
+
+export const Thing = (p: PopoverContainerProps) => <Box><List /></Box>;
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.input.tsx
new file mode 100644
index 0000000000..ea78e5f00c
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.input.tsx
@@ -0,0 +1 @@
+export * as Menu from '@codecademy/gamut/dist/Menu/elements';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.output.tsx
new file mode 100644
index 0000000000..ee558bb537
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-namespace.output.tsx
@@ -0,0 +1 @@
+export * as Menu from '@codecademy/gamut';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.input.tsx
new file mode 100644
index 0000000000..be42f12b6d
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.input.tsx
@@ -0,0 +1 @@
+export { MenuIcon, ListItem } from '@codecademy/gamut/dist/Menu/elements';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.output.tsx
new file mode 100644
index 0000000000..00eb532465
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/export-unrenamed.output.tsx
@@ -0,0 +1 @@
+export { MenuIcon, MenuListItem as ListItem } from '@codecademy/gamut';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.input.tsx
new file mode 100644
index 0000000000..11737f72e1
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.input.tsx
@@ -0,0 +1,4 @@
+import { conditionalStyles, formFieldStyles } from '@codecademy/gamut/dist/Form/styles';
+import { formFieldPaddingStyles as padding } from '@codecademy/gamut/dist/Form/styles';
+import { formFieldStyles as f, checkboxLabel } from '@codecademy/gamut/dist/Form/styles';
+import * as formStyles from '@codecademy/gamut/dist/Form/styles';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.output.tsx
new file mode 100644
index 0000000000..4bc7534bda
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.output.tsx
@@ -0,0 +1,3 @@
+import { conditionalStyles, formFieldStyles, formFieldPaddingStyles as padding } from '@codecademy/gamut';
+import { formFieldStyles as f, checkboxLabel } from '@codecademy/gamut/dist/Form/styles';
+import * as formStyles from '@codecademy/gamut/dist/Form/styles';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.warnings.json b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.warnings.json
new file mode 100644
index 0000000000..e127ff61a0
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/form-styles.warnings.json
@@ -0,0 +1 @@
+["checkboxLabel isn't exported from '@codecademy/gamut'", "* isn't exported from '@codecademy/gamut'"]
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.input.tsx
new file mode 100644
index 0000000000..50ad1aeb75
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.input.tsx
@@ -0,0 +1,8 @@
+import { Box, FlexBox, List, Text } from '@codecademy/gamut';
+import { ListItem } from '@codecademy/gamut/dist/Menu/elements';
+import type { BoxProps } from '@codecademy/gamut';
+import type { PopoverContainerProps } from '@codecademy/gamut/dist/PopoverContainer/types';
+import { Box as Again } from '@codecademy/gamut/dist/Box/props';
+import * as Gamut from '@codecademy/gamut';
+import { variance } from '@codecademy/variance';
+import { Prop } from '@codecademy/variance/dist/types/config';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.output.tsx
new file mode 100644
index 0000000000..3ed5ef37eb
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.output.tsx
@@ -0,0 +1,5 @@
+import { Box, FlexBox, List, Text, MenuListItem as ListItem } from '@codecademy/gamut';
+import type { BoxProps, PopoverContainerProps } from '@codecademy/gamut';
+import { Box as Again } from '@codecademy/gamut/dist/Box/props';
+import * as Gamut from '@codecademy/gamut';
+import { variance, Prop } from '@codecademy/variance';
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.warnings.json b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.warnings.json
new file mode 100644
index 0000000000..178e416e6d
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/merge.warnings.json
@@ -0,0 +1 @@
+["is only partly public", "Box is already imported from '@skillsoft/gamut'"]
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.input.tsx
new file mode 100644
index 0000000000..e812781efe
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.input.tsx
@@ -0,0 +1,5 @@
+import { Box } from '@codecademy/gamut/dist/Box';
+
+jest.mock('@codecademy/gamut/dist/Nope/thing', () => ({}));
+const button = require('@codecademy/gamut/dist/ButtonBase/ButtonBase');
+export const B = [Box, button];
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.output.tsx
new file mode 100644
index 0000000000..e812781efe
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.output.tsx
@@ -0,0 +1,5 @@
+import { Box } from '@codecademy/gamut/dist/Box';
+
+jest.mock('@codecademy/gamut/dist/Nope/thing', () => ({}));
+const button = require('@codecademy/gamut/dist/ButtonBase/ButtonBase');
+export const B = [Box, button];
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.warnings.json b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.warnings.json
new file mode 100644
index 0000000000..a953128956
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/mocks-unmapped.warnings.json
@@ -0,0 +1,4 @@
+[
+  "'@codecademy/gamut/dist/Nope/thing' in a mock or require() needs a manual rewrite",
+  "'@codecademy/gamut/dist/ButtonBase/ButtonBase' in a mock or require() needs a manual rewrite"
+]
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.input.tsx
new file mode 100644
index 0000000000..32ee05b6fa
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.input.tsx
@@ -0,0 +1,6 @@
+import { List, ListItem as Item, type ListProps } from '@codecademy/gamut/dist/Menu/elements';
+import { IconOption } from '@codecademy/gamut/dist/Form/SelectDropdown/elements';
+
+export { ListButton } from '@codecademy/gamut/dist/Menu/elements';
+
+jest.mock('@codecademy/gamut/dist/Menu/elements', () => ({ List: () => null }));
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.output.tsx
new file mode 100644
index 0000000000..10ed954ccc
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.output.tsx
@@ -0,0 +1,10 @@
+import {
+  MenuList as List,
+  MenuListItem as Item,
+  type MenuListProps as ListProps,
+  IconOptionComponent as IconOption,
+} from '@codecademy/gamut';
+
+export { MenuListButton as ListButton } from '@codecademy/gamut';
+
+jest.mock('@codecademy/gamut', () => ({ List: () => null }));
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.warnings.json b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.warnings.json
new file mode 100644
index 0000000000..6b61771448
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/renames.warnings.json
@@ -0,0 +1 @@
+["That now covers the whole package, and some exports were renamed. Check it by hand."]
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.input.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.input.tsx
new file mode 100644
index 0000000000..3fad9f3b4b
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.input.tsx
@@ -0,0 +1,7 @@
+import { PopoverContainerProps } from '@codecademy/gamut/dist/PopoverContainer/types';
+import type { Prop } from '@codecademy/variance/dist/types/config';
+import { formStyles } from '@codecademy/gamut/dist/Form/styles';
+import { ButtonBase } from '@codecademy/gamut/dist/ButtonBase/ButtonBase';
+import { Mystery } from '@codecademy/gamut/dist/Nope';
+
+jest.mock('@codecademy/gamut/dist/Box/props');
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.output.tsx b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.output.tsx
new file mode 100644
index 0000000000..d882b3d9f0
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.output.tsx
@@ -0,0 +1,7 @@
+import { PopoverContainerProps } from '@codecademy/gamut';
+import type { Prop } from '@codecademy/variance';
+import { formStyles } from '@codecademy/gamut/dist/Form/styles';
+import { ButtonBase } from '@codecademy/gamut/dist/ButtonBase/ButtonBase';
+import { Mystery } from '@codecademy/gamut/dist/Nope';
+
+jest.mock('@codecademy/gamut');
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.warnings.json b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.warnings.json
new file mode 100644
index 0000000000..99cf5b0f92
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/__testfixtures__/rewrites.warnings.json
@@ -0,0 +1 @@
+["'@codecademy/gamut/dist/Form/styles' is only partly public. formStyles isn't exported from '@codecademy/gamut'", "'@codecademy/gamut/dist/ButtonBase/ButtonBase' has no public replacement", "unmapped deep import '@codecademy/gamut/dist/Nope'", "rewrote '@codecademy/gamut/dist/Box/props' to '@codecademy/gamut' in a mock or require(). That now covers the whole package."]
diff --git a/packages/gamut-codemods/src/migrations/deep-imports/index.ts b/packages/gamut-codemods/src/migrations/deep-imports/index.ts
new file mode 100644
index 0000000000..efde70cd7a
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/deep-imports/index.ts
@@ -0,0 +1,253 @@
+import type {
+  Collection,
+  ExportSpecifier,
+  ImportDeclaration,
+  ImportSpecifier,
+  JSCodeshift,
+} from 'jscodeshift';
+
+import { renameSpecifier } from '../../lib/manifest';
+import { findModuleStrings, nameOf } from '../../lib/module-strings';
+import type { AstMigration } from '../../lib/types';
+
+/*
+  `@codecademy/gamut/dist/...` -> the public entry point from
+  manifest.deepImports. Renamed exports keep their local name so call sites
+  don't change: `import { List }` becomes `import { MenuList as List }`.
+*/
+
+const DIST = /^(@codecademy\/[\w-]+|eslint-plugin-gamut)\/dist(\/|$)/;
+
+type Specifier = ImportSpecifier | ExportSpecifier | { type: string };
+
+/*
+  Specifiers are rebuilt rather than mutated. `import { List }` has imported
+  and local sharing one source range, so recast's patcher drops the alias if
+  you only swap `imported`.
+*/
+const renameSpecifiers = (
+  j: JSCodeshift,
+  specifiers: Specifier[],
+  renames: Record<string, string>
+) =>
+  specifiers.map((spec) => {
+    if (spec.type === 'ImportSpecifier') {
+      const { imported, local, importKind } = spec as ImportSpecifier & {
+        importKind?: string;
+      };
+      const next = renames[nameOf(imported)];
+      if (!next) return spec;
+      const renamed = j.importSpecifier(
+        j.identifier(next),
+        j.identifier(nameOf(local ?? imported))
+      );
+      Object.assign(renamed, { importKind });
+      return renamed;
+    }
+    if (spec.type === 'ExportSpecifier') {
+      const { local, exported } = spec as ExportSpecifier;
+      const next = renames[nameOf(local)];
+      if (!next) return spec;
+      return j.exportSpecifier.from({
+        local: j.identifier(next),
+        exported: j.identifier(nameOf(exported ?? local)),
+      });
+    }
+    return spec;
+  });
+
+/* Only plain `{ a, b as c }` imports can be merged; defaults and `* as` can't. */
+const namedOnly = (node: ImportDeclaration) =>
+  (node.specifiers ?? []).every((spec) => spec.type === 'ImportSpecifier');
+
+/* Names the file already imports by name from `source`. */
+const importedNamesFrom = (root: Collection, j: JSCodeshift, source: string) =>
+  new Set(
+    root
+      .find(j.ImportDeclaration)
+      .nodes()
+      .filter((node) => node.source.value === source)
+      .flatMap((node) =>
+        (node.specifiers ?? [])
+          .filter(
+            (spec): spec is ImportSpecifier => spec.type === 'ImportSpecifier'
+          )
+          .map((spec) => nameOf(spec.imported))
+      )
+  );
+
+const mergeKey = (node: ImportDeclaration) =>
+  `${String(node.source.value)}\0${node.importKind ?? 'value'}`;
+
+type NamedSpecifier = ImportSpecifier & { importKind?: string };
+
+const specifierKey = (spec: NamedSpecifier) =>
+  `${spec.importKind ?? 'value'} ${nameOf(spec.imported)} ${nameOf(
+    spec.local ?? spec.imported
+  )}`;
+
+/*
+  A rewritten deep import often lands on a package the file already
+  imports from, and two declarations from one source trip
+  import/no-duplicates. Fold each rewritten declaration into the first
+  plain named import of the same source and kind. Declarations the file
+  already had are never merged with each other.
+*/
+const mergeRewritten = (
+  j: JSCodeshift,
+  root: Collection,
+  rewritten: Set<unknown>
+) => {
+  const targets = new Map<string, ImportDeclaration>();
+  root.find(j.ImportDeclaration).forEach((p) => {
+    const { node } = p;
+    if (!namedOnly(node)) return;
+    const key = mergeKey(node);
+    const target = targets.get(key);
+    if (!target) {
+      targets.set(key, node);
+      return;
+    }
+    if (!rewritten.has(node)) return;
+
+    const existing = new Set(
+      (target.specifiers as NamedSpecifier[]).map(specifierKey)
+    );
+    /* Clone into the target; recast's patcher can crash on moved nodes. */
+    const moved = (node.specifiers as NamedSpecifier[])
+      .filter((spec) => !existing.has(specifierKey(spec)))
+      .map((spec) =>
+        Object.assign(
+          j.importSpecifier(
+            j.identifier(nameOf(spec.imported)),
+            j.identifier(nameOf(spec.local ?? spec.imported))
+          ),
+          { importKind: spec.importKind }
+        )
+      );
+    target.specifiers = [...(target.specifiers ?? []), ...moved];
+    j(p).remove();
+  });
+};
+
+export const deepImports: AstMigration = {
+  name: 'deep-imports',
+  kind: 'ast',
+  description: 'Rewrite /dist/ deep imports to public entry points.',
+  run({ j, root, manifest, warn }) {
+    const byPath = new Map(manifest.deepImports.map((row) => [row.from, row]));
+    let changed = false;
+
+    /* Declarations first, so renames can be applied to their specifiers. */
+    const declarations = [
+      ...root.find(j.ImportDeclaration).nodes(),
+      ...root.find(j.ExportNamedDeclaration).nodes(),
+      ...root.find(j.ExportAllDeclaration).nodes(),
+    ];
+    const handled = new Set<unknown>();
+    const rewritten = new Set<unknown>();
+
+    for (const node of declarations) {
+      const source = node.source as { value?: unknown } | null | undefined;
+      if (typeof source?.value !== 'string' || !DIST.test(source.value)) {
+        continue;
+      }
+      handled.add(source);
+      const row = byPath.get(source.value);
+      if (!row) {
+        warn(
+          node,
+          `unmapped deep import '${source.value}'. Add it to the preset manifest's deepImports.`
+        );
+        continue;
+      }
+      if (!row.to) {
+        warn(
+          node,
+          `'${row.from}' has no public replacement. ${row.note ?? ''}`
+        );
+        continue;
+      }
+      if (row.onlyNames) {
+        const allowed = new Set(row.onlyNames);
+        const specifiers =
+          'specifiers' in node ? ((node.specifiers ?? []) as Specifier[]) : [];
+        const blocked = specifiers
+          .map((spec) =>
+            spec.type === 'ImportSpecifier'
+              ? nameOf((spec as ImportSpecifier).imported)
+              : spec.type === 'ExportSpecifier'
+              ? nameOf((spec as ExportSpecifier).local)
+              : '*'
+          )
+          .filter((name) => !allowed.has(name));
+        if (node.type === 'ExportAllDeclaration') blocked.push('*');
+        if (blocked.length > 0) {
+          warn(
+            node,
+            `'${row.from}' is only partly public. ${blocked.join(
+              ', '
+            )} isn't exported from '${row.to}'. ${row.note ?? ''}`
+          );
+          /* Usually a name the file already imports from the public entry. */
+          const alreadyImported = importedNamesFrom(root, j, row.to);
+          const duplicates = blocked.filter((name) =>
+            alreadyImported.has(name)
+          );
+          /* Warn with the names the run leaves behind, not the old scope. */
+          const after = (value: string) =>
+            renameSpecifier(manifest, value) ?? value;
+          if (duplicates.length > 0) {
+            warn(
+              node,
+              `${duplicates.join(', ')} is already imported from '${after(
+                row.to
+              )}' in this file, so this import duplicates it. Drop the '${after(
+                row.from
+              )}' import and use the '${after(row.to)}' one.`
+            );
+          }
+          continue;
+        }
+      }
+      if (row.renames && 'specifiers' in node && node.specifiers) {
+        node.specifiers = renameSpecifiers(
+          j,
+          node.specifiers,
+          row.renames
+        ) as typeof node.specifiers;
+      }
+      node.source = j.stringLiteral(row.to);
+      if (node.type === 'ImportDeclaration') rewritten.add(node);
+      changed = true;
+    }
+
+    if (rewritten.size > 0) mergeRewritten(j, root, rewritten);
+
+    /* Then mocks, require(), import(): only the string can change here. */
+    for (const literal of findModuleStrings(j, root)) {
+      if (handled.has(literal) || !DIST.test(literal.value)) continue;
+      const row = byPath.get(literal.value);
+      if (!row?.to) {
+        warn(
+          literal,
+          `deep import '${literal.value}' in a mock or require() needs a manual rewrite.`
+        );
+        continue;
+      }
+      /* jest.mock of a deep path now mocks the whole package. */
+      warn(
+        literal,
+        `rewrote '${literal.value}' to '${
+          row.to
+        }' in a mock or require(). That now covers the whole package${
+          row.renames ? ', and some exports were renamed' : ''
+        }. Check it by hand.`
+      );
+      literal.value = row.to;
+      changed = true;
+    }
+
+    return changed;
+  },
+};
diff --git a/packages/gamut-codemods/src/presets/scope-swap/index.ts b/packages/gamut-codemods/src/presets/scope-swap/index.ts
index f7d52d106b..b3e48d5892 100644
--- a/packages/gamut-codemods/src/presets/scope-swap/index.ts
+++ b/packages/gamut-codemods/src/presets/scope-swap/index.ts
@@ -1,4 +1,5 @@
 import type { Preset } from '../../lib/types';
+import { deepImports } from '../../migrations/deep-imports';
 import { markdownVideoOverrides } from '../../migrations/markdown-video-overrides';
 import { mdxImports } from '../../migrations/mdx-imports';
 import { mfShared } from '../../migrations/mf-shared';
@@ -14,6 +15,7 @@ export const scopeSwap: Preset = {
   description: 'Move from @codecademy/gamut* to @skillsoft/gamut*.',
   manifest,
   migrations: [
+    deepImports,
     movedExports,
     markdownVideoOverrides,
     mfShared,
diff --git a/packages/gamut-codemods/src/presets/scope-swap/manifest.ts b/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
index f8702a6c42..c32ba819db 100644
--- a/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
+++ b/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
@@ -99,7 +99,106 @@ export const manifest: Manifest = {
     },
   ],
 
-  deepImports: [],
+  /*
+    From the GMT-1740 deep-import inventory. Rows are only added once the
+    target is really exported; manifest.test.ts checks.
+  */
+  deepImports: [
+    {
+      from: '@codecademy/gamut/dist/PopoverContainer/types',
+      to: '@codecademy/gamut',
+    },
+    {
+      from: '@codecademy/gamut/dist/Form/SelectDropdown/types',
+      to: '@codecademy/gamut',
+    },
+    { from: '@codecademy/gamut/dist/Form/types', to: '@codecademy/gamut' },
+    {
+      from: '@codecademy/gamut/dist/Box/props',
+      to: '@codecademy/gamut',
+      onlyNames: ['BoxProps', 'FlexBoxProps', 'GridBoxProps'],
+    },
+    {
+      from: '@codecademy/gamut/dist/Tip/shared/types',
+      to: '@codecademy/gamut',
+    },
+    {
+      from: '@codecademy/gamut/dist/Button/shared',
+      to: '@codecademy/gamut',
+      onlyNames: ['ButtonBaseProps', 'ButtonProps', 'buttonProps'],
+    },
+    {
+      from: '@codecademy/gamut/dist/Markdown/libs/overrides',
+      to: '@codecademy/gamut',
+      onlyNames: [
+        'HTMLToReactNode',
+        'MarkdownOverrideSetting',
+        'MarkdownOverrideSettings',
+        'createCodeBlockOverride',
+        'createInputOverride',
+        'createTagOverride',
+        'createVideoOverride',
+        'standardOverrides',
+      ],
+    },
+    /*
+      Renamed on the way to the root: `List` and `IconOption` collided with
+      the public List component and IconOption type. This is the rename
+      upstream GMT-1740 held back (upstream 009aa43f6); skillsoft-gamut
+      ships it.
+    */
+    {
+      from: '@codecademy/gamut/dist/Menu/elements',
+      to: '@codecademy/gamut',
+      renames: {
+        List: 'MenuList',
+        ListProps: 'MenuListProps',
+        ListItem: 'MenuListItem',
+        ListItemProps: 'MenuListItemProps',
+        ListLink: 'MenuListLink',
+        ListLinkProps: 'MenuListLinkProps',
+        ListButton: 'MenuListButton',
+      },
+    },
+    {
+      from: '@codecademy/gamut/dist/Form/SelectDropdown/elements',
+      to: '@codecademy/gamut',
+      renames: { IconOption: 'IconOptionComponent' },
+      onlyNames: ['IconOption'],
+    },
+    {
+      from: '@codecademy/gamut/dist/ButtonBase/ButtonBase',
+      to: null,
+      note: 'ButtonBase is deliberately not public. Use FillButton, StrokeButton, TextButton, IconButton, or CTAButton.',
+    },
+    {
+      from: '@codecademy/gamut/dist/Form/styles',
+      to: '@codecademy/gamut',
+      onlyNames: [
+        'conditionalStyles',
+        'formFieldPaddingStyles',
+        'formFieldStyles',
+      ],
+      note: 'The rest of Form/styles is internal. Inline the styles, or use system props / css().',
+    },
+    {
+      from: '@codecademy/gamut-styles/dist/AssetProvider',
+      to: '@codecademy/gamut-styles',
+    },
+    {
+      from: '@codecademy/gamut-icons/dist/types',
+      to: '@codecademy/gamut-icons',
+    },
+    {
+      from: '@codecademy/gamut-icons/dist/props',
+      to: '@codecademy/gamut-icons',
+      onlyNames: ['GamutIconProps', 'IconStyleProps'],
+    },
+    {
+      from: '@codecademy/variance/dist/types/config',
+      to: '@codecademy/variance',
+    },
+  ],
 
   eslintPlugin: { from: 'gamut', to: '@skillsoft/gamut' },
 };
diff --git a/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap b/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap
index 30593dae53..c04b2fbe56 100644
--- a/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap
+++ b/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap
@@ -16,6 +16,7 @@ exports[`Gamut Exported Keys 1`] = `
   "Checkbox",
   "Coachmark",
   "Column",
+  "conditionalStyles",
   "ConnectedCheckbox",
   "ConnectedForm",
   "ConnectedFormGroup",
@@ -54,6 +55,8 @@ exports[`Gamut Exported Keys 1`] = `
   "focusVisibleStyle",
   "Form",
   "FormError",
+  "formFieldPaddingStyles",
+  "formFieldStyles",
   "FormGroup",
   "FormGroupDescription",
   "FormGroupLabel",
@@ -65,6 +68,7 @@ exports[`Gamut Exported Keys 1`] = `
   "GridForm",
   "GridFormContent",
   "IconButton",
+  "IconOptionComponent",
   "iFrameWrapper",
   "InfoTip",
   "Input",
@@ -78,7 +82,12 @@ exports[`Gamut Exported Keys 1`] = `
   "matchDisabledDates",
   "Menu",
   "MenuItem",
+  "MenuList",
+  "MenuListButton",
+  "MenuListItem",
+  "MenuListLink",
   "MenuSeparator",
+  "MenuToolTipWrapper",
   "Modal",
   "omitProps",
   "Overlay",
diff --git a/packages/gamut/src/Button/index.ts b/packages/gamut/src/Button/index.ts
index dae5e26ff3..dd02cffb1d 100644
--- a/packages/gamut/src/Button/index.ts
+++ b/packages/gamut/src/Button/index.ts
@@ -1,4 +1,4 @@
-export type { ButtonProps } from './shared';
+export type { ButtonBaseProps, ButtonProps } from './shared';
 export { buttonProps } from './shared';
 export * from './CTAButton';
 export * from './FillButton';
diff --git a/packages/gamut/src/Form/SelectDropdown/core/constants.ts b/packages/gamut/src/Form/SelectDropdown/core/constants.ts
index a5629613a2..50c1009384 100644
--- a/packages/gamut/src/Form/SelectDropdown/core/constants.ts
+++ b/packages/gamut/src/Form/SelectDropdown/core/constants.ts
@@ -6,7 +6,7 @@ import {
   CustomInput,
   CustomValueContainer,
   DropdownButton,
-  IconOption,
+  IconOptionComponent,
   MultiValueRemoveButton,
   MultiValueWithColorMode,
   RemoveAllButton,
@@ -20,7 +20,7 @@ const baseDefaultComponents = {
   ValueContainer: CustomValueContainer,
   MultiValue: MultiValueWithColorMode,
   MultiValueRemove: MultiValueRemoveButton,
-  Option: IconOption,
+  Option: IconOptionComponent,
   SingleValue: AbbreviatedSingleValue,
   Input: CustomInput,
 };
diff --git a/packages/gamut/src/Form/SelectDropdown/elements/index.ts b/packages/gamut/src/Form/SelectDropdown/elements/index.ts
index 5a67d3619b..9ab1c6655e 100644
--- a/packages/gamut/src/Form/SelectDropdown/elements/index.ts
+++ b/packages/gamut/src/Form/SelectDropdown/elements/index.ts
@@ -18,7 +18,7 @@ export {
 } from './containers';
 
 export {
-  IconOption,
+  IconOptionComponent,
   AbbreviatedSingleValue,
   formatOptionLabel,
   formatGroupLabel,
diff --git a/packages/gamut/src/Form/SelectDropdown/elements/options.tsx b/packages/gamut/src/Form/SelectDropdown/elements/options.tsx
index e91b25178a..17b011b7d4 100644
--- a/packages/gamut/src/Form/SelectDropdown/elements/options.tsx
+++ b/packages/gamut/src/Form/SelectDropdown/elements/options.tsx
@@ -46,7 +46,7 @@ const IconOptionLabel: React.FC<
  * Also manages ARIA attributes for accessibility.
  * Skips the check icon for react-select/creatable's "Add" row (__isNew__).
  */
-export const IconOption = ({
+export const IconOptionComponent = ({
   children,
   ...rest
 }: CustomSelectComponentProps<typeof SelectDropdownElements.Option>) => {
diff --git a/packages/gamut/src/Form/SelectDropdown/index.tsx b/packages/gamut/src/Form/SelectDropdown/index.tsx
index fd0cb718f8..f6d233827e 100644
--- a/packages/gamut/src/Form/SelectDropdown/index.tsx
+++ b/packages/gamut/src/Form/SelectDropdown/index.tsx
@@ -1,3 +1,4 @@
 export type { SelectDropdownTranslations } from './core/translations';
 export * from './types';
+export { IconOptionComponent } from './elements';
 export * from './SelectDropdown';
diff --git a/packages/gamut/src/Form/index.tsx b/packages/gamut/src/Form/index.tsx
index f59e8507d7..7301e9103c 100644
--- a/packages/gamut/src/Form/index.tsx
+++ b/packages/gamut/src/Form/index.tsx
@@ -13,3 +13,12 @@ export * from './inputs/Radio';
 export * from './inputs/RadioGroup';
 export * from './inputs/types';
 export * from './types';
+/*
+  For custom inputs that should look like Input, such as third-party hosted
+  payment fields. The rest of ./styles is internal.
+*/
+export {
+  conditionalStyles,
+  formFieldPaddingStyles,
+  formFieldStyles,
+} from './styles';
diff --git a/packages/gamut/src/Markdown/index.tsx b/packages/gamut/src/Markdown/index.tsx
index 1ef44e3e30..b613382f83 100644
--- a/packages/gamut/src/Markdown/index.tsx
+++ b/packages/gamut/src/Markdown/index.tsx
@@ -211,6 +211,7 @@ export class Markdown extends PureComponent<MarkdownProps> {
 }
 
 export type {
+  HTMLToReactNode,
   MarkdownOverrideSetting,
   MarkdownOverrideSettings,
 } from './libs/overrides';
diff --git a/packages/gamut/src/Menu/Menu.tsx b/packages/gamut/src/Menu/Menu.tsx
index 83b6bd328d..10d647f08e 100644
--- a/packages/gamut/src/Menu/Menu.tsx
+++ b/packages/gamut/src/Menu/Menu.tsx
@@ -1,12 +1,12 @@
 import type { ComponentProps } from 'react';
 import { forwardRef } from 'react';
 
-import { List } from './elements';
+import { MenuList } from './elements';
 import { MenuProvider, useMenu } from './MenuContext';
 
 export const Menu = forwardRef<
   HTMLUListElement | HTMLOListElement,
-  Omit<ComponentProps<typeof List>, 'root'>
+  Omit<ComponentProps<typeof MenuList>, 'root'>
 >(
   (
     { children, variant = 'popover', spacing = 'normal', role, ...rest },
@@ -15,9 +15,9 @@ export const Menu = forwardRef<
     const currentContext = useMenu({ variant, role, spacing });
 
     return (
-      <List {...rest} {...currentContext} ref={ref}>
+      <MenuList {...rest} {...currentContext} ref={ref}>
         <MenuProvider value={currentContext}>{children}</MenuProvider>
-      </List>
+      </MenuList>
     );
   }
 );
diff --git a/packages/gamut/src/Menu/MenuItem.tsx b/packages/gamut/src/Menu/MenuItem.tsx
index 04ca7efb7c..3288ab987a 100644
--- a/packages/gamut/src/Menu/MenuItem.tsx
+++ b/packages/gamut/src/Menu/MenuItem.tsx
@@ -6,8 +6,13 @@ import { forwardRef, useId } from 'react';
 import { FlexBox } from '../Box';
 import type { ToolTipProps } from '../Tip/ToolTip';
 import { Text } from '../Typography';
-import type { ListItemProps, ListLinkProps } from './elements';
-import { ListButton, ListItem, ListLink, MenuToolTipWrapper } from './elements';
+import type { MenuListItemProps, MenuListLinkProps } from './elements';
+import {
+  MenuListButton,
+  MenuListItem,
+  MenuListLink,
+  MenuToolTipWrapper,
+} from './elements';
 import { useMenuContext } from './MenuContext';
 
 const getListItemType = (href: boolean, onClick: boolean) =>
@@ -26,7 +31,7 @@ const currentItemText = {
 
 type HTMLProps = Partial<Pick<HTMLAnchorElement, 'href' | 'target' | 'rel'>>;
 type ForwardListItemProps = Omit<
-  ComponentProps<typeof ListItem>,
+  ComponentProps<typeof MenuListItem>,
   'variant' | 'selected' | 'active-navlink' | 'children'
 >;
 
@@ -97,7 +102,7 @@ export const MenuItem = forwardRef<
       role: listItemRole,
       height,
       width,
-    } as ListItemProps;
+    } as MenuListItemProps;
 
     const ariaLabel = label
       ? typeof label === 'string'
@@ -139,18 +144,18 @@ export const MenuItem = forwardRef<
 
     if (listItemType === 'link' && !disabled) {
       return (
-        <ListItem {...listItemProps}>
+        <MenuListItem {...listItemProps}>
           <MenuToolTipWrapper label={label} tipId={tipId}>
-            <ListLink
-              {...(computed as ListLinkProps)}
+            <MenuListLink
+              {...(computed as MenuListLinkProps)}
               href={href}
               ref={narrowMenuItemRef<HTMLAnchorElement>(ref)}
               target={target}
             >
               {content}
-            </ListLink>
+            </MenuListLink>
           </MenuToolTipWrapper>
-        </ListItem>
+        </MenuListItem>
       );
     }
 
@@ -160,32 +165,32 @@ export const MenuItem = forwardRef<
         : (props.onClick as any as MouseEventHandler<HTMLButtonElement>);
 
       return (
-        <ListItem {...listItemProps}>
+        <MenuListItem {...listItemProps}>
           <MenuToolTipWrapper
             closeOnClick={closeOnClick}
             label={label}
             tipId={tipId}
           >
-            <ListButton
-              {...(computed as ListLinkProps)}
+            <MenuListButton
+              {...(computed as MenuListLinkProps)}
               ref={narrowMenuItemRef<HTMLButtonElement>(ref)}
               onClick={handleClick}
             >
               {content}
-            </ListButton>
+            </MenuListButton>
           </MenuToolTipWrapper>
-        </ListItem>
+        </MenuListItem>
       );
     }
 
     return (
       // These are non-interactive and will never have tooltips (nor should they).
-      <ListItem
-        {...(computed as ListItemProps)}
+      <MenuListItem
+        {...(computed as MenuListItemProps)}
         ref={narrowMenuItemRef<HTMLLIElement>(ref)}
       >
         {content}
-      </ListItem>
+      </MenuListItem>
     );
   }
 );
diff --git a/packages/gamut/src/Menu/elements.tsx b/packages/gamut/src/Menu/elements.tsx
index d0f63d75cc..6ce6501958 100644
--- a/packages/gamut/src/Menu/elements.tsx
+++ b/packages/gamut/src/Menu/elements.tsx
@@ -34,7 +34,7 @@ const listProps = variance.compose(
   system.color
 );
 
-export interface ListProps extends ListStyleProps, StyleStateProps {
+export interface MenuListProps extends ListStyleProps, StyleStateProps {
   /** How offset spacing should be */
   spacing?: 'normal' | 'condensed';
   /** Menu variants for specific use cases and styles */
@@ -46,7 +46,7 @@ export interface ListProps extends ListStyleProps, StyleStateProps {
   showBorder?: boolean;
 }
 
-const StyledList = styled('ul', styledOptions<'ul'>())<ListProps>(
+const StyledList = styled('ul', styledOptions<'ul'>())<MenuListProps>(
   system.css({
     listStyle: 'none',
     width: 1,
@@ -70,7 +70,7 @@ const StyledList = styled('ul', styledOptions<'ul'>())<ListProps>(
   listProps
 );
 
-export const List = forwardRef<
+export const MenuList = forwardRef<
   HTMLUListElement,
   ComponentProps<typeof StyledList>
 >(({ context = true, m = 0, root = true, variant, ...rest }, ref) => (
@@ -195,14 +195,17 @@ const sizeVariants = system.variant({
   },
 });
 
-export interface ListItemProps
+export interface MenuListItemProps
   extends ListStyleProps,
     StyleStateProps,
     StyleProps<typeof interactiveVariants>,
     StyleProps<typeof activeStates>,
     StyleProps<typeof sizeVariants> {}
 
-export const ListItem = styled('li', styledOptions<'li'>())<ListItemProps>(
+export const MenuListItem = styled(
+  'li',
+  styledOptions<'li'>()
+)<MenuListItemProps>(
   interactiveVariants,
   activeStates,
   sizeVariants,
@@ -210,12 +213,12 @@ export const ListItem = styled('li', styledOptions<'li'>())<ListItemProps>(
   listProps
 );
 
-export interface ListLinkProps extends ListItemProps {
+export interface MenuListLinkProps extends MenuListItemProps {
   active?: boolean;
   navlink?: boolean;
 }
 
-const StyledListLink = styled('a', styledOptions<'a'>())<ListLinkProps>(
+const StyledListLink = styled('a', styledOptions<'a'>())<MenuListLinkProps>(
   resetStyles,
   interactiveVariants,
   activeStates,
@@ -224,17 +227,17 @@ const StyledListLink = styled('a', styledOptions<'a'>())<ListLinkProps>(
   listProps
 );
 
-export const ListLink = forwardRef<
+export const MenuListLink = forwardRef<
   HTMLAnchorElement,
   ComponentProps<typeof StyledListLink>
 >(({ zIndex = 1, ...rest }, ref) => (
   <StyledListLink ref={ref} zIndex={zIndex} {...rest} />
 ));
 
-export const ListButton = styled(
+export const MenuListButton = styled(
   'button',
   styledOptions<'button'>()
-)<ListLinkProps>(
+)<MenuListLinkProps>(
   resetStyles,
   interactiveVariants,
   activeStates,
diff --git a/packages/gamut/src/Menu/index.tsx b/packages/gamut/src/Menu/index.tsx
index 65077f603d..54f17e7928 100644
--- a/packages/gamut/src/Menu/index.tsx
+++ b/packages/gamut/src/Menu/index.tsx
@@ -1,3 +1,4 @@
+export * from './elements';
 export * from './Menu';
 export * from './MenuItem';
 export * from './MenuSeparator';