diff --git a/src/scenarios/initialize.ts b/src/scenarios/client/initialize.ts
similarity index 97%
rename from src/scenarios/initialize.ts
rename to src/scenarios/client/initialize.ts
index 9919b4d..ff046f5 100644
--- a/src/scenarios/initialize.ts
+++ b/src/scenarios/client/initialize.ts
@@ -1,6 +1,6 @@
 import http from 'http';
-import { Scenario, ScenarioUrls, ConformanceCheck } from '../types.js';
-import { createClientInitializationCheck, createServerInfoCheck } from '../checks.js';
+import { Scenario, ScenarioUrls, ConformanceCheck } from '../../types.js';
+import { createClientInitializationCheck, createServerInfoCheck } from '../../checks.js';
 
 export class InitializeScenario implements Scenario {
     name = 'initialize';
diff --git a/src/scenarios/tools_call.ts b/src/scenarios/client/tools_call.ts
similarity index 98%
rename from src/scenarios/tools_call.ts
rename to src/scenarios/client/tools_call.ts
index 96dcf99..606ce88 100644
--- a/src/scenarios/tools_call.ts
+++ b/src/scenarios/client/tools_call.ts
@@ -1,9 +1,9 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import type { Scenario, ConformanceCheck } from './types.js';
+import type { Scenario, ConformanceCheck } from '../../types.js';
 import express from 'express';
-import { ScenarioUrls } from '../types.js';
+import { ScenarioUrls } from '../../types.js';
 
 function createServer(checks: ConformanceCheck[]): express.Application {
     const server = new Server(
diff --git a/src/scenarios/index.ts b/src/scenarios/index.ts
index ca671d1..2682a6e 100644
--- a/src/scenarios/index.ts
+++ b/src/scenarios/index.ts
@@ -1,6 +1,6 @@
 import { Scenario } from '../types.js';
-import { InitializeScenario } from './initialize.js';
-import { ToolsCallScenario } from './tools_call.js';
+import { InitializeScenario } from './client/initialize.js';
+import { ToolsCallScenario } from './client/tools_call.js';
 
 export const scenarios = new Map<string, Scenario>([
     ['initialize', new InitializeScenario()],