diff --git a/openhands/storage/data_models/conversation_info.py b/openhands/server/data_models/conversation_info.py
similarity index 74%
rename from openhands/storage/data_models/conversation_info.py
rename to openhands/server/data_models/conversation_info.py
index 9bbeacd73d..c6f9523c62 100644
--- a/openhands/storage/data_models/conversation_info.py
+++ b/openhands/server/data_models/conversation_info.py
@@ -6,7 +6,10 @@ from openhands.storage.data_models.conversation_status import ConversationStatus
 
 @dataclass
 class ConversationInfo:
-    """Information about a conversation"""
+    """
+    Information about a conversation. This combines conversation metadata with
+    information on whether a conversation is currently running
+    """
 
     conversation_id: str
     title: str
diff --git a/openhands/storage/data_models/conversation_info_result_set.py b/openhands/server/data_models/conversation_info_result_set.py
similarity index 71%
rename from openhands/storage/data_models/conversation_info_result_set.py
rename to openhands/server/data_models/conversation_info_result_set.py
index b153baf1a2..5f91f5f531 100644
--- a/openhands/storage/data_models/conversation_info_result_set.py
+++ b/openhands/server/data_models/conversation_info_result_set.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from openhands.storage.data_models.conversation_info import ConversationInfo
+from openhands.server.data_models.conversation_info import ConversationInfo
 
 
 @dataclass
diff --git a/openhands/server/routes/manage_conversations.py b/openhands/server/routes/manage_conversations.py
index 88efc03cbf..0389bbd90c 100644
--- a/openhands/server/routes/manage_conversations.py
+++ b/openhands/server/routes/manage_conversations.py
@@ -12,6 +12,10 @@ from openhands.events.stream import EventStreamSubscriber
 from openhands.integrations.github.github_service import GithubServiceImpl
 from openhands.runtime import get_runtime_cls
 from openhands.server.auth import get_github_token, get_user_id
+from openhands.server.data_models.conversation_info import ConversationInfo
+from openhands.server.data_models.conversation_info_result_set import (
+    ConversationInfoResultSet,
+)
 from openhands.server.session.conversation_init_data import ConversationInitData
 from openhands.server.shared import (
     ConversationStoreImpl,
@@ -21,10 +25,6 @@ from openhands.server.shared import (
     monitoring_listener,
 )
 from openhands.server.types import LLMAuthenticationError, MissingSettingsError
-from openhands.storage.data_models.conversation_info import ConversationInfo
-from openhands.storage.data_models.conversation_info_result_set import (
-    ConversationInfoResultSet,
-)
 from openhands.storage.data_models.conversation_metadata import ConversationMetadata
 from openhands.storage.data_models.conversation_status import ConversationStatus
 from openhands.utils.async_utils import (
diff --git a/tests/unit/test_conversation.py b/tests/unit/test_conversation.py
index e9e61aa88c..467092b292 100644
--- a/tests/unit/test_conversation.py
+++ b/tests/unit/test_conversation.py
@@ -6,16 +6,16 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from openhands.runtime.impl.docker.docker_runtime import DockerRuntime
+from openhands.server.data_models.conversation_info import ConversationInfo
+from openhands.server.data_models.conversation_info_result_set import (
+    ConversationInfoResultSet,
+)
 from openhands.server.routes.manage_conversations import (
     delete_conversation,
     get_conversation,
     search_conversations,
     update_conversation,
 )
-from openhands.storage.data_models.conversation_info import ConversationInfo
-from openhands.storage.data_models.conversation_info_result_set import (
-    ConversationInfoResultSet,
-)
 from openhands.storage.data_models.conversation_status import ConversationStatus
 from openhands.storage.memory import InMemoryFileStore