diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a07d7b..d163b49 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,13 +80,13 @@ jobs:
         shell: bash
         if: matrix.task == 'check'
         run: |
-            uv run pyright typeagent test tools gmail
+            uv run pyright src test tools gmail
 
       - name: Run Format
         shell: bash
         if: matrix.task == 'format'
         run: |
-            uv run black -tpy312 -tpy313 -tpy314 typeagent test tools gmail demo --check
+            uv run black -tpy312 -tpy313 -tpy314 src test tools gmail demo --check
 
       - name: Login to Azure
         if: matrix.task == 'test'
diff --git a/Makefile b/Makefile
index 584baec..6f363fe 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ all: venv format check test build
 
 .PHONY: format
 format: venv
-	.venv/bin/isort typeagent test tools gmail demo $(FLAGS)
-	.venv/bin/black -tpy312 -tpy313 -tpy314 typeagent test tools gmail demo $(FLAGS)
+	.venv/bin/isort src test tools gmail demo $(FLAGS)
+	.venv/bin/black -tpy312 -tpy313 -tpy314 src test tools gmail demo $(FLAGS)
 
 .PHONY: check
 check: venv
-	.venv/bin/pyright --pythonpath .venv/bin/python typeagent test tools gmail
+	.venv/bin/pyright --pythonpath .venv/bin/python src test tools gmail
 
 .PHONY: test
 test: venv
@@ -36,7 +36,7 @@ compare: venv
 
 .PHONY: mcp
 mcp: venv
-	.venv/bin/mcp dev typeagent/mcp/server.py
+	.venv/bin/mcp dev src/typeagent/mcp/server.py
 
 .PHONY: profile
 profile: venv
diff --git a/make.bat b/make.bat
index 7a040ba..cdf1f68 100644
--- a/make.bat
+++ b/make.bat
@@ -26,14 +26,14 @@ goto help
 :format
 if not exist ".venv\" call make.bat venv
 echo Formatting code...
-.venv\Scripts\isort typeagent test tools gmail demo
-.venv\Scripts\black typeagent test tools gmail demo
+.venv\Scripts\isort src test tools gmail demo
+.venv\Scripts\black src test tools gmail demo
 goto end
 
 :check
 if not exist ".venv\" call make.bat venv
 echo Running type checks...
-.venv\Scripts\pyright --pythonpath .venv\Scripts\python typeagent test tools gmail demo
+.venv\Scripts\pyright --pythonpath .venv\Scripts\python src test tools gmail demo
 goto end
 
 :test
diff --git a/pyproject.toml b/pyproject.toml
index fa38e64..dac6ecc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,7 +65,7 @@ GitHub = "https://github.com/microsoft/typeagent-py"
 Documentation = "https://github.com/microsoft/typeagent-py/tree/main/docs/README.md"
 
 [tool.uv.build-backend]
-module-root = ""
+module-root = "src"
 
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"
@@ -85,3 +85,8 @@ sections = ["FUTURE", "STDLIB", "THIRDPARTY", "AI", "FIRSTPARTY", "LOCALFOLDER"]
 known_ai = ["mcp", "openai", "pydantic", "pydantic_ai", "tiktoken", "typechat"]
 known_first_party = ["typeagent", "test", "tools", "gmail", "demo"]
 known_local_folder = ["conftest"]
