diff --git a/mcp-server/src/PenpotMcpServer.ts b/mcp-server/src/PenpotMcpServer.ts
index dc8ff42..e579871 100644
--- a/mcp-server/src/PenpotMcpServer.ts
+++ b/mcp-server/src/PenpotMcpServer.ts
@@ -4,10 +4,10 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, CallToolResult, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { WebSocket, WebSocketServer } from "ws";
 
-import { ToolInterface } from "./interfaces/Tool.js";
+import { ToolInterface } from "./Tool";
 import { HelloWorldTool } from "./tools/HelloWorldTool.js";
 import { PrintTextTool } from "./tools/PrintTextTool.js";
-import { PluginTask } from "./interfaces/PluginTask.js";
+import { PluginTask } from "./PluginTask.js";
 
 /**
  * Penpot MCP server implementation with HTTP and SSE Transport Support
diff --git a/mcp-server/src/interfaces/PluginTask.ts b/mcp-server/src/PluginTask.ts
similarity index 100%
rename from mcp-server/src/interfaces/PluginTask.ts
rename to mcp-server/src/PluginTask.ts
diff --git a/mcp-server/src/interfaces/Tool.ts b/mcp-server/src/Tool.ts
similarity index 99%
rename from mcp-server/src/interfaces/Tool.ts
rename to mcp-server/src/Tool.ts
index a0cc694..728ff95 100644
--- a/mcp-server/src/interfaces/Tool.ts
+++ b/mcp-server/src/Tool.ts
@@ -3,7 +3,7 @@ import { validate, ValidationError } from "class-validator";
 import { plainToClass } from "class-transformer";
 import "reflect-metadata";
 import { TextResponse, ToolResponse } from "./ToolResponse.js";
-import type { PenpotMcpServer } from "../PenpotMcpServer.js";
+import type { PenpotMcpServer } from "./PenpotMcpServer.js";
 
 /**
  * Base interface for MCP tool implementations.
diff --git a/mcp-server/src/interfaces/ToolResponse.ts b/mcp-server/src/ToolResponse.ts
similarity index 100%
rename from mcp-server/src/interfaces/ToolResponse.ts
rename to mcp-server/src/ToolResponse.ts
diff --git a/mcp-server/src/tools/HelloWorldTool.ts b/mcp-server/src/tools/HelloWorldTool.ts
index 3fb8d59..5ec81b2 100644
--- a/mcp-server/src/tools/HelloWorldTool.ts
+++ b/mcp-server/src/tools/HelloWorldTool.ts
@@ -1,8 +1,8 @@
 import { IsNotEmpty, IsString } from "class-validator";
-import { Tool } from "../interfaces/Tool.js";
+import { Tool } from "../Tool.js";
 import "reflect-metadata";
-import type { ToolResponse } from "../interfaces/ToolResponse.js";
-import { TextResponse } from "../interfaces/ToolResponse.js";
+import type { ToolResponse } from "../ToolResponse.js";
+import { TextResponse } from "../ToolResponse.js";
 import { PenpotMcpServer } from "../PenpotMcpServer.js";
 
 /**
diff --git a/mcp-server/src/tools/PrintTextTool.ts b/mcp-server/src/tools/PrintTextTool.ts
index d57374b..7b0c592 100644
--- a/mcp-server/src/tools/PrintTextTool.ts
+++ b/mcp-server/src/tools/PrintTextTool.ts
@@ -1,8 +1,8 @@
 import { IsNotEmpty, IsString } from "class-validator";
-import { Tool } from "../interfaces/Tool.js";
-import { PluginTaskPrintText, PluginTaskPrintTextParams } from "../interfaces/PluginTask.js";
-import type { ToolResponse } from "../interfaces/ToolResponse.js";
-import { TextResponse } from "../interfaces/ToolResponse.js";
+import { Tool } from "../Tool.js";
+import { PluginTaskPrintText, PluginTaskPrintTextParams } from "../PluginTask.js";
+import type { ToolResponse } from "../ToolResponse.js";
+import { TextResponse } from "../ToolResponse.js";
 import "reflect-metadata";
 import { PenpotMcpServer } from "../PenpotMcpServer.js";