diff --git a/src/typeagent/knowpro/add_messages.py b/src/typeagent/knowpro/add_messages.py
index 1d9fc879..3d62d03f 100644
--- a/src/typeagent/knowpro/add_messages.py
+++ b/src/typeagent/knowpro/add_messages.py
@@ -13,8 +13,13 @@
 
 from ..aitools.embeddings import IEmbeddingModel, NormalizedEmbedding
 from ..storage.memory.semrefindex import collect_action_terms, collect_entity_terms
-from .interfaces import AddMessagesResult
-from .interfaces_core import IKnowledgeExtractor, IMessage, MessageOrdinal, TextLocation
+from .interfaces import (
+    AddMessagesResult,
+    IKnowledgeExtractor,
+    IMessage,
+    MessageOrdinal,
+    TextLocation,
+)
 from .knowledge_schema import KnowledgeResponse
 
 __all__ = ["add_messages_streaming"]
diff --git a/src/typeagent/knowpro/conversation_base.py b/src/typeagent/knowpro/conversation_base.py
index 14ab5edf..312cb9a2 100644
--- a/src/typeagent/knowpro/conversation_base.py
+++ b/src/typeagent/knowpro/conversation_base.py
@@ -34,9 +34,9 @@
     IStorageProvider,
     ITermToSemanticRefIndex,
     MessageOrdinal,
+    TextLocation,
     Topic,
 )
-from .interfaces_core import TextLocation
 from .knowledge_schema import Action, ConcreteEntity, KnowledgeResponse
 from .messageutils import get_all_message_chunk_locations
 
diff --git a/src/typeagent/podcasts/podcast_ingest.py b/src/typeagent/podcasts/podcast_ingest.py
index 2ff5c764..26ea42f1 100644
--- a/src/typeagent/podcasts/podcast_ingest.py
+++ b/src/typeagent/podcasts/podcast_ingest.py
@@ -8,8 +8,7 @@
 import time
 
 from ..knowpro.convsettings import ConversationSettings
-from ..knowpro.interfaces import Datetime
-from ..knowpro.interfaces_core import AddMessagesResult
+from ..knowpro.interfaces import AddMessagesResult, Datetime
 from ..knowpro.universal_message import format_timestamp_utc, UNIX_EPOCH
 from ..storage.utils import create_storage_provider
 from .podcast import Podcast, PodcastMessage, PodcastMessageMeta
diff --git a/src/typeagent/storage/sqlite/provider.py b/src/typeagent/storage/sqlite/provider.py
index a8ba9c06..0b3805a8 100644
--- a/src/typeagent/storage/sqlite/provider.py
+++ b/src/typeagent/storage/sqlite/provider.py
@@ -10,8 +10,7 @@
 from ...aitools.vectorbase import TextEmbeddingIndexSettings
 from ...knowpro import interfaces
 from ...knowpro.convsettings import MessageTextIndexSettings, RelatedTermIndexSettings
-from ...knowpro.interfaces import ConversationMetadata, STATUS_INGESTED
-from ...knowpro.interfaces_storage import ChunkFailure
+from ...knowpro.interfaces import ChunkFailure, ConversationMetadata, STATUS_INGESTED
 from ..memory.convthreads import ConversationThreads
 from .collections import SqliteMessageCollection, SqliteSemanticRefCollection
 from .messageindex import SqliteMessageTextIndex