diff --git a/scripts/print_mode_context_options.py b/scripts/print_mode_context_options.py
index 20a24d79..fe7f768f 100644
--- a/scripts/print_mode_context_options.py
+++ b/scripts/print_mode_context_options.py
@@ -1,4 +1,4 @@
-from serena.config import SerenaAgentContext, SerenaAgentMode
+from serena.config.context_mode import SerenaAgentContext, SerenaAgentMode
 
 if __name__ == "__main__":
     print("---------- Available modes: ----------")
diff --git a/src/serena/agent.py b/src/serena/agent.py
index 60e781f1..bf3de5ec 100644
--- a/src/serena/agent.py
+++ b/src/serena/agent.py
@@ -28,7 +28,7 @@ from sensai.util.logging import FallbackHandler, LogTime
 from sensai.util.string import ToStringMixin
 
 from serena import serena_version
-from serena.config import SerenaAgentContext, SerenaAgentMode
+from serena.config.context_mode import SerenaAgentContext, SerenaAgentMode
 from serena.constants import (
     DEFAULT_ENCODING,
     PROJECT_TEMPLATE_FILE,
diff --git a/src/serena/agno.py b/src/serena/agno.py
index 0bb0e70f..28284ab8 100644
--- a/src/serena/agno.py
+++ b/src/serena/agno.py
@@ -15,7 +15,7 @@ from dotenv import load_dotenv
 from sensai.util.logging import LogTime
 
 from serena.agent import SerenaAgent, Tool, show_fatal_exception_safe
-from serena.config import SerenaAgentContext
+from serena.config.context_mode import SerenaAgentContext
 from serena.constants import REPO_ROOT
 
 log = logging.getLogger(__name__)
diff --git a/src/serena/config/__init__.py b/src/serena/config/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/serena/config.py b/src/serena/config/context_mode.py
similarity index 100%
rename from src/serena/config.py
rename to src/serena/config/context_mode.py
diff --git a/src/serena/mcp.py b/src/serena/mcp.py
index c3d26405..8128c525 100644
--- a/src/serena/mcp.py
+++ b/src/serena/mcp.py
@@ -24,7 +24,7 @@ from serena.agent import (
     SerenaConfig,
     show_fatal_exception_safe,
 )
-from serena.config import SerenaAgentContext, SerenaAgentMode
+from serena.config.context_mode import SerenaAgentContext, SerenaAgentMode
 from serena.constants import DEFAULT_CONTEXT, DEFAULT_MODES
 from serena.tools import ToolInterface
 
diff --git a/src/serena/tools.py b/src/serena/tools.py
index 8f1b9f34..13cf8aa3 100644
--- a/src/serena/tools.py
+++ b/src/serena/tools.py
@@ -21,7 +21,7 @@ from mcp.server.fastmcp.utilities.func_metadata import FuncMetadata, func_metada
 from sensai.util import logging
 from sensai.util.string import dict_string
 
-from serena.config import SerenaAgentMode
+from serena.config.context_mode import SerenaAgentMode
 from serena.prompt_factory import PromptFactory
 from serena.symbol import SymbolManager
 from serena.text_utils import search_files