diff --git a/server/src/definition.ts b/server/src/providers/definition.ts
similarity index 96%
rename from server/src/definition.ts
rename to server/src/providers/definition.ts
index 24976e5..94f1ba0 100644
--- a/server/src/definition.ts
+++ b/server/src/providers/definition.ts
@@ -3,8 +3,8 @@ import { URI } from 'vscode-uri';
 
 import { DefinitionParams, DefinitionLink, Range } from 'vscode-languageserver/node';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { JRefSymbol } from './visitor';
-import { ServerContext } from './utils';
+import { JRefSymbol } from '../visitor';
+import { ServerContext } from '../utils';
 
 const defaultTargetRange: Range = {
   start: { line: 0, character: 0 },
diff --git a/server/src/diagnostics.ts b/server/src/providers/diagnostics.ts
similarity index 100%
rename from server/src/diagnostics.ts
rename to server/src/providers/diagnostics.ts
diff --git a/server/src/semanticTokens.ts b/server/src/providers/semanticTokens.ts
similarity index 96%
rename from server/src/semanticTokens.ts
rename to server/src/providers/semanticTokens.ts
index a56f6e1..944526c 100644
--- a/server/src/semanticTokens.ts
+++ b/server/src/providers/semanticTokens.ts
@@ -3,7 +3,7 @@ import {
   SemanticTokens,
   SemanticTokensParams,
 } from 'vscode-languageserver/node';
-import { ServerContext } from './utils';
+import { ServerContext } from '../utils';
 
 export const tokenTypes = ['function'];
 
diff --git a/server/src/server.ts b/server/src/server.ts
index 3447b5e..30a83c7 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -11,11 +11,11 @@ import {
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { Node, ParseError, parseTree } from 'jsonc-parser';
-import { createParseErrorDiagnostic } from './diagnostics';
+import { createParseErrorDiagnostic } from './providers/diagnostics';
 
-import { onDefinition } from './definition';
+import { onDefinition } from './providers/definition';
 import { SymbolTable, visit } from './visitor';
-import { handleSemanticTokens, tokenTypes } from './semanticTokens';
+import { handleSemanticTokens, tokenTypes } from './providers/semanticTokens';
 
 // Create a connection for the server, using Node's IPC as a transport.
 // Also include all preview / proposed LSP features.
diff --git a/server/src/test/definition.test.ts b/server/src/test/definition.test.ts
index edbd357..833b198 100644
--- a/server/src/test/definition.test.ts
+++ b/server/src/test/definition.test.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import { URI } from 'vscode-uri';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { onDefinition } from '../definition.js';
+import { onDefinition } from '../providers/definition.js';
 import { parseTree } from 'jsonc-parser';
 import { SymbolTable, visit } from '../visitor.js';
 import { DefinitionParams } from 'vscode-languageserver/node';
diff --git a/server/src/test/diagnostics.test.ts b/server/src/test/diagnostics.test.ts
index 213e231..ada533d 100644
--- a/server/src/test/diagnostics.test.ts
+++ b/server/src/test/diagnostics.test.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import { ParseErrorCode, ParseError } from 'jsonc-parser';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { createParseErrorDiagnostic, getDiagnosticsMessage } from '../diagnostics.js';
+import { createParseErrorDiagnostic, getDiagnosticsMessage } from '../providers/diagnostics.js';
 import { DiagnosticSeverity } from 'vscode-languageserver';
 
 suite('Diagnostics Test Suite', () => {