diff --git a/src/serena/code_editor.py b/src/serena/code_editor.py
index 2b848c72..b5075c38 100644
--- a/src/serena/code_editor.py
+++ b/src/serena/code_editor.py
@@ -6,6 +6,7 @@ from collections.abc import Iterable, Iterator, Reversible
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, Generic, Optional, TypeVar, cast
 
+from serena.jetbrains.jetbrains_plugin_client import JetBrainsPluginClient
 from serena.symbol import JetBrainsSymbol, LanguageServerSymbol, LanguageServerSymbolRetriever, PositionInFile, Symbol
 from solidlsp import SolidLanguageServer, ls_types
 from solidlsp.ls import LSPFileBuffer
@@ -13,7 +14,6 @@ from solidlsp.ls_utils import PathUtils, TextUtils
 
 from .constants import DEFAULT_SOURCE_FILE_ENCODING
 from .project import Project
-from .tools.jetbrains_plugin_client import JetBrainsPluginClient
 
 if TYPE_CHECKING:
     from .agent import SerenaAgent
diff --git a/src/serena/tools/jetbrains_plugin_client.py b/src/serena/jetbrains/jetbrains_plugin_client.py
similarity index 99%
rename from src/serena/tools/jetbrains_plugin_client.py
rename to src/serena/jetbrains/jetbrains_plugin_client.py
index 5474f051..2607f547 100644
--- a/src/serena/tools/jetbrains_plugin_client.py
+++ b/src/serena/jetbrains/jetbrains_plugin_client.py
@@ -12,10 +12,10 @@ import requests
 from requests import Response
 from sensai.util.string import ToStringMixin
 
-import serena.tools.jetbrains_types as jb
+import serena.jetbrains.jetbrains_types as jb
+from serena.jetbrains.jetbrains_types import PluginStatusDTO
 from serena.project import Project
 from serena.text_utils import render_html
-from serena.tools.jetbrains_types import PluginStatusDTO
 from serena.util.version import Version
 
 T = TypeVar("T")
diff --git a/src/serena/tools/jetbrains_types.py b/src/serena/jetbrains/jetbrains_types.py
similarity index 100%
rename from src/serena/tools/jetbrains_types.py
rename to src/serena/jetbrains/jetbrains_types.py
diff --git a/src/serena/symbol.py b/src/serena/symbol.py
index 9e7c8087..46292d7e 100644
--- a/src/serena/symbol.py
+++ b/src/serena/symbol.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Generic, Literal, NotRequired, Self, Type
 
 from sensai.util.string import ToStringMixin
 
-import serena.tools.jetbrains_types as jb
+import serena.jetbrains.jetbrains_types as jb
 from solidlsp import SolidLanguageServer
 from solidlsp.ls import ReferenceInSymbol as LSPReferenceInSymbol
 from solidlsp.ls_types import Position, SymbolKind, UnifiedSymbolInformation
diff --git a/src/serena/tools/jetbrains_tools.py b/src/serena/tools/jetbrains_tools.py
index 096cd1e2..ed9b53cc 100644
--- a/src/serena/tools/jetbrains_tools.py
+++ b/src/serena/tools/jetbrains_tools.py
@@ -2,9 +2,9 @@ import logging
 from collections import defaultdict
 from typing import Any, Literal
 
-import serena.tools.jetbrains_types as jb
+import serena.jetbrains.jetbrains_types as jb
+from serena.jetbrains.jetbrains_plugin_client import JetBrainsPluginClient
 from serena.tools import Tool, ToolMarkerOptional, ToolMarkerSymbolicRead
-from serena.tools.jetbrains_plugin_client import JetBrainsPluginClient
 
 log = logging.getLogger(__name__)