+
+[dependency-groups]
+dev = [
+    "isort>=7.0.0",
+]
diff --git a/typeagent/__init__.py b/src/typeagent/__init__.py
similarity index 100%
rename from typeagent/__init__.py
rename to src/typeagent/__init__.py
diff --git a/typeagent/aitools/auth.py b/src/typeagent/aitools/auth.py
similarity index 100%
rename from typeagent/aitools/auth.py
rename to src/typeagent/aitools/auth.py
diff --git a/typeagent/aitools/embeddings.py b/src/typeagent/aitools/embeddings.py
similarity index 100%
rename from typeagent/aitools/embeddings.py
rename to src/typeagent/aitools/embeddings.py
diff --git a/typeagent/aitools/utils.py b/src/typeagent/aitools/utils.py
similarity index 100%
rename from typeagent/aitools/utils.py
rename to src/typeagent/aitools/utils.py
diff --git a/typeagent/aitools/vectorbase.py b/src/typeagent/aitools/vectorbase.py
similarity index 100%
rename from typeagent/aitools/vectorbase.py
rename to src/typeagent/aitools/vectorbase.py
diff --git a/typeagent/emails/emailVerbs.json b/src/typeagent/emails/emailVerbs.json
similarity index 100%
rename from typeagent/emails/emailVerbs.json
rename to src/typeagent/emails/emailVerbs.json
diff --git a/typeagent/emails/email_import.py b/src/typeagent/emails/email_import.py
similarity index 100%
rename from typeagent/emails/email_import.py
rename to src/typeagent/emails/email_import.py
diff --git a/typeagent/emails/email_memory.py b/src/typeagent/emails/email_memory.py
similarity index 100%
rename from typeagent/emails/email_memory.py
rename to src/typeagent/emails/email_memory.py
diff --git a/typeagent/emails/email_message.py b/src/typeagent/emails/email_message.py
similarity index 100%
rename from typeagent/emails/email_message.py
rename to src/typeagent/emails/email_message.py
diff --git a/typeagent/emails/noiseTerms.txt b/src/typeagent/emails/noiseTerms.txt
similarity index 100%
rename from typeagent/emails/noiseTerms.txt
rename to src/typeagent/emails/noiseTerms.txt
diff --git a/typeagent/knowpro/answer_context_schema.py b/src/typeagent/knowpro/answer_context_schema.py
similarity index 100%
rename from typeagent/knowpro/answer_context_schema.py
rename to src/typeagent/knowpro/answer_context_schema.py
diff --git a/typeagent/knowpro/answer_response_schema.py b/src/typeagent/knowpro/answer_response_schema.py
similarity index 100%
rename from typeagent/knowpro/answer_response_schema.py
rename to src/typeagent/knowpro/answer_response_schema.py
diff --git a/typeagent/knowpro/answers.py b/src/typeagent/knowpro/answers.py
similarity index 100%
rename from typeagent/knowpro/answers.py
rename to src/typeagent/knowpro/answers.py
diff --git a/typeagent/knowpro/collections.py b/src/typeagent/knowpro/collections.py
similarity index 100%
rename from typeagent/knowpro/collections.py
rename to src/typeagent/knowpro/collections.py
diff --git a/typeagent/knowpro/common.py b/src/typeagent/knowpro/common.py
similarity index 100%
rename from typeagent/knowpro/common.py
rename to src/typeagent/knowpro/common.py
diff --git a/typeagent/knowpro/conversation_base.py b/src/typeagent/knowpro/conversation_base.py
similarity index 100%
rename from typeagent/knowpro/conversation_base.py
rename to src/typeagent/knowpro/conversation_base.py
diff --git a/typeagent/knowpro/convknowledge.py b/src/typeagent/knowpro/convknowledge.py
similarity index 100%
rename from typeagent/knowpro/convknowledge.py
rename to src/typeagent/knowpro/convknowledge.py
diff --git a/typeagent/knowpro/convsettings.py b/src/typeagent/knowpro/convsettings.py
similarity index 100%
rename from typeagent/knowpro/convsettings.py
rename to src/typeagent/knowpro/convsettings.py
diff --git a/typeagent/knowpro/convutils.py b/src/typeagent/knowpro/convutils.py
similarity index 100%
rename from typeagent/knowpro/convutils.py
rename to src/typeagent/knowpro/convutils.py
diff --git a/typeagent/knowpro/dataclasses.py b/src/typeagent/knowpro/dataclasses.py
similarity index 100%
rename from typeagent/knowpro/dataclasses.py
rename to src/typeagent/knowpro/dataclasses.py
diff --git a/typeagent/knowpro/date_time_schema.py b/src/typeagent/knowpro/date_time_schema.py
similarity index 100%
rename from typeagent/knowpro/date_time_schema.py
rename to src/typeagent/knowpro/date_time_schema.py
diff --git a/typeagent/knowpro/factory.py b/src/typeagent/knowpro/factory.py
similarity index 100%
rename from typeagent/knowpro/factory.py
rename to src/typeagent/knowpro/factory.py
diff --git a/typeagent/knowpro/field_helpers.py b/src/typeagent/knowpro/field_helpers.py
similarity index 100%
rename from typeagent/knowpro/field_helpers.py
rename to src/typeagent/knowpro/field_helpers.py
diff --git a/typeagent/knowpro/fuzzyindex.py b/src/typeagent/knowpro/fuzzyindex.py
similarity index 100%
rename from typeagent/knowpro/fuzzyindex.py
rename to src/typeagent/knowpro/fuzzyindex.py
diff --git a/typeagent/knowpro/interfaces.py b/src/typeagent/knowpro/interfaces.py
similarity index 100%
rename from typeagent/knowpro/interfaces.py
rename to src/typeagent/knowpro/interfaces.py
diff --git a/typeagent/knowpro/interfaces_core.py b/src/typeagent/knowpro/interfaces_core.py
similarity index 100%
rename from typeagent/knowpro/interfaces_core.py
rename to src/typeagent/knowpro/interfaces_core.py
diff --git a/typeagent/knowpro/interfaces_indexes.py b/src/typeagent/knowpro/interfaces_indexes.py
similarity index 100%
rename from typeagent/knowpro/interfaces_indexes.py
rename to src/typeagent/knowpro/interfaces_indexes.py
diff --git a/typeagent/knowpro/interfaces_search.py b/src/typeagent/knowpro/interfaces_search.py
similarity index 100%
rename from typeagent/knowpro/interfaces_search.py
rename to src/typeagent/knowpro/interfaces_search.py
diff --git a/typeagent/knowpro/interfaces_serialization.py b/src/typeagent/knowpro/interfaces_serialization.py
similarity index 100%
rename from typeagent/knowpro/interfaces_serialization.py
rename to src/typeagent/knowpro/interfaces_serialization.py
diff --git a/typeagent/knowpro/interfaces_storage.py b/src/typeagent/knowpro/interfaces_storage.py
similarity index 100%
rename from typeagent/knowpro/interfaces_storage.py
rename to src/typeagent/knowpro/interfaces_storage.py
diff --git a/typeagent/knowpro/knowledge.py b/src/typeagent/knowpro/knowledge.py
similarity index 100%
rename from typeagent/knowpro/knowledge.py
rename to src/typeagent/knowpro/knowledge.py
diff --git a/typeagent/knowpro/kplib.py b/src/typeagent/knowpro/kplib.py
similarity index 100%
rename from typeagent/knowpro/kplib.py
rename to src/typeagent/knowpro/kplib.py
diff --git a/typeagent/knowpro/messageutils.py b/src/typeagent/knowpro/messageutils.py
similarity index 100%
rename from typeagent/knowpro/messageutils.py
rename to src/typeagent/knowpro/messageutils.py
diff --git a/typeagent/knowpro/query.py b/src/typeagent/knowpro/query.py
similarity index 100%
rename from typeagent/knowpro/query.py
rename to src/typeagent/knowpro/query.py
diff --git a/typeagent/knowpro/search.py b/src/typeagent/knowpro/search.py
similarity index 100%
rename from typeagent/knowpro/search.py
rename to src/typeagent/knowpro/search.py
diff --git a/typeagent/knowpro/search_query_schema.py b/src/typeagent/knowpro/search_query_schema.py
similarity index 100%
rename from typeagent/knowpro/search_query_schema.py
rename to src/typeagent/knowpro/search_query_schema.py
diff --git a/typeagent/knowpro/searchlang.py b/src/typeagent/knowpro/searchlang.py
similarity index 100%
rename from typeagent/knowpro/searchlang.py
rename to src/typeagent/knowpro/searchlang.py
diff --git a/typeagent/knowpro/searchlib.py b/src/typeagent/knowpro/searchlib.py
similarity index 100%
rename from typeagent/knowpro/searchlib.py
rename to src/typeagent/knowpro/searchlib.py
diff --git a/typeagent/knowpro/secindex.py b/src/typeagent/knowpro/secindex.py
similarity index 100%
rename from typeagent/knowpro/secindex.py
rename to src/typeagent/knowpro/secindex.py
diff --git a/typeagent/knowpro/serialization.py b/src/typeagent/knowpro/serialization.py
similarity index 100%
rename from typeagent/knowpro/serialization.py
rename to src/typeagent/knowpro/serialization.py
diff --git a/typeagent/knowpro/textlocindex.py b/src/typeagent/knowpro/textlocindex.py
similarity index 100%
rename from typeagent/knowpro/textlocindex.py
rename to src/typeagent/knowpro/textlocindex.py
diff --git a/typeagent/knowpro/universal_message.py b/src/typeagent/knowpro/universal_message.py
similarity index 100%
rename from typeagent/knowpro/universal_message.py
rename to src/typeagent/knowpro/universal_message.py
diff --git a/typeagent/knowpro/utils.py b/src/typeagent/knowpro/utils.py
similarity index 100%
rename from typeagent/knowpro/utils.py
rename to src/typeagent/knowpro/utils.py
diff --git a/typeagent/mcp/server.py b/src/typeagent/mcp/server.py
similarity index 100%
rename from typeagent/mcp/server.py
rename to src/typeagent/mcp/server.py
diff --git a/typeagent/podcasts/podcast.py b/src/typeagent/podcasts/podcast.py
similarity index 100%
rename from typeagent/podcasts/podcast.py
rename to src/typeagent/podcasts/podcast.py
diff --git a/typeagent/podcasts/podcastVerbs.json b/src/typeagent/podcasts/podcastVerbs.json
similarity index 100%
rename from typeagent/podcasts/podcastVerbs.json
rename to src/typeagent/podcasts/podcastVerbs.json
diff --git a/typeagent/podcasts/podcast_ingest.py b/src/typeagent/podcasts/podcast_ingest.py
similarity index 100%
rename from typeagent/podcasts/podcast_ingest.py
rename to src/typeagent/podcasts/podcast_ingest.py
diff --git a/typeagent/py.typed b/src/typeagent/py.typed
similarity index 100%
rename from typeagent/py.typed
rename to src/typeagent/py.typed
diff --git a/typeagent/storage/__init__.py b/src/typeagent/storage/__init__.py
similarity index 100%
rename from typeagent/storage/__init__.py
rename to src/typeagent/storage/__init__.py
diff --git a/typeagent/storage/memory/__init__.py b/src/typeagent/storage/memory/__init__.py
similarity index 100%
rename from typeagent/storage/memory/__init__.py
rename to src/typeagent/storage/memory/__init__.py
diff --git a/typeagent/storage/memory/collections.py b/src/typeagent/storage/memory/collections.py
similarity index 100%
rename from typeagent/storage/memory/collections.py
rename to src/typeagent/storage/memory/collections.py
diff --git a/typeagent/storage/memory/convthreads.py b/src/typeagent/storage/memory/convthreads.py
similarity index 100%
rename from typeagent/storage/memory/convthreads.py
rename to src/typeagent/storage/memory/convthreads.py
diff --git a/typeagent/storage/memory/messageindex.py b/src/typeagent/storage/memory/messageindex.py
similarity index 100%
rename from typeagent/storage/memory/messageindex.py
rename to src/typeagent/storage/memory/messageindex.py
diff --git a/typeagent/storage/memory/propindex.py b/src/typeagent/storage/memory/propindex.py
similarity index 100%
rename from typeagent/storage/memory/propindex.py
rename to src/typeagent/storage/memory/propindex.py
diff --git a/typeagent/storage/memory/provider.py b/src/typeagent/storage/memory/provider.py
similarity index 100%
rename from typeagent/storage/memory/provider.py
rename to src/typeagent/storage/memory/provider.py
diff --git a/typeagent/storage/memory/reltermsindex.py b/src/typeagent/storage/memory/reltermsindex.py
similarity index 100%
rename from typeagent/storage/memory/reltermsindex.py
rename to src/typeagent/storage/memory/reltermsindex.py
diff --git a/typeagent/storage/memory/semrefindex.py b/src/typeagent/storage/memory/semrefindex.py
similarity index 100%
rename from typeagent/storage/memory/semrefindex.py
rename to src/typeagent/storage/memory/semrefindex.py
diff --git a/typeagent/storage/memory/timestampindex.py b/src/typeagent/storage/memory/timestampindex.py
similarity index 100%
rename from typeagent/storage/memory/timestampindex.py
rename to src/typeagent/storage/memory/timestampindex.py
diff --git a/typeagent/storage/sqlite/__init__.py b/src/typeagent/storage/sqlite/__init__.py
similarity index 100%
rename from typeagent/storage/sqlite/__init__.py
rename to src/typeagent/storage/sqlite/__init__.py
diff --git a/typeagent/storage/sqlite/collections.py b/src/typeagent/storage/sqlite/collections.py
similarity index 100%
rename from typeagent/storage/sqlite/collections.py
rename to src/typeagent/storage/sqlite/collections.py
diff --git a/typeagent/storage/sqlite/messageindex.py b/src/typeagent/storage/sqlite/messageindex.py
similarity index 100%
rename from typeagent/storage/sqlite/messageindex.py
rename to src/typeagent/storage/sqlite/messageindex.py
diff --git a/typeagent/storage/sqlite/propindex.py b/src/typeagent/storage/sqlite/propindex.py
similarity index 100%
rename from typeagent/storage/sqlite/propindex.py
rename to src/typeagent/storage/sqlite/propindex.py
diff --git a/typeagent/storage/sqlite/provider.py b/src/typeagent/storage/sqlite/provider.py
similarity index 100%
rename from typeagent/storage/sqlite/provider.py
rename to src/typeagent/storage/sqlite/provider.py
diff --git a/typeagent/storage/sqlite/reltermsindex.py b/src/typeagent/storage/sqlite/reltermsindex.py
similarity index 100%
rename from typeagent/storage/sqlite/reltermsindex.py
rename to src/typeagent/storage/sqlite/reltermsindex.py
diff --git a/typeagent/storage/sqlite/schema.py b/src/typeagent/storage/sqlite/schema.py
similarity index 100%
rename from typeagent/storage/sqlite/schema.py
rename to src/typeagent/storage/sqlite/schema.py
diff --git a/typeagent/storage/sqlite/semrefindex.py b/src/typeagent/storage/sqlite/semrefindex.py
similarity index 100%
rename from typeagent/storage/sqlite/semrefindex.py
rename to src/typeagent/storage/sqlite/semrefindex.py
diff --git a/typeagent/storage/sqlite/timestampindex.py b/src/typeagent/storage/sqlite/timestampindex.py
similarity index 100%
rename from typeagent/storage/sqlite/timestampindex.py
rename to src/typeagent/storage/sqlite/timestampindex.py
diff --git a/typeagent/storage/utils.py b/src/typeagent/storage/utils.py
similarity index 100%
rename from typeagent/storage/utils.py
rename to src/typeagent/storage/utils.py
diff --git a/typeagent/transcripts/README.md b/src/typeagent/transcripts/README.md
similarity index 100%
rename from typeagent/transcripts/README.md
rename to src/typeagent/transcripts/README.md
diff --git a/typeagent/transcripts/transcript.py b/src/typeagent/transcripts/transcript.py
similarity index 100%
rename from typeagent/transcripts/transcript.py
rename to src/typeagent/transcripts/transcript.py
diff --git a/typeagent/transcripts/transcript_ingest.py b/src/typeagent/transcripts/transcript_ingest.py
similarity index 100%
rename from typeagent/transcripts/transcript_ingest.py
rename to src/typeagent/transcripts/transcript_ingest.py
diff --git a/uv.lock b/uv.lock
index 5f6ee2f..21ebefc 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1828,6 +1828,11 @@ dev = [
     { name = "pytest-mock" },
 ]
 
+[package.dev-dependencies]
+dev = [
+    { name = "isort" },
+]
+
 [package.metadata]
 requires-dist = [
     { name = "azure-identity", specifier = ">=1.22.0" },
@@ -1858,6 +1863,9 @@ requires-dist = [
 ]
 provides-extras = ["dev"]
 
+[package.metadata.requires-dev]
+dev = [{ name = "isort", specifier = ">=7.0.0" }]
+
 [[package]]
 name = "typechat"
 version = "0.0.4"