diff --git a/src/textual/app.py b/src/textual/app.py
index e52b95e40..adcb18dd6 100644
--- a/src/textual/app.py
+++ b/src/textual/app.py
@@ -12,7 +12,6 @@ from typing import Any, Callable, Iterable, Type, TypeVar, TYPE_CHECKING
 import aiohttp
 import rich
 import rich.repr
-from aiohttp import ClientWebSocketResponse
 from rich.console import Console, RenderableType
 from rich.control import Control
 from rich.measure import Measurement
@@ -30,7 +29,7 @@ from ._event_broker import extract_handler_actions, NoHandler
 from ._profile import timer
 from .binding import Bindings, NoBinding
 from .css.stylesheet import Stylesheet, StylesheetParseError, StylesheetError
-from .devtools_client import DevtoolsClient, DevtoolsConnectionError
+from .devtools.client import DevtoolsClient, DevtoolsConnectionError
 from .dom import DOMNode
 from .driver import Driver
 from .file_monitor import FileMonitor
diff --git a/src/textual/devtools_client.py b/src/textual/devtools/client.py
similarity index 99%
rename from src/textual/devtools_client.py
rename to src/textual/devtools/client.py
index 4c28f2752..8169167be 100644
--- a/src/textual/devtools_client.py
+++ b/src/textual/devtools/client.py
@@ -14,7 +14,7 @@ from aiohttp import ClientResponseError, ClientConnectorError, ClientWebSocketRe
 from rich.console import Console
 from rich.segment import Segment
 
-from textual.devtools import DEFAULT_PORT
+from textual.devtools.server import DEFAULT_PORT
 
 WEBSOCKET_CONNECT_TIMEOUT = 3
 LOG_QUEUE_MAXSIZE = 512
diff --git a/src/textual/devtools.py b/src/textual/devtools/server.py
similarity index 100%
rename from src/textual/devtools.py
rename to src/textual/devtools/server.py
diff --git a/tests/conftest.py b/tests/conftest.py
index 823746566..f27259cc4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,7 +1,7 @@
 import pytest
 
-from textual.devtools import _make_devtools_aiohttp_app
-from textual.devtools_client import DevtoolsClient
+from textual.devtools.server import _make_devtools_aiohttp_app
+from textual.devtools.client import DevtoolsClient
 
 
 @pytest.fixture
diff --git a/tests/test_devtools.py b/tests/test_devtools.py
index c0df43c7c..4b611d084 100644
--- a/tests/test_devtools.py
+++ b/tests/test_devtools.py
@@ -7,7 +7,7 @@ from rich.console import Console
 from rich.segment import Segment
 
 from tests.utilities.render import wait_for_predicate
-from textual.devtools import DevtoolsLogMessage, DevtoolsInternalMessage
+from textual.devtools.server import DevtoolsLogMessage, DevtoolsInternalMessage
 
 TIMESTAMP = 1649166819
 WIDTH = 40
diff --git a/tests/test_devtools_client.py b/tests/test_devtools_client.py
index 12a0cc281..9a3d6c7eb 100644
--- a/tests/test_devtools_client.py
+++ b/tests/test_devtools_client.py
@@ -1,16 +1,14 @@
-import asyncio
 import json
 from asyncio import Queue
 from datetime import datetime
 
-import pytest
 import time_machine
 from aiohttp.web_ws import WebSocketResponse
 from rich.console import ConsoleDimensions
 from rich.panel import Panel
 
 from tests.utilities.render import wait_for_predicate
-from textual.devtools_client import DevtoolsClient
+from textual.devtools.client import DevtoolsClient
 
 TIMESTAMP = 1649166819