diff --git a/README.md b/README.md
index f06e8332..3c4dccaa 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Each namespace has its own authentication requirements and access patterns. Whil
 
 ```python
 # Example of accessing Client namespace
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 with Glean(api_token="client-token", instance="instance-name") as glean:
@@ -23,7 +23,7 @@ with Glean(api_token="client-token", instance="instance-name") as glean:
     print(search_response)
 
 # Example of accessing Indexing namespace 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 with Glean(api_token="indexing-token", instance="instance-name") as glean:
@@ -105,7 +105,7 @@ It's also possible to write a standalone Python script without needing to set up
 # ]
 # ///
 
-from glean import Glean
+from glean.api_client import Glean
 
 sdk = Glean(
   # SDK arguments
@@ -135,7 +135,7 @@ Generally, the SDK will work well with most IDEs out of the box. However, when u
 
 ```python
 # Synchronous Example
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -163,7 +163,7 @@ The same SDK client can also be used to make asychronous requests by importing a
 ```python
 # Asynchronous Example
 import asyncio
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 async def main():
@@ -192,7 +192,7 @@ asyncio.run(main())
 
 ```python
 # Synchronous Example
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -220,7 +220,7 @@ The same SDK client can also be used to make asychronous requests by importing a
 ```python
 # Asynchronous Example
 import asyncio
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 async def main():
@@ -259,8 +259,8 @@ This SDK supports the following security scheme globally:
 
 To authenticate with the API the `api_token` parameter must be set when initializing the SDK client instance. For example:
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -548,8 +548,8 @@ Some of the endpoints in this SDK support retries. If you use the SDK without an
 
 To change the default retry strategy for a single API call, simply provide a `RetryConfig` object to the call:
 ```python
-from glean import Glean, models
-from glean.utils import BackoffStrategy, RetryConfig, parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import BackoffStrategy, RetryConfig, parse_datetime
 import os
 
 
