diff --git a/surfsense_web/components/tool-ui/index.ts b/surfsense_web/components/tool-ui/index.ts
index 048f23558..93b6229a0 100644
--- a/surfsense_web/components/tool-ui/index.ts
+++ b/surfsense_web/components/tool-ui/index.ts
@@ -16,8 +16,6 @@ export {
 	type SerializableArticle,
 } from "./article";
 export { Audio } from "./audio";
-export { CreateLinearIssueToolUI } from "./create-linear-issue";
-export { CreateNotionPageToolUI } from "./create-notion-page";
 export {
 	type DeepAgentThinkingArgs,
 	type DeepAgentThinkingResult,
@@ -25,7 +23,6 @@ export {
 	InlineThinkingDisplay,
 	type ThinkingStep,
 } from "./deepagent-thinking";
-export { DeleteLinearIssueToolUI } from "./delete-linear-issue";
 export {
 	type DisplayImageArgs,
 	DisplayImageArgsSchema,
@@ -44,6 +41,11 @@ export {
 	parseSerializableImage,
 	type SerializableImage,
 } from "./image";
+export {
+	CreateLinearIssueToolUI,
+	DeleteLinearIssueToolUI,
+	UpdateLinearIssueToolUI,
+} from "./linear";
 export {
 	type LinkPreviewArgs,
 	LinkPreviewArgsSchema,
@@ -65,6 +67,7 @@ export {
 	parseSerializableMediaCard,
 	type SerializableMediaCard,
 } from "./media-card";
+export { CreateNotionPageToolUI, DeleteNotionPageToolUI, UpdateNotionPageToolUI } from "./notion";
 export {
 	Plan,
 	PlanErrorBoundary,
@@ -81,8 +84,6 @@ export {
 	ScrapeWebpageResultSchema,
 	ScrapeWebpageToolUI,
 } from "./scrape-webpage";
-export { UpdateLinearIssueToolUI } from "./update-linear-issue";
-export { UpdateNotionPageToolUI } from "./update-notion-page";
 export {
 	type MemoryItem,
 	type RecallMemoryArgs,
diff --git a/surfsense_web/components/tool-ui/create-linear-issue.tsx b/surfsense_web/components/tool-ui/linear/create-linear-issue.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/create-linear-issue.tsx
rename to surfsense_web/components/tool-ui/linear/create-linear-issue.tsx
diff --git a/surfsense_web/components/tool-ui/delete-linear-issue.tsx b/surfsense_web/components/tool-ui/linear/delete-linear-issue.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/delete-linear-issue.tsx
rename to surfsense_web/components/tool-ui/linear/delete-linear-issue.tsx
diff --git a/surfsense_web/components/tool-ui/linear/index.ts b/surfsense_web/components/tool-ui/linear/index.ts
new file mode 100644
index 000000000..202fe1f9a
--- /dev/null
+++ b/surfsense_web/components/tool-ui/linear/index.ts
@@ -0,0 +1,3 @@
+export { CreateLinearIssueToolUI } from "./create-linear-issue";
+export { DeleteLinearIssueToolUI } from "./delete-linear-issue";
+export { UpdateLinearIssueToolUI } from "./update-linear-issue";
diff --git a/surfsense_web/components/tool-ui/update-linear-issue.tsx b/surfsense_web/components/tool-ui/linear/update-linear-issue.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/update-linear-issue.tsx
rename to surfsense_web/components/tool-ui/linear/update-linear-issue.tsx
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/notion/create-notion-page.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/create-notion-page.tsx
rename to surfsense_web/components/tool-ui/notion/create-notion-page.tsx
diff --git a/surfsense_web/components/tool-ui/delete-notion-page.tsx b/surfsense_web/components/tool-ui/notion/delete-notion-page.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/delete-notion-page.tsx
rename to surfsense_web/components/tool-ui/notion/delete-notion-page.tsx
diff --git a/surfsense_web/components/tool-ui/notion/index.ts b/surfsense_web/components/tool-ui/notion/index.ts
new file mode 100644
index 000000000..51084d2dd
--- /dev/null
+++ b/surfsense_web/components/tool-ui/notion/index.ts
@@ -0,0 +1,3 @@
+export { CreateNotionPageToolUI } from "./create-notion-page";
+export { DeleteNotionPageToolUI } from "./delete-notion-page";
+export { UpdateNotionPageToolUI } from "./update-notion-page";
diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/notion/update-notion-page.tsx
similarity index 100%
rename from surfsense_web/components/tool-ui/update-notion-page.tsx
rename to surfsense_web/components/tool-ui/notion/update-notion-page.tsx