diff --git a/packages/database/src/index.ts b/packages/database/src/index.ts
index 78c3ccf00..c38fa73fd 100644
--- a/packages/database/src/index.ts
+++ b/packages/database/src/index.ts
@@ -11,7 +11,7 @@ export * from './schema';
 export * from './relations';
 
 // Export database helpers
-export * from './helpers';
+export * from './queries';
 
 // Export vault functions
 export * from './vault';
diff --git a/packages/database/src/helpers/assets/assets.ts b/packages/database/src/queries/assets/assets.ts
similarity index 100%
rename from packages/database/src/helpers/assets/assets.ts
rename to packages/database/src/queries/assets/assets.ts
diff --git a/packages/database/src/helpers/assets/dashboards.ts b/packages/database/src/queries/assets/dashboards.ts
similarity index 100%
rename from packages/database/src/helpers/assets/dashboards.ts
rename to packages/database/src/queries/assets/dashboards.ts
diff --git a/packages/database/src/helpers/assets/index.ts b/packages/database/src/queries/assets/index.ts
similarity index 100%
rename from packages/database/src/helpers/assets/index.ts
rename to packages/database/src/queries/assets/index.ts
diff --git a/packages/database/src/helpers/chats/chats.ts b/packages/database/src/queries/chats/chats.ts
similarity index 100%
rename from packages/database/src/helpers/chats/chats.ts
rename to packages/database/src/queries/chats/chats.ts
diff --git a/packages/database/src/helpers/chats/index.ts b/packages/database/src/queries/chats/index.ts
similarity index 100%
rename from packages/database/src/helpers/chats/index.ts
rename to packages/database/src/queries/chats/index.ts
diff --git a/packages/database/src/helpers/dataSources/index.ts b/packages/database/src/queries/dataSources/index.ts
similarity index 100%
rename from packages/database/src/helpers/dataSources/index.ts
rename to packages/database/src/queries/dataSources/index.ts
diff --git a/packages/database/src/helpers/dataSources/organizationDataSource.ts b/packages/database/src/queries/dataSources/organizationDataSource.ts
similarity index 100%
rename from packages/database/src/helpers/dataSources/organizationDataSource.ts
rename to packages/database/src/queries/dataSources/organizationDataSource.ts
diff --git a/packages/database/src/helpers/index.ts b/packages/database/src/queries/index.ts
similarity index 100%
rename from packages/database/src/helpers/index.ts
rename to packages/database/src/queries/index.ts
diff --git a/packages/database/src/helpers/messages/chatConversationHistory.ts b/packages/database/src/queries/messages/chatConversationHistory.ts
similarity index 100%
rename from packages/database/src/helpers/messages/chatConversationHistory.ts
rename to packages/database/src/queries/messages/chatConversationHistory.ts
diff --git a/packages/database/src/helpers/messages/index.ts b/packages/database/src/queries/messages/index.ts
similarity index 100%
rename from packages/database/src/helpers/messages/index.ts
rename to packages/database/src/queries/messages/index.ts
diff --git a/packages/database/src/helpers/messages/messageContext.ts b/packages/database/src/queries/messages/messageContext.ts
similarity index 100%
rename from packages/database/src/helpers/messages/messageContext.ts
rename to packages/database/src/queries/messages/messageContext.ts
diff --git a/packages/database/src/helpers/messages/messages.ts b/packages/database/src/queries/messages/messages.ts
similarity index 100%
rename from packages/database/src/helpers/messages/messages.ts
rename to packages/database/src/queries/messages/messages.ts
diff --git a/packages/database/src/helpers/metadata/braintrustMetadata.ts b/packages/database/src/queries/metadata/braintrustMetadata.ts
similarity index 100%
rename from packages/database/src/helpers/metadata/braintrustMetadata.ts
rename to packages/database/src/queries/metadata/braintrustMetadata.ts
diff --git a/packages/database/src/helpers/metadata/index.ts b/packages/database/src/queries/metadata/index.ts
similarity index 100%
rename from packages/database/src/helpers/metadata/index.ts
rename to packages/database/src/queries/metadata/index.ts
diff --git a/packages/database/src/helpers/organizations/index.ts b/packages/database/src/queries/organizations/index.ts
similarity index 100%
rename from packages/database/src/helpers/organizations/index.ts
rename to packages/database/src/queries/organizations/index.ts
diff --git a/packages/database/src/helpers/organizations/organizations.ts b/packages/database/src/queries/organizations/organizations.ts
similarity index 100%
rename from packages/database/src/helpers/organizations/organizations.ts
rename to packages/database/src/queries/organizations/organizations.ts
diff --git a/packages/database/src/helpers/users/index.ts b/packages/database/src/queries/users/index.ts
similarity index 100%
rename from packages/database/src/helpers/users/index.ts
rename to packages/database/src/queries/users/index.ts
diff --git a/packages/database/src/helpers/users/user.ts b/packages/database/src/queries/users/user.ts
similarity index 100%
rename from packages/database/src/helpers/users/user.ts
rename to packages/database/src/queries/users/user.ts