diff --git a/ai-service/src/handlers/chat/route.ts b/ai-service/src/handlers/chat.handler.ts
similarity index 97%
rename from ai-service/src/handlers/chat/route.ts
rename to ai-service/src/handlers/chat.handler.ts
index 9a8e03b1b..bfd94a5e2 100644
--- a/ai-service/src/handlers/chat/route.ts
+++ b/ai-service/src/handlers/chat.handler.ts
@@ -8,8 +8,8 @@ import {
     streamText,
     TextPart
 } from 'ai';
-import { createRuntimeContext, WriterType } from '../../lib/ai/mastra/utils/runtime-context';
-import { mastra } from '../../lib/ai/mastra';
+import { createRuntimeContext, WriterType } from '../lib/ai/mastra/utils/runtime-context';
+import { mastra } from '../lib/ai/mastra';
 import { createImagineClient } from '@/lib/imagine/create-artifact-client';
 import { anthropic } from '@ai-sdk/anthropic';
 import { getOrCreateArtifactSandbox, startDevServer } from '@/lib/daytona/daytona-sandbox';
@@ -20,7 +20,7 @@ import {
 import {
     getOrCreateConversation,
     updateConversationHistory
-} from '@/lib/message-history';
+} from './message-history';
 
 export const routeHandler = async (c: Context) => {
     try {
diff --git a/ai-service/src/handlers/conversation.ts b/ai-service/src/handlers/conversations.handler.ts
similarity index 98%
rename from ai-service/src/handlers/conversation.ts
rename to ai-service/src/handlers/conversations.handler.ts
index d774c96ea..857181ed7 100644
--- a/ai-service/src/handlers/conversation.ts
+++ b/ai-service/src/handlers/conversations.handler.ts
@@ -1,5 +1,5 @@
 import { getArtifactSandbox, startDevServer } from "@/lib/daytona/daytona-sandbox";
-import { convertDBMessagesToImagineUIMessages, getOrCreateConversation } from "@/lib/message-history";
+import { convertDBMessagesToImagineUIMessages, getOrCreateConversation } from "./message-history";
 import { prisma } from "@/lib/prisma";
 import { ImagineUIMessage } from "@/shared-types";
 import { Context } from "hono";
diff --git a/ai-service/src/lib/message-history.ts b/ai-service/src/handlers/message-history.ts
similarity index 96%
rename from ai-service/src/lib/message-history.ts
rename to ai-service/src/handlers/message-history.ts
index 2814a4dd5..90dc8af3d 100644
--- a/ai-service/src/lib/message-history.ts
+++ b/ai-service/src/handlers/message-history.ts
@@ -1,6 +1,6 @@
 import { ImagineUIMessage } from "@/shared-types";
-import { Message, Prisma } from "./generated/prisma";
-import { prisma } from "./prisma";
+import { Message, Prisma } from "@/lib/generated/prisma";
+import { prisma } from "@/lib/prisma";
 
 type ConversationWithMessages = Prisma.ConversationGetPayload<{
   include: {
diff --git a/ai-service/src/handlers/chat/types.ts b/ai-service/src/handlers/types.ts
similarity index 100%
rename from ai-service/src/handlers/chat/types.ts
rename to ai-service/src/handlers/types.ts
diff --git a/ai-service/src/lib/daytona-image.ts b/ai-service/src/lib/daytona-image.ts
deleted file mode 100644
index 6b63995c8..000000000
--- a/ai-service/src/lib/daytona-image.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Image } from '@daytonaio/sdk';
-import { daytona } from './daytona-client';
-
-export async function buildImage() {
-    const image = Image.base("daytonaio/sandbox")
-        .workdir('/home/daytona/artifact')
-        .runCommands('npm -v');
-
-    console.log(' image', image);
-
-    const snapshot = await daytona.snapshot.create(
-        {
-            name: 'imgn-vite:v3',
-            image,
-            resources: {
-                cpu: 1,
-                memory: 1,
-                disk: 3
-            }
-        },
-        {
-            onLogs: console.log
-        }
-    );
-
-    console.log('snapshot', snapshot);
-}
-
-buildImage();
diff --git a/ai-service/src/lib/Dockerfile-daytona b/ai-service/src/lib/daytona/Dockerfile-daytona
similarity index 100%
rename from ai-service/src/lib/Dockerfile-daytona
rename to ai-service/src/lib/daytona/Dockerfile-daytona
diff --git a/ai-service/src/lib/daytona/cleanup-sandboxes.ts b/ai-service/src/lib/daytona/cleanup-sandboxes.ts
index 6069ec3a0..6314d75c6 100644
--- a/ai-service/src/lib/daytona/cleanup-sandboxes.ts
+++ b/ai-service/src/lib/daytona/cleanup-sandboxes.ts
@@ -1,4 +1,4 @@
-import { daytona } from "@/lib/daytona-client";
+import { daytona } from "@/lib/daytona/daytona-client";
 
 async function main() {
     const sandboxes = await daytona.list();
diff --git a/ai-service/src/lib/daytona-client.ts b/ai-service/src/lib/daytona/daytona-client.ts
similarity index 100%
rename from ai-service/src/lib/daytona-client.ts
rename to ai-service/src/lib/daytona/daytona-client.ts
diff --git a/ai-service/src/lib/daytona/daytona-sandbox.ts b/ai-service/src/lib/daytona/daytona-sandbox.ts
index b51855b95..0b8957764 100644
--- a/ai-service/src/lib/daytona/daytona-sandbox.ts
+++ b/ai-service/src/lib/daytona/daytona-sandbox.ts
@@ -1,5 +1,5 @@
 import { Sandbox } from '@daytonaio/sdk';
-import { daytona } from '../daytona-client';
+import { daytona } from './daytona-client';
 import { OnStepUpdateFn, WorkspaceStepId } from '@/lib/ai/custom-parts/workspace-state';
 import { prisma } from '@/lib/prisma';
 
diff --git a/ai-service/src/server.ts b/ai-service/src/server.ts
index 6a6a32cb7..dd0cd3a91 100644
--- a/ai-service/src/server.ts
+++ b/ai-service/src/server.ts
@@ -8,8 +8,8 @@ import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { HTTPException } from 'hono/http-exception';
 import { fileURLToPath } from 'url';
-import { handleChatRequest } from '@/handlers/chat/route';
-import { getConversation, getConversations } from './handlers/conversation';
+import { handleChatRequest } from '@/handlers/chat.handler';
+import { getConversation, getConversations } from './handlers/conversations.handler';
 import { contextStorage } from "hono/context-storage";
 
 const app = new Hono();
diff --git a/ai-service/src/shared-types/index.ts b/ai-service/src/shared-types/index.ts
index 76625c746..7a77bdaa1 100644
--- a/ai-service/src/shared-types/index.ts
+++ b/ai-service/src/shared-types/index.ts
@@ -3,7 +3,7 @@ import { thinkingUIDataPartSchema } from '@/lib/ai/custom-parts/thinking';
 import { workspaceStateUIDataPartSchema } from '@/lib/ai/custom-parts/workspace-state';
 import { fileTools } from '@/lib/ai/mastra/tools/file-tools';
 import { InferUIDataParts, InferUITool, ToolUIPart, UIMessage } from 'ai';
-export type { GetConversationResult, GetConversationsResult } from '@/handlers/conversation';
+export type { GetConversationResult, GetConversationsResult } from '@/handlers/conversations.handler';
 
 export type ImagineTools = {
     readFile: InferUITool<typeof fileTools.readFileTool>;