diff --git a/apps/rowboat/app/actions/copilot.actions.ts b/apps/rowboat/app/actions/copilot.actions.ts
index 5712e0af..a36b3c41 100644
--- a/apps/rowboat/app/actions/copilot.actions.ts
+++ b/apps/rowboat/app/actions/copilot.actions.ts
@@ -3,7 +3,7 @@ import {
     CopilotAPIRequest,
     CopilotChatContext, CopilotMessage,
     DataSourceSchemaForCopilot,
-} from "../../src/application/lib/copilot/types";
+} from "../../src/entities/models/copilot";
 import { 
     Workflow} from "../lib/types/workflow_types";
 import { z } from 'zod';
diff --git a/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts b/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
index 1e540933..80396f2c 100644
--- a/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
+++ b/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
@@ -1,7 +1,7 @@
 import { getCustomerIdForProject, logUsage, UsageTracker } from "@/app/lib/billing";
 import { USE_BILLING } from "@/app/lib/feature_flags";
 import { redisClient } from "@/app/lib/redis";
-import { CopilotAPIRequest } from "@/src/application/lib/copilot/types";
+import { CopilotAPIRequest } from "@/src/entities/models/copilot";
 import { streamMultiAgentResponse } from "@/src/application/lib/copilot/copilot";
 
 export const maxDuration = 300;
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
index fc9675fe..2e901e7f 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
@@ -2,8 +2,8 @@
 import { Button } from "@/components/ui/button";
 import { Dropdown, DropdownItem, DropdownMenu, DropdownSection, DropdownTrigger, Spinner, Tooltip } from "@heroui/react";
 import { useRef, useState, createContext, useContext, useCallback, forwardRef, useImperativeHandle, useEffect, Ref } from "react";
-import { CopilotChatContext } from "../../../../src/application/lib/copilot/types";
-import { CopilotMessage } from "../../../../src/application/lib/copilot/types";
+import { CopilotChatContext } from "../../../../src/entities/models/copilot";
+import { CopilotMessage } from "../../../../src/entities/models/copilot";
 import { Workflow } from "@/app/lib/types/workflow_types";
 import { DataSource } from "@/src/entities/models/data-source";
 import { z } from "zod";
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx b/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
index 001bb89c..e67ca589 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
@@ -2,7 +2,7 @@
 import { createContext, useContext, useRef, useState } from "react";
 import clsx from "clsx";
 import { z } from "zod";
-import { CopilotAssistantMessageActionPart } from "../../../../../src/application/lib/copilot/types";
+import { CopilotAssistantMessageActionPart } from "../../../../../src/entities/models/copilot";
 import { Workflow } from "../../../../lib/types/workflow_types";
 import { PreviewModalProvider, usePreviewModal } from '../../workflow/preview-modal';
 import { getAppliedChangeKey } from "../app";
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
index 2b891084..c0e9865c 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
@@ -5,7 +5,7 @@ import { z } from "zod";
 import { Workflow} from "@/app/lib/types/workflow_types";
 import MarkdownContent from "@/app/lib/components/markdown-content";
 import { MessageSquareIcon, EllipsisIcon, XIcon, CheckCheckIcon, ChevronDown, ChevronUp } from "lucide-react";
-import { CopilotMessage, CopilotAssistantMessage, CopilotAssistantMessageActionPart } from "@/src/application/lib/copilot/types";
+import { CopilotMessage, CopilotAssistantMessage, CopilotAssistantMessageActionPart } from "@/src/entities/models/copilot";
 import { Action, StreamingAction } from './actions';
 import { useParsedBlocks } from "../use-parsed-blocks";
 import { validateConfigChanges } from "@/app/lib/client_utils";
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/use-copilot.tsx b/apps/rowboat/app/projects/[projectId]/copilot/use-copilot.tsx
index 70e6da1b..fb29ce10 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/use-copilot.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/use-copilot.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useRef, useState } from "react";
 import { getCopilotResponseStream } from "@/app/actions/copilot.actions";
-import { CopilotMessage } from "@/src/application/lib/copilot/types";
+import { CopilotMessage } from "@/src/entities/models/copilot";
 import { Workflow } from "@/app/lib/types/workflow_types";
 import { DataSource } from "@/src/entities/models/data-source";
 import { z } from "zod";
diff --git a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
index 15abca57..3ad2c96a 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
@@ -7,7 +7,7 @@ import { useState, useEffect, useRef } from "react";
 import { usePreviewModal } from "../workflow/preview-modal";
 import { Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Select, SelectItem, Chip, SelectSection, Input } from "@heroui/react";
 import { PreviewModalProvider } from "../workflow/preview-modal";
-import { CopilotMessage } from "@/src/application/lib/copilot/types";
+import { CopilotMessage } from "@/src/entities/models/copilot";
 import { getCopilotAgentInstructions } from "@/app/actions/copilot.actions";
 import { Dropdown as CustomDropdown } from "../../../lib/components/dropdown";
 import { createAtMentions } from "../../../lib/components/atmentions";
diff --git a/apps/rowboat/src/application/lib/copilot/copilot.ts b/apps/rowboat/src/application/lib/copilot/copilot.ts
index 4a60fe94..79d0ae60 100644
--- a/apps/rowboat/src/application/lib/copilot/copilot.ts
+++ b/apps/rowboat/src/application/lib/copilot/copilot.ts
@@ -2,7 +2,7 @@ import z from "zod";
 import { createOpenAI } from "@ai-sdk/openai";
 import { generateObject, streamText, tool } from "ai";
 import { Workflow, WorkflowTool } from "@/app/lib/types/workflow_types";
-import { CopilotChatContext, CopilotMessage, DataSourceSchemaForCopilot } from "./types";
+import { CopilotChatContext, CopilotMessage, DataSourceSchemaForCopilot } from "../../../entities/models/copilot";
 import { PrefixLogger } from "@/app/lib/utils";
 import zodToJsonSchema from "zod-to-json-schema";
 import { COPILOT_INSTRUCTIONS_EDIT_AGENT } from "./copilot_edit_agent";
diff --git a/apps/rowboat/src/application/lib/copilot/types.ts b/apps/rowboat/src/entities/models/copilot.ts
similarity index 100%
rename from apps/rowboat/src/application/lib/copilot/types.ts
rename to apps/rowboat/src/entities/models/copilot.ts