diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index a5a347cbd..fcafb1946 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -36,7 +36,11 @@ import {
   QueryHistoryConfigListener,
   QueryServerConfigListener,
 } from "./config";
-import { install } from "./languageSupport";
+import {
+  install,
+  spawnIdeServer,
+  getQueryEditorCommands,
+} from "./language-support";
 import { DatabaseManager } from "./local-databases";
 import { DatabaseUI } from "./local-databases-ui";
 import {
@@ -72,7 +76,6 @@ import {
   getErrorMessage,
   getErrorStack,
 } from "./pure/helpers-pure";
-import { spawnIdeServer } from "./ide-server";
 import { ResultsView } from "./interface";
 import { WebviewReveal } from "./interface-utils";
 import {
@@ -118,7 +121,6 @@ import {
 } from "./common/commands";
 import { LocalQueries } from "./local-queries";
 import { getAstCfgCommands } from "./ast-cfg-commands";
-import { getQueryEditorCommands } from "./query-editor";
 import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";
 import { DebuggerUI } from "./debugger/debugger-ui";
diff --git a/extensions/ql-vscode/src/ide-server.ts b/extensions/ql-vscode/src/language-support/ide-server.ts
similarity index 88%
rename from extensions/ql-vscode/src/ide-server.ts
rename to extensions/ql-vscode/src/language-support/ide-server.ts
index b76e3b326..00cb3e4e4 100644
--- a/extensions/ql-vscode/src/ide-server.ts
+++ b/extensions/ql-vscode/src/language-support/ide-server.ts
@@ -1,8 +1,8 @@
 import { ProgressLocation, window } from "vscode";
 import { StreamInfo } from "vscode-languageclient/node";
-import { shouldDebugIdeServer, spawnServer } from "./cli";
-import { QueryServerConfig } from "./config";
-import { ideServerLogger } from "./common";
+import { shouldDebugIdeServer, spawnServer } from "../cli";
+import { QueryServerConfig } from "../config";
+import { ideServerLogger } from "../common";
 
 /**
  * Managing the language server for CodeQL.
diff --git a/extensions/ql-vscode/src/language-support/index.ts b/extensions/ql-vscode/src/language-support/index.ts
new file mode 100644
index 000000000..8c2868414
--- /dev/null
+++ b/extensions/ql-vscode/src/language-support/index.ts
@@ -0,0 +1,3 @@
+export * from "./ide-server";
+export * from "./language-support";
+export * from "./query-editor";
diff --git a/extensions/ql-vscode/src/languageSupport.ts b/extensions/ql-vscode/src/language-support/language-support.ts
similarity index 96%
rename from extensions/ql-vscode/src/languageSupport.ts
rename to extensions/ql-vscode/src/language-support/language-support.ts
index de75a392b..8b9f759fc 100644
--- a/extensions/ql-vscode/src/languageSupport.ts
+++ b/extensions/ql-vscode/src/language-support/language-support.ts
@@ -12,7 +12,7 @@ import { languages, IndentAction, OnEnterRule } from "vscode";
  */
 export function install() {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const langConfig = require("../language-configuration.json");
+  const langConfig = require("../../language-configuration.json");
   // setLanguageConfiguration requires a regexp for the wordpattern, not a string
   langConfig.wordPattern = new RegExp(langConfig.wordPattern);
   langConfig.onEnterRules = onEnterRules;
diff --git a/extensions/ql-vscode/src/query-editor.ts b/extensions/ql-vscode/src/language-support/query-editor.ts
similarity index 89%
rename from extensions/ql-vscode/src/query-editor.ts
rename to extensions/ql-vscode/src/language-support/query-editor.ts
index a55647f7f..29f852d44 100644
--- a/extensions/ql-vscode/src/query-editor.ts
+++ b/extensions/ql-vscode/src/language-support/query-editor.ts
@@ -1,11 +1,11 @@
 import { Uri, window } from "vscode";
-import { CodeQLCliServer } from "./cli";
-import { QueryRunner } from "./query-server";
+import { CodeQLCliServer } from "../cli";
+import { QueryRunner } from "../query-server";
 import { basename, join } from "path";
-import { getErrorMessage } from "./pure/helpers-pure";
-import { redactableError } from "./pure/errors";
-import { showAndLogExceptionWithTelemetry } from "./helpers";
-import { AppCommandManager, QueryEditorCommands } from "./common/commands";
+import { getErrorMessage } from "../pure/helpers-pure";
+import { redactableError } from "../pure/errors";
+import { showAndLogExceptionWithTelemetry } from "../helpers";
+import { AppCommandManager, QueryEditorCommands } from "../common/commands";
 
 type QueryEditorOptions = {
   commandManager: AppCommandManager;