@@ -589,8 +589,8 @@ with Glean(
 
 If you'd like to override the default retry strategy for all operations that support retries, you can use the `retry_config` optional parameter when initializing the SDK:
 ```python
-from glean import Glean, models
-from glean.utils import BackoffStrategy, RetryConfig, parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import BackoffStrategy, RetryConfig, parse_datetime
 import os
 
 
@@ -648,7 +648,7 @@ All operations return a response object or raise an exception:
 ### Example
 
 ```python
-from glean import Glean, errors, models
+from glean.api_client import Glean, errors, models
 import os
 
 
@@ -727,8 +727,8 @@ The default server `https://{instance}-be.glean.com` contains variables and is s
 #### Example
 
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -770,8 +770,8 @@ with Glean(
 
 The default server can be overridden globally by passing a URL to the `server_url: str` optional parameter when initializing the SDK client instance. For example:
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -819,7 +819,7 @@ This allows you to wrap the client with your own custom logic, such as adding cu
 
 For example, you could specify a header for every request that this sdk makes as follows:
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import httpx
 
 http_client = httpx.Client(headers={"x-custom-header": "someValue"})
@@ -828,8 +828,8 @@ s = Glean(client=http_client)
 
 or you could wrap the client with your own custom logic:
 ```python
-from glean import Glean
-from glean.httpclient import AsyncHttpClient
+from glean.api_client import Glean
+from glean.api_client.httpclient import AsyncHttpClient
 import httpx
 
 class CustomClient(AsyncHttpClient):
@@ -899,7 +899,7 @@ The `Glean` class implements the context manager protocol and registers a finali
 [context-manager]: https://docs.python.org/3/reference/datamodel.html#context-managers
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 def main():
 
@@ -926,7 +926,7 @@ You can setup your SDK to emit debug logs for SDK requests and responses.
 
 You can pass your own logger class directly into your SDK.
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import logging
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/USAGE.md b/USAGE.md
index ee23c873..2f889db2 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -1,7 +1,7 @@
 <!-- Start SDK Example Usage [usage] -->
 ```python
 # Synchronous Example
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -29,7 +29,7 @@ The same SDK client can also be used to make asychronous requests by importing a
 ```python
 # Asynchronous Example
 import asyncio
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 async def main():
@@ -56,7 +56,7 @@ asyncio.run(main())
 
 ```python
 # Synchronous Example
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -84,7 +84,7 @@ The same SDK client can also be used to make asychronous requests by importing a
 ```python
 # Asynchronous Example
 import asyncio
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 async def main():
diff --git a/docs/sdks/agents/README.md b/docs/sdks/agents/README.md
index e7c486c8..96516f93 100644
--- a/docs/sdks/agents/README.md
+++ b/docs/sdks/agents/README.md
@@ -18,7 +18,7 @@ Get an agent by ID. This endpoint implements the LangChain Agent Protocol, speci
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -58,7 +58,7 @@ Get an agent's schemas by ID. This endpoint implements the LangChain Agent Proto
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -98,7 +98,7 @@ List Agents available in this service. This endpoint implements the LangChain Ag
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -137,7 +137,7 @@ Creates and triggers a run of an agent. Streams the output in SSE format. This e
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -176,7 +176,7 @@ Creates and triggers a run of an agent. Waits for final output and then returns
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/announcements/README.md b/docs/sdks/announcements/README.md
index 6a3c79ec..8462996f 100644
--- a/docs/sdks/announcements/README.md
+++ b/docs/sdks/announcements/README.md
@@ -17,8 +17,8 @@ Create a textual announcement visible to some set of users based on department a
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -22092,7 +22092,7 @@ Delete an existing user-generated announcement.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -22127,8 +22127,8 @@ Update a textual announcement visible to some set of users based on department a
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
diff --git a/docs/sdks/answers/README.md b/docs/sdks/answers/README.md
index 8e0824df..766273ef 100644
--- a/docs/sdks/answers/README.md
+++ b/docs/sdks/answers/README.md
@@ -19,8 +19,8 @@ Create a user-generated Answer that contains a question and answer.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -1390,7 +1390,7 @@ Delete an existing user-generated Answer.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -1426,8 +1426,8 @@ Update an existing user-generated Answer.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -2391,7 +2391,7 @@ Read the details of a particular Answer given its ID.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -2433,7 +2433,7 @@ List Answers created by the current user.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/clientactivity/README.md b/docs/sdks/clientactivity/README.md
index 1c9ba7dc..89f0de06 100644
--- a/docs/sdks/clientactivity/README.md
+++ b/docs/sdks/clientactivity/README.md
@@ -15,8 +15,8 @@ Report user activity that occurs on indexed documents such as viewing or editing
 ### Example Usage
 
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -73,7 +73,7 @@ Report events that happen to results within a Glean client UI, such as search re
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
diff --git a/docs/sdks/clientauthentication/README.md b/docs/sdks/clientauthentication/README.md
index e0030df0..d5351c52 100644
--- a/docs/sdks/clientauthentication/README.md
+++ b/docs/sdks/clientauthentication/README.md
@@ -14,7 +14,7 @@ Creates an authentication token for the authenticated user.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/clientchat/README.md b/docs/sdks/clientchat/README.md
index e2fcebc5..9f7db0a7 100644
--- a/docs/sdks/clientchat/README.md
+++ b/docs/sdks/clientchat/README.md
@@ -23,7 +23,7 @@ Have a conversation with Glean AI.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -79,7 +79,7 @@ Deletes all saved Chats a user has had and all their contained conversational co
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -113,7 +113,7 @@ Deletes saved Chats and all their contained conversational content.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -148,7 +148,7 @@ Retrieves the chat history between Glean Assistant and the user for a given Chat
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -188,7 +188,7 @@ Retrieves all the saved Chats between Glean Assistant and the user. The returned
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -227,7 +227,7 @@ Gets the Chat application details for the specified application ID.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -267,7 +267,7 @@ Upload files for Chat.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -312,7 +312,7 @@ Get files uploaded by a user for Chat.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -354,7 +354,7 @@ Delete files uploaded by a user for Chat.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -393,7 +393,7 @@ Have a conversation with Glean AI.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
diff --git a/docs/sdks/clientdocuments/README.md b/docs/sdks/clientdocuments/README.md
index 4dc51c49..c2eb3bde 100644
--- a/docs/sdks/clientdocuments/README.md
+++ b/docs/sdks/clientdocuments/README.md
@@ -17,7 +17,7 @@ Read the emails of all users who have access to the given document.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -56,7 +56,7 @@ Read the documents including metadata (does not include enhanced metadata via `/
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -95,7 +95,7 @@ Read the documents including metadata (does not include enhanced metadata via `/
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -171,7 +171,7 @@ Generate an AI summary of the requested documents.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/clientshortcuts/README.md b/docs/sdks/clientshortcuts/README.md
index 720ff413..3dd20eb4 100644
--- a/docs/sdks/clientshortcuts/README.md
+++ b/docs/sdks/clientshortcuts/README.md
@@ -19,8 +19,8 @@ Create a user-generated shortcut that contains an alias and destination URL.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -1642,7 +1642,7 @@ Delete an existing user-generated shortcut.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -1676,7 +1676,7 @@ Read a particular shortcut's details given its ID.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -1717,7 +1717,7 @@ List shortcuts editable/owned by the currently authenticated user.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -1776,8 +1776,8 @@ Updates the shortcut with the given ID.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
diff --git a/docs/sdks/clientverification/README.md b/docs/sdks/clientverification/README.md
index f51a2d7c..c177e107 100644
--- a/docs/sdks/clientverification/README.md
+++ b/docs/sdks/clientverification/README.md
@@ -16,7 +16,7 @@ Creates a verification reminder for the document. Users can create verification
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -58,7 +58,7 @@ Returns the information to be rendered in verification dashboard. Includes infor
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -97,7 +97,7 @@ Verify documents to keep the knowledge up to date within customer corpus.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/collections/README.md b/docs/sdks/collections/README.md
index 37b6cd8c..ab5811aa 100644
--- a/docs/sdks/collections/README.md
+++ b/docs/sdks/collections/README.md
@@ -21,7 +21,7 @@ Add items to a Collection.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -62,8 +62,8 @@ Create a publicly visible (empty) Collection of documents.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -759,7 +759,7 @@ Delete a Collection given the Collection's ID.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -799,7 +799,7 @@ Delete a single item from a Collection.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -841,8 +841,8 @@ Update the properties of an existing Collection.
 
 ```python
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -1938,7 +1938,7 @@ Update the URL, Glean Document ID, description of an item within a Collection gi
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -1981,7 +1981,7 @@ Read the details of a Collection given its ID. Does not fetch items in this Coll
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -2023,7 +2023,7 @@ List all existing Collections.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/datasources/README.md b/docs/sdks/datasources/README.md
index d3cdad79..4a509b4c 100644
--- a/docs/sdks/datasources/README.md
+++ b/docs/sdks/datasources/README.md
@@ -15,7 +15,7 @@ Add or update a custom datasource and its schema.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -84,7 +84,7 @@ Fetches the datasource config for the specified custom datasource.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/entities/README.md b/docs/sdks/entities/README.md
index 4b58a0a6..541dcd15 100644
--- a/docs/sdks/entities/README.md
+++ b/docs/sdks/entities/README.md
@@ -15,7 +15,7 @@ List some set of details for all entities that fit the given criteria and return
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -71,7 +71,7 @@ Read people details for the given IDs.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/indexingauthentication/README.md b/docs/sdks/indexingauthentication/README.md
index f04784c9..3f977f91 100644
--- a/docs/sdks/indexingauthentication/README.md
+++ b/docs/sdks/indexingauthentication/README.md
@@ -14,7 +14,7 @@ Rotates the secret value inside the Indexing API token and returns the new raw s
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/indexingdatasource/README.md b/docs/sdks/indexingdatasource/README.md
index 1dabef04..dbc1d80e 100644
--- a/docs/sdks/indexingdatasource/README.md
+++ b/docs/sdks/indexingdatasource/README.md
@@ -18,7 +18,7 @@ Tip: Refer to the [Troubleshooting tutorial](https://developers.glean.com/docs/i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/indexingdocuments/README.md b/docs/sdks/indexingdocuments/README.md
index 69592e5f..f90b96f6 100644
--- a/docs/sdks/indexingdocuments/README.md
+++ b/docs/sdks/indexingdocuments/README.md
@@ -25,7 +25,7 @@ Adds a document to the index or updates an existing document.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -62,7 +62,7 @@ Adds or updates multiple documents in the index. Please refer to the [bulk index
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -98,7 +98,7 @@ Replaces the documents in a datasource using paginated batch API calls. Please r
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -149,7 +149,7 @@ For more frequent document processing, contact Glean support.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -183,7 +183,7 @@ Deletes the specified document from the index. Succeeds if document is not prese
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -223,7 +223,7 @@ Tip: Refer to the [Troubleshooting tutorial](https://developers.glean.com/docs/i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -267,7 +267,7 @@ Tip: Refer to the [Troubleshooting tutorial](https://developers.glean.com/docs/i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -315,7 +315,7 @@ Tip: Refer to the [Troubleshooting tutorial](https://developers.glean.com/docs/i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -362,7 +362,7 @@ Tip: Use [/debug/{datasource}/document](https://developers.glean.com/docs/indexi
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -408,7 +408,7 @@ Tip: Use [/debug/{datasource}/status](https://developers.glean.com/docs/indexing
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/indexingpermissions/README.md b/docs/sdks/indexingpermissions/README.md
index fa8f997b..942409ab 100644
--- a/docs/sdks/indexingpermissions/README.md
+++ b/docs/sdks/indexingpermissions/README.md
@@ -25,7 +25,7 @@ Updates the permissions for a given document without modifying document content.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -63,7 +63,7 @@ Adds a datasource user or updates an existing user.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -102,7 +102,7 @@ Replaces the users in a datasource using paginated batch API calls. Please refer
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -155,7 +155,7 @@ Add or update a group in the datasource.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -193,7 +193,7 @@ Replaces the groups in a datasource using paginated batch API calls. Please refe
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -240,7 +240,7 @@ Add the memberships of a group in the datasource.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -278,7 +278,7 @@ Replaces the memberships for a group in a datasource using paginated batch API c
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -323,7 +323,7 @@ Schedules the immediate processing of all group memberships uploaded through the
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -357,7 +357,7 @@ Delete the user from the datasource. Silently succeeds if user is not present.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -393,7 +393,7 @@ Delete group from the datasource. Silently succeeds if group is not present.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -429,7 +429,7 @@ Delete membership to a group in the specified datasource. Silently succeeds if m
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -467,7 +467,7 @@ Allow the datasource be visible to the specified beta users. The default behavio
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/indexingshortcuts/README.md b/docs/sdks/indexingshortcuts/README.md
index 5c843609..fcfa071f 100644
--- a/docs/sdks/indexingshortcuts/README.md
+++ b/docs/sdks/indexingshortcuts/README.md
@@ -15,7 +15,7 @@ Replaces all the currently indexed shortcuts using paginated batch API calls. No
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -66,7 +66,7 @@ Creates glean shortcuts for uploaded shortcuts info. Glean would host the shortc
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/insights/README.md b/docs/sdks/insights/README.md
index b9b75bba..139f7a63 100644
--- a/docs/sdks/insights/README.md
+++ b/docs/sdks/insights/README.md
@@ -14,7 +14,7 @@ Reads the aggregate information for each user, query, and content.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
diff --git a/docs/sdks/messages/README.md b/docs/sdks/messages/README.md
index e54fd988..3491b1ff 100644
--- a/docs/sdks/messages/README.md
+++ b/docs/sdks/messages/README.md
@@ -14,7 +14,7 @@ Retrieves list of messages from messaging/chat datasources (e.g. Slack, Teams).
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
diff --git a/docs/sdks/people/README.md b/docs/sdks/people/README.md
index 3fd27510..ea830e9b 100644
--- a/docs/sdks/people/README.md
+++ b/docs/sdks/people/README.md
@@ -26,7 +26,7 @@ Tip: Refer to the [Troubleshooting tutorial](https://developers.glean.com/docs/i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -71,7 +71,7 @@ Tip: Use [/debug/{datasource}/status](https://developers.glean.com/docs/indexing
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -110,7 +110,7 @@ Adds an employee or updates information about an employee
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -154,7 +154,7 @@ Replaces all the currently indexed employees using paginated batch API calls. Pl
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -225,7 +225,7 @@ Schedules the immediate processing of employees and teams uploaded through the i
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -258,7 +258,7 @@ Delete an employee. Silently succeeds if employee is not present.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -293,7 +293,7 @@ Adds a team or updates information about a team
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -350,7 +350,7 @@ Delete a team based on provided id.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -384,7 +384,7 @@ Replaces all the currently indexed teams using paginated batch API calls. Please
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/pins/README.md b/docs/sdks/pins/README.md
index d19a33dc..490fd47a 100644
--- a/docs/sdks/pins/README.md
+++ b/docs/sdks/pins/README.md
@@ -18,7 +18,7 @@ Update an existing user-generated pin.
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -73,7 +73,7 @@ Read pin details given its ID.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -112,7 +112,7 @@ Lists all pins.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -151,7 +151,7 @@ Pin a document as a result for a given search query.Pin results that are known t
 ### Example Usage
 
 ```python
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 
 
@@ -206,7 +206,7 @@ Unpin a previously pinned result.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/policies/README.md b/docs/sdks/policies/README.md
index 9022f666..fffa6e52 100644
--- a/docs/sdks/policies/README.md
+++ b/docs/sdks/policies/README.md
@@ -18,7 +18,7 @@ Fetches the specified policy version, or the latest if no version is provided.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -58,7 +58,7 @@ Updates an existing policy.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -102,7 +102,7 @@ Lists policies with filtering.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -142,7 +142,7 @@ Creates a new policy with specified specifications and returns its id.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -181,7 +181,7 @@ Downloads CSV violations report for a specific policy id. This does not support
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/reports/README.md b/docs/sdks/reports/README.md
index 4f245c85..0e21c24f 100644
--- a/docs/sdks/reports/README.md
+++ b/docs/sdks/reports/README.md
@@ -16,7 +16,7 @@ Creates a new one-time report and executes its batch job.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -55,7 +55,7 @@ Downloads CSV violations report for a specific report id.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -94,7 +94,7 @@ Fetches the status of the run corresponding to the report-id.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/search/README.md b/docs/sdks/search/README.md
index 3e3e6dad..b1987d30 100644
--- a/docs/sdks/search/README.md
+++ b/docs/sdks/search/README.md
@@ -18,8 +18,8 @@ Retrieves results for search query without respect for permissions. This is avai
 ### Example Usage
 
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -132,7 +132,7 @@ Retrieve query suggestions, operators and documents for the given partially type
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -176,7 +176,7 @@ The personalized feed/home includes different types of contents including sugges
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -217,8 +217,8 @@ Retrieve recommended documents for the given URL or Glean Document ID.
 ### Example Usage
 
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
@@ -365,8 +365,8 @@ Retrieve results from the index for the given query and filters.
 ### Example Usage
 
 ```python
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 
 
diff --git a/docs/sdks/tools/README.md b/docs/sdks/tools/README.md
index 1394f356..fb10e54f 100644
--- a/docs/sdks/tools/README.md
+++ b/docs/sdks/tools/README.md
@@ -15,7 +15,7 @@ Returns a filtered set of available tools based on optional tool name parameters
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -54,7 +54,7 @@ Execute the specified tool with provided parameters
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/docs/sdks/visibilityoverrides/README.md b/docs/sdks/visibilityoverrides/README.md
index 34742cda..c9b50dac 100644
--- a/docs/sdks/visibilityoverrides/README.md
+++ b/docs/sdks/visibilityoverrides/README.md
@@ -15,7 +15,7 @@ Fetches the visibility override status of the documents passed.
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
@@ -54,7 +54,7 @@ Sets the visibility-override state of the documents specified, effectively hidin
 ### Example Usage
 
 ```python
-from glean import Glean
+from glean.api_client import Glean
 import os
 
 
diff --git a/examples/chat_example.py b/examples/chat_example.py
index d337c9ed..96639dc4 100644
--- a/examples/chat_example.py
+++ b/examples/chat_example.py
@@ -2,7 +2,7 @@
 # poetry install
 # poetry run python examples/ask_example.py
 
-from glean import Glean, errors, models
+from glean.api_client import Glean, errors, models
 import os
 
 
diff --git a/src/glean/__init__.py b/src/glean/api_client/__init__.py
similarity index 100%
rename from src/glean/__init__.py
rename to src/glean/api_client/__init__.py
diff --git a/src/glean/_hooks/__init__.py b/src/glean/api_client/_hooks/__init__.py
similarity index 100%
rename from src/glean/_hooks/__init__.py
rename to src/glean/api_client/_hooks/__init__.py
diff --git a/src/glean/_hooks/registration.py b/src/glean/api_client/_hooks/registration.py
similarity index 100%
rename from src/glean/_hooks/registration.py
rename to src/glean/api_client/_hooks/registration.py
diff --git a/src/glean/_hooks/sdkhooks.py b/src/glean/api_client/_hooks/sdkhooks.py
similarity index 98%
rename from src/glean/_hooks/sdkhooks.py
rename to src/glean/api_client/_hooks/sdkhooks.py
index 64e1c954..198de607 100644
--- a/src/glean/_hooks/sdkhooks.py
+++ b/src/glean/api_client/_hooks/sdkhooks.py
@@ -13,7 +13,7 @@
 )
 from .registration import init_hooks
 from typing import List, Optional, Tuple
-from glean.httpclient import HttpClient
+from glean.api_client.httpclient import HttpClient
 
 
 class SDKHooks(Hooks):
diff --git a/src/glean/_hooks/types.py b/src/glean/api_client/_hooks/types.py
similarity index 98%
rename from src/glean/_hooks/types.py
rename to src/glean/api_client/_hooks/types.py
index 031b0a58..fda013c8 100644
--- a/src/glean/_hooks/types.py
+++ b/src/glean/api_client/_hooks/types.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from abc import ABC, abstractmethod
-from glean.httpclient import HttpClient
+from glean.api_client.httpclient import HttpClient
 import httpx
 from typing import Any, Callable, List, Optional, Tuple, Union
 
diff --git a/src/glean/_version.py b/src/glean/api_client/_version.py
similarity index 100%
rename from src/glean/_version.py
rename to src/glean/api_client/_version.py
diff --git a/src/glean/agents.py b/src/glean/api_client/agents.py
similarity index 99%
rename from src/glean/agents.py
rename to src/glean/api_client/agents.py
index 0e484312..b1e09f45 100644
--- a/src/glean/agents.py
+++ b/src/glean/api_client/agents.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/announcements.py b/src/glean/api_client/announcements.py
similarity index 99%
rename from src/glean/announcements.py
rename to src/glean/api_client/announcements.py
index 832e8944..fd82227f 100644
--- a/src/glean/announcements.py
+++ b/src/glean/api_client/announcements.py
@@ -2,10 +2,10 @@
 
 from .basesdk import BaseSDK
 from datetime import datetime
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/answers.py b/src/glean/api_client/answers.py
similarity index 99%
rename from src/glean/answers.py
rename to src/glean/api_client/answers.py
index 2fac68e1..2ef0f1b6 100644
--- a/src/glean/answers.py
+++ b/src/glean/api_client/answers.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/basesdk.py b/src/glean/api_client/basesdk.py
similarity index 98%
rename from src/glean/basesdk.py
rename to src/glean/api_client/basesdk.py
index 45a8cff6..32828ecb 100644
--- a/src/glean/basesdk.py
+++ b/src/glean/api_client/basesdk.py
@@ -1,9 +1,9 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .sdkconfiguration import SDKConfiguration
-from glean import errors, models, utils
-from glean._hooks import AfterErrorContext, AfterSuccessContext, BeforeRequestContext
-from glean.utils import RetryConfig, SerializedRequestBody, get_body_content
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import AfterErrorContext, AfterSuccessContext, BeforeRequestContext
+from glean.api_client.utils import RetryConfig, SerializedRequestBody, get_body_content
 import httpx
 from typing import Callable, List, Mapping, Optional, Tuple
 from urllib.parse import parse_qs, urlparse
diff --git a/src/glean/client.py b/src/glean/api_client/client.py
similarity index 67%
rename from src/glean/client.py
rename to src/glean/api_client/client.py
index 901eda0b..c435c8e9 100644
--- a/src/glean/client.py
+++ b/src/glean/api_client/client.py
@@ -2,23 +2,23 @@
 
 from .basesdk import BaseSDK
 from .sdkconfiguration import SDKConfiguration
-from glean.agents import Agents
-from glean.announcements import Announcements
-from glean.answers import Answers
-from glean.client_activity import ClientActivity
-from glean.client_authentication import ClientAuthentication
-from glean.client_chat import ClientChat
-from glean.client_documents import ClientDocuments
-from glean.client_shortcuts import ClientShortcuts
-from glean.client_verification import ClientVerification
-from glean.collections import Collections
-from glean.entities import Entities
-from glean.governance import Governance
-from glean.insights import Insights
-from glean.messages import Messages
-from glean.pins import Pins
-from glean.search import Search
-from glean.tools import Tools
+from glean.api_client.agents import Agents
+from glean.api_client.announcements import Announcements
+from glean.api_client.answers import Answers
+from glean.api_client.client_activity import ClientActivity
+from glean.api_client.client_authentication import ClientAuthentication
+from glean.api_client.client_chat import ClientChat
+from glean.api_client.client_documents import ClientDocuments
+from glean.api_client.client_shortcuts import ClientShortcuts
+from glean.api_client.client_verification import ClientVerification
+from glean.api_client.collections import Collections
+from glean.api_client.entities import Entities
+from glean.api_client.governance import Governance
+from glean.api_client.insights import Insights
+from glean.api_client.messages import Messages
+from glean.api_client.pins import Pins
+from glean.api_client.search import Search
+from glean.api_client.tools import Tools
 
 
 class Client(BaseSDK):
diff --git a/src/glean/client_activity.py b/src/glean/api_client/client_activity.py
similarity index 98%
rename from src/glean/client_activity.py
rename to src/glean/api_client/client_activity.py
index 8ef36461..da1f7d87 100644
--- a/src/glean/client_activity.py
+++ b/src/glean/api_client/client_activity.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/client_authentication.py b/src/glean/api_client/client_authentication.py
similarity index 97%
rename from src/glean/client_authentication.py
rename to src/glean/api_client/client_authentication.py
index 842848b3..9ac8f866 100644
--- a/src/glean/client_authentication.py
+++ b/src/glean/api_client/client_authentication.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional
 
 
diff --git a/src/glean/client_chat.py b/src/glean/api_client/client_chat.py
similarity index 99%
rename from src/glean/client_chat.py
rename to src/glean/api_client/client_chat.py
index d7011bb6..408b1c93 100644
--- a/src/glean/client_chat.py
+++ b/src/glean/api_client/client_chat.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/client_documents.py b/src/glean/api_client/client_documents.py
similarity index 99%
rename from src/glean/client_documents.py
rename to src/glean/api_client/client_documents.py
index 4628a657..843dc7b0 100644
--- a/src/glean/client_documents.py
+++ b/src/glean/api_client/client_documents.py
@@ -2,10 +2,10 @@
 
 from .basesdk import BaseSDK
 from datetime import datetime
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/client_shortcuts.py b/src/glean/api_client/client_shortcuts.py
similarity index 99%
rename from src/glean/client_shortcuts.py
rename to src/glean/api_client/client_shortcuts.py
index 7dace99a..2b1d83ae 100644
--- a/src/glean/client_shortcuts.py
+++ b/src/glean/api_client/client_shortcuts.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/client_verification.py b/src/glean/api_client/client_verification.py
similarity index 99%
rename from src/glean/client_verification.py
rename to src/glean/api_client/client_verification.py
index eff58807..cfb9a83a 100644
--- a/src/glean/client_verification.py
+++ b/src/glean/api_client/client_verification.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional
 
 
diff --git a/src/glean/collections.py b/src/glean/api_client/collections.py
similarity index 99%
rename from src/glean/collections.py
rename to src/glean/api_client/collections.py
index 3d022250..45b22015 100644
--- a/src/glean/collections.py
+++ b/src/glean/api_client/collections.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Any, List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/data.py b/src/glean/api_client/data.py
similarity index 85%
rename from src/glean/data.py
rename to src/glean/api_client/data.py
index b99f1730..5644cede 100644
--- a/src/glean/data.py
+++ b/src/glean/api_client/data.py
@@ -2,8 +2,8 @@
 
 from .basesdk import BaseSDK
 from .sdkconfiguration import SDKConfiguration
-from glean.policies import Policies
-from glean.reports import Reports
+from glean.api_client.policies import Policies
+from glean.api_client.reports import Reports
 
 
 class Data(BaseSDK):
diff --git a/src/glean/datasources.py b/src/glean/api_client/datasources.py
similarity index 99%
rename from src/glean/datasources.py
rename to src/glean/api_client/datasources.py
index 3396a901..012e51d3 100644
--- a/src/glean/datasources.py
+++ b/src/glean/api_client/datasources.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/entities.py b/src/glean/api_client/entities.py
similarity index 98%
rename from src/glean/entities.py
rename to src/glean/api_client/entities.py
index c1963edc..7690999b 100644
--- a/src/glean/entities.py
+++ b/src/glean/api_client/entities.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/errors/__init__.py b/src/glean/api_client/errors/__init__.py
similarity index 100%
rename from src/glean/errors/__init__.py
rename to src/glean/api_client/errors/__init__.py
diff --git a/src/glean/errors/collectionerror.py b/src/glean/api_client/errors/collectionerror.py
similarity index 78%
rename from src/glean/errors/collectionerror.py
rename to src/glean/api_client/errors/collectionerror.py
index 968009a0..49cc9653 100644
--- a/src/glean/errors/collectionerror.py
+++ b/src/glean/api_client/errors/collectionerror.py
@@ -1,9 +1,9 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean import utils
-from glean.models import collectionerror as models_collectionerror
-from glean.types import BaseModel
+from glean.api_client import utils
+from glean.api_client.models import collectionerror as models_collectionerror
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated
 
diff --git a/src/glean/errors/gleandataerror.py b/src/glean/api_client/errors/gleandataerror.py
similarity index 92%
rename from src/glean/errors/gleandataerror.py
rename to src/glean/api_client/errors/gleandataerror.py
index c0b55746..cce205b6 100644
--- a/src/glean/errors/gleandataerror.py
+++ b/src/glean/api_client/errors/gleandataerror.py
@@ -1,12 +1,12 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean import utils
-from glean.models import (
+from glean.api_client import utils
+from glean.api_client.models import (
     errormessage as models_errormessage,
     invalidoperatorvalueerror as models_invalidoperatorvalueerror,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated
diff --git a/src/glean/errors/gleanerror.py b/src/glean/api_client/errors/gleanerror.py
similarity index 100%
rename from src/glean/errors/gleanerror.py
rename to src/glean/api_client/errors/gleanerror.py
diff --git a/src/glean/governance.py b/src/glean/api_client/governance.py
similarity index 83%
rename from src/glean/governance.py
rename to src/glean/api_client/governance.py
index ed1b5548..a2bbbc3a 100644
--- a/src/glean/governance.py
+++ b/src/glean/api_client/governance.py
@@ -2,8 +2,8 @@
 
 from .basesdk import BaseSDK
 from .sdkconfiguration import SDKConfiguration
-from glean.data import Data
-from glean.governance_documents import GovernanceDocuments
+from glean.api_client.data import Data
+from glean.api_client.governance_documents import GovernanceDocuments
 
 
 class Governance(BaseSDK):
diff --git a/src/glean/governance_documents.py b/src/glean/api_client/governance_documents.py
similarity index 88%
rename from src/glean/governance_documents.py
rename to src/glean/api_client/governance_documents.py
index 549c9bdb..2a665859 100644
--- a/src/glean/governance_documents.py
+++ b/src/glean/api_client/governance_documents.py
@@ -2,7 +2,7 @@
 
 from .basesdk import BaseSDK
 from .sdkconfiguration import SDKConfiguration
-from glean.visibilityoverrides import Visibilityoverrides
+from glean.api_client.visibilityoverrides import Visibilityoverrides
 
 
 class GovernanceDocuments(BaseSDK):
diff --git a/src/glean/httpclient.py b/src/glean/api_client/httpclient.py
similarity index 100%
rename from src/glean/httpclient.py
rename to src/glean/api_client/httpclient.py
diff --git a/src/glean/indexing.py b/src/glean/api_client/indexing.py
similarity index 70%
rename from src/glean/indexing.py
rename to src/glean/api_client/indexing.py
index 6a13f19d..e74c3a8c 100644
--- a/src/glean/indexing.py
+++ b/src/glean/api_client/indexing.py
@@ -2,13 +2,13 @@
 
 from .basesdk import BaseSDK
 from .sdkconfiguration import SDKConfiguration
-from glean.datasources import Datasources
-from glean.indexing_authentication import IndexingAuthentication
-from glean.indexing_datasource import IndexingDatasource
-from glean.indexing_documents import IndexingDocuments
-from glean.indexing_permissions import IndexingPermissions
-from glean.indexing_shortcuts import IndexingShortcuts
-from glean.people import People
+from glean.api_client.datasources import Datasources
+from glean.api_client.indexing_authentication import IndexingAuthentication
+from glean.api_client.indexing_datasource import IndexingDatasource
+from glean.api_client.indexing_documents import IndexingDocuments
+from glean.api_client.indexing_permissions import IndexingPermissions
+from glean.api_client.indexing_shortcuts import IndexingShortcuts
+from glean.api_client.people import People
 
 
 class Indexing(BaseSDK):
diff --git a/src/glean/indexing_authentication.py b/src/glean/api_client/indexing_authentication.py
similarity index 97%
rename from src/glean/indexing_authentication.py
rename to src/glean/api_client/indexing_authentication.py
index 8580ca6f..50a4ba76 100644
--- a/src/glean/indexing_authentication.py
+++ b/src/glean/api_client/indexing_authentication.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional
 
 
diff --git a/src/glean/indexing_datasource.py b/src/glean/api_client/indexing_datasource.py
similarity index 97%
rename from src/glean/indexing_datasource.py
rename to src/glean/api_client/indexing_datasource.py
index c2c3f229..773dab19 100644
--- a/src/glean/indexing_datasource.py
+++ b/src/glean/api_client/indexing_datasource.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional
 
 
diff --git a/src/glean/indexing_documents.py b/src/glean/api_client/indexing_documents.py
similarity index 99%
rename from src/glean/indexing_documents.py
rename to src/glean/api_client/indexing_documents.py
index a1655370..60b29c87 100644
--- a/src/glean/indexing_documents.py
+++ b/src/glean/api_client/indexing_documents.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 from typing_extensions import deprecated
 
diff --git a/src/glean/indexing_permissions.py b/src/glean/api_client/indexing_permissions.py
similarity index 99%
rename from src/glean/indexing_permissions.py
rename to src/glean/api_client/indexing_permissions.py
index e7eb99fb..07652763 100644
--- a/src/glean/indexing_permissions.py
+++ b/src/glean/api_client/indexing_permissions.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/indexing_shortcuts.py b/src/glean/api_client/indexing_shortcuts.py
similarity index 98%
rename from src/glean/indexing_shortcuts.py
rename to src/glean/api_client/indexing_shortcuts.py
index 3e2a9af9..581b9938 100644
--- a/src/glean/indexing_shortcuts.py
+++ b/src/glean/api_client/indexing_shortcuts.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/insights.py b/src/glean/api_client/insights.py
similarity index 98%
rename from src/glean/insights.py
rename to src/glean/api_client/insights.py
index d430da06..95d57ff8 100644
--- a/src/glean/insights.py
+++ b/src/glean/api_client/insights.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 
 
diff --git a/src/glean/messages.py b/src/glean/api_client/messages.py
similarity index 98%
rename from src/glean/messages.py
rename to src/glean/api_client/messages.py
index c3aabc47..f68d38bd 100644
--- a/src/glean/messages.py
+++ b/src/glean/api_client/messages.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional
 
 
diff --git a/src/glean/models/__init__.py b/src/glean/api_client/models/__init__.py
similarity index 100%
rename from src/glean/models/__init__.py
rename to src/glean/api_client/models/__init__.py
diff --git a/src/glean/models/activity.py b/src/glean/api_client/models/activity.py
similarity index 89%
rename from src/glean/models/activity.py
rename to src/glean/api_client/models/activity.py
index 3345caa9..d5bc29a4 100644
--- a/src/glean/models/activity.py
+++ b/src/glean/api_client/models/activity.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .activityevent import ActivityEvent, ActivityEventTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/activityevent.py b/src/glean/api_client/models/activityevent.py
similarity index 97%
rename from src/glean/models/activityevent.py
rename to src/glean/api_client/models/activityevent.py
index 47af1a61..a05294c4 100644
--- a/src/glean/models/activityevent.py
+++ b/src/glean/api_client/models/activityevent.py
@@ -4,7 +4,7 @@
 from .activityeventparams import ActivityEventParams, ActivityEventParamsTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/activityeventparams.py b/src/glean/api_client/models/activityeventparams.py
similarity index 98%
rename from src/glean/models/activityeventparams.py
rename to src/glean/api_client/models/activityeventparams.py
index 7bb52217..ca97d3e4 100644
--- a/src/glean/models/activityeventparams.py
+++ b/src/glean/api_client/models/activityeventparams.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/addcollectionitemserror.py b/src/glean/api_client/models/addcollectionitemserror.py
similarity index 93%
rename from src/glean/models/addcollectionitemserror.py
rename to src/glean/api_client/models/addcollectionitemserror.py
index e1b963bf..31118e56 100644
--- a/src/glean/models/addcollectionitemserror.py
+++ b/src/glean/api_client/models/addcollectionitemserror.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/addcollectionitemsrequest.py b/src/glean/api_client/models/addcollectionitemsrequest.py
similarity index 95%
rename from src/glean/models/addcollectionitemsrequest.py
rename to src/glean/api_client/models/addcollectionitemsrequest.py
index b0567ad4..e838d123 100644
--- a/src/glean/models/addcollectionitemsrequest.py
+++ b/src/glean/api_client/models/addcollectionitemsrequest.py
@@ -5,7 +5,7 @@
     CollectionItemDescriptor,
     CollectionItemDescriptorTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/addcollectionitemsresponse.py b/src/glean/api_client/models/addcollectionitemsresponse.py
similarity index 93%
rename from src/glean/models/addcollectionitemsresponse.py
rename to src/glean/api_client/models/addcollectionitemsresponse.py
index 2323f5b2..20ec74c3 100644
--- a/src/glean/models/addcollectionitemsresponse.py
+++ b/src/glean/api_client/models/addcollectionitemsresponse.py
@@ -6,7 +6,7 @@
     AddCollectionItemsErrorTypedDict,
 )
 from .collection import Collection, CollectionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/additionalfielddefinition.py b/src/glean/api_client/models/additionalfielddefinition.py
similarity index 98%
rename from src/glean/models/additionalfielddefinition.py
rename to src/glean/api_client/models/additionalfielddefinition.py
index dd54ddfd..70b5a835 100644
--- a/src/glean/models/additionalfielddefinition.py
+++ b/src/glean/api_client/models/additionalfielddefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/agent.py b/src/glean/api_client/models/agent.py
similarity index 98%
rename from src/glean/models/agent.py
rename to src/glean/api_client/models/agent.py
index a8e1aeed..7f9d9080 100644
--- a/src/glean/models/agent.py
+++ b/src/glean/api_client/models/agent.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from pydantic import ConfigDict
 from typing import Any, Dict, Optional
diff --git a/src/glean/models/agentconfig.py b/src/glean/api_client/models/agentconfig.py
similarity index 95%
rename from src/glean/models/agentconfig.py
rename to src/glean/api_client/models/agentconfig.py
index 2a25de73..c9f5b77d 100644
--- a/src/glean/models/agentconfig.py
+++ b/src/glean/api_client/models/agentconfig.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/agentexecutionstatus.py b/src/glean/api_client/models/agentexecutionstatus.py
similarity index 100%
rename from src/glean/models/agentexecutionstatus.py
rename to src/glean/api_client/models/agentexecutionstatus.py
diff --git a/src/glean/models/agentrun.py b/src/glean/api_client/models/agentrun.py
similarity index 96%
rename from src/glean/models/agentrun.py
rename to src/glean/api_client/models/agentrun.py
index 40bae9fc..d79dd526 100644
--- a/src/glean/models/agentrun.py
+++ b/src/glean/api_client/models/agentrun.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .agentexecutionstatus import AgentExecutionStatus
 from .message import Message, MessageTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Any, Dict, List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/agentruncreate.py b/src/glean/api_client/models/agentruncreate.py
similarity index 95%
rename from src/glean/models/agentruncreate.py
rename to src/glean/api_client/models/agentruncreate.py
index 7d87b0dc..d1a9058d 100644
--- a/src/glean/models/agentruncreate.py
+++ b/src/glean/api_client/models/agentruncreate.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .message import Message, MessageTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Any, Dict, List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/agentrunwaitresponse.py b/src/glean/api_client/models/agentrunwaitresponse.py
similarity index 93%
rename from src/glean/models/agentrunwaitresponse.py
rename to src/glean/api_client/models/agentrunwaitresponse.py
index 1bec8c68..151a8c6e 100644
--- a/src/glean/models/agentrunwaitresponse.py
+++ b/src/glean/api_client/models/agentrunwaitresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .agentrun import AgentRun, AgentRunTypedDict
 from .message import Message, MessageTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/agentschemas.py b/src/glean/api_client/models/agentschemas.py
similarity index 96%
rename from src/glean/models/agentschemas.py
rename to src/glean/api_client/models/agentschemas.py
index f66c83c9..9dd72561 100644
--- a/src/glean/models/agentschemas.py
+++ b/src/glean/api_client/models/agentschemas.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/aiappactioncounts.py b/src/glean/api_client/models/aiappactioncounts.py
similarity index 98%
rename from src/glean/models/aiappactioncounts.py
rename to src/glean/api_client/models/aiappactioncounts.py
index e148a16c..63068d07 100644
--- a/src/glean/models/aiappactioncounts.py
+++ b/src/glean/api_client/models/aiappactioncounts.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from pydantic import ConfigDict
 from typing import Dict, Optional
diff --git a/src/glean/models/aiappsinsightsresponse.py b/src/glean/api_client/models/aiappsinsightsresponse.py
similarity index 97%
rename from src/glean/models/aiappsinsightsresponse.py
rename to src/glean/api_client/models/aiappsinsightsresponse.py
index 983143fa..88b2de71 100644
--- a/src/glean/models/aiappsinsightsresponse.py
+++ b/src/glean/api_client/models/aiappsinsightsresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .aiappactioncounts import AiAppActionCounts, AiAppActionCountsTypedDict
 from .useractivityinsight import UserActivityInsight, UserActivityInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/aiinsightsresponse.py b/src/glean/api_client/models/aiinsightsresponse.py
similarity index 98%
rename from src/glean/models/aiinsightsresponse.py
rename to src/glean/api_client/models/aiinsightsresponse.py
index d2f0ee44..05426681 100644
--- a/src/glean/models/aiinsightsresponse.py
+++ b/src/glean/api_client/models/aiinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .useractivityinsight import UserActivityInsight, UserActivityInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/allowlistoptions.py b/src/glean/api_client/models/allowlistoptions.py
similarity index 94%
rename from src/glean/models/allowlistoptions.py
rename to src/glean/api_client/models/allowlistoptions.py
index ddd7ad1b..9e546b7a 100644
--- a/src/glean/models/allowlistoptions.py
+++ b/src/glean/api_client/models/allowlistoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/announcement.py b/src/glean/api_client/models/announcement.py
similarity index 99%
rename from src/glean/models/announcement.py
rename to src/glean/api_client/models/announcement.py
index af035a90..a7a308f6 100644
--- a/src/glean/models/announcement.py
+++ b/src/glean/api_client/models/announcement.py
@@ -9,7 +9,7 @@
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/anonymousevent.py b/src/glean/api_client/models/anonymousevent.py
similarity index 95%
rename from src/glean/models/anonymousevent.py
rename to src/glean/api_client/models/anonymousevent.py
index 55235ef5..72e1b97f 100644
--- a/src/glean/models/anonymousevent.py
+++ b/src/glean/api_client/models/anonymousevent.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .timeinterval import TimeInterval, TimeIntervalTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/answer.py b/src/glean/api_client/models/answer.py
similarity index 99%
rename from src/glean/models/answer.py
rename to src/glean/api_client/models/answer.py
index e50b44a2..000e5893 100644
--- a/src/glean/models/answer.py
+++ b/src/glean/api_client/models/answer.py
@@ -6,7 +6,7 @@
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/answerboard.py b/src/glean/api_client/models/answerboard.py
similarity index 98%
rename from src/glean/models/answerboard.py
rename to src/glean/api_client/models/answerboard.py
index 05734ac5..7e63384b 100644
--- a/src/glean/models/answerboard.py
+++ b/src/glean/api_client/models/answerboard.py
@@ -4,7 +4,7 @@
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/answercreationdata.py b/src/glean/api_client/models/answercreationdata.py
similarity index 98%
rename from src/glean/models/answercreationdata.py
rename to src/glean/api_client/models/answercreationdata.py
index 6f21c8b8..b3c6f130 100644
--- a/src/glean/models/answercreationdata.py
+++ b/src/glean/api_client/models/answercreationdata.py
@@ -9,7 +9,7 @@
 )
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/answerlike.py b/src/glean/api_client/models/answerlike.py
similarity index 94%
rename from src/glean/models/answerlike.py
rename to src/glean/api_client/models/answerlike.py
index 8029de8b..13fe4e8e 100644
--- a/src/glean/models/answerlike.py
+++ b/src/glean/api_client/models/answerlike.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/answerlikes.py b/src/glean/api_client/models/answerlikes.py
similarity index 95%
rename from src/glean/models/answerlikes.py
rename to src/glean/api_client/models/answerlikes.py
index 3924016f..7eaed580 100644
--- a/src/glean/models/answerlikes.py
+++ b/src/glean/api_client/models/answerlikes.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, TYPE_CHECKING
 from typing_extensions import Annotated, TypedDict
diff --git a/src/glean/models/answerresult.py b/src/glean/api_client/models/answerresult.py
similarity index 94%
rename from src/glean/models/answerresult.py
rename to src/glean/api_client/models/answerresult.py
index af5df5e9..53786e41 100644
--- a/src/glean/models/answerresult.py
+++ b/src/glean/api_client/models/answerresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .answer import Answer, AnswerTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/appresult.py b/src/glean/api_client/models/appresult.py
similarity index 96%
rename from src/glean/models/appresult.py
rename to src/glean/api_client/models/appresult.py
index 2e8ff9cf..f4bd01d7 100644
--- a/src/glean/models/appresult.py
+++ b/src/glean/api_client/models/appresult.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/authconfig.py b/src/glean/api_client/models/authconfig.py
similarity index 98%
rename from src/glean/models/authconfig.py
rename to src/glean/api_client/models/authconfig.py
index 98ada4b7..aa025f87 100644
--- a/src/glean/models/authconfig.py
+++ b/src/glean/api_client/models/authconfig.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/authtoken.py b/src/glean/api_client/models/authtoken.py
similarity index 96%
rename from src/glean/models/authtoken.py
rename to src/glean/api_client/models/authtoken.py
index 3f0f862c..789d550d 100644
--- a/src/glean/models/authtoken.py
+++ b/src/glean/api_client/models/authtoken.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/autocompleterequest.py b/src/glean/api_client/models/autocompleterequest.py
similarity index 98%
rename from src/glean/models/autocompleterequest.py
rename to src/glean/api_client/models/autocompleterequest.py
index 9dc7bded..a0f18921 100644
--- a/src/glean/models/autocompleterequest.py
+++ b/src/glean/api_client/models/autocompleterequest.py
@@ -4,7 +4,7 @@
 from .authtoken import AuthToken, AuthTokenTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/autocompleteresponse.py b/src/glean/api_client/models/autocompleteresponse.py
similarity index 98%
rename from src/glean/models/autocompleteresponse.py
rename to src/glean/api_client/models/autocompleteresponse.py
index feed4f46..e01a7fe5 100644
--- a/src/glean/models/autocompleteresponse.py
+++ b/src/glean/api_client/models/autocompleteresponse.py
@@ -8,7 +8,7 @@
 )
 from .gleandataerror import GleanDataError, GleanDataErrorTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/autocompleteresult.py b/src/glean/api_client/models/autocompleteresult.py
similarity index 98%
rename from src/glean/models/autocompleteresult.py
rename to src/glean/api_client/models/autocompleteresult.py
index fdba82ed..dc4f6022 100644
--- a/src/glean/models/autocompleteresult.py
+++ b/src/glean/api_client/models/autocompleteresult.py
@@ -7,7 +7,7 @@
 from .structuredresult import StructuredResult, StructuredResultTypedDict
 from .textrange import TextRange, TextRangeTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/autocompleteresultgroup.py b/src/glean/api_client/models/autocompleteresultgroup.py
similarity index 96%
rename from src/glean/models/autocompleteresultgroup.py
rename to src/glean/api_client/models/autocompleteresultgroup.py
index 57db6754..6ecfef75 100644
--- a/src/glean/models/autocompleteresultgroup.py
+++ b/src/glean/api_client/models/autocompleteresultgroup.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/badge.py b/src/glean/api_client/models/badge.py
similarity index 96%
rename from src/glean/models/badge.py
rename to src/glean/api_client/models/badge.py
index bbeeb2f1..9ba49c7e 100644
--- a/src/glean/models/badge.py
+++ b/src/glean/api_client/models/badge.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexdocumentsrequest.py b/src/glean/api_client/models/bulkindexdocumentsrequest.py
similarity index 98%
rename from src/glean/models/bulkindexdocumentsrequest.py
rename to src/glean/api_client/models/bulkindexdocumentsrequest.py
index c210a0ac..cdd99d7b 100644
--- a/src/glean/models/bulkindexdocumentsrequest.py
+++ b/src/glean/api_client/models/bulkindexdocumentsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentdefinition import DocumentDefinition, DocumentDefinitionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexemployeesrequest.py b/src/glean/api_client/models/bulkindexemployeesrequest.py
similarity index 98%
rename from src/glean/models/bulkindexemployeesrequest.py
rename to src/glean/api_client/models/bulkindexemployeesrequest.py
index 0218f020..1419dc21 100644
--- a/src/glean/models/bulkindexemployeesrequest.py
+++ b/src/glean/api_client/models/bulkindexemployeesrequest.py
@@ -5,7 +5,7 @@
     EmployeeInfoDefinition,
     EmployeeInfoDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexgroupsrequest.py b/src/glean/api_client/models/bulkindexgroupsrequest.py
similarity index 98%
rename from src/glean/models/bulkindexgroupsrequest.py
rename to src/glean/api_client/models/bulkindexgroupsrequest.py
index 171f26b2..07e1a59b 100644
--- a/src/glean/models/bulkindexgroupsrequest.py
+++ b/src/glean/api_client/models/bulkindexgroupsrequest.py
@@ -5,7 +5,7 @@
     DatasourceGroupDefinition,
     DatasourceGroupDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexmembershipsrequest.py b/src/glean/api_client/models/bulkindexmembershipsrequest.py
similarity index 98%
rename from src/glean/models/bulkindexmembershipsrequest.py
rename to src/glean/api_client/models/bulkindexmembershipsrequest.py
index 9367b9fa..44304838 100644
--- a/src/glean/models/bulkindexmembershipsrequest.py
+++ b/src/glean/api_client/models/bulkindexmembershipsrequest.py
@@ -5,7 +5,7 @@
     DatasourceBulkMembershipDefinition,
     DatasourceBulkMembershipDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexshortcutsrequest.py b/src/glean/api_client/models/bulkindexshortcutsrequest.py
similarity index 97%
rename from src/glean/models/bulkindexshortcutsrequest.py
rename to src/glean/api_client/models/bulkindexshortcutsrequest.py
index 382382cb..c80fe55a 100644
--- a/src/glean/models/bulkindexshortcutsrequest.py
+++ b/src/glean/api_client/models/bulkindexshortcutsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .externalshortcut import ExternalShortcut, ExternalShortcutTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexteamsrequest.py b/src/glean/api_client/models/bulkindexteamsrequest.py
similarity index 97%
rename from src/glean/models/bulkindexteamsrequest.py
rename to src/glean/api_client/models/bulkindexteamsrequest.py
index dbb7fad8..ac60f03e 100644
--- a/src/glean/models/bulkindexteamsrequest.py
+++ b/src/glean/api_client/models/bulkindexteamsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .teaminfodefinition import TeamInfoDefinition, TeamInfoDefinitionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkindexusersrequest.py b/src/glean/api_client/models/bulkindexusersrequest.py
similarity index 98%
rename from src/glean/models/bulkindexusersrequest.py
rename to src/glean/api_client/models/bulkindexusersrequest.py
index 4ca386bd..a53ca35c 100644
--- a/src/glean/models/bulkindexusersrequest.py
+++ b/src/glean/api_client/models/bulkindexusersrequest.py
@@ -5,7 +5,7 @@
     DatasourceUserDefinition,
     DatasourceUserDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/bulkuploadhistoryevent.py b/src/glean/api_client/models/bulkuploadhistoryevent.py
similarity index 98%
rename from src/glean/models/bulkuploadhistoryevent.py
rename to src/glean/api_client/models/bulkuploadhistoryevent.py
index 9e7d0578..e5cd4781 100644
--- a/src/glean/models/bulkuploadhistoryevent.py
+++ b/src/glean/api_client/models/bulkuploadhistoryevent.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/calendarattendee.py b/src/glean/api_client/models/calendarattendee.py
similarity index 97%
rename from src/glean/models/calendarattendee.py
rename to src/glean/api_client/models/calendarattendee.py
index 8d06f5e2..a4d87906 100644
--- a/src/glean/models/calendarattendee.py
+++ b/src/glean/api_client/models/calendarattendee.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/calendarattendees.py b/src/glean/api_client/models/calendarattendees.py
similarity index 98%
rename from src/glean/models/calendarattendees.py
rename to src/glean/api_client/models/calendarattendees.py
index 5ce155dc..232506aa 100644
--- a/src/glean/models/calendarattendees.py
+++ b/src/glean/api_client/models/calendarattendees.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/calendarevent.py b/src/glean/api_client/models/calendarevent.py
similarity index 98%
rename from src/glean/models/calendarevent.py
rename to src/glean/api_client/models/calendarevent.py
index 4bb4aa6a..467c0117 100644
--- a/src/glean/models/calendarevent.py
+++ b/src/glean/api_client/models/calendarevent.py
@@ -7,7 +7,7 @@
 from .generatedattachment import GeneratedAttachment, GeneratedAttachmentTypedDict
 from .timeinterval import TimeInterval, TimeIntervalTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/canonicalizingregextype.py b/src/glean/api_client/models/canonicalizingregextype.py
similarity index 95%
rename from src/glean/models/canonicalizingregextype.py
rename to src/glean/api_client/models/canonicalizingregextype.py
index c56f8746..dbf351ad 100644
--- a/src/glean/models/canonicalizingregextype.py
+++ b/src/glean/api_client/models/canonicalizingregextype.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/channelinviteinfo.py b/src/glean/api_client/models/channelinviteinfo.py
similarity index 97%
rename from src/glean/models/channelinviteinfo.py
rename to src/glean/api_client/models/channelinviteinfo.py
index 7545a4a7..61d5c404 100644
--- a/src/glean/models/channelinviteinfo.py
+++ b/src/glean/api_client/models/channelinviteinfo.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .communicationchannel import CommunicationChannel
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chat.py b/src/glean/api_client/models/chat.py
similarity index 98%
rename from src/glean/models/chat.py
rename to src/glean/api_client/models/chat.py
index cfcdeb02..95ad4589 100644
--- a/src/glean/models/chat.py
+++ b/src/glean/api_client/models/chat.py
@@ -4,7 +4,7 @@
 from .chatmessage import ChatMessage, ChatMessageTypedDict
 from .iconconfig import IconConfig, IconConfigTypedDict
 from .person import Person, PersonTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatfile.py b/src/glean/api_client/models/chatfile.py
similarity index 95%
rename from src/glean/models/chatfile.py
rename to src/glean/api_client/models/chatfile.py
index 2526e07f..972ff1bf 100644
--- a/src/glean/models/chatfile.py
+++ b/src/glean/api_client/models/chatfile.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatfilemetadata import ChatFileMetadata, ChatFileMetadataTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/chatfilefailurereason.py b/src/glean/api_client/models/chatfilefailurereason.py
similarity index 100%
rename from src/glean/models/chatfilefailurereason.py
rename to src/glean/api_client/models/chatfilefailurereason.py
diff --git a/src/glean/models/chatfilemetadata.py b/src/glean/api_client/models/chatfilemetadata.py
similarity index 97%
rename from src/glean/models/chatfilemetadata.py
rename to src/glean/api_client/models/chatfilemetadata.py
index 37e75fea..6f6e8152 100644
--- a/src/glean/models/chatfilemetadata.py
+++ b/src/glean/api_client/models/chatfilemetadata.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .chatfilefailurereason import ChatFileFailureReason
 from .chatfilestatus import ChatFileStatus
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatfilestatus.py b/src/glean/api_client/models/chatfilestatus.py
similarity index 100%
rename from src/glean/models/chatfilestatus.py
rename to src/glean/api_client/models/chatfilestatus.py
diff --git a/src/glean/models/chatmessage.py b/src/glean/api_client/models/chatmessage.py
similarity index 99%
rename from src/glean/models/chatmessage.py
rename to src/glean/api_client/models/chatmessage.py
index c2bf1128..df2d9d20 100644
--- a/src/glean/models/chatmessage.py
+++ b/src/glean/api_client/models/chatmessage.py
@@ -5,7 +5,7 @@
 from .chatmessagecitation import ChatMessageCitation, ChatMessageCitationTypedDict
 from .chatmessagefragment import ChatMessageFragment, ChatMessageFragmentTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatmessagecitation.py b/src/glean/api_client/models/chatmessagecitation.py
similarity index 97%
rename from src/glean/models/chatmessagecitation.py
rename to src/glean/api_client/models/chatmessagecitation.py
index dc63d6e6..d7591c11 100644
--- a/src/glean/models/chatmessagecitation.py
+++ b/src/glean/api_client/models/chatmessagecitation.py
@@ -5,7 +5,7 @@
 from .document import Document, DocumentTypedDict
 from .person import Person, PersonTypedDict
 from .referencerange import ReferenceRange, ReferenceRangeTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatmessagefragment.py b/src/glean/api_client/models/chatmessagefragment.py
similarity index 98%
rename from src/glean/models/chatmessagefragment.py
rename to src/glean/api_client/models/chatmessagefragment.py
index dc893191..4c9f8346 100644
--- a/src/glean/models/chatmessagefragment.py
+++ b/src/glean/api_client/models/chatmessagefragment.py
@@ -5,7 +5,7 @@
 from .querysuggestion import QuerySuggestion, QuerySuggestionTypedDict
 from .structuredresult import StructuredResult, StructuredResultTypedDict
 from .toolinfo import ToolInfo, ToolInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatmetadata.py b/src/glean/api_client/models/chatmetadata.py
similarity index 98%
rename from src/glean/models/chatmetadata.py
rename to src/glean/api_client/models/chatmetadata.py
index 9636874f..dc261334 100644
--- a/src/glean/models/chatmetadata.py
+++ b/src/glean/api_client/models/chatmetadata.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
 from .person import Person, PersonTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatmetadataresult.py b/src/glean/api_client/models/chatmetadataresult.py
similarity index 95%
rename from src/glean/models/chatmetadataresult.py
rename to src/glean/api_client/models/chatmetadataresult.py
index 1d2f5c2d..f0de14fc 100644
--- a/src/glean/models/chatmetadataresult.py
+++ b/src/glean/api_client/models/chatmetadataresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatmetadata import ChatMetadata, ChatMetadataTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatop.py b/src/glean/api_client/models/chatop.py
similarity index 89%
rename from src/glean/models/chatop.py
rename to src/glean/api_client/models/chatop.py
index bf09c9a4..dbd76070 100644
--- a/src/glean/models/chatop.py
+++ b/src/glean/api_client/models/chatop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .chatrequest import ChatRequest, ChatRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatrequest.py b/src/glean/api_client/models/chatrequest.py
similarity index 98%
rename from src/glean/models/chatrequest.py
rename to src/glean/api_client/models/chatrequest.py
index d287cfcf..1cf31c2c 100644
--- a/src/glean/models/chatrequest.py
+++ b/src/glean/api_client/models/chatrequest.py
@@ -7,7 +7,7 @@
     ChatRestrictionFilters,
     ChatRestrictionFiltersTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatresponse.py b/src/glean/api_client/models/chatresponse.py
similarity index 97%
rename from src/glean/models/chatresponse.py
rename to src/glean/api_client/models/chatresponse.py
index 6dbb3cc0..533145b4 100644
--- a/src/glean/models/chatresponse.py
+++ b/src/glean/api_client/models/chatresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatmessage import ChatMessage, ChatMessageTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatrestrictionfilters.py b/src/glean/api_client/models/chatrestrictionfilters.py
similarity index 97%
rename from src/glean/models/chatrestrictionfilters.py
rename to src/glean/api_client/models/chatrestrictionfilters.py
index 54489981..9595d0ea 100644
--- a/src/glean/models/chatrestrictionfilters.py
+++ b/src/glean/api_client/models/chatrestrictionfilters.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentspec_union import DocumentSpecUnion, DocumentSpecUnionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatresult.py b/src/glean/api_client/models/chatresult.py
similarity index 95%
rename from src/glean/models/chatresult.py
rename to src/glean/api_client/models/chatresult.py
index 5e7fa603..799019f7 100644
--- a/src/glean/models/chatresult.py
+++ b/src/glean/api_client/models/chatresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chat import Chat, ChatTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatstreamop.py b/src/glean/api_client/models/chatstreamop.py
similarity index 89%
rename from src/glean/models/chatstreamop.py
rename to src/glean/api_client/models/chatstreamop.py
index 2dd8a220..73c25c90 100644
--- a/src/glean/models/chatstreamop.py
+++ b/src/glean/api_client/models/chatstreamop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .chatrequest import ChatRequest, ChatRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/chatzerostatesuggestionoptions.py b/src/glean/api_client/models/chatzerostatesuggestionoptions.py
similarity index 94%
rename from src/glean/models/chatzerostatesuggestionoptions.py
rename to src/glean/api_client/models/chatzerostatesuggestionoptions.py
index da897f31..dc31b3bf 100644
--- a/src/glean/models/chatzerostatesuggestionoptions.py
+++ b/src/glean/api_client/models/chatzerostatesuggestionoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/checkdocumentaccessrequest.py b/src/glean/api_client/models/checkdocumentaccessrequest.py
similarity index 96%
rename from src/glean/models/checkdocumentaccessrequest.py
rename to src/glean/api_client/models/checkdocumentaccessrequest.py
index 1758da92..fca1be2f 100644
--- a/src/glean/models/checkdocumentaccessrequest.py
+++ b/src/glean/api_client/models/checkdocumentaccessrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/checkdocumentaccessresponse.py b/src/glean/api_client/models/checkdocumentaccessresponse.py
similarity index 94%
rename from src/glean/models/checkdocumentaccessresponse.py
rename to src/glean/api_client/models/checkdocumentaccessresponse.py
index 85d1afd5..ae0f173a 100644
--- a/src/glean/models/checkdocumentaccessresponse.py
+++ b/src/glean/api_client/models/checkdocumentaccessresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/clustergroup.py b/src/glean/api_client/models/clustergroup.py
similarity index 96%
rename from src/glean/models/clustergroup.py
rename to src/glean/api_client/models/clustergroup.py
index 933ef1de..e48ca094 100644
--- a/src/glean/models/clustergroup.py
+++ b/src/glean/api_client/models/clustergroup.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .clustertypeenum import ClusterTypeEnum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/clustertypeenum.py b/src/glean/api_client/models/clustertypeenum.py
similarity index 100%
rename from src/glean/models/clustertypeenum.py
rename to src/glean/api_client/models/clustertypeenum.py
diff --git a/src/glean/models/code.py b/src/glean/api_client/models/code.py
similarity index 95%
rename from src/glean/models/code.py
rename to src/glean/api_client/models/code.py
index 4f7eff1d..02176f8e 100644
--- a/src/glean/models/code.py
+++ b/src/glean/api_client/models/code.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/codeline.py b/src/glean/api_client/models/codeline.py
similarity index 94%
rename from src/glean/models/codeline.py
rename to src/glean/api_client/models/codeline.py
index e47d249d..46321873 100644
--- a/src/glean/models/codeline.py
+++ b/src/glean/api_client/models/codeline.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/collection.py b/src/glean/api_client/models/collection.py
similarity index 99%
rename from src/glean/models/collection.py
rename to src/glean/api_client/models/collection.py
index ffddeeff..df25e6db 100644
--- a/src/glean/models/collection.py
+++ b/src/glean/api_client/models/collection.py
@@ -9,7 +9,7 @@
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/collectionerror.py b/src/glean/api_client/models/collectionerror.py
similarity index 94%
rename from src/glean/models/collectionerror.py
rename to src/glean/api_client/models/collectionerror.py
index fbdf49a2..d1c742d3 100644
--- a/src/glean/models/collectionerror.py
+++ b/src/glean/api_client/models/collectionerror.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/collectionitem.py b/src/glean/api_client/models/collectionitem.py
similarity index 98%
rename from src/glean/models/collectionitem.py
rename to src/glean/api_client/models/collectionitem.py
index 04dc2b57..50086101 100644
--- a/src/glean/models/collectionitem.py
+++ b/src/glean/api_client/models/collectionitem.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/collectionitemdescriptor.py b/src/glean/api_client/models/collectionitemdescriptor.py
similarity index 97%
rename from src/glean/models/collectionitemdescriptor.py
rename to src/glean/api_client/models/collectionitemdescriptor.py
index afca336a..54a063ea 100644
--- a/src/glean/models/collectionitemdescriptor.py
+++ b/src/glean/api_client/models/collectionitemdescriptor.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/collectionpinmetadata.py b/src/glean/api_client/models/collectionpinmetadata.py
similarity index 91%
rename from src/glean/models/collectionpinmetadata.py
rename to src/glean/api_client/models/collectionpinmetadata.py
index 6cfe8a6b..fcd3edbe 100644
--- a/src/glean/models/collectionpinmetadata.py
+++ b/src/glean/api_client/models/collectionpinmetadata.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .collectionpintarget import CollectionPinTarget, CollectionPinTargetTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/collectionpinnablecategories.py b/src/glean/api_client/models/collectionpinnablecategories.py
similarity index 100%
rename from src/glean/models/collectionpinnablecategories.py
rename to src/glean/api_client/models/collectionpinnablecategories.py
diff --git a/src/glean/models/collectionpinnabletargets.py b/src/glean/api_client/models/collectionpinnabletargets.py
similarity index 100%
rename from src/glean/models/collectionpinnabletargets.py
rename to src/glean/api_client/models/collectionpinnabletargets.py
diff --git a/src/glean/models/collectionpinnedmetadata.py b/src/glean/api_client/models/collectionpinnedmetadata.py
similarity index 97%
rename from src/glean/models/collectionpinnedmetadata.py
rename to src/glean/api_client/models/collectionpinnedmetadata.py
index a151e2a7..0d25132c 100644
--- a/src/glean/models/collectionpinnedmetadata.py
+++ b/src/glean/api_client/models/collectionpinnedmetadata.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .collectionpinmetadata import CollectionPinMetadata, CollectionPinMetadataTypedDict
 from .collectionpintarget import CollectionPinTarget, CollectionPinTargetTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/collectionpintarget.py b/src/glean/api_client/models/collectionpintarget.py
similarity index 96%
rename from src/glean/models/collectionpintarget.py
rename to src/glean/api_client/models/collectionpintarget.py
index ac3b565f..c7764331 100644
--- a/src/glean/models/collectionpintarget.py
+++ b/src/glean/api_client/models/collectionpintarget.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .collectionpinnablecategories import CollectionPinnableCategories
 from .collectionpinnabletargets import CollectionPinnableTargets
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/commentdefinition.py b/src/glean/api_client/models/commentdefinition.py
similarity index 98%
rename from src/glean/models/commentdefinition.py
rename to src/glean/api_client/models/commentdefinition.py
index 641ee68b..53314a48 100644
--- a/src/glean/models/commentdefinition.py
+++ b/src/glean/api_client/models/commentdefinition.py
@@ -6,7 +6,7 @@
     UserReferenceDefinition,
     UserReferenceDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/communicationchannel.py b/src/glean/api_client/models/communicationchannel.py
similarity index 100%
rename from src/glean/models/communicationchannel.py
rename to src/glean/api_client/models/communicationchannel.py
diff --git a/src/glean/models/company.py b/src/glean/api_client/models/company.py
similarity index 98%
rename from src/glean/models/company.py
rename to src/glean/api_client/models/company.py
index 5dff289e..27fdff7c 100644
--- a/src/glean/models/company.py
+++ b/src/glean/api_client/models/company.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import date
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/conferencedata.py b/src/glean/api_client/models/conferencedata.py
similarity index 94%
rename from src/glean/models/conferencedata.py
rename to src/glean/api_client/models/conferencedata.py
index ade1f8af..f90928c7 100644
--- a/src/glean/models/conferencedata.py
+++ b/src/glean/api_client/models/conferencedata.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/connectortype.py b/src/glean/api_client/models/connectortype.py
similarity index 100%
rename from src/glean/models/connectortype.py
rename to src/glean/api_client/models/connectortype.py
diff --git a/src/glean/models/contentdefinition.py b/src/glean/api_client/models/contentdefinition.py
similarity index 96%
rename from src/glean/models/contentdefinition.py
rename to src/glean/api_client/models/contentdefinition.py
index 98529f76..db493b39 100644
--- a/src/glean/models/contentdefinition.py
+++ b/src/glean/api_client/models/contentdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/contentinsightsresponse.py b/src/glean/api_client/models/contentinsightsresponse.py
similarity index 97%
rename from src/glean/models/contentinsightsresponse.py
rename to src/glean/api_client/models/contentinsightsresponse.py
index 3d26399c..a8cf841c 100644
--- a/src/glean/models/contentinsightsresponse.py
+++ b/src/glean/api_client/models/contentinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentinsight import DocumentInsight, DocumentInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/contenttype.py b/src/glean/api_client/models/contenttype.py
similarity index 100%
rename from src/glean/models/contenttype.py
rename to src/glean/api_client/models/contenttype.py
diff --git a/src/glean/models/countinfo.py b/src/glean/api_client/models/countinfo.py
similarity index 94%
rename from src/glean/models/countinfo.py
rename to src/glean/api_client/models/countinfo.py
index a6fedfc0..a01c4253 100644
--- a/src/glean/models/countinfo.py
+++ b/src/glean/api_client/models/countinfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .period import Period, PeriodTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/createannouncementrequest.py b/src/glean/api_client/models/createannouncementrequest.py
similarity index 99%
rename from src/glean/models/createannouncementrequest.py
rename to src/glean/api_client/models/createannouncementrequest.py
index 8f071232..66373cd7 100644
--- a/src/glean/models/createannouncementrequest.py
+++ b/src/glean/api_client/models/createannouncementrequest.py
@@ -6,7 +6,7 @@
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/createanswerrequest.py b/src/glean/api_client/models/createanswerrequest.py
similarity index 89%
rename from src/glean/models/createanswerrequest.py
rename to src/glean/api_client/models/createanswerrequest.py
index f2640986..498a9a16 100644
--- a/src/glean/models/createanswerrequest.py
+++ b/src/glean/api_client/models/createanswerrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .answercreationdata import AnswerCreationData, AnswerCreationDataTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/createauthtokenresponse.py b/src/glean/api_client/models/createauthtokenresponse.py
similarity index 94%
rename from src/glean/models/createauthtokenresponse.py
rename to src/glean/api_client/models/createauthtokenresponse.py
index b0d554a4..50e696ac 100644
--- a/src/glean/models/createauthtokenresponse.py
+++ b/src/glean/api_client/models/createauthtokenresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/createcollectionrequest.py b/src/glean/api_client/models/createcollectionrequest.py
similarity index 98%
rename from src/glean/models/createcollectionrequest.py
rename to src/glean/api_client/models/createcollectionrequest.py
index 34075cd5..fb4d7932 100644
--- a/src/glean/models/createcollectionrequest.py
+++ b/src/glean/api_client/models/createcollectionrequest.py
@@ -4,7 +4,7 @@
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/createcollectionresponse.py b/src/glean/api_client/models/createcollectionresponse.py
similarity index 99%
rename from src/glean/models/createcollectionresponse.py
rename to src/glean/api_client/models/createcollectionresponse.py
index d4abfb1f..902d8c71 100644
--- a/src/glean/models/createcollectionresponse.py
+++ b/src/glean/api_client/models/createcollectionresponse.py
@@ -15,7 +15,7 @@
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/createdlpreportrequest.py b/src/glean/api_client/models/createdlpreportrequest.py
similarity index 96%
rename from src/glean/models/createdlpreportrequest.py
rename to src/glean/api_client/models/createdlpreportrequest.py
index f4f32ce6..6d3ab517 100644
--- a/src/glean/models/createdlpreportrequest.py
+++ b/src/glean/api_client/models/createdlpreportrequest.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .dlpconfig import DlpConfig, DlpConfigTypedDict
 from .dlpfrequency import DlpFrequency
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/createdlpreportresponse.py b/src/glean/api_client/models/createdlpreportresponse.py
similarity index 92%
rename from src/glean/models/createdlpreportresponse.py
rename to src/glean/api_client/models/createdlpreportresponse.py
index 1c2440da..6f9a001a 100644
--- a/src/glean/models/createdlpreportresponse.py
+++ b/src/glean/api_client/models/createdlpreportresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpreport import DlpReport, DlpReportTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/createshortcutrequest.py b/src/glean/api_client/models/createshortcutrequest.py
similarity index 90%
rename from src/glean/models/createshortcutrequest.py
rename to src/glean/api_client/models/createshortcutrequest.py
index 0378d85b..828bb6b9 100644
--- a/src/glean/models/createshortcutrequest.py
+++ b/src/glean/api_client/models/createshortcutrequest.py
@@ -5,7 +5,7 @@
     ShortcutMutableProperties,
     ShortcutMutablePropertiesTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/createshortcutresponse.py b/src/glean/api_client/models/createshortcutresponse.py
similarity index 92%
rename from src/glean/models/createshortcutresponse.py
rename to src/glean/api_client/models/createshortcutresponse.py
index 9f4e2f24..b07ad611 100644
--- a/src/glean/models/createshortcutresponse.py
+++ b/src/glean/api_client/models/createshortcutresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .shortcut import Shortcut, ShortcutTypedDict
 from .shortcuterror import ShortcutError, ShortcutErrorTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/customdatasourceconfig.py b/src/glean/api_client/models/customdatasourceconfig.py
similarity index 99%
rename from src/glean/models/customdatasourceconfig.py
rename to src/glean/api_client/models/customdatasourceconfig.py
index 9bc1ae45..2a808ccb 100644
--- a/src/glean/models/customdatasourceconfig.py
+++ b/src/glean/api_client/models/customdatasourceconfig.py
@@ -8,7 +8,7 @@
 from .objectdefinition import ObjectDefinition, ObjectDefinitionTypedDict
 from .quicklink import Quicklink, QuicklinkTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customdatavalue.py b/src/glean/api_client/models/customdatavalue.py
similarity index 96%
rename from src/glean/models/customdatavalue.py
rename to src/glean/api_client/models/customdatavalue.py
index dbb96794..d21b3605 100644
--- a/src/glean/models/customdatavalue.py
+++ b/src/glean/api_client/models/customdatavalue.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customentity.py b/src/glean/api_client/models/customentity.py
similarity index 97%
rename from src/glean/models/customentity.py
rename to src/glean/api_client/models/customentity.py
index 822d8e13..f9abd92e 100644
--- a/src/glean/models/customentity.py
+++ b/src/glean/api_client/models/customentity.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .customentitymetadata import CustomEntityMetadata, CustomEntityMetadataTypedDict
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customentitymetadata.py b/src/glean/api_client/models/customentitymetadata.py
similarity index 93%
rename from src/glean/models/customentitymetadata.py
rename to src/glean/api_client/models/customentitymetadata.py
index 8260520b..332933e7 100644
--- a/src/glean/models/customentitymetadata.py
+++ b/src/glean/api_client/models/customentitymetadata.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .customdatavalue import CustomDataValue, CustomDataValueTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customer.py b/src/glean/api_client/models/customer.py
similarity index 98%
rename from src/glean/models/customer.py
rename to src/glean/api_client/models/customer.py
index df266206..1582f201 100644
--- a/src/glean/models/customer.py
+++ b/src/glean/api_client/models/customer.py
@@ -4,7 +4,7 @@
 from .company import Company, CompanyTypedDict
 from .customermetadata import CustomerMetadata, CustomerMetadataTypedDict
 from datetime import date
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customermetadata.py b/src/glean/api_client/models/customermetadata.py
similarity index 95%
rename from src/glean/models/customermetadata.py
rename to src/glean/api_client/models/customermetadata.py
index b57385fd..bd60cdb0 100644
--- a/src/glean/models/customermetadata.py
+++ b/src/glean/api_client/models/customermetadata.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .customdatavalue import CustomDataValue, CustomDataValueTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customfielddata.py b/src/glean/api_client/models/customfielddata.py
similarity index 94%
rename from src/glean/models/customfielddata.py
rename to src/glean/api_client/models/customfielddata.py
index be8e0fc8..002ac692 100644
--- a/src/glean/models/customfielddata.py
+++ b/src/glean/api_client/models/customfielddata.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/customfieldvalue.py b/src/glean/api_client/models/customfieldvalue.py
similarity index 100%
rename from src/glean/models/customfieldvalue.py
rename to src/glean/api_client/models/customfieldvalue.py
diff --git a/src/glean/models/customfieldvaluehyperlink.py b/src/glean/api_client/models/customfieldvaluehyperlink.py
similarity index 93%
rename from src/glean/models/customfieldvaluehyperlink.py
rename to src/glean/api_client/models/customfieldvaluehyperlink.py
index ce1a9248..ce664b0a 100644
--- a/src/glean/models/customfieldvaluehyperlink.py
+++ b/src/glean/api_client/models/customfieldvaluehyperlink.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customfieldvalueperson.py b/src/glean/api_client/models/customfieldvalueperson.py
similarity index 90%
rename from src/glean/models/customfieldvalueperson.py
rename to src/glean/api_client/models/customfieldvalueperson.py
index 11146c5d..75220fe4 100644
--- a/src/glean/models/customfieldvalueperson.py
+++ b/src/glean/api_client/models/customfieldvalueperson.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/customfieldvaluestr.py b/src/glean/api_client/models/customfieldvaluestr.py
similarity index 91%
rename from src/glean/models/customfieldvaluestr.py
rename to src/glean/api_client/models/customfieldvaluestr.py
index 6574b2ac..d86c0191 100644
--- a/src/glean/models/customfieldvaluestr.py
+++ b/src/glean/api_client/models/customfieldvaluestr.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/customproperty.py b/src/glean/api_client/models/customproperty.py
similarity index 95%
rename from src/glean/models/customproperty.py
rename to src/glean/api_client/models/customproperty.py
index c11c0cae..08ee1298 100644
--- a/src/glean/models/customproperty.py
+++ b/src/glean/api_client/models/customproperty.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Any, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/datasourcebulkmembershipdefinition.py b/src/glean/api_client/models/datasourcebulkmembershipdefinition.py
similarity index 96%
rename from src/glean/models/datasourcebulkmembershipdefinition.py
rename to src/glean/api_client/models/datasourcebulkmembershipdefinition.py
index 6d02859c..6d2b7bd5 100644
--- a/src/glean/models/datasourcebulkmembershipdefinition.py
+++ b/src/glean/api_client/models/datasourcebulkmembershipdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/datasourcegroupdefinition.py b/src/glean/api_client/models/datasourcegroupdefinition.py
similarity index 92%
rename from src/glean/models/datasourcegroupdefinition.py
rename to src/glean/api_client/models/datasourcegroupdefinition.py
index c709de09..745d20c3 100644
--- a/src/glean/models/datasourcegroupdefinition.py
+++ b/src/glean/api_client/models/datasourcegroupdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/datasourcemembershipdefinition.py b/src/glean/api_client/models/datasourcemembershipdefinition.py
similarity index 96%
rename from src/glean/models/datasourcemembershipdefinition.py
rename to src/glean/api_client/models/datasourcemembershipdefinition.py
index d22fce2c..948b36e7 100644
--- a/src/glean/models/datasourcemembershipdefinition.py
+++ b/src/glean/api_client/models/datasourcemembershipdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/datasourceobjecttypedocumentcountentry.py b/src/glean/api_client/models/datasourceobjecttypedocumentcountentry.py
similarity index 94%
rename from src/glean/models/datasourceobjecttypedocumentcountentry.py
rename to src/glean/api_client/models/datasourceobjecttypedocumentcountentry.py
index 7ce147ce..baa69550 100644
--- a/src/glean/models/datasourceobjecttypedocumentcountentry.py
+++ b/src/glean/api_client/models/datasourceobjecttypedocumentcountentry.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/datasourceprofile.py b/src/glean/api_client/models/datasourceprofile.py
similarity index 97%
rename from src/glean/models/datasourceprofile.py
rename to src/glean/api_client/models/datasourceprofile.py
index ade0ca39..f62f74b8 100644
--- a/src/glean/models/datasourceprofile.py
+++ b/src/glean/api_client/models/datasourceprofile.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/datasourceuserdefinition.py b/src/glean/api_client/models/datasourceuserdefinition.py
similarity index 95%
rename from src/glean/models/datasourceuserdefinition.py
rename to src/glean/api_client/models/datasourceuserdefinition.py
index f6db75b6..18485fbb 100644
--- a/src/glean/models/datasourceuserdefinition.py
+++ b/src/glean/api_client/models/datasourceuserdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debugdatasourcestatusidentityresponsecomponent.py b/src/glean/api_client/models/debugdatasourcestatusidentityresponsecomponent.py
similarity index 96%
rename from src/glean/models/debugdatasourcestatusidentityresponsecomponent.py
rename to src/glean/api_client/models/debugdatasourcestatusidentityresponsecomponent.py
index 4624bd1d..cb0378c0 100644
--- a/src/glean/models/debugdatasourcestatusidentityresponsecomponent.py
+++ b/src/glean/api_client/models/debugdatasourcestatusidentityresponsecomponent.py
@@ -5,7 +5,7 @@
     BulkUploadHistoryEvent,
     BulkUploadHistoryEventTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debugdatasourcestatusresponse.py b/src/glean/api_client/models/debugdatasourcestatusresponse.py
similarity index 99%
rename from src/glean/models/debugdatasourcestatusresponse.py
rename to src/glean/api_client/models/debugdatasourcestatusresponse.py
index 12beea51..eb3606ec 100644
--- a/src/glean/models/debugdatasourcestatusresponse.py
+++ b/src/glean/api_client/models/debugdatasourcestatusresponse.py
@@ -18,7 +18,7 @@
     ProcessingHistoryEventTypedDict,
 )
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debugdocumentrequest.py b/src/glean/api_client/models/debugdocumentrequest.py
similarity index 95%
rename from src/glean/models/debugdocumentrequest.py
rename to src/glean/api_client/models/debugdocumentrequest.py
index 2d1d6479..981a5987 100644
--- a/src/glean/models/debugdocumentrequest.py
+++ b/src/glean/api_client/models/debugdocumentrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/debugdocumentresponse.py b/src/glean/api_client/models/debugdocumentresponse.py
similarity index 96%
rename from src/glean/models/debugdocumentresponse.py
rename to src/glean/api_client/models/debugdocumentresponse.py
index cabcfc6a..05dad25c 100644
--- a/src/glean/models/debugdocumentresponse.py
+++ b/src/glean/api_client/models/debugdocumentresponse.py
@@ -9,7 +9,7 @@
     DocumentStatusResponse,
     DocumentStatusResponseTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debugdocumentsrequest.py b/src/glean/api_client/models/debugdocumentsrequest.py
similarity index 94%
rename from src/glean/models/debugdocumentsrequest.py
rename to src/glean/api_client/models/debugdocumentsrequest.py
index af8bce83..d69a6bac 100644
--- a/src/glean/models/debugdocumentsrequest.py
+++ b/src/glean/api_client/models/debugdocumentsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .debugdocumentrequest import DebugDocumentRequest, DebugDocumentRequestTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List
 from typing_extensions import Annotated, TypedDict
diff --git a/src/glean/models/debugdocumentsresponse.py b/src/glean/api_client/models/debugdocumentsresponse.py
similarity index 95%
rename from src/glean/models/debugdocumentsresponse.py
rename to src/glean/api_client/models/debugdocumentsresponse.py
index 5e4e50f8..00ae8c48 100644
--- a/src/glean/models/debugdocumentsresponse.py
+++ b/src/glean/api_client/models/debugdocumentsresponse.py
@@ -5,7 +5,7 @@
     DebugDocumentsResponseItem,
     DebugDocumentsResponseItemTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debugdocumentsresponseitem.py b/src/glean/api_client/models/debugdocumentsresponseitem.py
similarity index 96%
rename from src/glean/models/debugdocumentsresponseitem.py
rename to src/glean/api_client/models/debugdocumentsresponseitem.py
index 2200a6fe..d47e4fe0 100644
--- a/src/glean/models/debugdocumentsresponseitem.py
+++ b/src/glean/api_client/models/debugdocumentsresponseitem.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .debugdocumentresponse import DebugDocumentResponse, DebugDocumentResponseTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/debuguserrequest.py b/src/glean/api_client/models/debuguserrequest.py
similarity index 92%
rename from src/glean/models/debuguserrequest.py
rename to src/glean/api_client/models/debuguserrequest.py
index 07ceeae5..be474f54 100644
--- a/src/glean/models/debuguserrequest.py
+++ b/src/glean/api_client/models/debuguserrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/debuguserresponse.py b/src/glean/api_client/models/debuguserresponse.py
similarity index 96%
rename from src/glean/models/debuguserresponse.py
rename to src/glean/api_client/models/debuguserresponse.py
index 3404dbcd..73d9f2f8 100644
--- a/src/glean/models/debuguserresponse.py
+++ b/src/glean/api_client/models/debuguserresponse.py
@@ -6,7 +6,7 @@
     DatasourceGroupDefinitionTypedDict,
 )
 from .userstatusresponse import UserStatusResponse, UserStatusResponseTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deleteallchatsop.py b/src/glean/api_client/models/deleteallchatsop.py
similarity index 87%
rename from src/glean/models/deleteallchatsop.py
rename to src/glean/api_client/models/deleteallchatsop.py
index befce73b..1a54c19e 100644
--- a/src/glean/models/deleteallchatsop.py
+++ b/src/glean/api_client/models/deleteallchatsop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deleteannouncementrequest.py b/src/glean/api_client/models/deleteannouncementrequest.py
similarity index 89%
rename from src/glean/models/deleteannouncementrequest.py
rename to src/glean/api_client/models/deleteannouncementrequest.py
index d0a768c0..7531e633 100644
--- a/src/glean/models/deleteannouncementrequest.py
+++ b/src/glean/api_client/models/deleteannouncementrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/deleteanswerrequest.py b/src/glean/api_client/models/deleteanswerrequest.py
similarity index 95%
rename from src/glean/models/deleteanswerrequest.py
rename to src/glean/api_client/models/deleteanswerrequest.py
index 9ba9504d..d803b3d5 100644
--- a/src/glean/models/deleteanswerrequest.py
+++ b/src/glean/api_client/models/deleteanswerrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletechatfilesop.py b/src/glean/api_client/models/deletechatfilesop.py
similarity index 89%
rename from src/glean/models/deletechatfilesop.py
rename to src/glean/api_client/models/deletechatfilesop.py
index 8acbac91..464edeb4 100644
--- a/src/glean/models/deletechatfilesop.py
+++ b/src/glean/api_client/models/deletechatfilesop.py
@@ -5,8 +5,8 @@
     DeleteChatFilesRequest,
     DeleteChatFilesRequestTypedDict,
 )
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletechatfilesrequest.py b/src/glean/api_client/models/deletechatfilesrequest.py
similarity index 91%
rename from src/glean/models/deletechatfilesrequest.py
rename to src/glean/api_client/models/deletechatfilesrequest.py
index cb5968c4..fc8ea162 100644
--- a/src/glean/models/deletechatfilesrequest.py
+++ b/src/glean/api_client/models/deletechatfilesrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List
 from typing_extensions import Annotated, TypedDict
diff --git a/src/glean/models/deletechatsop.py b/src/glean/api_client/models/deletechatsop.py
similarity index 89%
rename from src/glean/models/deletechatsop.py
rename to src/glean/api_client/models/deletechatsop.py
index 83b4ace7..2e32eb95 100644
--- a/src/glean/models/deletechatsop.py
+++ b/src/glean/api_client/models/deletechatsop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .deletechatsrequest import DeleteChatsRequest, DeleteChatsRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletechatsrequest.py b/src/glean/api_client/models/deletechatsrequest.py
similarity index 90%
rename from src/glean/models/deletechatsrequest.py
rename to src/glean/api_client/models/deletechatsrequest.py
index ec534b71..7a5dcced 100644
--- a/src/glean/models/deletechatsrequest.py
+++ b/src/glean/api_client/models/deletechatsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/deletecollectionitemrequest.py b/src/glean/api_client/models/deletecollectionitemrequest.py
similarity index 96%
rename from src/glean/models/deletecollectionitemrequest.py
rename to src/glean/api_client/models/deletecollectionitemrequest.py
index d694ed49..adec2f3f 100644
--- a/src/glean/models/deletecollectionitemrequest.py
+++ b/src/glean/api_client/models/deletecollectionitemrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletecollectionitemresponse.py b/src/glean/api_client/models/deletecollectionitemresponse.py
similarity index 90%
rename from src/glean/models/deletecollectionitemresponse.py
rename to src/glean/api_client/models/deletecollectionitemresponse.py
index 67d96110..c37b0116 100644
--- a/src/glean/models/deletecollectionitemresponse.py
+++ b/src/glean/api_client/models/deletecollectionitemresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .collection import Collection, CollectionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/deletecollectionrequest.py b/src/glean/api_client/models/deletecollectionrequest.py
similarity index 94%
rename from src/glean/models/deletecollectionrequest.py
rename to src/glean/api_client/models/deletecollectionrequest.py
index 3f16fbeb..494d2b6f 100644
--- a/src/glean/models/deletecollectionrequest.py
+++ b/src/glean/api_client/models/deletecollectionrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletedocumentrequest.py b/src/glean/api_client/models/deletedocumentrequest.py
similarity index 96%
rename from src/glean/models/deletedocumentrequest.py
rename to src/glean/api_client/models/deletedocumentrequest.py
index 4f025f80..2879d6fa 100644
--- a/src/glean/models/deletedocumentrequest.py
+++ b/src/glean/api_client/models/deletedocumentrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deleteemployeerequest.py b/src/glean/api_client/models/deleteemployeerequest.py
similarity index 95%
rename from src/glean/models/deleteemployeerequest.py
rename to src/glean/api_client/models/deleteemployeerequest.py
index 12e65d42..301b6b69 100644
--- a/src/glean/models/deleteemployeerequest.py
+++ b/src/glean/api_client/models/deleteemployeerequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletegrouprequest.py b/src/glean/api_client/models/deletegrouprequest.py
similarity index 96%
rename from src/glean/models/deletegrouprequest.py
rename to src/glean/api_client/models/deletegrouprequest.py
index 63164170..49b46855 100644
--- a/src/glean/models/deletegrouprequest.py
+++ b/src/glean/api_client/models/deletegrouprequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/deletemembershiprequest.py b/src/glean/api_client/models/deletemembershiprequest.py
similarity index 96%
rename from src/glean/models/deletemembershiprequest.py
rename to src/glean/api_client/models/deletemembershiprequest.py
index 5aab6c01..c84cb9af 100644
--- a/src/glean/models/deletemembershiprequest.py
+++ b/src/glean/api_client/models/deletemembershiprequest.py
@@ -5,7 +5,7 @@
     DatasourceMembershipDefinition,
     DatasourceMembershipDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/deleteshortcutrequest.py b/src/glean/api_client/models/deleteshortcutrequest.py
similarity index 89%
rename from src/glean/models/deleteshortcutrequest.py
rename to src/glean/api_client/models/deleteshortcutrequest.py
index 4f2cfcf1..d6f5b600 100644
--- a/src/glean/models/deleteshortcutrequest.py
+++ b/src/glean/api_client/models/deleteshortcutrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/deleteteamrequest.py b/src/glean/api_client/models/deleteteamrequest.py
similarity index 91%
rename from src/glean/models/deleteteamrequest.py
rename to src/glean/api_client/models/deleteteamrequest.py
index 8923d3b5..d8150a41 100644
--- a/src/glean/models/deleteteamrequest.py
+++ b/src/glean/api_client/models/deleteteamrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/deleteuserrequest.py b/src/glean/api_client/models/deleteuserrequest.py
similarity index 95%
rename from src/glean/models/deleteuserrequest.py
rename to src/glean/api_client/models/deleteuserrequest.py
index 78b5a498..86430ed4 100644
--- a/src/glean/models/deleteuserrequest.py
+++ b/src/glean/api_client/models/deleteuserrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/disambiguation.py b/src/glean/api_client/models/disambiguation.py
similarity index 95%
rename from src/glean/models/disambiguation.py
rename to src/glean/api_client/models/disambiguation.py
index 1a7a1049..2b8a57ca 100644
--- a/src/glean/models/disambiguation.py
+++ b/src/glean/api_client/models/disambiguation.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .entitytype import EntityType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/displayablelistitemuiconfig.py b/src/glean/api_client/models/displayablelistitemuiconfig.py
similarity index 93%
rename from src/glean/models/displayablelistitemuiconfig.py
rename to src/glean/api_client/models/displayablelistitemuiconfig.py
index ab642c52..5a591828 100644
--- a/src/glean/models/displayablelistitemuiconfig.py
+++ b/src/glean/api_client/models/displayablelistitemuiconfig.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/dlpconfig.py b/src/glean/api_client/models/dlpconfig.py
similarity index 99%
rename from src/glean/models/dlpconfig.py
rename to src/glean/api_client/models/dlpconfig.py
index 9893ed93..5276ca8e 100644
--- a/src/glean/models/dlpconfig.py
+++ b/src/glean/api_client/models/dlpconfig.py
@@ -14,7 +14,7 @@
 )
 from .sensitiveinfotype import SensitiveInfoType, SensitiveInfoTypeTypedDict
 from .sharingoptions import SharingOptions, SharingOptionsTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/dlpfrequency.py b/src/glean/api_client/models/dlpfrequency.py
similarity index 100%
rename from src/glean/models/dlpfrequency.py
rename to src/glean/api_client/models/dlpfrequency.py
diff --git a/src/glean/models/dlpperson.py b/src/glean/api_client/models/dlpperson.py
similarity index 95%
rename from src/glean/models/dlpperson.py
rename to src/glean/api_client/models/dlpperson.py
index 920771fc..cf67bb62 100644
--- a/src/glean/models/dlpperson.py
+++ b/src/glean/api_client/models/dlpperson.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlppersonmetadata import DlpPersonMetadata, DlpPersonMetadataTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/dlppersonmetadata.py b/src/glean/api_client/models/dlppersonmetadata.py
similarity index 93%
rename from src/glean/models/dlppersonmetadata.py
rename to src/glean/api_client/models/dlppersonmetadata.py
index a94c2562..2c868c6b 100644
--- a/src/glean/models/dlppersonmetadata.py
+++ b/src/glean/api_client/models/dlppersonmetadata.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/dlpreport.py b/src/glean/api_client/models/dlpreport.py
similarity index 98%
rename from src/glean/models/dlpreport.py
rename to src/glean/api_client/models/dlpreport.py
index 3eb4fc5b..38e378fe 100644
--- a/src/glean/models/dlpreport.py
+++ b/src/glean/api_client/models/dlpreport.py
@@ -6,7 +6,7 @@
 from .dlpperson import DlpPerson, DlpPersonTypedDict
 from .dlpreportstatus import DlpReportStatus
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/dlpreportstatus.py b/src/glean/api_client/models/dlpreportstatus.py
similarity index 100%
rename from src/glean/models/dlpreportstatus.py
rename to src/glean/api_client/models/dlpreportstatus.py
diff --git a/src/glean/models/dlpsimpleresult.py b/src/glean/api_client/models/dlpsimpleresult.py
similarity index 100%
rename from src/glean/models/dlpsimpleresult.py
rename to src/glean/api_client/models/dlpsimpleresult.py
diff --git a/src/glean/models/document.py b/src/glean/api_client/models/document.py
similarity index 98%
rename from src/glean/models/document.py
rename to src/glean/api_client/models/document.py
index 027e43f2..106245e2 100644
--- a/src/glean/models/document.py
+++ b/src/glean/api_client/models/document.py
@@ -4,7 +4,7 @@
 from .connectortype import ConnectorType
 from .documentcontent import DocumentContent, DocumentContentTypedDict
 from .documentsection import DocumentSection, DocumentSectionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentcontent.py b/src/glean/api_client/models/documentcontent.py
similarity index 92%
rename from src/glean/models/documentcontent.py
rename to src/glean/api_client/models/documentcontent.py
index d288a252..493b94f6 100644
--- a/src/glean/models/documentcontent.py
+++ b/src/glean/api_client/models/documentcontent.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentdefinition.py b/src/glean/api_client/models/documentdefinition.py
similarity index 99%
rename from src/glean/models/documentdefinition.py
rename to src/glean/api_client/models/documentdefinition.py
index 609946b6..8353646c 100644
--- a/src/glean/models/documentdefinition.py
+++ b/src/glean/api_client/models/documentdefinition.py
@@ -16,7 +16,7 @@
     UserReferenceDefinition,
     UserReferenceDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentinsight.py b/src/glean/api_client/models/documentinsight.py
similarity index 94%
rename from src/glean/models/documentinsight.py
rename to src/glean/api_client/models/documentinsight.py
index be536467..3bbdf7d7 100644
--- a/src/glean/models/documentinsight.py
+++ b/src/glean/api_client/models/documentinsight.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
 from .document import Document, DocumentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentinteractions.py b/src/glean/api_client/models/documentinteractions.py
similarity index 97%
rename from src/glean/models/documentinteractions.py
rename to src/glean/api_client/models/documentinteractions.py
index ae951d1e..2aca5c2f 100644
--- a/src/glean/models/documentinteractions.py
+++ b/src/glean/api_client/models/documentinteractions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentinteractionsdefinition.py b/src/glean/api_client/models/documentinteractionsdefinition.py
similarity index 94%
rename from src/glean/models/documentinteractionsdefinition.py
rename to src/glean/api_client/models/documentinteractionsdefinition.py
index 7f78aa70..151bc107 100644
--- a/src/glean/models/documentinteractionsdefinition.py
+++ b/src/glean/api_client/models/documentinteractionsdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentmetadata.py b/src/glean/api_client/models/documentmetadata.py
similarity index 99%
rename from src/glean/models/documentmetadata.py
rename to src/glean/api_client/models/documentmetadata.py
index cdb9a672..a2a63141 100644
--- a/src/glean/models/documentmetadata.py
+++ b/src/glean/api_client/models/documentmetadata.py
@@ -9,7 +9,7 @@
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from .viewerinfo import ViewerInfo, ViewerInfoTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentorerror_union.py b/src/glean/api_client/models/documentorerror_union.py
similarity index 94%
rename from src/glean/models/documentorerror_union.py
rename to src/glean/api_client/models/documentorerror_union.py
index 4bdee856..e48c8a66 100644
--- a/src/glean/models/documentorerror_union.py
+++ b/src/glean/api_client/models/documentorerror_union.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .document import Document, DocumentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional, Union
 from typing_extensions import NotRequired, TypeAliasType, TypedDict
 
diff --git a/src/glean/models/documentpermissionsdefinition.py b/src/glean/api_client/models/documentpermissionsdefinition.py
similarity index 98%
rename from src/glean/models/documentpermissionsdefinition.py
rename to src/glean/api_client/models/documentpermissionsdefinition.py
index 98e3b8b2..c555bbac 100644
--- a/src/glean/models/documentpermissionsdefinition.py
+++ b/src/glean/api_client/models/documentpermissionsdefinition.py
@@ -9,7 +9,7 @@
     UserReferenceDefinition,
     UserReferenceDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentsection.py b/src/glean/api_client/models/documentsection.py
similarity index 93%
rename from src/glean/models/documentsection.py
rename to src/glean/api_client/models/documentsection.py
index d3d42a76..d64c6209 100644
--- a/src/glean/models/documentsection.py
+++ b/src/glean/api_client/models/documentsection.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/documentspec_union.py b/src/glean/api_client/models/documentspec_union.py
similarity index 97%
rename from src/glean/models/documentspec_union.py
rename to src/glean/api_client/models/documentspec_union.py
index 18534355..a6e1da28 100644
--- a/src/glean/models/documentspec_union.py
+++ b/src/glean/api_client/models/documentspec_union.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
diff --git a/src/glean/models/documentstatusresponse.py b/src/glean/api_client/models/documentstatusresponse.py
similarity index 97%
rename from src/glean/models/documentstatusresponse.py
rename to src/glean/api_client/models/documentstatusresponse.py
index 047d545c..df265ad5 100644
--- a/src/glean/models/documentstatusresponse.py
+++ b/src/glean/api_client/models/documentstatusresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentvisibility.py b/src/glean/api_client/models/documentvisibility.py
similarity index 100%
rename from src/glean/models/documentvisibility.py
rename to src/glean/api_client/models/documentvisibility.py
diff --git a/src/glean/models/documentvisibilityoverride.py b/src/glean/api_client/models/documentvisibilityoverride.py
similarity index 95%
rename from src/glean/models/documentvisibilityoverride.py
rename to src/glean/api_client/models/documentvisibilityoverride.py
index 9bd9d125..3453978a 100644
--- a/src/glean/models/documentvisibilityoverride.py
+++ b/src/glean/api_client/models/documentvisibilityoverride.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/documentvisibilityupdateresult.py b/src/glean/api_client/models/documentvisibilityupdateresult.py
similarity index 96%
rename from src/glean/models/documentvisibilityupdateresult.py
rename to src/glean/api_client/models/documentvisibilityupdateresult.py
index ec64b0d4..b6d43377 100644
--- a/src/glean/models/documentvisibilityupdateresult.py
+++ b/src/glean/api_client/models/documentvisibilityupdateresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/downloadpolicycsvop.py b/src/glean/api_client/models/downloadpolicycsvop.py
similarity index 81%
rename from src/glean/models/downloadpolicycsvop.py
rename to src/glean/api_client/models/downloadpolicycsvop.py
index 46beba49..76743c95 100644
--- a/src/glean/models/downloadpolicycsvop.py
+++ b/src/glean/api_client/models/downloadpolicycsvop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/downloadreportcsvop.py b/src/glean/api_client/models/downloadreportcsvop.py
similarity index 81%
rename from src/glean/models/downloadreportcsvop.py
rename to src/glean/api_client/models/downloadreportcsvop.py
index 1f3817cb..d6059a8f 100644
--- a/src/glean/models/downloadreportcsvop.py
+++ b/src/glean/api_client/models/downloadreportcsvop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/editanswerrequest.py b/src/glean/api_client/models/editanswerrequest.py
similarity index 99%
rename from src/glean/models/editanswerrequest.py
rename to src/glean/api_client/models/editanswerrequest.py
index 6244b8b0..b2df1749 100644
--- a/src/glean/models/editanswerrequest.py
+++ b/src/glean/api_client/models/editanswerrequest.py
@@ -9,7 +9,7 @@
 )
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/editcollectionitemrequest.py b/src/glean/api_client/models/editcollectionitemrequest.py
similarity index 96%
rename from src/glean/models/editcollectionitemrequest.py
rename to src/glean/api_client/models/editcollectionitemrequest.py
index 29f79283..a070bb0b 100644
--- a/src/glean/models/editcollectionitemrequest.py
+++ b/src/glean/api_client/models/editcollectionitemrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/editcollectionitemresponse.py b/src/glean/api_client/models/editcollectionitemresponse.py
similarity index 90%
rename from src/glean/models/editcollectionitemresponse.py
rename to src/glean/api_client/models/editcollectionitemresponse.py
index a53036d8..c1cc2975 100644
--- a/src/glean/models/editcollectionitemresponse.py
+++ b/src/glean/api_client/models/editcollectionitemresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .collection import Collection, CollectionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/editcollectionrequest.py b/src/glean/api_client/models/editcollectionrequest.py
similarity index 98%
rename from src/glean/models/editcollectionrequest.py
rename to src/glean/api_client/models/editcollectionrequest.py
index 46ce459f..a9fc63f9 100644
--- a/src/glean/models/editcollectionrequest.py
+++ b/src/glean/api_client/models/editcollectionrequest.py
@@ -4,7 +4,7 @@
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/editcollectionresponse.py b/src/glean/api_client/models/editcollectionresponse.py
similarity index 99%
rename from src/glean/models/editcollectionresponse.py
rename to src/glean/api_client/models/editcollectionresponse.py
index af4ce155..bc57b392 100644
--- a/src/glean/models/editcollectionresponse.py
+++ b/src/glean/api_client/models/editcollectionresponse.py
@@ -15,7 +15,7 @@
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/editpinrequest.py b/src/glean/api_client/models/editpinrequest.py
similarity index 96%
rename from src/glean/models/editpinrequest.py
rename to src/glean/api_client/models/editpinrequest.py
index f6ea4621..989157be 100644
--- a/src/glean/models/editpinrequest.py
+++ b/src/glean/api_client/models/editpinrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetfilter import FacetFilter, FacetFilterTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/employeeinfodefinition.py b/src/glean/api_client/models/employeeinfodefinition.py
similarity index 99%
rename from src/glean/models/employeeinfodefinition.py
rename to src/glean/api_client/models/employeeinfodefinition.py
index 496133c3..960ebead 100644
--- a/src/glean/models/employeeinfodefinition.py
+++ b/src/glean/api_client/models/employeeinfodefinition.py
@@ -14,7 +14,7 @@
 )
 from .structuredlocation import StructuredLocation, StructuredLocationTypedDict
 from datetime import date
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/employeeteaminfo.py b/src/glean/api_client/models/employeeteaminfo.py
similarity index 94%
rename from src/glean/models/employeeteaminfo.py
rename to src/glean/api_client/models/employeeteaminfo.py
index 45a78d7c..00ddca58 100644
--- a/src/glean/models/employeeteaminfo.py
+++ b/src/glean/api_client/models/employeeteaminfo.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/entitiessortorder.py b/src/glean/api_client/models/entitiessortorder.py
similarity index 100%
rename from src/glean/models/entitiessortorder.py
rename to src/glean/api_client/models/entitiessortorder.py
diff --git a/src/glean/models/entityrelationship.py b/src/glean/api_client/models/entityrelationship.py
similarity index 95%
rename from src/glean/models/entityrelationship.py
rename to src/glean/api_client/models/entityrelationship.py
index a8c0b6ad..0c2c8e5c 100644
--- a/src/glean/models/entityrelationship.py
+++ b/src/glean/api_client/models/entityrelationship.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/entitytype.py b/src/glean/api_client/models/entitytype.py
similarity index 100%
rename from src/glean/models/entitytype.py
rename to src/glean/api_client/models/entitytype.py
diff --git a/src/glean/models/errormessage.py b/src/glean/api_client/models/errormessage.py
similarity index 92%
rename from src/glean/models/errormessage.py
rename to src/glean/api_client/models/errormessage.py
index 7cb2fdc8..dcc51f28 100644
--- a/src/glean/models/errormessage.py
+++ b/src/glean/api_client/models/errormessage.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/eventclassification.py b/src/glean/api_client/models/eventclassification.py
similarity index 94%
rename from src/glean/models/eventclassification.py
rename to src/glean/api_client/models/eventclassification.py
index 56a245ed..32164a76 100644
--- a/src/glean/models/eventclassification.py
+++ b/src/glean/api_client/models/eventclassification.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .eventclassificationname import EventClassificationName
 from .eventstrategyname import EventStrategyName
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/eventclassificationname.py b/src/glean/api_client/models/eventclassificationname.py
similarity index 100%
rename from src/glean/models/eventclassificationname.py
rename to src/glean/api_client/models/eventclassificationname.py
diff --git a/src/glean/models/eventstrategyname.py b/src/glean/api_client/models/eventstrategyname.py
similarity index 100%
rename from src/glean/models/eventstrategyname.py
rename to src/glean/api_client/models/eventstrategyname.py
diff --git a/src/glean/models/externalsharingoptions.py b/src/glean/api_client/models/externalsharingoptions.py
similarity index 98%
rename from src/glean/models/externalsharingoptions.py
rename to src/glean/api_client/models/externalsharingoptions.py
index 452b155d..7f187884 100644
--- a/src/glean/models/externalsharingoptions.py
+++ b/src/glean/api_client/models/externalsharingoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict, deprecated
diff --git a/src/glean/models/externalshortcut.py b/src/glean/api_client/models/externalshortcut.py
similarity index 98%
rename from src/glean/models/externalshortcut.py
rename to src/glean/api_client/models/externalshortcut.py
index c6ed3d7f..ecb88c28 100644
--- a/src/glean/models/externalshortcut.py
+++ b/src/glean/api_client/models/externalshortcut.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/extractedqna.py b/src/glean/api_client/models/extractedqna.py
similarity index 95%
rename from src/glean/models/extractedqna.py
rename to src/glean/api_client/models/extractedqna.py
index 0f5d3446..d5a9426c 100644
--- a/src/glean/models/extractedqna.py
+++ b/src/glean/api_client/models/extractedqna.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/facetbucket.py b/src/glean/api_client/models/facetbucket.py
similarity index 95%
rename from src/glean/models/facetbucket.py
rename to src/glean/api_client/models/facetbucket.py
index ee3f3b72..4d4f01fd 100644
--- a/src/glean/models/facetbucket.py
+++ b/src/glean/api_client/models/facetbucket.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetvalue import FacetValue, FacetValueTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/facetbucketfilter.py b/src/glean/api_client/models/facetbucketfilter.py
similarity index 93%
rename from src/glean/models/facetbucketfilter.py
rename to src/glean/api_client/models/facetbucketfilter.py
index 67b3be74..aec0e36b 100644
--- a/src/glean/models/facetbucketfilter.py
+++ b/src/glean/api_client/models/facetbucketfilter.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/facetfilter.py b/src/glean/api_client/models/facetfilter.py
similarity index 97%
rename from src/glean/models/facetfilter.py
rename to src/glean/api_client/models/facetfilter.py
index 8da27b10..27c22663 100644
--- a/src/glean/models/facetfilter.py
+++ b/src/glean/api_client/models/facetfilter.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetfiltervalue import FacetFilterValue, FacetFilterValueTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/facetfilterset.py b/src/glean/api_client/models/facetfilterset.py
similarity index 94%
rename from src/glean/models/facetfilterset.py
rename to src/glean/api_client/models/facetfilterset.py
index aad053a9..f6ae8b5c 100644
--- a/src/glean/models/facetfilterset.py
+++ b/src/glean/api_client/models/facetfilterset.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetfilter import FacetFilter, FacetFilterTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/facetfiltervalue.py b/src/glean/api_client/models/facetfiltervalue.py
similarity index 95%
rename from src/glean/models/facetfiltervalue.py
rename to src/glean/api_client/models/facetfiltervalue.py
index 97e0b641..84af2821 100644
--- a/src/glean/models/facetfiltervalue.py
+++ b/src/glean/api_client/models/facetfiltervalue.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/facetresult.py b/src/glean/api_client/models/facetresult.py
similarity index 98%
rename from src/glean/models/facetresult.py
rename to src/glean/api_client/models/facetresult.py
index 011a0555..c250a6ba 100644
--- a/src/glean/models/facetresult.py
+++ b/src/glean/api_client/models/facetresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetbucket import FacetBucket, FacetBucketTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/facetvalue.py b/src/glean/api_client/models/facetvalue.py
similarity index 96%
rename from src/glean/models/facetvalue.py
rename to src/glean/api_client/models/facetvalue.py
index 7ebb1437..21ff8e3e 100644
--- a/src/glean/models/facetvalue.py
+++ b/src/glean/api_client/models/facetvalue.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/favoriteinfo.py b/src/glean/api_client/models/favoriteinfo.py
similarity index 95%
rename from src/glean/models/favoriteinfo.py
rename to src/glean/api_client/models/favoriteinfo.py
index 0a5893ce..1556a690 100644
--- a/src/glean/models/favoriteinfo.py
+++ b/src/glean/api_client/models/favoriteinfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .ugctype import UgcType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedback.py b/src/glean/api_client/models/feedback.py
similarity index 99%
rename from src/glean/models/feedback.py
rename to src/glean/api_client/models/feedback.py
index 23937b70..fe92b73b 100644
--- a/src/glean/models/feedback.py
+++ b/src/glean/api_client/models/feedback.py
@@ -9,7 +9,7 @@
 from .workflowfeedbackinfo import WorkflowFeedbackInfo, WorkflowFeedbackInfoTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedbackchatexchange.py b/src/glean/api_client/models/feedbackchatexchange.py
similarity index 97%
rename from src/glean/models/feedbackchatexchange.py
rename to src/glean/api_client/models/feedbackchatexchange.py
index 0532284f..5d7a5273 100644
--- a/src/glean/models/feedbackchatexchange.py
+++ b/src/glean/api_client/models/feedbackchatexchange.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedbackop.py b/src/glean/api_client/models/feedbackop.py
similarity index 87%
rename from src/glean/models/feedbackop.py
rename to src/glean/api_client/models/feedbackop.py
index b946c087..86bac83c 100644
--- a/src/glean/models/feedbackop.py
+++ b/src/glean/api_client/models/feedbackop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .feedback import Feedback, FeedbackTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedentry.py b/src/glean/api_client/models/feedentry.py
similarity index 99%
rename from src/glean/models/feedentry.py
rename to src/glean/api_client/models/feedentry.py
index f105542d..25fa1edb 100644
--- a/src/glean/models/feedentry.py
+++ b/src/glean/api_client/models/feedentry.py
@@ -18,7 +18,7 @@
 from .useractivity import UserActivity, UserActivityTypedDict
 from .workflowresult import WorkflowResult, WorkflowResultTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedrequest.py b/src/glean/api_client/models/feedrequest.py
similarity index 98%
rename from src/glean/models/feedrequest.py
rename to src/glean/api_client/models/feedrequest.py
index 51ed2d02..d9f4be0c 100644
--- a/src/glean/models/feedrequest.py
+++ b/src/glean/api_client/models/feedrequest.py
@@ -4,7 +4,7 @@
 from .feedrequestoptions import FeedRequestOptions, FeedRequestOptionsTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedrequestoptions.py b/src/glean/api_client/models/feedrequestoptions.py
similarity index 98%
rename from src/glean/models/feedrequestoptions.py
rename to src/glean/api_client/models/feedrequestoptions.py
index 6568cd97..c647c5e6 100644
--- a/src/glean/models/feedrequestoptions.py
+++ b/src/glean/api_client/models/feedrequestoptions.py
@@ -5,7 +5,7 @@
     ChatZeroStateSuggestionOptions,
     ChatZeroStateSuggestionOptionsTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedresponse.py b/src/glean/api_client/models/feedresponse.py
similarity index 97%
rename from src/glean/models/feedresponse.py
rename to src/glean/api_client/models/feedresponse.py
index 914c6d25..d0c78ace 100644
--- a/src/glean/models/feedresponse.py
+++ b/src/glean/api_client/models/feedresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .facetresult import FacetResult, FacetResultTypedDict
 from .feedresult import FeedResult, FeedResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/feedresult.py b/src/glean/api_client/models/feedresult.py
similarity index 98%
rename from src/glean/models/feedresult.py
rename to src/glean/api_client/models/feedresult.py
index f487648b..a43350f6 100644
--- a/src/glean/models/feedresult.py
+++ b/src/glean/api_client/models/feedresult.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .feedentry import FeedEntry, FeedEntryTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/followupaction.py b/src/glean/api_client/models/followupaction.py
similarity index 98%
rename from src/glean/models/followupaction.py
rename to src/glean/api_client/models/followupaction.py
index 4ef5e7eb..c19f8432 100644
--- a/src/glean/models/followupaction.py
+++ b/src/glean/api_client/models/followupaction.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/generatedattachment.py b/src/glean/api_client/models/generatedattachment.py
similarity index 97%
rename from src/glean/models/generatedattachment.py
rename to src/glean/api_client/models/generatedattachment.py
index 841d3d41..3e45adcc 100644
--- a/src/glean/models/generatedattachment.py
+++ b/src/glean/api_client/models/generatedattachment.py
@@ -10,7 +10,7 @@
 )
 from .person import Person, PersonTypedDict
 from .structuredlink import StructuredLink, StructuredLinkTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/generatedattachmentcontent.py b/src/glean/api_client/models/generatedattachmentcontent.py
similarity index 95%
rename from src/glean/models/generatedattachmentcontent.py
rename to src/glean/api_client/models/generatedattachmentcontent.py
index 434674ea..efc70dbd 100644
--- a/src/glean/models/generatedattachmentcontent.py
+++ b/src/glean/api_client/models/generatedattachmentcontent.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/generatedqna.py b/src/glean/api_client/models/generatedqna.py
similarity index 98%
rename from src/glean/models/generatedqna.py
rename to src/glean/api_client/models/generatedqna.py
index 6c4a2f27..74dc6438 100644
--- a/src/glean/models/generatedqna.py
+++ b/src/glean/api_client/models/generatedqna.py
@@ -4,7 +4,7 @@
 from .followupaction import FollowupAction, FollowupActionTypedDict
 from .textrange import TextRange, TextRangeTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/get_rest_api_v1_tools_listop.py b/src/glean/api_client/models/get_rest_api_v1_tools_listop.py
similarity index 85%
rename from src/glean/models/get_rest_api_v1_tools_listop.py
rename to src/glean/api_client/models/get_rest_api_v1_tools_listop.py
index 1881ad77..5d4cbffa 100644
--- a/src/glean/models/get_rest_api_v1_tools_listop.py
+++ b/src/glean/api_client/models/get_rest_api_v1_tools_listop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getagentop.py b/src/glean/api_client/models/getagentop.py
similarity index 87%
rename from src/glean/models/getagentop.py
rename to src/glean/api_client/models/getagentop.py
index c2555cf5..8c46cd53 100644
--- a/src/glean/models/getagentop.py
+++ b/src/glean/api_client/models/getagentop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getagentschemasop.py b/src/glean/api_client/models/getagentschemasop.py
similarity index 87%
rename from src/glean/models/getagentschemasop.py
rename to src/glean/api_client/models/getagentschemasop.py
index f851af62..2ccdeb6d 100644
--- a/src/glean/models/getagentschemasop.py
+++ b/src/glean/api_client/models/getagentschemasop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getanswererror.py b/src/glean/api_client/models/getanswererror.py
similarity index 94%
rename from src/glean/models/getanswererror.py
rename to src/glean/api_client/models/getanswererror.py
index eb1a3092..b22de15f 100644
--- a/src/glean/models/getanswererror.py
+++ b/src/glean/api_client/models/getanswererror.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .person import Person, PersonTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getanswerrequest.py b/src/glean/api_client/models/getanswerrequest.py
similarity index 95%
rename from src/glean/models/getanswerrequest.py
rename to src/glean/api_client/models/getanswerrequest.py
index 989bb4b6..8fab070a 100644
--- a/src/glean/models/getanswerrequest.py
+++ b/src/glean/api_client/models/getanswerrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getanswerresponse.py b/src/glean/api_client/models/getanswerresponse.py
similarity index 93%
rename from src/glean/models/getanswerresponse.py
rename to src/glean/api_client/models/getanswerresponse.py
index 429a43b1..0c019028 100644
--- a/src/glean/models/getanswerresponse.py
+++ b/src/glean/api_client/models/getanswerresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .answerresult import AnswerResult, AnswerResultTypedDict
 from .getanswererror import GetAnswerError, GetAnswerErrorTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getchatapplicationop.py b/src/glean/api_client/models/getchatapplicationop.py
similarity index 89%
rename from src/glean/models/getchatapplicationop.py
rename to src/glean/api_client/models/getchatapplicationop.py
index 445a27c6..0125e6b2 100644
--- a/src/glean/models/getchatapplicationop.py
+++ b/src/glean/api_client/models/getchatapplicationop.py
@@ -5,8 +5,8 @@
     GetChatApplicationRequest,
     GetChatApplicationRequestTypedDict,
 )
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getchatapplicationrequest.py b/src/glean/api_client/models/getchatapplicationrequest.py
similarity index 89%
rename from src/glean/models/getchatapplicationrequest.py
rename to src/glean/api_client/models/getchatapplicationrequest.py
index 757c0ffa..54068333 100644
--- a/src/glean/models/getchatapplicationrequest.py
+++ b/src/glean/api_client/models/getchatapplicationrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/getchatapplicationresponse.py b/src/glean/api_client/models/getchatapplicationresponse.py
similarity index 89%
rename from src/glean/models/getchatapplicationresponse.py
rename to src/glean/api_client/models/getchatapplicationresponse.py
index a8ff8a40..35bc5fe9 100644
--- a/src/glean/models/getchatapplicationresponse.py
+++ b/src/glean/api_client/models/getchatapplicationresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Any, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getchatfilesop.py b/src/glean/api_client/models/getchatfilesop.py
similarity index 89%
rename from src/glean/models/getchatfilesop.py
rename to src/glean/api_client/models/getchatfilesop.py
index b1ca6796..43d5942b 100644
--- a/src/glean/models/getchatfilesop.py
+++ b/src/glean/api_client/models/getchatfilesop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .getchatfilesrequest import GetChatFilesRequest, GetChatFilesRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getchatfilesrequest.py b/src/glean/api_client/models/getchatfilesrequest.py
similarity index 90%
rename from src/glean/models/getchatfilesrequest.py
rename to src/glean/api_client/models/getchatfilesrequest.py
index 9cd56de6..86c92b64 100644
--- a/src/glean/models/getchatfilesrequest.py
+++ b/src/glean/api_client/models/getchatfilesrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List
 from typing_extensions import Annotated, TypedDict
diff --git a/src/glean/models/getchatfilesresponse.py b/src/glean/api_client/models/getchatfilesresponse.py
similarity index 92%
rename from src/glean/models/getchatfilesresponse.py
rename to src/glean/api_client/models/getchatfilesresponse.py
index ba25057f..01009b4c 100644
--- a/src/glean/models/getchatfilesresponse.py
+++ b/src/glean/api_client/models/getchatfilesresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatfile import ChatFile, ChatFileTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Dict, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getchatop.py b/src/glean/api_client/models/getchatop.py
similarity index 88%
rename from src/glean/models/getchatop.py
rename to src/glean/api_client/models/getchatop.py
index 4a3babdd..223baba2 100644
--- a/src/glean/models/getchatop.py
+++ b/src/glean/api_client/models/getchatop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .getchatrequest import GetChatRequest, GetChatRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getchatrequest.py b/src/glean/api_client/models/getchatrequest.py
similarity index 88%
rename from src/glean/models/getchatrequest.py
rename to src/glean/api_client/models/getchatrequest.py
index e613d9bc..ddc94798 100644
--- a/src/glean/models/getchatrequest.py
+++ b/src/glean/api_client/models/getchatrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/getchatresponse.py b/src/glean/api_client/models/getchatresponse.py
similarity index 91%
rename from src/glean/models/getchatresponse.py
rename to src/glean/api_client/models/getchatresponse.py
index 8c691843..5f24d0ab 100644
--- a/src/glean/models/getchatresponse.py
+++ b/src/glean/api_client/models/getchatresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatresult import ChatResult, ChatResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getcollectionrequest.py b/src/glean/api_client/models/getcollectionrequest.py
similarity index 96%
rename from src/glean/models/getcollectionrequest.py
rename to src/glean/api_client/models/getcollectionrequest.py
index 54e02c4d..3d4d0c41 100644
--- a/src/glean/models/getcollectionrequest.py
+++ b/src/glean/api_client/models/getcollectionrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getcollectionresponse.py b/src/glean/api_client/models/getcollectionresponse.py
similarity index 96%
rename from src/glean/models/getcollectionresponse.py
rename to src/glean/api_client/models/getcollectionresponse.py
index 7e77c8e1..2360fd29 100644
--- a/src/glean/models/getcollectionresponse.py
+++ b/src/glean/api_client/models/getcollectionresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .collection import Collection, CollectionTypedDict
 from .collectionerror import CollectionError, CollectionErrorTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdatasourceconfigrequest.py b/src/glean/api_client/models/getdatasourceconfigrequest.py
similarity index 92%
rename from src/glean/models/getdatasourceconfigrequest.py
rename to src/glean/api_client/models/getdatasourceconfigrequest.py
index 8ed8591e..0fa42a25 100644
--- a/src/glean/models/getdatasourceconfigrequest.py
+++ b/src/glean/api_client/models/getdatasourceconfigrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/getdlpreportresponse.py b/src/glean/api_client/models/getdlpreportresponse.py
similarity index 92%
rename from src/glean/models/getdlpreportresponse.py
rename to src/glean/api_client/models/getdlpreportresponse.py
index 03453e67..910b76f3 100644
--- a/src/glean/models/getdlpreportresponse.py
+++ b/src/glean/api_client/models/getdlpreportresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpreport import DlpReport, DlpReportTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getdocpermissionsrequest.py b/src/glean/api_client/models/getdocpermissionsrequest.py
similarity index 92%
rename from src/glean/models/getdocpermissionsrequest.py
rename to src/glean/api_client/models/getdocpermissionsrequest.py
index fd7ca9d6..87d3980f 100644
--- a/src/glean/models/getdocpermissionsrequest.py
+++ b/src/glean/api_client/models/getdocpermissionsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocpermissionsresponse.py b/src/glean/api_client/models/getdocpermissionsresponse.py
similarity index 94%
rename from src/glean/models/getdocpermissionsresponse.py
rename to src/glean/api_client/models/getdocpermissionsresponse.py
index 394201f2..4e466616 100644
--- a/src/glean/models/getdocpermissionsresponse.py
+++ b/src/glean/api_client/models/getdocpermissionsresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentcountrequest.py b/src/glean/api_client/models/getdocumentcountrequest.py
similarity index 92%
rename from src/glean/models/getdocumentcountrequest.py
rename to src/glean/api_client/models/getdocumentcountrequest.py
index 4be931c8..4fd7db81 100644
--- a/src/glean/models/getdocumentcountrequest.py
+++ b/src/glean/api_client/models/getdocumentcountrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/getdocumentcountresponse.py b/src/glean/api_client/models/getdocumentcountresponse.py
similarity index 94%
rename from src/glean/models/getdocumentcountresponse.py
rename to src/glean/api_client/models/getdocumentcountresponse.py
index fa717e0e..a92b11bd 100644
--- a/src/glean/models/getdocumentcountresponse.py
+++ b/src/glean/api_client/models/getdocumentcountresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentsbyfacetsrequest.py b/src/glean/api_client/models/getdocumentsbyfacetsrequest.py
similarity index 97%
rename from src/glean/models/getdocumentsbyfacetsrequest.py
rename to src/glean/api_client/models/getdocumentsbyfacetsrequest.py
index 78843609..2bb8c880 100644
--- a/src/glean/models/getdocumentsbyfacetsrequest.py
+++ b/src/glean/api_client/models/getdocumentsbyfacetsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetfilterset import FacetFilterSet, FacetFilterSetTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentsbyfacetsresponse.py b/src/glean/api_client/models/getdocumentsbyfacetsresponse.py
similarity index 96%
rename from src/glean/models/getdocumentsbyfacetsresponse.py
rename to src/glean/api_client/models/getdocumentsbyfacetsresponse.py
index 1a083f6f..f3f1a394 100644
--- a/src/glean/models/getdocumentsbyfacetsresponse.py
+++ b/src/glean/api_client/models/getdocumentsbyfacetsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .document import Document, DocumentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentsrequest.py b/src/glean/api_client/models/getdocumentsrequest.py
similarity index 96%
rename from src/glean/models/getdocumentsrequest.py
rename to src/glean/api_client/models/getdocumentsrequest.py
index 9090b6e7..fccf9c08 100644
--- a/src/glean/models/getdocumentsrequest.py
+++ b/src/glean/api_client/models/getdocumentsrequest.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .documentspec_union import DocumentSpecUnion, DocumentSpecUnionTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentsresponse.py b/src/glean/api_client/models/getdocumentsresponse.py
similarity index 93%
rename from src/glean/models/getdocumentsresponse.py
rename to src/glean/api_client/models/getdocumentsresponse.py
index 2a6eee0b..8d88a307 100644
--- a/src/glean/models/getdocumentsresponse.py
+++ b/src/glean/api_client/models/getdocumentsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentorerror_union import DocumentOrErrorUnion, DocumentOrErrorUnionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Dict, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getdocumentstatusrequest.py b/src/glean/api_client/models/getdocumentstatusrequest.py
similarity index 95%
rename from src/glean/models/getdocumentstatusrequest.py
rename to src/glean/api_client/models/getdocumentstatusrequest.py
index 570468fb..47266d92 100644
--- a/src/glean/models/getdocumentstatusrequest.py
+++ b/src/glean/api_client/models/getdocumentstatusrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/getdocumentstatusresponse.py b/src/glean/api_client/models/getdocumentstatusresponse.py
similarity index 97%
rename from src/glean/models/getdocumentstatusresponse.py
rename to src/glean/api_client/models/getdocumentstatusresponse.py
index 55d2b6ad..2d9da081 100644
--- a/src/glean/models/getdocumentstatusresponse.py
+++ b/src/glean/api_client/models/getdocumentstatusresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocumentvisibilityoverridesresponse.py b/src/glean/api_client/models/getdocumentvisibilityoverridesresponse.py
similarity index 93%
rename from src/glean/models/getdocumentvisibilityoverridesresponse.py
rename to src/glean/api_client/models/getdocumentvisibilityoverridesresponse.py
index 8c256125..7b7f9502 100644
--- a/src/glean/models/getdocumentvisibilityoverridesresponse.py
+++ b/src/glean/api_client/models/getdocumentvisibilityoverridesresponse.py
@@ -5,7 +5,7 @@
     DocumentVisibilityOverride,
     DocumentVisibilityOverrideTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getdocvisibilityop.py b/src/glean/api_client/models/getdocvisibilityop.py
similarity index 85%
rename from src/glean/models/getdocvisibilityop.py
rename to src/glean/api_client/models/getdocvisibilityop.py
index 95e72004..e6f51f11 100644
--- a/src/glean/models/getdocvisibilityop.py
+++ b/src/glean/api_client/models/getdocvisibilityop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/getpinrequest.py b/src/glean/api_client/models/getpinrequest.py
similarity index 90%
rename from src/glean/models/getpinrequest.py
rename to src/glean/api_client/models/getpinrequest.py
index ddaf8a97..3ad5f923 100644
--- a/src/glean/models/getpinrequest.py
+++ b/src/glean/api_client/models/getpinrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getpinresponse.py b/src/glean/api_client/models/getpinresponse.py
similarity index 90%
rename from src/glean/models/getpinresponse.py
rename to src/glean/api_client/models/getpinresponse.py
index e4e97024..e7e58070 100644
--- a/src/glean/models/getpinresponse.py
+++ b/src/glean/api_client/models/getpinresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .pindocument import PinDocument, PinDocumentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getpolicyop.py b/src/glean/api_client/models/getpolicyop.py
similarity index 88%
rename from src/glean/models/getpolicyop.py
rename to src/glean/api_client/models/getpolicyop.py
index 47c8c132..41f8894d 100644
--- a/src/glean/models/getpolicyop.py
+++ b/src/glean/api_client/models/getpolicyop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
diff --git a/src/glean/models/getreportstatusop.py b/src/glean/api_client/models/getreportstatusop.py
similarity index 81%
rename from src/glean/models/getreportstatusop.py
rename to src/glean/api_client/models/getreportstatusop.py
index 4900e261..17fc5617 100644
--- a/src/glean/models/getreportstatusop.py
+++ b/src/glean/api_client/models/getreportstatusop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/getshortcutrequest_union.py b/src/glean/api_client/models/getshortcutrequest_union.py
similarity index 95%
rename from src/glean/models/getshortcutrequest_union.py
rename to src/glean/api_client/models/getshortcutrequest_union.py
index cfd118b8..6f031d6d 100644
--- a/src/glean/models/getshortcutrequest_union.py
+++ b/src/glean/api_client/models/getshortcutrequest_union.py
@@ -5,7 +5,7 @@
     UserGeneratedContentID,
     UserGeneratedContentIDTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Union
 from typing_extensions import TypeAliasType, TypedDict
 
diff --git a/src/glean/models/getshortcutresponse.py b/src/glean/api_client/models/getshortcutresponse.py
similarity index 92%
rename from src/glean/models/getshortcutresponse.py
rename to src/glean/api_client/models/getshortcutresponse.py
index 25954b3a..52a9e1fc 100644
--- a/src/glean/models/getshortcutresponse.py
+++ b/src/glean/api_client/models/getshortcutresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .shortcut import Shortcut, ShortcutTypedDict
 from .shortcuterror import ShortcutError, ShortcutErrorTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/getusercountrequest.py b/src/glean/api_client/models/getusercountrequest.py
similarity index 92%
rename from src/glean/models/getusercountrequest.py
rename to src/glean/api_client/models/getusercountrequest.py
index 18c1d020..093c81b4 100644
--- a/src/glean/models/getusercountrequest.py
+++ b/src/glean/api_client/models/getusercountrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/getusercountresponse.py b/src/glean/api_client/models/getusercountresponse.py
similarity index 94%
rename from src/glean/models/getusercountresponse.py
rename to src/glean/api_client/models/getusercountresponse.py
index 06a7e2db..cf329c0f 100644
--- a/src/glean/models/getusercountresponse.py
+++ b/src/glean/api_client/models/getusercountresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/gleanassistinsightsresponse.py b/src/glean/api_client/models/gleanassistinsightsresponse.py
similarity index 97%
rename from src/glean/models/gleanassistinsightsresponse.py
rename to src/glean/api_client/models/gleanassistinsightsresponse.py
index 84e15316..11fde8c6 100644
--- a/src/glean/models/gleanassistinsightsresponse.py
+++ b/src/glean/api_client/models/gleanassistinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .useractivityinsight import UserActivityInsight, UserActivityInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/gleandataerror.py b/src/glean/api_client/models/gleandataerror.py
similarity index 97%
rename from src/glean/models/gleandataerror.py
rename to src/glean/api_client/models/gleandataerror.py
index b0f8856c..0e3c93c2 100644
--- a/src/glean/models/gleandataerror.py
+++ b/src/glean/api_client/models/gleandataerror.py
@@ -6,7 +6,7 @@
     InvalidOperatorValueError,
     InvalidOperatorValueErrorTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/grantpermission.py b/src/glean/api_client/models/grantpermission.py
similarity index 94%
rename from src/glean/models/grantpermission.py
rename to src/glean/api_client/models/grantpermission.py
index 99155a81..c8b4da2a 100644
--- a/src/glean/models/grantpermission.py
+++ b/src/glean/api_client/models/grantpermission.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .scopetype import ScopeType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/greenlistusersrequest.py b/src/glean/api_client/models/greenlistusersrequest.py
similarity index 94%
rename from src/glean/models/greenlistusersrequest.py
rename to src/glean/api_client/models/greenlistusersrequest.py
index d19d7426..85f19cbf 100644
--- a/src/glean/models/greenlistusersrequest.py
+++ b/src/glean/api_client/models/greenlistusersrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/group.py b/src/glean/api_client/models/group.py
similarity index 93%
rename from src/glean/models/group.py
rename to src/glean/api_client/models/group.py
index accdf53a..8b1c31f8 100644
--- a/src/glean/models/group.py
+++ b/src/glean/api_client/models/group.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .grouptype import GroupType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/grouptype.py b/src/glean/api_client/models/grouptype.py
similarity index 100%
rename from src/glean/models/grouptype.py
rename to src/glean/api_client/models/grouptype.py
diff --git a/src/glean/models/hotword.py b/src/glean/api_client/models/hotword.py
similarity index 91%
rename from src/glean/models/hotword.py
rename to src/glean/api_client/models/hotword.py
index 56429904..d7fb8583 100644
--- a/src/glean/models/hotword.py
+++ b/src/glean/api_client/models/hotword.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .hotwordproximity import HotwordProximity, HotwordProximityTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/hotwordproximity.py b/src/glean/api_client/models/hotwordproximity.py
similarity index 92%
rename from src/glean/models/hotwordproximity.py
rename to src/glean/api_client/models/hotwordproximity.py
index 4f81aa21..5365ad4e 100644
--- a/src/glean/models/hotwordproximity.py
+++ b/src/glean/api_client/models/hotwordproximity.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/iconconfig.py b/src/glean/api_client/models/iconconfig.py
similarity index 97%
rename from src/glean/models/iconconfig.py
rename to src/glean/api_client/models/iconconfig.py
index 006373a3..5abfc126 100644
--- a/src/glean/models/iconconfig.py
+++ b/src/glean/api_client/models/iconconfig.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/indexdocumentrequest.py b/src/glean/api_client/models/indexdocumentrequest.py
similarity index 95%
rename from src/glean/models/indexdocumentrequest.py
rename to src/glean/api_client/models/indexdocumentrequest.py
index 57e230f4..4fba3e89 100644
--- a/src/glean/models/indexdocumentrequest.py
+++ b/src/glean/api_client/models/indexdocumentrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentdefinition import DocumentDefinition, DocumentDefinitionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/indexdocumentsrequest.py b/src/glean/api_client/models/indexdocumentsrequest.py
similarity index 96%
rename from src/glean/models/indexdocumentsrequest.py
rename to src/glean/api_client/models/indexdocumentsrequest.py
index eb15212f..7b914d56 100644
--- a/src/glean/models/indexdocumentsrequest.py
+++ b/src/glean/api_client/models/indexdocumentsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentdefinition import DocumentDefinition, DocumentDefinitionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/indexemployeerequest.py b/src/glean/api_client/models/indexemployeerequest.py
similarity index 95%
rename from src/glean/models/indexemployeerequest.py
rename to src/glean/api_client/models/indexemployeerequest.py
index b8b80de3..f991332f 100644
--- a/src/glean/models/indexemployeerequest.py
+++ b/src/glean/api_client/models/indexemployeerequest.py
@@ -5,7 +5,7 @@
     EmployeeInfoDefinition,
     EmployeeInfoDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/indexgrouprequest.py b/src/glean/api_client/models/indexgrouprequest.py
similarity index 96%
rename from src/glean/models/indexgrouprequest.py
rename to src/glean/api_client/models/indexgrouprequest.py
index a287a298..061d1f90 100644
--- a/src/glean/models/indexgrouprequest.py
+++ b/src/glean/api_client/models/indexgrouprequest.py
@@ -5,7 +5,7 @@
     DatasourceGroupDefinition,
     DatasourceGroupDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/indexingshortcut.py b/src/glean/api_client/models/indexingshortcut.py
similarity index 98%
rename from src/glean/models/indexingshortcut.py
rename to src/glean/api_client/models/indexingshortcut.py
index 5b5467eb..ada9bb84 100644
--- a/src/glean/models/indexingshortcut.py
+++ b/src/glean/api_client/models/indexingshortcut.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/indexmembershiprequest.py b/src/glean/api_client/models/indexmembershiprequest.py
similarity index 96%
rename from src/glean/models/indexmembershiprequest.py
rename to src/glean/api_client/models/indexmembershiprequest.py
index 1b1d85b6..998015da 100644
--- a/src/glean/models/indexmembershiprequest.py
+++ b/src/glean/api_client/models/indexmembershiprequest.py
@@ -5,7 +5,7 @@
     DatasourceMembershipDefinition,
     DatasourceMembershipDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/indexstatus.py b/src/glean/api_client/models/indexstatus.py
similarity index 94%
rename from src/glean/models/indexstatus.py
rename to src/glean/api_client/models/indexstatus.py
index 7154613e..444468cd 100644
--- a/src/glean/models/indexstatus.py
+++ b/src/glean/api_client/models/indexstatus.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/indexteamrequest.py b/src/glean/api_client/models/indexteamrequest.py
similarity index 95%
rename from src/glean/models/indexteamrequest.py
rename to src/glean/api_client/models/indexteamrequest.py
index cc1a9997..487fd368 100644
--- a/src/glean/models/indexteamrequest.py
+++ b/src/glean/api_client/models/indexteamrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .teaminfodefinition import TeamInfoDefinition, TeamInfoDefinitionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/indexuserrequest.py b/src/glean/api_client/models/indexuserrequest.py
similarity index 96%
rename from src/glean/models/indexuserrequest.py
rename to src/glean/api_client/models/indexuserrequest.py
index e7e3d8a6..233e2f7d 100644
--- a/src/glean/models/indexuserrequest.py
+++ b/src/glean/api_client/models/indexuserrequest.py
@@ -5,7 +5,7 @@
     DatasourceUserDefinition,
     DatasourceUserDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/inputoptions.py b/src/glean/api_client/models/inputoptions.py
similarity index 98%
rename from src/glean/models/inputoptions.py
rename to src/glean/api_client/models/inputoptions.py
index c90fc10d..8d013eef 100644
--- a/src/glean/models/inputoptions.py
+++ b/src/glean/api_client/models/inputoptions.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .timerange import TimeRange, TimeRangeTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/insightsagentsrequestoptions.py b/src/glean/api_client/models/insightsagentsrequestoptions.py
similarity index 93%
rename from src/glean/models/insightsagentsrequestoptions.py
rename to src/glean/api_client/models/insightsagentsrequestoptions.py
index dc759ffd..5d8cc6cd 100644
--- a/src/glean/models/insightsagentsrequestoptions.py
+++ b/src/glean/api_client/models/insightsagentsrequestoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/insightsaiapprequestoptions.py b/src/glean/api_client/models/insightsaiapprequestoptions.py
similarity index 93%
rename from src/glean/models/insightsaiapprequestoptions.py
rename to src/glean/api_client/models/insightsaiapprequestoptions.py
index 17cf1432..dbe7cf53 100644
--- a/src/glean/models/insightsaiapprequestoptions.py
+++ b/src/glean/api_client/models/insightsaiapprequestoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/insightsrequest.py b/src/glean/api_client/models/insightsrequest.py
similarity index 98%
rename from src/glean/models/insightsrequest.py
rename to src/glean/api_client/models/insightsrequest.py
index 5f7071c8..b7ade2c6 100644
--- a/src/glean/models/insightsrequest.py
+++ b/src/glean/api_client/models/insightsrequest.py
@@ -11,7 +11,7 @@
 )
 from .period import Period, PeriodTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/insightsresponse.py b/src/glean/api_client/models/insightsresponse.py
similarity index 98%
rename from src/glean/models/insightsresponse.py
rename to src/glean/api_client/models/insightsresponse.py
index 5c564dad..8bd36b75 100644
--- a/src/glean/models/insightsresponse.py
+++ b/src/glean/api_client/models/insightsresponse.py
@@ -21,7 +21,7 @@
     ShortcutInsightsResponseTypedDict,
 )
 from .userinsightsresponse import UserInsightsResponse, UserInsightsResponseTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/invalidoperatorvalueerror.py b/src/glean/api_client/models/invalidoperatorvalueerror.py
similarity index 92%
rename from src/glean/models/invalidoperatorvalueerror.py
rename to src/glean/api_client/models/invalidoperatorvalueerror.py
index b90606a5..ce4b0f67 100644
--- a/src/glean/models/invalidoperatorvalueerror.py
+++ b/src/glean/api_client/models/invalidoperatorvalueerror.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/inviteinfo.py b/src/glean/api_client/models/inviteinfo.py
similarity index 98%
rename from src/glean/models/inviteinfo.py
rename to src/glean/api_client/models/inviteinfo.py
index b8f57893..a7cbaf75 100644
--- a/src/glean/models/inviteinfo.py
+++ b/src/glean/api_client/models/inviteinfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/labeledcountinfo.py b/src/glean/api_client/models/labeledcountinfo.py
similarity index 94%
rename from src/glean/models/labeledcountinfo.py
rename to src/glean/api_client/models/labeledcountinfo.py
index a5b71efa..d7f33f18 100644
--- a/src/glean/models/labeledcountinfo.py
+++ b/src/glean/api_client/models/labeledcountinfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listanswersrequest.py b/src/glean/api_client/models/listanswersrequest.py
similarity index 91%
rename from src/glean/models/listanswersrequest.py
rename to src/glean/api_client/models/listanswersrequest.py
index 747f0925..28e5130a 100644
--- a/src/glean/models/listanswersrequest.py
+++ b/src/glean/api_client/models/listanswersrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listanswersresponse.py b/src/glean/api_client/models/listanswersresponse.py
similarity index 92%
rename from src/glean/models/listanswersresponse.py
rename to src/glean/api_client/models/listanswersresponse.py
index 6af13c2f..6afb7851 100644
--- a/src/glean/models/listanswersresponse.py
+++ b/src/glean/api_client/models/listanswersresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .answerresult import AnswerResult, AnswerResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List
 from typing_extensions import Annotated, TypedDict
diff --git a/src/glean/models/listchatsop.py b/src/glean/api_client/models/listchatsop.py
similarity index 87%
rename from src/glean/models/listchatsop.py
rename to src/glean/api_client/models/listchatsop.py
index 85259e5e..7523b314 100644
--- a/src/glean/models/listchatsop.py
+++ b/src/glean/api_client/models/listchatsop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listchatsresponse.py b/src/glean/api_client/models/listchatsresponse.py
similarity index 92%
rename from src/glean/models/listchatsresponse.py
rename to src/glean/api_client/models/listchatsresponse.py
index 24e73e2c..00c90dea 100644
--- a/src/glean/models/listchatsresponse.py
+++ b/src/glean/api_client/models/listchatsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatmetadataresult import ChatMetadataResult, ChatMetadataResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listcollectionsrequest.py b/src/glean/api_client/models/listcollectionsrequest.py
similarity index 96%
rename from src/glean/models/listcollectionsrequest.py
rename to src/glean/api_client/models/listcollectionsrequest.py
index 7d0b9178..9f35b1d3 100644
--- a/src/glean/models/listcollectionsrequest.py
+++ b/src/glean/api_client/models/listcollectionsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listcollectionsresponse.py b/src/glean/api_client/models/listcollectionsresponse.py
similarity index 92%
rename from src/glean/models/listcollectionsresponse.py
rename to src/glean/api_client/models/listcollectionsresponse.py
index ee8b293c..fcca4d58 100644
--- a/src/glean/models/listcollectionsresponse.py
+++ b/src/glean/api_client/models/listcollectionsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .collection import Collection, CollectionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/listdlpreportsresponse.py b/src/glean/api_client/models/listdlpreportsresponse.py
similarity index 90%
rename from src/glean/models/listdlpreportsresponse.py
rename to src/glean/api_client/models/listdlpreportsresponse.py
index 51e7b760..32b68e06 100644
--- a/src/glean/models/listdlpreportsresponse.py
+++ b/src/glean/api_client/models/listdlpreportsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpreport import DlpReport, DlpReportTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/listentitiesrequest.py b/src/glean/api_client/models/listentitiesrequest.py
similarity index 98%
rename from src/glean/models/listentitiesrequest.py
rename to src/glean/api_client/models/listentitiesrequest.py
index dc78f755..219e947e 100644
--- a/src/glean/models/listentitiesrequest.py
+++ b/src/glean/api_client/models/listentitiesrequest.py
@@ -4,7 +4,7 @@
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from .sortoptions import SortOptions, SortOptionsTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listentitiesresponse.py b/src/glean/api_client/models/listentitiesresponse.py
similarity index 98%
rename from src/glean/models/listentitiesresponse.py
rename to src/glean/api_client/models/listentitiesresponse.py
index c65b98d4..1ad37e6b 100644
--- a/src/glean/models/listentitiesresponse.py
+++ b/src/glean/api_client/models/listentitiesresponse.py
@@ -6,7 +6,7 @@
 from .facetresult import FacetResult, FacetResultTypedDict
 from .person import Person, PersonTypedDict
 from .team import Team, TeamTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listpinsop.py b/src/glean/api_client/models/listpinsop.py
similarity index 86%
rename from src/glean/models/listpinsop.py
rename to src/glean/api_client/models/listpinsop.py
index 72d50b0c..c31a5c29 100644
--- a/src/glean/models/listpinsop.py
+++ b/src/glean/api_client/models/listpinsop.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/listpinsresponse.py b/src/glean/api_client/models/listpinsresponse.py
similarity index 90%
rename from src/glean/models/listpinsresponse.py
rename to src/glean/api_client/models/listpinsresponse.py
index 1ba4a0d3..aa39d3ad 100644
--- a/src/glean/models/listpinsresponse.py
+++ b/src/glean/api_client/models/listpinsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .pindocument import PinDocument, PinDocumentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/listpoliciesop.py b/src/glean/api_client/models/listpoliciesop.py
similarity index 89%
rename from src/glean/models/listpoliciesop.py
rename to src/glean/api_client/models/listpoliciesop.py
index 21e72223..1ebdb4bd 100644
--- a/src/glean/models/listpoliciesop.py
+++ b/src/glean/api_client/models/listpoliciesop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listshortcutspaginatedrequest.py b/src/glean/api_client/models/listshortcutspaginatedrequest.py
similarity index 98%
rename from src/glean/models/listshortcutspaginatedrequest.py
rename to src/glean/api_client/models/listshortcutspaginatedrequest.py
index 0c029aed..ce1c0600 100644
--- a/src/glean/models/listshortcutspaginatedrequest.py
+++ b/src/glean/api_client/models/listshortcutspaginatedrequest.py
@@ -4,7 +4,7 @@
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from .sortoptions import SortOptions, SortOptionsTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listshortcutspaginatedresponse.py b/src/glean/api_client/models/listshortcutspaginatedresponse.py
similarity index 95%
rename from src/glean/models/listshortcutspaginatedresponse.py
rename to src/glean/api_client/models/listshortcutspaginatedresponse.py
index 1b2b4c11..c3b7359d 100644
--- a/src/glean/models/listshortcutspaginatedresponse.py
+++ b/src/glean/api_client/models/listshortcutspaginatedresponse.py
@@ -7,7 +7,7 @@
     ShortcutsPaginationMetadata,
     ShortcutsPaginationMetadataTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/listverificationsop.py b/src/glean/api_client/models/listverificationsop.py
similarity index 83%
rename from src/glean/models/listverificationsop.py
rename to src/glean/api_client/models/listverificationsop.py
index 48e76c70..f8967a3d 100644
--- a/src/glean/models/listverificationsop.py
+++ b/src/glean/api_client/models/listverificationsop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
diff --git a/src/glean/models/manualfeedbackinfo.py b/src/glean/api_client/models/manualfeedbackinfo.py
similarity index 99%
rename from src/glean/models/manualfeedbackinfo.py
rename to src/glean/api_client/models/manualfeedbackinfo.py
index 22cae708..a67678c9 100644
--- a/src/glean/models/manualfeedbackinfo.py
+++ b/src/glean/api_client/models/manualfeedbackinfo.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .feedbackchatexchange import FeedbackChatExchange, FeedbackChatExchangeTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/meeting.py b/src/glean/api_client/models/meeting.py
similarity index 95%
rename from src/glean/models/meeting.py
rename to src/glean/api_client/models/meeting.py
index 36420712..956309eb 100644
--- a/src/glean/models/meeting.py
+++ b/src/glean/api_client/models/meeting.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/message.py b/src/glean/api_client/models/message.py
similarity index 94%
rename from src/glean/models/message.py
rename to src/glean/api_client/models/message.py
index c1c3eeba..fe32980c 100644
--- a/src/glean/models/message.py
+++ b/src/glean/api_client/models/message.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .contenttype import ContentType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/messagesrequest.py b/src/glean/api_client/models/messagesrequest.py
similarity index 98%
rename from src/glean/models/messagesrequest.py
rename to src/glean/api_client/models/messagesrequest.py
index 144d5fb0..07b71075 100644
--- a/src/glean/models/messagesrequest.py
+++ b/src/glean/api_client/models/messagesrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/messagesresponse.py b/src/glean/api_client/models/messagesresponse.py
similarity index 95%
rename from src/glean/models/messagesresponse.py
rename to src/glean/api_client/models/messagesresponse.py
index 61e2762e..eb85f7fd 100644
--- a/src/glean/models/messagesresponse.py
+++ b/src/glean/api_client/models/messagesresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .searchresponse import SearchResponse, SearchResponseTypedDict
 from .searchresult import SearchResult, SearchResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/objectdefinition.py b/src/glean/api_client/models/objectdefinition.py
similarity index 98%
rename from src/glean/models/objectdefinition.py
rename to src/glean/api_client/models/objectdefinition.py
index bbaac033..b6cfddb5 100644
--- a/src/glean/models/objectdefinition.py
+++ b/src/glean/api_client/models/objectdefinition.py
@@ -4,7 +4,7 @@
 from .propertydefinition import PropertyDefinition, PropertyDefinitionTypedDict
 from .propertygroup import PropertyGroup, PropertyGroupTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/objectpermissions.py b/src/glean/api_client/models/objectpermissions.py
similarity index 93%
rename from src/glean/models/objectpermissions.py
rename to src/glean/api_client/models/objectpermissions.py
index ccede03e..c36464f5 100644
--- a/src/glean/models/objectpermissions.py
+++ b/src/glean/api_client/models/objectpermissions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .writepermission import WritePermission, WritePermissionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/operatormetadata.py b/src/glean/api_client/models/operatormetadata.py
similarity index 97%
rename from src/glean/models/operatormetadata.py
rename to src/glean/api_client/models/operatormetadata.py
index 55f82fc6..58f49e58 100644
--- a/src/glean/models/operatormetadata.py
+++ b/src/glean/api_client/models/operatormetadata.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .operatorscope import OperatorScope, OperatorScopeTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/operatorscope.py b/src/glean/api_client/models/operatorscope.py
similarity index 91%
rename from src/glean/models/operatorscope.py
rename to src/glean/api_client/models/operatorscope.py
index 143497c8..0cfabb96 100644
--- a/src/glean/models/operatorscope.py
+++ b/src/glean/api_client/models/operatorscope.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/peoplerequest.py b/src/glean/api_client/models/peoplerequest.py
similarity index 98%
rename from src/glean/models/peoplerequest.py
rename to src/glean/api_client/models/peoplerequest.py
index 3f052d70..9b578bfc 100644
--- a/src/glean/models/peoplerequest.py
+++ b/src/glean/api_client/models/peoplerequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/peopleresponse.py b/src/glean/api_client/models/peopleresponse.py
similarity index 96%
rename from src/glean/models/peopleresponse.py
rename to src/glean/api_client/models/peopleresponse.py
index 755ed52f..789930ea 100644
--- a/src/glean/models/peopleresponse.py
+++ b/src/glean/api_client/models/peopleresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .person import Person, PersonTypedDict
 from .relateddocuments import RelatedDocuments, RelatedDocumentsTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/period.py b/src/glean/api_client/models/period.py
similarity index 97%
rename from src/glean/models/period.py
rename to src/glean/api_client/models/period.py
index aed3dd73..2796c2fe 100644
--- a/src/glean/models/period.py
+++ b/src/glean/api_client/models/period.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .timepoint import TimePoint, TimePointTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/permissions.py b/src/glean/api_client/models/permissions.py
similarity index 98%
rename from src/glean/models/permissions.py
rename to src/glean/api_client/models/permissions.py
index e27672d4..1e425fb5 100644
--- a/src/glean/models/permissions.py
+++ b/src/glean/api_client/models/permissions.py
@@ -4,7 +4,7 @@
 from .grantpermission import GrantPermission, GrantPermissionTypedDict
 from .readpermission import ReadPermission, ReadPermissionTypedDict
 from .writepermission import WritePermission, WritePermissionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/permissionsgroupintersectiondefinition.py b/src/glean/api_client/models/permissionsgroupintersectiondefinition.py
similarity index 93%
rename from src/glean/models/permissionsgroupintersectiondefinition.py
rename to src/glean/api_client/models/permissionsgroupintersectiondefinition.py
index 0761adda..b0d3c386 100644
--- a/src/glean/models/permissionsgroupintersectiondefinition.py
+++ b/src/glean/api_client/models/permissionsgroupintersectiondefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/person.py b/src/glean/api_client/models/person.py
similarity index 96%
rename from src/glean/models/person.py
rename to src/glean/api_client/models/person.py
index 97cf8add..c1edbe87 100644
--- a/src/glean/models/person.py
+++ b/src/glean/api_client/models/person.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/persondistance.py b/src/glean/api_client/models/persondistance.py
similarity index 94%
rename from src/glean/models/persondistance.py
rename to src/glean/api_client/models/persondistance.py
index a7e6fcfa..8a4af8da 100644
--- a/src/glean/models/persondistance.py
+++ b/src/glean/api_client/models/persondistance.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/personmetadata.py b/src/glean/api_client/models/personmetadata.py
similarity index 99%
rename from src/glean/models/personmetadata.py
rename to src/glean/api_client/models/personmetadata.py
index c86469ed..4c73b100 100644
--- a/src/glean/models/personmetadata.py
+++ b/src/glean/api_client/models/personmetadata.py
@@ -11,7 +11,7 @@
 from .structuredlocation import StructuredLocation, StructuredLocationTypedDict
 from datetime import date, datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/personobject.py b/src/glean/api_client/models/personobject.py
similarity index 93%
rename from src/glean/models/personobject.py
rename to src/glean/api_client/models/personobject.py
index 65b90df7..af5a7318 100644
--- a/src/glean/models/personobject.py
+++ b/src/glean/api_client/models/personobject.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing_extensions import Annotated, TypedDict
 
diff --git a/src/glean/models/personteam.py b/src/glean/api_client/models/personteam.py
similarity index 97%
rename from src/glean/models/personteam.py
rename to src/glean/api_client/models/personteam.py
index a4e1ec3f..0b2a386b 100644
--- a/src/glean/models/personteam.py
+++ b/src/glean/api_client/models/personteam.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/persontoteamrelationship.py b/src/glean/api_client/models/persontoteamrelationship.py
similarity index 97%
rename from src/glean/models/persontoteamrelationship.py
rename to src/glean/api_client/models/persontoteamrelationship.py
index ec21ab37..e9e026ba 100644
--- a/src/glean/models/persontoteamrelationship.py
+++ b/src/glean/api_client/models/persontoteamrelationship.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/pindocument.py b/src/glean/api_client/models/pindocument.py
similarity index 97%
rename from src/glean/models/pindocument.py
rename to src/glean/api_client/models/pindocument.py
index 322321e3..66d2ae39 100644
--- a/src/glean/models/pindocument.py
+++ b/src/glean/api_client/models/pindocument.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .facetfilter import FacetFilter, FacetFilterTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/pinrequest.py b/src/glean/api_client/models/pinrequest.py
similarity index 96%
rename from src/glean/models/pinrequest.py
rename to src/glean/api_client/models/pinrequest.py
index 52f2ada1..36d8b7c7 100644
--- a/src/glean/models/pinrequest.py
+++ b/src/glean/api_client/models/pinrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .facetfilter import FacetFilter, FacetFilterTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/possiblevalue.py b/src/glean/api_client/models/possiblevalue.py
similarity index 93%
rename from src/glean/models/possiblevalue.py
rename to src/glean/api_client/models/possiblevalue.py
index e5db4aa3..a77e2ae8 100644
--- a/src/glean/models/possiblevalue.py
+++ b/src/glean/api_client/models/possiblevalue.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/post_api_index_v1_debug_datasource_documentop.py b/src/glean/api_client/models/post_api_index_v1_debug_datasource_documentop.py
similarity index 86%
rename from src/glean/models/post_api_index_v1_debug_datasource_documentop.py
rename to src/glean/api_client/models/post_api_index_v1_debug_datasource_documentop.py
index a36df820..5ef9dd02 100644
--- a/src/glean/models/post_api_index_v1_debug_datasource_documentop.py
+++ b/src/glean/api_client/models/post_api_index_v1_debug_datasource_documentop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .debugdocumentrequest import DebugDocumentRequest, DebugDocumentRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/post_api_index_v1_debug_datasource_documentsop.py b/src/glean/api_client/models/post_api_index_v1_debug_datasource_documentsop.py
similarity index 86%
rename from src/glean/models/post_api_index_v1_debug_datasource_documentsop.py
rename to src/glean/api_client/models/post_api_index_v1_debug_datasource_documentsop.py
index aa809f44..12ca7d0e 100644
--- a/src/glean/models/post_api_index_v1_debug_datasource_documentsop.py
+++ b/src/glean/api_client/models/post_api_index_v1_debug_datasource_documentsop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .debugdocumentsrequest import DebugDocumentsRequest, DebugDocumentsRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/post_api_index_v1_debug_datasource_statusop.py b/src/glean/api_client/models/post_api_index_v1_debug_datasource_statusop.py
similarity index 82%
rename from src/glean/models/post_api_index_v1_debug_datasource_statusop.py
rename to src/glean/api_client/models/post_api_index_v1_debug_datasource_statusop.py
index e69fc87c..ed9f1cdd 100644
--- a/src/glean/models/post_api_index_v1_debug_datasource_statusop.py
+++ b/src/glean/api_client/models/post_api_index_v1_debug_datasource_statusop.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/post_api_index_v1_debug_datasource_userop.py b/src/glean/api_client/models/post_api_index_v1_debug_datasource_userop.py
similarity index 86%
rename from src/glean/models/post_api_index_v1_debug_datasource_userop.py
rename to src/glean/api_client/models/post_api_index_v1_debug_datasource_userop.py
index f75df688..79c5a3b1 100644
--- a/src/glean/models/post_api_index_v1_debug_datasource_userop.py
+++ b/src/glean/api_client/models/post_api_index_v1_debug_datasource_userop.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 from .debuguserrequest import DebugUserRequest, DebugUserRequestTypedDict
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/processalldocumentsrequest.py b/src/glean/api_client/models/processalldocumentsrequest.py
similarity index 94%
rename from src/glean/models/processalldocumentsrequest.py
rename to src/glean/api_client/models/processalldocumentsrequest.py
index 6f84b9ce..a0a21dea 100644
--- a/src/glean/models/processalldocumentsrequest.py
+++ b/src/glean/api_client/models/processalldocumentsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/processallmembershipsrequest.py b/src/glean/api_client/models/processallmembershipsrequest.py
similarity index 94%
rename from src/glean/models/processallmembershipsrequest.py
rename to src/glean/api_client/models/processallmembershipsrequest.py
index ff0558d9..30f48f78 100644
--- a/src/glean/models/processallmembershipsrequest.py
+++ b/src/glean/api_client/models/processallmembershipsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/processinghistoryevent.py b/src/glean/api_client/models/processinghistoryevent.py
similarity index 95%
rename from src/glean/models/processinghistoryevent.py
rename to src/glean/api_client/models/processinghistoryevent.py
index 776cfbd5..c6e69fcf 100644
--- a/src/glean/models/processinghistoryevent.py
+++ b/src/glean/api_client/models/processinghistoryevent.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/prompttemplate.py b/src/glean/api_client/models/prompttemplate.py
similarity index 98%
rename from src/glean/models/prompttemplate.py
rename to src/glean/api_client/models/prompttemplate.py
index ad08ed3d..54b225b1 100644
--- a/src/glean/models/prompttemplate.py
+++ b/src/glean/api_client/models/prompttemplate.py
@@ -8,7 +8,7 @@
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from .person import Person, PersonTypedDict
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/prompttemplateresult.py b/src/glean/api_client/models/prompttemplateresult.py
similarity index 96%
rename from src/glean/models/prompttemplateresult.py
rename to src/glean/api_client/models/prompttemplateresult.py
index 2813c395..6b88984a 100644
--- a/src/glean/models/prompttemplateresult.py
+++ b/src/glean/api_client/models/prompttemplateresult.py
@@ -4,7 +4,7 @@
 from .countinfo import CountInfo, CountInfoTypedDict
 from .favoriteinfo import FavoriteInfo, FavoriteInfoTypedDict
 from .prompttemplate import PromptTemplate, PromptTemplateTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/propertydefinition.py b/src/glean/api_client/models/propertydefinition.py
similarity index 98%
rename from src/glean/models/propertydefinition.py
rename to src/glean/api_client/models/propertydefinition.py
index 07986fb6..202519a9 100644
--- a/src/glean/models/propertydefinition.py
+++ b/src/glean/api_client/models/propertydefinition.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/propertygroup.py b/src/glean/api_client/models/propertygroup.py
similarity index 95%
rename from src/glean/models/propertygroup.py
rename to src/glean/api_client/models/propertygroup.py
index 96051c41..c60fd6d4 100644
--- a/src/glean/models/propertygroup.py
+++ b/src/glean/api_client/models/propertygroup.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/queryinsight.py b/src/glean/api_client/models/queryinsight.py
similarity index 96%
rename from src/glean/models/queryinsight.py
rename to src/glean/api_client/models/queryinsight.py
index 921e54b9..762df192 100644
--- a/src/glean/models/queryinsight.py
+++ b/src/glean/api_client/models/queryinsight.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/queryinsightsresponse.py b/src/glean/api_client/models/queryinsightsresponse.py
similarity index 97%
rename from src/glean/models/queryinsightsresponse.py
rename to src/glean/api_client/models/queryinsightsresponse.py
index 848432f8..ba290047 100644
--- a/src/glean/models/queryinsightsresponse.py
+++ b/src/glean/api_client/models/queryinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .queryinsight import QueryInsight, QueryInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/querysuggestion.py b/src/glean/api_client/models/querysuggestion.py
similarity index 98%
rename from src/glean/models/querysuggestion.py
rename to src/glean/api_client/models/querysuggestion.py
index 61fbe090..70b2289c 100644
--- a/src/glean/models/querysuggestion.py
+++ b/src/glean/api_client/models/querysuggestion.py
@@ -7,7 +7,7 @@
     SearchRequestInputDetailsTypedDict,
 )
 from .searchrequestoptions import SearchRequestOptions, SearchRequestOptionsTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/querysuggestionlist.py b/src/glean/api_client/models/querysuggestionlist.py
similarity index 93%
rename from src/glean/models/querysuggestionlist.py
rename to src/glean/api_client/models/querysuggestionlist.py
index 0b9127b9..57fa7f92 100644
--- a/src/glean/models/querysuggestionlist.py
+++ b/src/glean/api_client/models/querysuggestionlist.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/quicklink.py b/src/glean/api_client/models/quicklink.py
similarity index 97%
rename from src/glean/models/quicklink.py
rename to src/glean/api_client/models/quicklink.py
index c44892bb..95bd967e 100644
--- a/src/glean/models/quicklink.py
+++ b/src/glean/api_client/models/quicklink.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/reaction.py b/src/glean/api_client/models/reaction.py
similarity index 95%
rename from src/glean/models/reaction.py
rename to src/glean/api_client/models/reaction.py
index 9612a6ea..ac1bb02b 100644
--- a/src/glean/models/reaction.py
+++ b/src/glean/api_client/models/reaction.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/readpermission.py b/src/glean/api_client/models/readpermission.py
similarity index 94%
rename from src/glean/models/readpermission.py
rename to src/glean/api_client/models/readpermission.py
index 862421bf..81526247 100644
--- a/src/glean/models/readpermission.py
+++ b/src/glean/api_client/models/readpermission.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .scopetype import ScopeType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/recommendationsrequest.py b/src/glean/api_client/models/recommendationsrequest.py
similarity index 98%
rename from src/glean/models/recommendationsrequest.py
rename to src/glean/api_client/models/recommendationsrequest.py
index 689b01e5..68b30ada 100644
--- a/src/glean/models/recommendationsrequest.py
+++ b/src/glean/api_client/models/recommendationsrequest.py
@@ -9,7 +9,7 @@
 )
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/recommendationsrequestoptions.py b/src/glean/api_client/models/recommendationsrequestoptions.py
similarity index 97%
rename from src/glean/models/recommendationsrequestoptions.py
rename to src/glean/api_client/models/recommendationsrequestoptions.py
index 7fecc5d0..f27ef64c 100644
--- a/src/glean/models/recommendationsrequestoptions.py
+++ b/src/glean/api_client/models/recommendationsrequestoptions.py
@@ -4,7 +4,7 @@
 from .document import Document, DocumentTypedDict
 from .facetfilterset import FacetFilterSet, FacetFilterSetTypedDict
 from .searchresultprominenceenum import SearchResultProminenceEnum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/referencerange.py b/src/glean/api_client/models/referencerange.py
similarity index 96%
rename from src/glean/models/referencerange.py
rename to src/glean/api_client/models/referencerange.py
index 9e5321cf..3d137cef 100644
--- a/src/glean/models/referencerange.py
+++ b/src/glean/api_client/models/referencerange.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .searchresultsnippet import SearchResultSnippet, SearchResultSnippetTypedDict
 from .textrange import TextRange, TextRangeTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/relateddocuments.py b/src/glean/api_client/models/relateddocuments.py
similarity index 98%
rename from src/glean/models/relateddocuments.py
rename to src/glean/api_client/models/relateddocuments.py
index bc823662..f775ce9c 100644
--- a/src/glean/models/relateddocuments.py
+++ b/src/glean/api_client/models/relateddocuments.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/relatedobject.py b/src/glean/api_client/models/relatedobject.py
similarity index 96%
rename from src/glean/models/relatedobject.py
rename to src/glean/api_client/models/relatedobject.py
index b3335105..d2d611da 100644
--- a/src/glean/models/relatedobject.py
+++ b/src/glean/api_client/models/relatedobject.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/relatedobjectedge.py b/src/glean/api_client/models/relatedobjectedge.py
similarity index 90%
rename from src/glean/models/relatedobjectedge.py
rename to src/glean/api_client/models/relatedobjectedge.py
index 468d19b0..2634048d 100644
--- a/src/glean/models/relatedobjectedge.py
+++ b/src/glean/api_client/models/relatedobjectedge.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .relatedobject import RelatedObject, RelatedObjectTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/relatedquestion.py b/src/glean/api_client/models/relatedquestion.py
similarity index 95%
rename from src/glean/models/relatedquestion.py
rename to src/glean/api_client/models/relatedquestion.py
index 5fcc99a8..c362711f 100644
--- a/src/glean/models/relatedquestion.py
+++ b/src/glean/api_client/models/relatedquestion.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/reminder.py b/src/glean/api_client/models/reminder.py
similarity index 97%
rename from src/glean/models/reminder.py
rename to src/glean/api_client/models/reminder.py
index 40ebcd39..1b5b0836 100644
--- a/src/glean/models/reminder.py
+++ b/src/glean/api_client/models/reminder.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/reminderrequest.py b/src/glean/api_client/models/reminderrequest.py
similarity index 97%
rename from src/glean/models/reminderrequest.py
rename to src/glean/api_client/models/reminderrequest.py
index 27542407..1a941256 100644
--- a/src/glean/models/reminderrequest.py
+++ b/src/glean/api_client/models/reminderrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/reportstatusresponse.py b/src/glean/api_client/models/reportstatusresponse.py
similarity index 95%
rename from src/glean/models/reportstatusresponse.py
rename to src/glean/api_client/models/reportstatusresponse.py
index 084427b6..7d241231 100644
--- a/src/glean/models/reportstatusresponse.py
+++ b/src/glean/api_client/models/reportstatusresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/restrictionfilters.py b/src/glean/api_client/models/restrictionfilters.py
similarity index 96%
rename from src/glean/models/restrictionfilters.py
rename to src/glean/api_client/models/restrictionfilters.py
index 3bb6569a..f2db483e 100644
--- a/src/glean/models/restrictionfilters.py
+++ b/src/glean/api_client/models/restrictionfilters.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .documentspec_union import DocumentSpecUnion, DocumentSpecUnionTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/resultsdescription.py b/src/glean/api_client/models/resultsdescription.py
similarity index 95%
rename from src/glean/models/resultsdescription.py
rename to src/glean/api_client/models/resultsdescription.py
index 48741a0c..e74d6464 100644
--- a/src/glean/models/resultsdescription.py
+++ b/src/glean/api_client/models/resultsdescription.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/resultsresponse.py b/src/glean/api_client/models/resultsresponse.py
similarity index 98%
rename from src/glean/models/resultsresponse.py
rename to src/glean/api_client/models/resultsresponse.py
index 26fc7849..51162563 100644
--- a/src/glean/models/resultsresponse.py
+++ b/src/glean/api_client/models/resultsresponse.py
@@ -6,7 +6,7 @@
 from .searchresult import SearchResult, SearchResultTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from .structuredresult import StructuredResult, StructuredResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/resulttab.py b/src/glean/api_client/models/resulttab.py
similarity index 96%
rename from src/glean/models/resulttab.py
rename to src/glean/api_client/models/resulttab.py
index a89fab72..60271315 100644
--- a/src/glean/models/resulttab.py
+++ b/src/glean/api_client/models/resulttab.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/rotatetokenresponse.py b/src/glean/api_client/models/rotatetokenresponse.py
similarity index 98%
rename from src/glean/models/rotatetokenresponse.py
rename to src/glean/api_client/models/rotatetokenresponse.py
index d40ecdb7..84bf069b 100644
--- a/src/glean/models/rotatetokenresponse.py
+++ b/src/glean/api_client/models/rotatetokenresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/scopetype.py b/src/glean/api_client/models/scopetype.py
similarity index 100%
rename from src/glean/models/scopetype.py
rename to src/glean/api_client/models/scopetype.py
diff --git a/src/glean/models/searchagentsrequest.py b/src/glean/api_client/models/searchagentsrequest.py
similarity index 91%
rename from src/glean/models/searchagentsrequest.py
rename to src/glean/api_client/models/searchagentsrequest.py
index b69266ed..20fca100 100644
--- a/src/glean/models/searchagentsrequest.py
+++ b/src/glean/api_client/models/searchagentsrequest.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/searchagentsresponse.py b/src/glean/api_client/models/searchagentsresponse.py
similarity index 90%
rename from src/glean/models/searchagentsresponse.py
rename to src/glean/api_client/models/searchagentsresponse.py
index b9688acb..8f0f47c4 100644
--- a/src/glean/models/searchagentsresponse.py
+++ b/src/glean/api_client/models/searchagentsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .agent import Agent, AgentTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/searchproviderinfo.py b/src/glean/api_client/models/searchproviderinfo.py
similarity index 95%
rename from src/glean/models/searchproviderinfo.py
rename to src/glean/api_client/models/searchproviderinfo.py
index a54cc20c..39a4eec6 100644
--- a/src/glean/models/searchproviderinfo.py
+++ b/src/glean/api_client/models/searchproviderinfo.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchrequest.py b/src/glean/api_client/models/searchrequest.py
similarity index 99%
rename from src/glean/models/searchrequest.py
rename to src/glean/api_client/models/searchrequest.py
index 5747a540..0cb6349a 100644
--- a/src/glean/models/searchrequest.py
+++ b/src/glean/api_client/models/searchrequest.py
@@ -10,7 +10,7 @@
 from .searchrequestoptions import SearchRequestOptions, SearchRequestOptionsTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchrequestinputdetails.py b/src/glean/api_client/models/searchrequestinputdetails.py
similarity index 95%
rename from src/glean/models/searchrequestinputdetails.py
rename to src/glean/api_client/models/searchrequestinputdetails.py
index 3290f4ff..57b61118 100644
--- a/src/glean/models/searchrequestinputdetails.py
+++ b/src/glean/api_client/models/searchrequestinputdetails.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchrequestoptions.py b/src/glean/api_client/models/searchrequestoptions.py
similarity index 99%
rename from src/glean/models/searchrequestoptions.py
rename to src/glean/api_client/models/searchrequestoptions.py
index 76fb4c92..34ce5702 100644
--- a/src/glean/models/searchrequestoptions.py
+++ b/src/glean/api_client/models/searchrequestoptions.py
@@ -7,7 +7,7 @@
 from .facetfilterset import FacetFilterSet, FacetFilterSetTypedDict
 from .restrictionfilters import RestrictionFilters, RestrictionFiltersTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchresponse.py b/src/glean/api_client/models/searchresponse.py
similarity index 99%
rename from src/glean/models/searchresponse.py
rename to src/glean/api_client/models/searchresponse.py
index e9d9f9c5..ef9c3d8b 100644
--- a/src/glean/models/searchresponse.py
+++ b/src/glean/api_client/models/searchresponse.py
@@ -14,7 +14,7 @@
 from .searchresult import SearchResult, SearchResultTypedDict
 from .sessioninfo import SessionInfo, SessionInfoTypedDict
 from .structuredresult import StructuredResult, StructuredResultTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchresponsemetadata.py b/src/glean/api_client/models/searchresponsemetadata.py
similarity index 98%
rename from src/glean/models/searchresponsemetadata.py
rename to src/glean/api_client/models/searchresponsemetadata.py
index d0ddcee6..d71f08f1 100644
--- a/src/glean/models/searchresponsemetadata.py
+++ b/src/glean/api_client/models/searchresponsemetadata.py
@@ -5,7 +5,7 @@
 from .querysuggestionlist import QuerySuggestionList, QuerySuggestionListTypedDict
 from .searchwarning import SearchWarning, SearchWarningTypedDict
 from .textrange import TextRange, TextRangeTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchresult.py b/src/glean/api_client/models/searchresult.py
similarity index 99%
rename from src/glean/models/searchresult.py
rename to src/glean/api_client/models/searchresult.py
index a8f70094..51538a55 100644
--- a/src/glean/models/searchresult.py
+++ b/src/glean/api_client/models/searchresult.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .clustertypeenum import ClusterTypeEnum
 from .searchresultprominenceenum import SearchResultProminenceEnum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchresultprominenceenum.py b/src/glean/api_client/models/searchresultprominenceenum.py
similarity index 100%
rename from src/glean/models/searchresultprominenceenum.py
rename to src/glean/api_client/models/searchresultprominenceenum.py
diff --git a/src/glean/models/searchresultsnippet.py b/src/glean/api_client/models/searchresultsnippet.py
similarity index 97%
rename from src/glean/models/searchresultsnippet.py
rename to src/glean/api_client/models/searchresultsnippet.py
index 35845875..de0e3be1 100644
--- a/src/glean/models/searchresultsnippet.py
+++ b/src/glean/api_client/models/searchresultsnippet.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/searchwarning.py b/src/glean/api_client/models/searchwarning.py
similarity index 97%
rename from src/glean/models/searchwarning.py
rename to src/glean/api_client/models/searchwarning.py
index 7d9f737c..3d775bc2 100644
--- a/src/glean/models/searchwarning.py
+++ b/src/glean/api_client/models/searchwarning.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/security.py b/src/glean/api_client/models/security.py
similarity index 84%
rename from src/glean/models/security.py
rename to src/glean/api_client/models/security.py
index 6dce037d..da770e94 100644
--- a/src/glean/models/security.py
+++ b/src/glean/api_client/models/security.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, SecurityMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, SecurityMetadata
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
diff --git a/src/glean/models/seenfeedbackinfo.py b/src/glean/api_client/models/seenfeedbackinfo.py
similarity index 94%
rename from src/glean/models/seenfeedbackinfo.py
rename to src/glean/api_client/models/seenfeedbackinfo.py
index d5ec7557..9f43bbd7 100644
--- a/src/glean/models/seenfeedbackinfo.py
+++ b/src/glean/api_client/models/seenfeedbackinfo.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/sensitivecontentoptions.py b/src/glean/api_client/models/sensitivecontentoptions.py
similarity index 97%
rename from src/glean/models/sensitivecontentoptions.py
rename to src/glean/api_client/models/sensitivecontentoptions.py
index 005d5341..41619cb7 100644
--- a/src/glean/models/sensitivecontentoptions.py
+++ b/src/glean/api_client/models/sensitivecontentoptions.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .sensitiveexpression import SensitiveExpression, SensitiveExpressionTypedDict
 from .sensitiveinfotype import SensitiveInfoType, SensitiveInfoTypeTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/sensitiveexpression.py b/src/glean/api_client/models/sensitiveexpression.py
similarity index 94%
rename from src/glean/models/sensitiveexpression.py
rename to src/glean/api_client/models/sensitiveexpression.py
index a04db57e..c0bcf68c 100644
--- a/src/glean/models/sensitiveexpression.py
+++ b/src/glean/api_client/models/sensitiveexpression.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .hotword import Hotword, HotwordTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/sensitiveinfotype.py b/src/glean/api_client/models/sensitiveinfotype.py
similarity index 96%
rename from src/glean/models/sensitiveinfotype.py
rename to src/glean/api_client/models/sensitiveinfotype.py
index e9a7b865..1ed61135 100644
--- a/src/glean/models/sensitiveinfotype.py
+++ b/src/glean/api_client/models/sensitiveinfotype.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict, deprecated
diff --git a/src/glean/models/sessioninfo.py b/src/glean/api_client/models/sessioninfo.py
similarity index 97%
rename from src/glean/models/sessioninfo.py
rename to src/glean/api_client/models/sessioninfo.py
index d9693770..4b1e8a30 100644
--- a/src/glean/models/sessioninfo.py
+++ b/src/glean/api_client/models/sessioninfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/share.py b/src/glean/api_client/models/share.py
similarity index 96%
rename from src/glean/models/share.py
rename to src/glean/api_client/models/share.py
index a5c4105b..5be4a595 100644
--- a/src/glean/models/share.py
+++ b/src/glean/api_client/models/share.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/sharingoptions.py b/src/glean/api_client/models/sharingoptions.py
similarity index 98%
rename from src/glean/models/sharingoptions.py
rename to src/glean/api_client/models/sharingoptions.py
index b31841d8..18adf24b 100644
--- a/src/glean/models/sharingoptions.py
+++ b/src/glean/api_client/models/sharingoptions.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcut.py b/src/glean/api_client/models/shortcut.py
similarity index 99%
rename from src/glean/models/shortcut.py
rename to src/glean/api_client/models/shortcut.py
index 44e8b3f0..6b97d4c7 100644
--- a/src/glean/models/shortcut.py
+++ b/src/glean/api_client/models/shortcut.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcuterror.py b/src/glean/api_client/models/shortcuterror.py
similarity index 93%
rename from src/glean/models/shortcuterror.py
rename to src/glean/api_client/models/shortcuterror.py
index 9124986d..803c24ed 100644
--- a/src/glean/models/shortcuterror.py
+++ b/src/glean/api_client/models/shortcuterror.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcutinsight.py b/src/glean/api_client/models/shortcutinsight.py
similarity index 94%
rename from src/glean/models/shortcutinsight.py
rename to src/glean/api_client/models/shortcutinsight.py
index 4bac6cfe..c6ccd538 100644
--- a/src/glean/models/shortcutinsight.py
+++ b/src/glean/api_client/models/shortcutinsight.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
 from .shortcut import Shortcut, ShortcutTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcutinsightsresponse.py b/src/glean/api_client/models/shortcutinsightsresponse.py
similarity index 97%
rename from src/glean/models/shortcutinsightsresponse.py
rename to src/glean/api_client/models/shortcutinsightsresponse.py
index cadf74c3..852e11f2 100644
--- a/src/glean/models/shortcutinsightsresponse.py
+++ b/src/glean/api_client/models/shortcutinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .shortcutinsight import ShortcutInsight, ShortcutInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcutmutableproperties.py b/src/glean/api_client/models/shortcutmutableproperties.py
similarity index 98%
rename from src/glean/models/shortcutmutableproperties.py
rename to src/glean/api_client/models/shortcutmutableproperties.py
index 8fa8f60b..e19d0a27 100644
--- a/src/glean/models/shortcutmutableproperties.py
+++ b/src/glean/api_client/models/shortcutmutableproperties.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/shortcutspaginationmetadata.py b/src/glean/api_client/models/shortcutspaginationmetadata.py
similarity index 94%
rename from src/glean/models/shortcutspaginationmetadata.py
rename to src/glean/api_client/models/shortcutspaginationmetadata.py
index 5143f13c..80e5dc5d 100644
--- a/src/glean/models/shortcutspaginationmetadata.py
+++ b/src/glean/api_client/models/shortcutspaginationmetadata.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/socialnetwork.py b/src/glean/api_client/models/socialnetwork.py
similarity index 94%
rename from src/glean/models/socialnetwork.py
rename to src/glean/api_client/models/socialnetwork.py
index 94c733b7..e9c5173b 100644
--- a/src/glean/models/socialnetwork.py
+++ b/src/glean/api_client/models/socialnetwork.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/socialnetworkdefinition.py b/src/glean/api_client/models/socialnetworkdefinition.py
similarity index 95%
rename from src/glean/models/socialnetworkdefinition.py
rename to src/glean/api_client/models/socialnetworkdefinition.py
index 2d6516e5..48f96a67 100644
--- a/src/glean/models/socialnetworkdefinition.py
+++ b/src/glean/api_client/models/socialnetworkdefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/sortoptions.py b/src/glean/api_client/models/sortoptions.py
similarity index 93%
rename from src/glean/models/sortoptions.py
rename to src/glean/api_client/models/sortoptions.py
index 79c4ed72..4813522f 100644
--- a/src/glean/models/sortoptions.py
+++ b/src/glean/api_client/models/sortoptions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredlink.py b/src/glean/api_client/models/structuredlink.py
similarity index 95%
rename from src/glean/models/structuredlink.py
rename to src/glean/api_client/models/structuredlink.py
index a8985e92..486038a7 100644
--- a/src/glean/models/structuredlink.py
+++ b/src/glean/api_client/models/structuredlink.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .iconconfig import IconConfig, IconConfigTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredlocation.py b/src/glean/api_client/models/structuredlocation.py
similarity index 97%
rename from src/glean/models/structuredlocation.py
rename to src/glean/api_client/models/structuredlocation.py
index 4874e6fb..55300568 100644
--- a/src/glean/models/structuredlocation.py
+++ b/src/glean/api_client/models/structuredlocation.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredresult.py b/src/glean/api_client/models/structuredresult.py
similarity index 99%
rename from src/glean/models/structuredresult.py
rename to src/glean/api_client/models/structuredresult.py
index d63ad335..66222923 100644
--- a/src/glean/models/structuredresult.py
+++ b/src/glean/api_client/models/structuredresult.py
@@ -4,7 +4,7 @@
 from .appresult import AppResult, AppResultTypedDict
 from .disambiguation import Disambiguation, DisambiguationTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredtext.py b/src/glean/api_client/models/structuredtext.py
similarity index 95%
rename from src/glean/models/structuredtext.py
rename to src/glean/api_client/models/structuredtext.py
index 6a68e687..2debe614 100644
--- a/src/glean/models/structuredtext.py
+++ b/src/glean/api_client/models/structuredtext.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredtextitem.py b/src/glean/api_client/models/structuredtextitem.py
similarity index 96%
rename from src/glean/models/structuredtextitem.py
rename to src/glean/api_client/models/structuredtextitem.py
index 3b954e5a..a473e147 100644
--- a/src/glean/models/structuredtextitem.py
+++ b/src/glean/api_client/models/structuredtextitem.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/structuredtextmutableproperties.py b/src/glean/api_client/models/structuredtextmutableproperties.py
similarity index 86%
rename from src/glean/models/structuredtextmutableproperties.py
rename to src/glean/api_client/models/structuredtextmutableproperties.py
index e82a65fc..4a55f087 100644
--- a/src/glean/models/structuredtextmutableproperties.py
+++ b/src/glean/api_client/models/structuredtextmutableproperties.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/summarizerequest.py b/src/glean/api_client/models/summarizerequest.py
similarity index 97%
rename from src/glean/models/summarizerequest.py
rename to src/glean/api_client/models/summarizerequest.py
index 5a963a46..367ac2cf 100644
--- a/src/glean/models/summarizerequest.py
+++ b/src/glean/api_client/models/summarizerequest.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .documentspec_union import DocumentSpecUnion, DocumentSpecUnionTypedDict
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/summarizeresponse.py b/src/glean/api_client/models/summarizeresponse.py
similarity index 95%
rename from src/glean/models/summarizeresponse.py
rename to src/glean/api_client/models/summarizeresponse.py
index 8cd9e1c0..d92dcee1 100644
--- a/src/glean/models/summarizeresponse.py
+++ b/src/glean/api_client/models/summarizeresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .summary import Summary, SummaryTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/summary.py b/src/glean/api_client/models/summary.py
similarity index 93%
rename from src/glean/models/summary.py
rename to src/glean/api_client/models/summary.py
index b1dd9646..0ba4d7c7 100644
--- a/src/glean/models/summary.py
+++ b/src/glean/api_client/models/summary.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/team.py b/src/glean/api_client/models/team.py
similarity index 99%
rename from src/glean/models/team.py
rename to src/glean/api_client/models/team.py
index 4dde941c..e6004910 100644
--- a/src/glean/models/team.py
+++ b/src/glean/api_client/models/team.py
@@ -7,7 +7,7 @@
 from .teamemail import TeamEmail, TeamEmailTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/teamemail.py b/src/glean/api_client/models/teamemail.py
similarity index 93%
rename from src/glean/models/teamemail.py
rename to src/glean/api_client/models/teamemail.py
index 56223c58..8bdb438f 100644
--- a/src/glean/models/teamemail.py
+++ b/src/glean/api_client/models/teamemail.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/teaminfodefinition.py b/src/glean/api_client/models/teaminfodefinition.py
similarity index 98%
rename from src/glean/models/teaminfodefinition.py
rename to src/glean/api_client/models/teaminfodefinition.py
index 9d4ae746..675b9b47 100644
--- a/src/glean/models/teaminfodefinition.py
+++ b/src/glean/api_client/models/teaminfodefinition.py
@@ -8,7 +8,7 @@
 from .datasourceprofile import DatasourceProfile, DatasourceProfileTypedDict
 from .teamemail import TeamEmail, TeamEmailTypedDict
 from .teammember import TeamMember, TeamMemberTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/teammember.py b/src/glean/api_client/models/teammember.py
similarity index 95%
rename from src/glean/models/teammember.py
rename to src/glean/api_client/models/teammember.py
index 5b1905c8..a4f6d272 100644
--- a/src/glean/models/teammember.py
+++ b/src/glean/api_client/models/teammember.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import date
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/textrange.py b/src/glean/api_client/models/textrange.py
similarity index 97%
rename from src/glean/models/textrange.py
rename to src/glean/api_client/models/textrange.py
index 88507a28..8cf75c00 100644
--- a/src/glean/models/textrange.py
+++ b/src/glean/api_client/models/textrange.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/thumbnail.py b/src/glean/api_client/models/thumbnail.py
similarity index 94%
rename from src/glean/models/thumbnail.py
rename to src/glean/api_client/models/thumbnail.py
index 9cddc208..0b139d49 100644
--- a/src/glean/models/thumbnail.py
+++ b/src/glean/api_client/models/thumbnail.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/timeinterval.py b/src/glean/api_client/models/timeinterval.py
similarity index 92%
rename from src/glean/models/timeinterval.py
rename to src/glean/api_client/models/timeinterval.py
index 2dc0d8f4..b9dc81f9 100644
--- a/src/glean/models/timeinterval.py
+++ b/src/glean/api_client/models/timeinterval.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/timepoint.py b/src/glean/api_client/models/timepoint.py
similarity index 94%
rename from src/glean/models/timepoint.py
rename to src/glean/api_client/models/timepoint.py
index 99665fd8..cb67cc9c 100644
--- a/src/glean/models/timepoint.py
+++ b/src/glean/api_client/models/timepoint.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/timerange.py b/src/glean/api_client/models/timerange.py
similarity index 94%
rename from src/glean/models/timerange.py
rename to src/glean/api_client/models/timerange.py
index a4aec9af..3a7d2489 100644
--- a/src/glean/models/timerange.py
+++ b/src/glean/api_client/models/timerange.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from datetime import datetime
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/tool.py b/src/glean/api_client/models/tool.py
similarity index 97%
rename from src/glean/models/tool.py
rename to src/glean/api_client/models/tool.py
index 610e63ec..45a31d22 100644
--- a/src/glean/models/tool.py
+++ b/src/glean/api_client/models/tool.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .toolparameter import ToolParameter, ToolParameterTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/toolinfo.py b/src/glean/api_client/models/toolinfo.py
similarity index 95%
rename from src/glean/models/toolinfo.py
rename to src/glean/api_client/models/toolinfo.py
index 64819df0..672bba86 100644
--- a/src/glean/models/toolinfo.py
+++ b/src/glean/api_client/models/toolinfo.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .toolmetadata import ToolMetadata, ToolMetadataTypedDict
 from .writeactionparameter import WriteActionParameter, WriteActionParameterTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Dict, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/toolmetadata.py b/src/glean/api_client/models/toolmetadata.py
similarity index 99%
rename from src/glean/models/toolmetadata.py
rename to src/glean/api_client/models/toolmetadata.py
index 12f55292..5d7116eb 100644
--- a/src/glean/models/toolmetadata.py
+++ b/src/glean/api_client/models/toolmetadata.py
@@ -6,7 +6,7 @@
 from .personobject import PersonObject, PersonObjectTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/toolparameter.py b/src/glean/api_client/models/toolparameter.py
similarity index 97%
rename from src/glean/models/toolparameter.py
rename to src/glean/api_client/models/toolparameter.py
index 18403a3e..91b81ce8 100644
--- a/src/glean/models/toolparameter.py
+++ b/src/glean/api_client/models/toolparameter.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/toolscallparameter.py b/src/glean/api_client/models/toolscallparameter.py
similarity index 95%
rename from src/glean/models/toolscallparameter.py
rename to src/glean/api_client/models/toolscallparameter.py
index ebb02a02..132fd96f 100644
--- a/src/glean/models/toolscallparameter.py
+++ b/src/glean/api_client/models/toolscallparameter.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Dict, List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/toolscallrequest.py b/src/glean/api_client/models/toolscallrequest.py
similarity index 94%
rename from src/glean/models/toolscallrequest.py
rename to src/glean/api_client/models/toolscallrequest.py
index 2c5854a6..235e9ae1 100644
--- a/src/glean/models/toolscallrequest.py
+++ b/src/glean/api_client/models/toolscallrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .toolscallparameter import ToolsCallParameter, ToolsCallParameterTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Dict
 from typing_extensions import TypedDict
 
diff --git a/src/glean/models/toolscallresponse.py b/src/glean/api_client/models/toolscallresponse.py
similarity index 93%
rename from src/glean/models/toolscallresponse.py
rename to src/glean/api_client/models/toolscallresponse.py
index aa6ca3af..797f3f57 100644
--- a/src/glean/models/toolscallresponse.py
+++ b/src/glean/api_client/models/toolscallresponse.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Any, Dict, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/toolslistresponse.py b/src/glean/api_client/models/toolslistresponse.py
similarity index 89%
rename from src/glean/models/toolslistresponse.py
rename to src/glean/api_client/models/toolslistresponse.py
index 4990ebbb..f544d750 100644
--- a/src/glean/models/toolslistresponse.py
+++ b/src/glean/api_client/models/toolslistresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .tool import Tool, ToolTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/ugctype.py b/src/glean/api_client/models/ugctype.py
similarity index 100%
rename from src/glean/models/ugctype.py
rename to src/glean/api_client/models/ugctype.py
diff --git a/src/glean/models/unpin.py b/src/glean/api_client/models/unpin.py
similarity index 90%
rename from src/glean/models/unpin.py
rename to src/glean/api_client/models/unpin.py
index aa8cb3ff..a4c49e40 100644
--- a/src/glean/models/unpin.py
+++ b/src/glean/api_client/models/unpin.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/updateannouncementrequest.py b/src/glean/api_client/models/updateannouncementrequest.py
similarity index 99%
rename from src/glean/models/updateannouncementrequest.py
rename to src/glean/api_client/models/updateannouncementrequest.py
index 48bdf880..21c7532d 100644
--- a/src/glean/models/updateannouncementrequest.py
+++ b/src/glean/api_client/models/updateannouncementrequest.py
@@ -6,7 +6,7 @@
 from .thumbnail import Thumbnail, ThumbnailTypedDict
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updatedlpconfigrequest.py b/src/glean/api_client/models/updatedlpconfigrequest.py
similarity index 94%
rename from src/glean/models/updatedlpconfigrequest.py
rename to src/glean/api_client/models/updatedlpconfigrequest.py
index 7ee6bf44..c6066cc3 100644
--- a/src/glean/models/updatedlpconfigrequest.py
+++ b/src/glean/api_client/models/updatedlpconfigrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpconfig import DlpConfig, DlpConfigTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/updatedlpconfigresponse.py b/src/glean/api_client/models/updatedlpconfigresponse.py
similarity index 93%
rename from src/glean/models/updatedlpconfigresponse.py
rename to src/glean/api_client/models/updatedlpconfigresponse.py
index e8d1e418..ff266a09 100644
--- a/src/glean/models/updatedlpconfigresponse.py
+++ b/src/glean/api_client/models/updatedlpconfigresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpsimpleresult import DlpSimpleResult
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updatedlpreportrequest.py b/src/glean/api_client/models/updatedlpreportrequest.py
similarity index 97%
rename from src/glean/models/updatedlpreportrequest.py
rename to src/glean/api_client/models/updatedlpreportrequest.py
index 022d1dfd..d7ca51b1 100644
--- a/src/glean/models/updatedlpreportrequest.py
+++ b/src/glean/api_client/models/updatedlpreportrequest.py
@@ -4,7 +4,7 @@
 from .dlpconfig import DlpConfig, DlpConfigTypedDict
 from .dlpfrequency import DlpFrequency
 from .dlpreportstatus import DlpReportStatus
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updatedlpreportresponse.py b/src/glean/api_client/models/updatedlpreportresponse.py
similarity index 90%
rename from src/glean/models/updatedlpreportresponse.py
rename to src/glean/api_client/models/updatedlpreportresponse.py
index bba09661..ce3171a3 100644
--- a/src/glean/models/updatedlpreportresponse.py
+++ b/src/glean/api_client/models/updatedlpreportresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .dlpsimpleresult import DlpSimpleResult
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/updatedocumentvisibilityoverridesrequest.py b/src/glean/api_client/models/updatedocumentvisibilityoverridesrequest.py
similarity index 94%
rename from src/glean/models/updatedocumentvisibilityoverridesrequest.py
rename to src/glean/api_client/models/updatedocumentvisibilityoverridesrequest.py
index 87721c58..fd268508 100644
--- a/src/glean/models/updatedocumentvisibilityoverridesrequest.py
+++ b/src/glean/api_client/models/updatedocumentvisibilityoverridesrequest.py
@@ -5,7 +5,7 @@
     DocumentVisibilityOverride,
     DocumentVisibilityOverrideTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updatedocumentvisibilityoverridesresponse.py b/src/glean/api_client/models/updatedocumentvisibilityoverridesresponse.py
similarity index 94%
rename from src/glean/models/updatedocumentvisibilityoverridesresponse.py
rename to src/glean/api_client/models/updatedocumentvisibilityoverridesresponse.py
index d9487918..e2a3e0fd 100644
--- a/src/glean/models/updatedocumentvisibilityoverridesresponse.py
+++ b/src/glean/api_client/models/updatedocumentvisibilityoverridesresponse.py
@@ -5,7 +5,7 @@
     DocumentVisibilityUpdateResult,
     DocumentVisibilityUpdateResultTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/updatepermissionsrequest.py b/src/glean/api_client/models/updatepermissionsrequest.py
similarity index 97%
rename from src/glean/models/updatepermissionsrequest.py
rename to src/glean/api_client/models/updatepermissionsrequest.py
index b7c267ce..c8040633 100644
--- a/src/glean/models/updatepermissionsrequest.py
+++ b/src/glean/api_client/models/updatepermissionsrequest.py
@@ -5,7 +5,7 @@
     DocumentPermissionsDefinition,
     DocumentPermissionsDefinitionTypedDict,
 )
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updatepolicyop.py b/src/glean/api_client/models/updatepolicyop.py
similarity index 85%
rename from src/glean/models/updatepolicyop.py
rename to src/glean/api_client/models/updatepolicyop.py
index 145df42f..b34f7fd4 100644
--- a/src/glean/models/updatepolicyop.py
+++ b/src/glean/api_client/models/updatepolicyop.py
@@ -5,8 +5,8 @@
     UpdateDlpReportRequest,
     UpdateDlpReportRequestTypedDict,
 )
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, PathParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 from typing_extensions import Annotated, TypedDict
 
 
diff --git a/src/glean/models/updateshortcutrequest.py b/src/glean/api_client/models/updateshortcutrequest.py
similarity index 98%
rename from src/glean/models/updateshortcutrequest.py
rename to src/glean/api_client/models/updateshortcutrequest.py
index 1e4cf868..ef0bd710 100644
--- a/src/glean/models/updateshortcutrequest.py
+++ b/src/glean/api_client/models/updateshortcutrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .userrolespecification import UserRoleSpecification, UserRoleSpecificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/updateshortcutresponse.py b/src/glean/api_client/models/updateshortcutresponse.py
similarity index 92%
rename from src/glean/models/updateshortcutresponse.py
rename to src/glean/api_client/models/updateshortcutresponse.py
index e3fef19a..c7798e9a 100644
--- a/src/glean/models/updateshortcutresponse.py
+++ b/src/glean/api_client/models/updateshortcutresponse.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .shortcut import Shortcut, ShortcutTypedDict
 from .shortcuterror import ShortcutError, ShortcutErrorTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/uploadchatfilesop.py b/src/glean/api_client/models/uploadchatfilesop.py
similarity index 89%
rename from src/glean/models/uploadchatfilesop.py
rename to src/glean/api_client/models/uploadchatfilesop.py
index 35aacc03..8659c6a0 100644
--- a/src/glean/models/uploadchatfilesop.py
+++ b/src/glean/api_client/models/uploadchatfilesop.py
@@ -5,8 +5,8 @@
     UploadChatFilesRequest,
     UploadChatFilesRequestTypedDict,
 )
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, QueryParamMetadata, RequestMetadata
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/uploadchatfilesrequest.py b/src/glean/api_client/models/uploadchatfilesrequest.py
similarity index 90%
rename from src/glean/models/uploadchatfilesrequest.py
rename to src/glean/api_client/models/uploadchatfilesrequest.py
index 4417015c..e8aad89e 100644
--- a/src/glean/models/uploadchatfilesrequest.py
+++ b/src/glean/api_client/models/uploadchatfilesrequest.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
-from glean.utils import FieldMetadata, MultipartFormMetadata
+from glean.api_client.types import BaseModel
+from glean.api_client.utils import FieldMetadata, MultipartFormMetadata
 import io
 import pydantic
 from typing import IO, List, Optional, Union
diff --git a/src/glean/models/uploadchatfilesresponse.py b/src/glean/api_client/models/uploadchatfilesresponse.py
similarity index 91%
rename from src/glean/models/uploadchatfilesresponse.py
rename to src/glean/api_client/models/uploadchatfilesresponse.py
index dda7cc0c..976f3665 100644
--- a/src/glean/models/uploadchatfilesresponse.py
+++ b/src/glean/api_client/models/uploadchatfilesresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .chatfile import ChatFile, ChatFileTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/uploadshortcutsrequest.py b/src/glean/api_client/models/uploadshortcutsrequest.py
similarity index 97%
rename from src/glean/models/uploadshortcutsrequest.py
rename to src/glean/api_client/models/uploadshortcutsrequest.py
index 619fe38b..9043d477 100644
--- a/src/glean/models/uploadshortcutsrequest.py
+++ b/src/glean/api_client/models/uploadshortcutsrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .indexingshortcut import IndexingShortcut, IndexingShortcutTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/uploadstatusenum.py b/src/glean/api_client/models/uploadstatusenum.py
similarity index 100%
rename from src/glean/models/uploadstatusenum.py
rename to src/glean/api_client/models/uploadstatusenum.py
diff --git a/src/glean/models/user.py b/src/glean/api_client/models/user.py
similarity index 95%
rename from src/glean/models/user.py
rename to src/glean/api_client/models/user.py
index 572b4c60..733b3be3 100644
--- a/src/glean/models/user.py
+++ b/src/glean/api_client/models/user.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/useractivity.py b/src/glean/api_client/models/useractivity.py
similarity index 96%
rename from src/glean/models/useractivity.py
rename to src/glean/api_client/models/useractivity.py
index 9832e321..462905bb 100644
--- a/src/glean/models/useractivity.py
+++ b/src/glean/api_client/models/useractivity.py
@@ -4,7 +4,7 @@
 from .countinfo import CountInfo, CountInfoTypedDict
 from .person import Person, PersonTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/useractivityinsight.py b/src/glean/api_client/models/useractivityinsight.py
similarity index 96%
rename from src/glean/models/useractivityinsight.py
rename to src/glean/api_client/models/useractivityinsight.py
index 4529efa9..309f88a6 100644
--- a/src/glean/models/useractivityinsight.py
+++ b/src/glean/api_client/models/useractivityinsight.py
@@ -4,7 +4,7 @@
 from .countinfo import CountInfo, CountInfoTypedDict
 from .person import Person, PersonTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/usergeneratedcontentid.py b/src/glean/api_client/models/usergeneratedcontentid.py
similarity index 90%
rename from src/glean/models/usergeneratedcontentid.py
rename to src/glean/api_client/models/usergeneratedcontentid.py
index cbd50abb..c5655d64 100644
--- a/src/glean/models/usergeneratedcontentid.py
+++ b/src/glean/api_client/models/usergeneratedcontentid.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/userinsightsresponse.py b/src/glean/api_client/models/userinsightsresponse.py
similarity index 98%
rename from src/glean/models/userinsightsresponse.py
rename to src/glean/api_client/models/userinsightsresponse.py
index 487800d4..7e01f2ba 100644
--- a/src/glean/models/userinsightsresponse.py
+++ b/src/glean/api_client/models/userinsightsresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .useractivityinsight import UserActivityInsight, UserActivityInsightTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/userreferencedefinition.py b/src/glean/api_client/models/userreferencedefinition.py
similarity index 95%
rename from src/glean/models/userreferencedefinition.py
rename to src/glean/api_client/models/userreferencedefinition.py
index 911a685d..531dd213 100644
--- a/src/glean/models/userreferencedefinition.py
+++ b/src/glean/api_client/models/userreferencedefinition.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/userrole.py b/src/glean/api_client/models/userrole.py
similarity index 100%
rename from src/glean/models/userrole.py
rename to src/glean/api_client/models/userrole.py
diff --git a/src/glean/models/userrolespecification.py b/src/glean/api_client/models/userrolespecification.py
similarity index 95%
rename from src/glean/models/userrolespecification.py
rename to src/glean/api_client/models/userrolespecification.py
index 6e7afb1c..2330faaf 100644
--- a/src/glean/models/userrolespecification.py
+++ b/src/glean/api_client/models/userrolespecification.py
@@ -4,7 +4,7 @@
 from .documentspec_union import DocumentSpecUnion, DocumentSpecUnionTypedDict
 from .group import Group, GroupTypedDict
 from .userrole import UserRole
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/userstatusresponse.py b/src/glean/api_client/models/userstatusresponse.py
similarity index 96%
rename from src/glean/models/userstatusresponse.py
rename to src/glean/api_client/models/userstatusresponse.py
index f7154073..c9189228 100644
--- a/src/glean/models/userstatusresponse.py
+++ b/src/glean/api_client/models/userstatusresponse.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .uploadstatusenum import UploadStatusEnum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/userviewinfo.py b/src/glean/api_client/models/userviewinfo.py
similarity index 95%
rename from src/glean/models/userviewinfo.py
rename to src/glean/api_client/models/userviewinfo.py
index bf2ad759..a8b4831f 100644
--- a/src/glean/models/userviewinfo.py
+++ b/src/glean/api_client/models/userviewinfo.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/verification.py b/src/glean/api_client/models/verification.py
similarity index 94%
rename from src/glean/models/verification.py
rename to src/glean/api_client/models/verification.py
index a949e449..503085a1 100644
--- a/src/glean/models/verification.py
+++ b/src/glean/api_client/models/verification.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional, TYPE_CHECKING
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/verificationfeed.py b/src/glean/api_client/models/verificationfeed.py
similarity index 93%
rename from src/glean/models/verificationfeed.py
rename to src/glean/api_client/models/verificationfeed.py
index d1a25c6a..e2ac050e 100644
--- a/src/glean/models/verificationfeed.py
+++ b/src/glean/api_client/models/verificationfeed.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .verification import Verification, VerificationTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import List, Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/verificationmetadata.py b/src/glean/api_client/models/verificationmetadata.py
similarity index 98%
rename from src/glean/models/verificationmetadata.py
rename to src/glean/api_client/models/verificationmetadata.py
index 825f9c87..14a25e02 100644
--- a/src/glean/models/verificationmetadata.py
+++ b/src/glean/api_client/models/verificationmetadata.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .countinfo import CountInfo, CountInfoTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional, TYPE_CHECKING
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/verifyrequest.py b/src/glean/api_client/models/verifyrequest.py
similarity index 94%
rename from src/glean/models/verifyrequest.py
rename to src/glean/api_client/models/verifyrequest.py
index 256e4390..a06f5f05 100644
--- a/src/glean/models/verifyrequest.py
+++ b/src/glean/api_client/models/verifyrequest.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/viewerinfo.py b/src/glean/api_client/models/viewerinfo.py
similarity index 96%
rename from src/glean/models/viewerinfo.py
rename to src/glean/api_client/models/viewerinfo.py
index 696f98c4..1854c828 100644
--- a/src/glean/models/viewerinfo.py
+++ b/src/glean/api_client/models/viewerinfo.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from datetime import datetime
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict, deprecated
diff --git a/src/glean/models/workflow.py b/src/glean/api_client/models/workflow.py
similarity index 97%
rename from src/glean/models/workflow.py
rename to src/glean/api_client/models/workflow.py
index 37e5bfa8..ad1c3565 100644
--- a/src/glean/models/workflow.py
+++ b/src/glean/api_client/models/workflow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .objectpermissions import ObjectPermissions, ObjectPermissionsTypedDict
 from .person import Person, PersonTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/workflowfeedbackinfo.py b/src/glean/api_client/models/workflowfeedbackinfo.py
similarity index 94%
rename from src/glean/models/workflowfeedbackinfo.py
rename to src/glean/api_client/models/workflowfeedbackinfo.py
index 7f8f3548..5326dfe3 100644
--- a/src/glean/models/workflowfeedbackinfo.py
+++ b/src/glean/api_client/models/workflowfeedbackinfo.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
diff --git a/src/glean/models/workflowresult.py b/src/glean/api_client/models/workflowresult.py
similarity index 88%
rename from src/glean/models/workflowresult.py
rename to src/glean/api_client/models/workflowresult.py
index ce709d1f..b3e81a84 100644
--- a/src/glean/models/workflowresult.py
+++ b/src/glean/api_client/models/workflowresult.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .workflow import Workflow, WorkflowTypedDict
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 from typing_extensions import TypedDict
 
 
diff --git a/src/glean/models/writeactionparameter.py b/src/glean/api_client/models/writeactionparameter.py
similarity index 97%
rename from src/glean/models/writeactionparameter.py
rename to src/glean/api_client/models/writeactionparameter.py
index 3f649a81..e425de28 100644
--- a/src/glean/models/writeactionparameter.py
+++ b/src/glean/api_client/models/writeactionparameter.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .possiblevalue import PossibleValue, PossibleValueTypedDict
 from enum import Enum
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/models/writepermission.py b/src/glean/api_client/models/writepermission.py
similarity index 97%
rename from src/glean/models/writepermission.py
rename to src/glean/api_client/models/writepermission.py
index 780b3213..d7511267 100644
--- a/src/glean/models/writepermission.py
+++ b/src/glean/api_client/models/writepermission.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .scopetype import ScopeType
-from glean.types import BaseModel
+from glean.api_client.types import BaseModel
 import pydantic
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
diff --git a/src/glean/people.py b/src/glean/api_client/people.py
similarity index 99%
rename from src/glean/people.py
rename to src/glean/api_client/people.py
index 4faffa0a..1b1119b7 100644
--- a/src/glean/people.py
+++ b/src/glean/api_client/people.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union
 from typing_extensions import deprecated
 
diff --git a/src/glean/pins.py b/src/glean/api_client/pins.py
similarity index 99%
rename from src/glean/pins.py
rename to src/glean/api_client/pins.py
index 83b9003d..7a6de9f7 100644
--- a/src/glean/pins.py
+++ b/src/glean/api_client/pins.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/policies.py b/src/glean/api_client/policies.py
similarity index 99%
rename from src/glean/policies.py
rename to src/glean/api_client/policies.py
index 449b6a5b..c3afb92b 100644
--- a/src/glean/policies.py
+++ b/src/glean/api_client/policies.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/py.typed b/src/glean/api_client/py.typed
similarity index 100%
rename from src/glean/py.typed
rename to src/glean/api_client/py.typed
diff --git a/src/glean/reports.py b/src/glean/api_client/reports.py
similarity index 99%
rename from src/glean/reports.py
rename to src/glean/api_client/reports.py
index e71c17e8..56cbac86 100644
--- a/src/glean/reports.py
+++ b/src/glean/api_client/reports.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/sdk.py b/src/glean/api_client/sdk.py
similarity index 95%
rename from src/glean/sdk.py
rename to src/glean/api_client/sdk.py
index 0a19cc8e..92503726 100644
--- a/src/glean/sdk.py
+++ b/src/glean/api_client/sdk.py
@@ -5,17 +5,17 @@
 from .sdkconfiguration import SDKConfiguration
 from .utils.logger import Logger, get_default_logger
 from .utils.retries import RetryConfig
-from glean import models, utils
-from glean._hooks import SDKHooks
-from glean.types import OptionalNullable, UNSET
+from glean.api_client import models, utils
+from glean.api_client._hooks import SDKHooks
+from glean.api_client.types import OptionalNullable, UNSET
 import httpx
 import importlib
 from typing import Any, Callable, Dict, List, Optional, TYPE_CHECKING, Union, cast
 import weakref
 
 if TYPE_CHECKING:
-    from glean.client import Client
-    from glean.indexing import Indexing
+    from glean.api_client.client import Client
+    from glean.api_client.indexing import Indexing
 
 
 class Glean(BaseSDK):
@@ -41,8 +41,8 @@ class Glean(BaseSDK):
     client: "Client"
     indexing: "Indexing"
     _sub_sdk_map = {
-        "client": ("glean.client", "Client"),
-        "indexing": ("glean.indexing", "Indexing"),
+        "client": ("glean.api_client.client", "Client"),
+        "indexing": ("glean.api_client.indexing", "Indexing"),
     }
 
     def __init__(
diff --git a/src/glean/sdkconfiguration.py b/src/glean/api_client/sdkconfiguration.py
similarity index 94%
rename from src/glean/sdkconfiguration.py
rename to src/glean/api_client/sdkconfiguration.py
index 008c8c4c..52802863 100644
--- a/src/glean/sdkconfiguration.py
+++ b/src/glean/api_client/sdkconfiguration.py
@@ -10,8 +10,8 @@
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
 from dataclasses import dataclass, field
-from glean import models
-from glean.types import OptionalNullable, UNSET
+from glean.api_client import models
+from glean.api_client.types import OptionalNullable, UNSET
 from pydantic import Field
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
diff --git a/src/glean/search.py b/src/glean/api_client/search.py
similarity index 99%
rename from src/glean/search.py
rename to src/glean/api_client/search.py
index 97ae11a2..46feccdd 100644
--- a/src/glean/search.py
+++ b/src/glean/api_client/search.py
@@ -2,10 +2,10 @@
 
 from .basesdk import BaseSDK
 from datetime import datetime
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Any, List, Mapping, Optional, Union, cast
 
 
diff --git a/src/glean/tools.py b/src/glean/api_client/tools.py
similarity index 98%
rename from src/glean/tools.py
rename to src/glean/api_client/tools.py
index 0fa8c9b4..c6b17a32 100644
--- a/src/glean/tools.py
+++ b/src/glean/api_client/tools.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import Dict, List, Mapping, Optional, Union
 
 
diff --git a/src/glean/types/__init__.py b/src/glean/api_client/types/__init__.py
similarity index 100%
rename from src/glean/types/__init__.py
rename to src/glean/api_client/types/__init__.py
diff --git a/src/glean/types/basemodel.py b/src/glean/api_client/types/basemodel.py
similarity index 100%
rename from src/glean/types/basemodel.py
rename to src/glean/api_client/types/basemodel.py
diff --git a/src/glean/utils/__init__.py b/src/glean/api_client/utils/__init__.py
similarity index 100%
rename from src/glean/utils/__init__.py
rename to src/glean/api_client/utils/__init__.py
diff --git a/src/glean/utils/annotations.py b/src/glean/api_client/utils/annotations.py
similarity index 100%
rename from src/glean/utils/annotations.py
rename to src/glean/api_client/utils/annotations.py
diff --git a/src/glean/utils/datetimes.py b/src/glean/api_client/utils/datetimes.py
similarity index 100%
rename from src/glean/utils/datetimes.py
rename to src/glean/api_client/utils/datetimes.py
diff --git a/src/glean/utils/enums.py b/src/glean/api_client/utils/enums.py
similarity index 100%
rename from src/glean/utils/enums.py
rename to src/glean/api_client/utils/enums.py
diff --git a/src/glean/utils/eventstreaming.py b/src/glean/api_client/utils/eventstreaming.py
similarity index 100%
rename from src/glean/utils/eventstreaming.py
rename to src/glean/api_client/utils/eventstreaming.py
diff --git a/src/glean/utils/forms.py b/src/glean/api_client/utils/forms.py
similarity index 100%
rename from src/glean/utils/forms.py
rename to src/glean/api_client/utils/forms.py
diff --git a/src/glean/utils/headers.py b/src/glean/api_client/utils/headers.py
similarity index 100%
rename from src/glean/utils/headers.py
rename to src/glean/api_client/utils/headers.py
diff --git a/src/glean/utils/logger.py b/src/glean/api_client/utils/logger.py
similarity index 100%
rename from src/glean/utils/logger.py
rename to src/glean/api_client/utils/logger.py
diff --git a/src/glean/utils/metadata.py b/src/glean/api_client/utils/metadata.py
similarity index 100%
rename from src/glean/utils/metadata.py
rename to src/glean/api_client/utils/metadata.py
diff --git a/src/glean/utils/queryparams.py b/src/glean/api_client/utils/queryparams.py
similarity index 100%
rename from src/glean/utils/queryparams.py
rename to src/glean/api_client/utils/queryparams.py
diff --git a/src/glean/utils/requestbodies.py b/src/glean/api_client/utils/requestbodies.py
similarity index 100%
rename from src/glean/utils/requestbodies.py
rename to src/glean/api_client/utils/requestbodies.py
diff --git a/src/glean/utils/retries.py b/src/glean/api_client/utils/retries.py
similarity index 100%
rename from src/glean/utils/retries.py
rename to src/glean/api_client/utils/retries.py
diff --git a/src/glean/utils/security.py b/src/glean/api_client/utils/security.py
similarity index 100%
rename from src/glean/utils/security.py
rename to src/glean/api_client/utils/security.py
diff --git a/src/glean/utils/serializers.py b/src/glean/api_client/utils/serializers.py
similarity index 100%
rename from src/glean/utils/serializers.py
rename to src/glean/api_client/utils/serializers.py
diff --git a/src/glean/utils/url.py b/src/glean/api_client/utils/url.py
similarity index 100%
rename from src/glean/utils/url.py
rename to src/glean/api_client/utils/url.py
diff --git a/src/glean/utils/values.py b/src/glean/api_client/utils/values.py
similarity index 100%
rename from src/glean/utils/values.py
rename to src/glean/api_client/utils/values.py
diff --git a/src/glean/visibilityoverrides.py b/src/glean/api_client/visibilityoverrides.py
similarity index 98%
rename from src/glean/visibilityoverrides.py
rename to src/glean/api_client/visibilityoverrides.py
index 26cada36..f4761bdf 100644
--- a/src/glean/visibilityoverrides.py
+++ b/src/glean/api_client/visibilityoverrides.py
@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from glean import errors, models, utils
-from glean._hooks import HookContext
-from glean.types import BaseModel, OptionalNullable, UNSET
-from glean.utils import get_security_from_env
+from glean.api_client import errors, models, utils
+from glean.api_client._hooks import HookContext
+from glean.api_client.types import BaseModel, OptionalNullable, UNSET
+from glean.api_client.utils import get_security_from_env
 from typing import List, Mapping, Optional, Union, cast
 
 
diff --git a/tests/test_activities.py b/tests/test_activities.py
index cdefb4ab..47f6ea74 100644
--- a/tests/test_activities.py
+++ b/tests/test_activities.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_agents.py b/tests/test_agents.py
index 15253b52..46af6f6e 100644
--- a/tests/test_agents.py
+++ b/tests/test_agents.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_announcements.py b/tests/test_announcements.py
index 7c7432f2..09609c85 100644
--- a/tests/test_announcements.py
+++ b/tests/test_announcements.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_answers.py b/tests/test_answers.py
index 95c35a21..c68c4acf 100644
--- a/tests/test_answers.py
+++ b/tests/test_answers.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_client_activity.py b/tests/test_client_activity.py
index ef3d2ca8..e16936d2 100644
--- a/tests/test_client_activity.py
+++ b/tests/test_client_activity.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_client_authentication.py b/tests/test_client_authentication.py
index dd151ca2..b42ddaac 100644
--- a/tests/test_client_authentication.py
+++ b/tests/test_client_authentication.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_client_chat.py b/tests/test_client_chat.py
index 72f444b5..b2c164b5 100644
--- a/tests/test_client_chat.py
+++ b/tests/test_client_chat.py
@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_client_documents.py b/tests/test_client_documents.py
index 6211af4f..d56452e4 100644
--- a/tests/test_client_documents.py
+++ b/tests/test_client_documents.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_client_shortcuts.py b/tests/test_client_shortcuts.py
index 13c88762..1753aebe 100644
--- a/tests/test_client_shortcuts.py
+++ b/tests/test_client_shortcuts.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_client_verification.py b/tests/test_client_verification.py
index fb06cefb..a4495c3e 100644
--- a/tests/test_client_verification.py
+++ b/tests/test_client_verification.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_collections.py b/tests/test_collections.py
index d6bd2d45..db0e81ca 100644
--- a/tests/test_collections.py
+++ b/tests/test_collections.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_datasources.py b/tests/test_datasources.py
index 7ba301c7..40e7e180 100644
--- a/tests/test_datasources.py
+++ b/tests/test_datasources.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_entities.py b/tests/test_entities.py
index 8b7c893d..3a8a237c 100644
--- a/tests/test_entities.py
+++ b/tests/test_entities.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_indexing_authentication.py b/tests/test_indexing_authentication.py
index 1fdaf85c..da2be6ab 100644
--- a/tests/test_indexing_authentication.py
+++ b/tests/test_indexing_authentication.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_indexing_documents.py b/tests/test_indexing_documents.py
index b0cbf336..46c3361e 100644
--- a/tests/test_indexing_documents.py
+++ b/tests/test_indexing_documents.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_indexing_permissions.py b/tests/test_indexing_permissions.py
index 39ec1697..486c9a56 100644
--- a/tests/test_indexing_permissions.py
+++ b/tests/test_indexing_permissions.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_insights.py b/tests/test_insights.py
index 145d6ce3..43734ebe 100644
--- a/tests/test_insights.py
+++ b/tests/test_insights.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_messages.py b/tests/test_messages.py
index 27ecbb48..75f65e17 100644
--- a/tests/test_messages.py
+++ b/tests/test_messages.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_people.py b/tests/test_people.py
index 97c80f4f..de6db47e 100644
--- a/tests/test_people.py
+++ b/tests/test_people.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_pins.py b/tests/test_pins.py
index c46321dd..e702c89d 100644
--- a/tests/test_pins.py
+++ b/tests/test_pins.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean, models
+from glean.api_client import Glean, models
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_policies.py b/tests/test_policies.py
index 579e2bb1..26bd810f 100644
--- a/tests/test_policies.py
+++ b/tests/test_policies.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_search.py b/tests/test_search.py
index 204752b0..a9da8d6a 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -1,8 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from datetime import date
-from glean import Glean, models
-from glean.utils import parse_datetime
+from glean.api_client import Glean, models
+from glean.api_client.utils import parse_datetime
 import os
 import pytest
 from tests.test_client import create_test_http_client
diff --git a/tests/test_summarize.py b/tests/test_summarize.py
index 60885fec..d533cc4a 100644
--- a/tests/test_summarize.py
+++ b/tests/test_summarize.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_tools.py b/tests/test_tools.py
index 9f51e63f..57ea1190 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 from tests.test_client import create_test_http_client
 
diff --git a/tests/test_troubleshooting.py b/tests/test_troubleshooting.py
index 09f65272..6dfd893b 100644
--- a/tests/test_troubleshooting.py
+++ b/tests/test_troubleshooting.py
@@ -1,6 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from glean import Glean
+from glean.api_client import Glean
 import os
 import pytest
 from tests.test_client import create_test_http_client