Removed deprecated modules and updated imports

tests/messaging/test_handler.py

@@ -4,8 +4,8 @@ import pytest
 
 from messaging.handler import ClaudeMessageHandler
 from messaging.models import IncomingMessage
-from messaging.tree_data import MessageNode, MessageTree
-from messaging.tree_queue import MessageState
+from messaging.trees.data import MessageNode, MessageTree
+from messaging.trees.queue_manager import MessageState
 
 
 @pytest.fixture

tests/messaging/test_handler_context_isolation.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 from messaging.handler import ClaudeMessageHandler
-from messaging.tree_data import MessageState
+from messaging.trees.data import MessageState
 
 
 async def _gen_session(events):

tests/messaging/test_handler_integration.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from messaging.handler import ClaudeMessageHandler
-from messaging.tree_data import MessageState
+from messaging.trees.data import MessageState
 
 
 @pytest.fixture

tests/messaging/test_handler_markdown_and_status_edges.py

@@ -5,7 +5,7 @@ import pytest
 from messaging.handler import ClaudeMessageHandler
 from messaging.models import IncomingMessage
 from messaging.telegram_markdown import render_markdown_to_mdv2
-from messaging.tree_data import MessageNode, MessageState
+from messaging.trees.data import MessageNode, MessageState
 
 
 def test_render_markdown_to_mdv2_empty_returns_empty():

tests/messaging/test_messaging.py

@@ -174,21 +174,21 @@ class TestTreeQueueManager:
 
     def test_tree_queue_manager_init(self):
         """Test TreeQueueManager initialization."""
-        from messaging.tree_queue import TreeQueueManager
+        from messaging.trees.queue_manager import TreeQueueManager
 
         mgr = TreeQueueManager()
         assert mgr.get_tree_count() == 0
 
     def test_tree_not_busy_initially(self):
         """Test tree is not busy when no messages."""
-        from messaging.tree_queue import TreeQueueManager
+        from messaging.trees.queue_manager import TreeQueueManager
 
         mgr = TreeQueueManager()
         assert mgr.is_tree_busy("nonexistent") is False
 
     def test_get_queue_size_empty(self):
         """Test queue size is 0 for non-existent node."""
-        from messaging.tree_queue import TreeQueueManager
+        from messaging.trees.queue_manager import TreeQueueManager
 
         mgr = TreeQueueManager()
         assert mgr.get_queue_size("nonexistent") == 0
@@ -197,7 +197,7 @@ class TestTreeQueueManager:
     async def test_create_tree_and_enqueue(self):
         """Test creating a tree and enqueueing."""
         from messaging.models import IncomingMessage
-        from messaging.tree_queue import TreeQueueManager
+        from messaging.trees.queue_manager import TreeQueueManager
 
         mgr = TreeQueueManager()
         processed = []
@@ -217,7 +217,7 @@ class TestTreeQueueManager:
 
     def test_cancel_tree_empty(self):
         """Test cancelling non-existent tree."""
-        from messaging.tree_queue import TreeQueueManager
+        from messaging.trees.queue_manager import TreeQueueManager
 
         mgr = TreeQueueManager()
         cancelled = mgr.cancel_tree("nonexistent")

tests/messaging/test_restart_reply_restore.py

@@ -5,7 +5,7 @@ import pytest
 from messaging.handler import ClaudeMessageHandler
 from messaging.models import IncomingMessage
 from messaging.session import SessionStore
-from messaging.tree_queue import TreeQueueManager
+from messaging.trees.queue_manager import TreeQueueManager
 
 
 @pytest.mark.asyncio

tests/messaging/test_tree_concurrency.py

@@ -5,8 +5,8 @@ import asyncio
 import pytest
 
 from messaging.models import IncomingMessage
-from messaging.tree_data import MessageNode, MessageState, MessageTree
-from messaging.tree_queue import TreeQueueManager
+from messaging.trees.data import MessageNode, MessageState, MessageTree
+from messaging.trees.queue_manager import TreeQueueManager
 
 
 def _make_incoming(text: str = "hello", msg_id: str = "m1") -> IncomingMessage:

tests/messaging/test_tree_processor.py

@@ -5,8 +5,8 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 from messaging.models import IncomingMessage
-from messaging.tree_data import MessageNode, MessageState, MessageTree
-from messaging.tree_processor import TreeQueueProcessor
+from messaging.trees.data import MessageNode, MessageState, MessageTree
+from messaging.trees.processor import TreeQueueProcessor
 
 
 @pytest.fixture

tests/messaging/test_tree_queue.py

@@ -5,7 +5,7 @@ import asyncio
 import pytest
 
 from messaging.models import IncomingMessage
-from messaging.tree_queue import (
+from messaging.trees.queue_manager import (
     MessageNode,
     MessageState,
     MessageTree,

tests/messaging/test_tree_repository.py

@@ -3,8 +3,8 @@ from unittest.mock import MagicMock
 import pytest
 
 from messaging.models import IncomingMessage
-from messaging.tree_data import MessageNode, MessageState, MessageTree
-from messaging.tree_repository import TreeRepository
+from messaging.trees.data import MessageNode, MessageState, MessageTree
+from messaging.trees.repository import TreeRepository
 
 
 @pytest.fixture