diff --git a/src/lib/agents/search/researcher/actions/webSearch.ts b/src/lib/agents/search/researcher/actions/webSearch.ts
index 943afff..5ceb2ed 100644
--- a/src/lib/agents/search/researcher/actions/webSearch.ts
+++ b/src/lib/agents/search/researcher/actions/webSearch.ts
@@ -1,6 +1,7 @@
 import z from 'zod';
 import { ResearchAction } from '../../types';
 import { searchSearxng } from '@/lib/searxng';
+import { Chunk } from '@/lib/types';
 
 const actionSchema = z.object({
   type: z.literal('web_search'),
diff --git a/src/lib/agents/search/types.ts b/src/lib/agents/search/types.ts
index fc0735d..0914503 100644
--- a/src/lib/agents/search/types.ts
+++ b/src/lib/agents/search/types.ts
@@ -2,6 +2,7 @@ import z from 'zod';
 import BaseLLM from '../../models/base/llm';
 import BaseEmbedding from '@/lib/models/base/embedding';
 import SessionManager from '@/lib/session';
+import { ChatTurnMessage, Chunk } from '@/lib/types';
 
 export type SearchSources = 'web' | 'discussions' | 'academic';
 
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
index 71d441f..50dd14c 100644
--- a/src/lib/db/schema.ts
+++ b/src/lib/db/schema.ts
@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm';
 import { text, integer, sqliteTable } from 'drizzle-orm/sqlite-core';
+import { Block } from '../types';
 
 export const messages = sqliteTable('messages', {
   id: integer('id').primaryKey(),
diff --git a/src/lib/models/base/embedding.ts b/src/lib/models/base/embedding.ts
index 35413ed..a817605 100644
--- a/src/lib/models/base/embedding.ts
+++ b/src/lib/models/base/embedding.ts
@@ -1,3 +1,5 @@
+import { Chunk } from '@/lib/types';
+
 abstract class BaseEmbedding<CONFIG> {
   constructor(protected config: CONFIG) {}
   abstract embedText(texts: string[]): Promise<number[][]>;
diff --git a/src/lib/models/providers/ollama/ollamaEmbedding.ts b/src/lib/models/providers/ollama/ollamaEmbedding.ts
index 0fd306a..7bb00b8 100644
--- a/src/lib/models/providers/ollama/ollamaEmbedding.ts
+++ b/src/lib/models/providers/ollama/ollamaEmbedding.ts
@@ -1,5 +1,6 @@
 import { Ollama } from 'ollama';
 import BaseEmbedding from '../../base/embedding';
+import { Chunk } from '@/lib/types';
 
 type OllamaConfig = {
   model: string;
diff --git a/src/lib/models/providers/openai/openaiEmbedding.ts b/src/lib/models/providers/openai/openaiEmbedding.ts
index ea15680..4e137ad 100644
--- a/src/lib/models/providers/openai/openaiEmbedding.ts
+++ b/src/lib/models/providers/openai/openaiEmbedding.ts
@@ -1,5 +1,6 @@
 import OpenAI from 'openai';
 import BaseEmbedding from '../../base/embedding';
+import { Chunk } from '@/lib/types';
 
 type OpenAIConfig = {
   apiKey: string;
diff --git a/src/lib/models/registry.ts b/src/lib/models/registry.ts
index 5067b6d..687c84c 100644
--- a/src/lib/models/registry.ts
+++ b/src/lib/models/registry.ts
@@ -1,7 +1,5 @@
 import { ConfigModelProvider } from '../config/types';
-import BaseModelProvider, {
-  createProviderInstance,
-} from './providers/baseProvider';
+import BaseModelProvider, { createProviderInstance } from './base/provider';
 import { getConfiguredModelProviders } from '../config/serverRegistry';
 import { providers } from './providers';
 import { MinimalProvider, ModelList } from './types';
diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts
index ce77d3b..45560d1 100644
--- a/src/lib/models/types.ts
+++ b/src/lib/models/types.ts
@@ -1,4 +1,5 @@
 import z from 'zod';
+import { ChatTurnMessage } from '../types';
 
 type Model = {
   name: string;
@@ -37,7 +38,7 @@ type GenerateOptions = {
 };
 
 type GenerateTextInput = {
-  messages: Message[];
+  messages: ChatTurnMessage[];
   options?: GenerateOptions;
 };
 
@@ -54,7 +55,7 @@ type StreamTextOutput = {
 
 type GenerateObjectInput = {
   schema: z.ZodTypeAny;
-  messages: Message[];
+  messages: ChatTurnMessage[];
   options?: GenerateOptions;
 };