diff --git a/src/serena/tools/__init__.py b/src/serena/tools/__init__.py
new file mode 100644
index 00000000..39cfbd46
--- /dev/null
+++ b/src/serena/tools/__init__.py
@@ -0,0 +1,2 @@
+# ruff: noqa
+from .tools_base import *
diff --git a/src/serena/tools.py b/src/serena/tools/tools_base.py
similarity index 99%
rename from src/serena/tools.py
rename to src/serena/tools/tools_base.py
index dbfb6f40..a7c49759 100644
--- a/src/serena/tools.py
+++ b/src/serena/tools/tools_base.py
@@ -32,7 +32,7 @@ from solidlsp import SolidLanguageServer
 from solidlsp.ls_types import SymbolKind
 
 if TYPE_CHECKING:
-    from .agent import LinesRead, MemoriesManager, SerenaAgent
+    from serena.agent import LinesRead, MemoriesManager, SerenaAgent
 
 log = logging.getLogger(__name__)
 T = TypeVar("T")