diff --git a/CODEOWNERS b/CODEOWNERS
index e83a97a61..206ac3cb0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,5 @@
 **/* @github/codeql-vscode-reviewers
 **/variant-analysis/ @github/code-scanning-secexp-reviewers
 **/databases/ @github/code-scanning-secexp-reviewers
-**/data-extensions-editor/ @github/code-scanning-secexp-reviewers
+**/model-editor/ @github/code-scanning-secexp-reviewers
 **/queries-panel/ @github/code-scanning-secexp-reviewers
diff --git a/extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx b/extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx
index f4521c15a..518c063ed 100644
--- a/extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx
+++ b/extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 
 import { Meta, StoryFn } from "@storybook/react";
 
-import { MethodRow as MethodRowComponent } from "../../view/data-extensions-editor/MethodRow";
+import { MethodRow as MethodRowComponent } from "../../view/model-editor/MethodRow";
 import { CallClassification } from "../../model-editor/external-api-usage";
 
 export default {
diff --git a/extensions/ql-vscode/test/factories/data-extension/external-api-factories.ts b/extensions/ql-vscode/test/factories/data-extension/external-api-factories.ts
index fb245e8c5..1b7941119 100644
--- a/extensions/ql-vscode/test/factories/data-extension/external-api-factories.ts
+++ b/extensions/ql-vscode/test/factories/data-extension/external-api-factories.ts
@@ -2,8 +2,8 @@ import {
   Usage,
   ExternalApiUsage,
   CallClassification,
-} from "../../../src/data-extensions-editor/external-api-usage";
-import { ModeledMethodType } from "../../../src/data-extensions-editor/modeled-method";
+} from "../../../src/model-editor/external-api-usage";
+import { ModeledMethodType } from "../../../src/model-editor/modeled-method";
 import { ResolvableLocationValue } from "../../../src/common/bqrs-cli-types";
 
 export function createExternalApiUsage({
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/auto-model.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/auto-model.test.ts
index 7a9e49491..b59e29e3b 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/auto-model.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/auto-model.test.ts
@@ -2,14 +2,14 @@ import {
   createAutoModelRequest,
   encodeSarif,
   getCandidates,
-} from "../../../src/data-extensions-editor/auto-model";
-import { Mode } from "../../../src/data-extensions-editor/shared/mode";
-import { AutomodelMode } from "../../../src/data-extensions-editor/auto-model-api";
-import { AutoModelQueriesResult } from "../../../src/data-extensions-editor/auto-model-codeml-queries";
+} from "../../../src/model-editor/auto-model";
+import { Mode } from "../../../src/model-editor/shared/mode";
+import { AutomodelMode } from "../../../src/model-editor/auto-model-api";
+import { AutoModelQueriesResult } from "../../../src/model-editor/auto-model-codeml-queries";
 import * as sarif from "sarif";
 import { gzipDecode } from "../../../src/common/zlib";
-import { ExternalApiUsage } from "../../../src/data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../../src/data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../../src/model-editor/external-api-usage";
+import { ModeledMethod } from "../../../src/model-editor/modeled-method";
 
 describe("createAutoModelRequest", () => {
   const createSarifLog = (queryId: string): sarif.Log => {
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
index e9fd9c89f..0e78da8e4 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
@@ -1,6 +1,6 @@
-import { decodeBqrsToExternalApiUsages } from "../../../src/data-extensions-editor/bqrs";
+import { decodeBqrsToExternalApiUsages } from "../../../src/model-editor/bqrs";
 import { DecodedBqrsChunk } from "../../../src/common/bqrs-cli-types";
-import { CallClassification } from "../../../src/data-extensions-editor/external-api-usage";
+import { CallClassification } from "../../../src/model-editor/external-api-usage";
 
 describe("decodeBqrsToExternalApiUsages", () => {
   const chunk: DecodedBqrsChunk = {
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/extension-pack-name.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/extension-pack-name.test.ts
index 6498f8206..4bdc06aa7 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/extension-pack-name.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/extension-pack-name.test.ts
@@ -3,7 +3,7 @@ import {
   formatPackName,
   parsePackName,
   validatePackName,
-} from "../../../src/data-extensions-editor/extension-pack-name";
+} from "../../../src/model-editor/extension-pack-name";
 
 describe("autoNameExtensionPack", () => {
   const testCases: Array<{
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/library.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/library.test.ts
index 8d3d67a2b..411a41472 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/library.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/library.test.ts
@@ -1,4 +1,4 @@
-import { parseLibraryFilename } from "../../../src/data-extensions-editor/library";
+import { parseLibraryFilename } from "../../../src/model-editor/library";
 
 describe("parseLibraryFilename", () => {
   const testCases = [
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/shared/modeled-percentage.spec.ts b/extensions/ql-vscode/test/unit-tests/model-editor/shared/modeled-percentage.spec.ts
index 5380c37fa..91cf73198 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/shared/modeled-percentage.spec.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/shared/modeled-percentage.spec.ts
@@ -1,4 +1,4 @@
-import { calculateModeledPercentage } from "../../../../src/data-extensions-editor/shared/modeled-percentage";
+import { calculateModeledPercentage } from "../../../../src/model-editor/shared/modeled-percentage";
 
 describe("calculateModeledPercentage", () => {
   it("when there are no external API usages", () => {
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/yaml.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/yaml.test.ts
index d3dec801a..a19eeb52b 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/yaml.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/yaml.test.ts
@@ -4,8 +4,8 @@ import {
   createDataExtensionYamlsForFrameworkMode,
   createFilenameForLibrary,
   loadDataExtensionYaml,
-} from "../../../src/data-extensions-editor/yaml";
-import { CallClassification } from "../../../src/data-extensions-editor/external-api-usage";
+} from "../../../src/model-editor/yaml";
+import { CallClassification } from "../../../src/model-editor/external-api-usage";
 
 describe("createDataExtensionYaml", () => {
   it("creates the correct YAML file", () => {
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts
index e88342a69..f02df483e 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts
@@ -6,8 +6,8 @@ import { mkdirSync, writeFileSync } from "fs";
 import {
   listModelFiles,
   loadModeledMethods,
-} from "../../../../src/data-extensions-editor/modeled-method-fs";
-import { ExtensionPack } from "../../../../src/data-extensions-editor/shared/extension-pack";
+} from "../../../../src/model-editor/modeled-method-fs";
+import { ExtensionPack } from "../../../../src/model-editor/shared/extension-pack";
 import { join } from "path";
 import { extLogger } from "../../../../src/common/logging/vscode";
 import { homedir } from "os";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts
index 19c387c72..a584b3316 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts
@@ -8,13 +8,13 @@ import { QueryResultType } from "../../../../src/query-server/new-messages";
 import {
   generateCandidateFilterPack,
   runAutoModelQueries,
-} from "../../../../src/data-extensions-editor/auto-model-codeml-queries";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+} from "../../../../src/model-editor/auto-model-codeml-queries";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { QueryRunner } from "../../../../src/query-server";
 import * as queryResolver from "../../../../src/local-queries/query-resolver";
-import { MethodSignature } from "../../../../src/data-extensions-editor/external-api-usage";
+import { MethodSignature } from "../../../../src/model-editor/external-api-usage";
 import { join } from "path";
 import { exists, readFile } from "fs-extra";
 import { load as loadYaml } from "js-yaml";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts
index 8265ee3ad..f67c073c2 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts
@@ -1,11 +1,11 @@
 import { readFile, readFileSync, readdir } from "fs-extra";
 import { join } from "path";
 import { load } from "js-yaml";
-import { setUpPack } from "../../../../src/data-extensions-editor/data-extensions-editor-queries";
+import { setUpPack } from "../../../../src/model-editor/data-extensions-editor-queries";
 import { dirSync } from "tmp-promise";
-import { fetchExternalApiQueries } from "../../../../src/data-extensions-editor/queries";
+import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
 import { QueryLanguage } from "../../../../src/common/query-language";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { mockedObject } from "../../utils/mocking.helpers";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts
index 211ad07e4..7f0fa6424 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts
@@ -16,8 +16,8 @@ import { QlpacksInfo } from "../../../../src/codeql-cli/cli";
 
 import * as config from "../../../../src/config";
 
-import { pickExtensionPack } from "../../../../src/data-extensions-editor/extension-pack-picker";
-import { ExtensionPack } from "../../../../src/data-extensions-editor/shared/extension-pack";
+import { pickExtensionPack } from "../../../../src/model-editor/extension-pack-picker";
+import { ExtensionPack } from "../../../../src/model-editor/shared/extension-pack";
 import { createMockLogger } from "../../../__mocks__/loggerMock";
 import { vscodeGetConfigurationMock } from "../../test-config";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extensions-workspace-folder.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extensions-workspace-folder.test.ts
index 712b75159..279100b82 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extensions-workspace-folder.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extensions-workspace-folder.test.ts
@@ -1,7 +1,7 @@
 import { Uri, workspace, WorkspaceFolder } from "vscode";
 import { dir, DirectoryResult } from "tmp-promise";
 import { join } from "path";
-import { autoPickExtensionsDirectory } from "../../../../src/data-extensions-editor/extensions-workspace-folder";
+import { autoPickExtensionsDirectory } from "../../../../src/model-editor/extensions-workspace-folder";
 import * as files from "../../../../src/common/files";
 import { mkdirp } from "fs-extra";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/external-api-usage-query.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/external-api-usage-query.test.ts
index be3ad9ac8..2fdd1a3bd 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/external-api-usage-query.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/external-api-usage-query.test.ts
@@ -1,7 +1,7 @@
 import {
   readQueryResults,
   runExternalApiQueries,
-} from "../../../../src/data-extensions-editor/external-api-usage-queries";
+} from "../../../../src/model-editor/external-api-usage-queries";
 import { createMockLogger } from "../../../__mocks__/loggerMock";
 import {
   DatabaseItem,
@@ -9,13 +9,13 @@ import {
 } from "../../../../src/databases/local-databases";
 import { dirSync, file } from "tmp-promise";
 import { QueryResultType } from "../../../../src/query-server/new-messages";
-import { fetchExternalApiQueries } from "../../../../src/data-extensions-editor/queries";
+import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
 import * as log from "../../../../src/common/logging/notifications";
 import { RedactableError } from "../../../../src/common/errors";
 import { showAndLogExceptionWithTelemetry } from "../../../../src/common/logging";
 import { QueryLanguage } from "../../../../src/common/query-language";
 import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { join } from "path";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { QueryRunner } from "../../../../src/query-server";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-data-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-data-provider.test.ts
index 5e5bfcb9c..340295515 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-data-provider.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-data-provider.test.ts
@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
-import { ExternalApiUsage } from "../../../../../src/data-extensions-editor/external-api-usage";
-import { MethodsUsageDataProvider } from "../../../../../src/data-extensions-editor/methods-usage/methods-usage-data-provider";
+import { ExternalApiUsage } from "../../../../../src/model-editor/external-api-usage";
+import { MethodsUsageDataProvider } from "../../../../../src/model-editor/methods-usage/methods-usage-data-provider";
 import { DatabaseItem } from "../../../../../src/databases/local-databases";
 import {
   createExternalApiUsage,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-panel.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-panel.test.ts
index e98f7e5d8..5b1ef45b6 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-panel.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-panel.test.ts
@@ -1,7 +1,7 @@
 import { window, TreeView } from "vscode";
 import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
-import { ExternalApiUsage } from "../../../../../src/data-extensions-editor/external-api-usage";
-import { MethodsUsagePanel } from "../../../../../src/data-extensions-editor/methods-usage/methods-usage-panel";
+import { ExternalApiUsage } from "../../../../../src/model-editor/external-api-usage";
+import { MethodsUsagePanel } from "../../../../../src/model-editor/methods-usage/methods-usage-panel";
 import { DatabaseItem } from "../../../../../src/databases/local-databases";
 import { mockedObject } from "../../../utils/mocking.helpers";
 import {