diff --git a/src/anthropic/resources/beta/tools/messages.py b/src/anthropic/resources/beta/tools/messages.py
index ff79a972..2d5cd77b 100644
--- a/src/anthropic/resources/beta/tools/messages.py
+++ b/src/anthropic/resources/beta/tools/messages.py
@@ -8,7 +8,6 @@
 import httpx
 
 from .... import _legacy_response
-from ....types import MessageStreamEvent
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._utils import (
     required_args,
@@ -22,7 +21,11 @@
 from ...._base_client import (
     make_request_options,
 )
-from ....types.beta.tools import ToolParam, ToolsBetaMessage, ToolsBetaMessageParam, message_create_params
+from ....types.beta.tools import message_create_params
+from ....types.message_stream_event import MessageStreamEvent
+from ....types.beta.tools.tool_param import ToolParam
+from ....types.beta.tools.tools_beta_message import ToolsBetaMessage
+from ....types.beta.tools.tools_beta_message_param import ToolsBetaMessageParam
 
 __all__ = ["Messages", "AsyncMessages"]
 
diff --git a/src/anthropic/resources/completions.py b/src/anthropic/resources/completions.py
index 25e8eac9..65caedb0 100644
--- a/src/anthropic/resources/completions.py
+++ b/src/anthropic/resources/completions.py
@@ -8,7 +8,7 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import Completion, completion_create_params
+from ..types import completion_create_params
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._utils import (
     required_args,
@@ -22,6 +22,7 @@
 from .._base_client import (
     make_request_options,
 )
+from ..types.completion import Completion
 
 __all__ = ["Completions", "AsyncCompletions"]
 
diff --git a/src/anthropic/resources/messages.py b/src/anthropic/resources/messages.py
index a7e58250..b5fd0541 100644
--- a/src/anthropic/resources/messages.py
+++ b/src/anthropic/resources/messages.py
@@ -9,7 +9,7 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import Message, MessageParam, MessageStreamEvent, message_create_params
+from ..types import message_create_params
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._utils import (
     required_args,
@@ -31,6 +31,9 @@
     MessageStreamManager,
     AsyncMessageStreamManager,
 )
+from ..types.message import Message
+from ..types.message_param import MessageParam
+from ..types.message_stream_event import MessageStreamEvent
 
 __all__ = ["Messages", "AsyncMessages"]
 
diff --git a/tests/api_resources/beta/tools/test_messages.py b/tests/api_resources/beta/tools/test_messages.py
index a053c3eb..9e6eb7a1 100644
--- a/tests/api_resources/beta/tools/test_messages.py
+++ b/tests/api_resources/beta/tools/test_messages.py
@@ -9,7 +9,7 @@
 
 from anthropic import Anthropic, AsyncAnthropic
 from tests.utils import assert_matches_type
-from anthropic.types.beta.tools import ToolsBetaMessage
+from anthropic.types.beta.tools.tools_beta_message import ToolsBetaMessage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_completions.py b/tests/api_resources/test_completions.py
index f46b7bb7..fdffc44a 100644
--- a/tests/api_resources/test_completions.py
+++ b/tests/api_resources/test_completions.py
@@ -9,7 +9,7 @@
 
 from anthropic import Anthropic, AsyncAnthropic
 from tests.utils import assert_matches_type
-from anthropic.types import Completion
+from anthropic.types.completion import Completion
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_messages.py b/tests/api_resources/test_messages.py
index ac0700c3..bfef0225 100644
--- a/tests/api_resources/test_messages.py
+++ b/tests/api_resources/test_messages.py
@@ -9,7 +9,7 @@
 
 from anthropic import Anthropic, AsyncAnthropic
 from tests.utils import assert_matches_type
-from anthropic.types import Message
+from anthropic.types.message import Message
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")