diff --git a/lib/tfw/builtins/__init__.py b/lib/tfw/builtins/__init__.py
index 129296d..c554666 100644
--- a/lib/tfw/builtins/__init__.py
+++ b/lib/tfw/builtins/__init__.py
@@ -3,6 +3,7 @@ from .frontend_event_handler import FrontendEventHandler
 from .fsm_managing_event_handler import FSMManagingEventHandler
 from .ide_event_handler import IdeEventHandler
 from .log_monitoring_event_handler import LogMonitoringEventHandler
+from .message_sender import MessageSender
 from .pipe_io_event_handler import PipeIOEventHandlerBase, PipeIOEventHandler
 from .pipe_io_event_handler import TransformerPipeIOEventHandler, CommandEventHandler
 from .process_managing_event_handler import ProcessManagingEventHandler
diff --git a/lib/tfw/builtins/frontend_event_handler.py b/lib/tfw/builtins/frontend_event_handler.py
index b372023..d3fe91e 100644
--- a/lib/tfw/builtins/frontend_event_handler.py
+++ b/lib/tfw/builtins/frontend_event_handler.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from contextlib import suppress
 
-from tfw.components.message_sender import MessageSender
+from tfw.builtins.message_sender import MessageSender
 from tfw.event_handlers import FrontendEventHandlerBase
 
 
diff --git a/lib/tfw/components/message_sender.py b/lib/tfw/builtins/message_sender.py
similarity index 100%
rename from lib/tfw/components/message_sender.py
rename to lib/tfw/builtins/message_sender.py
diff --git a/lib/tfw/components/__init__.py b/lib/tfw/components/__init__.py
index 60bd615..203f7e1 100644
--- a/lib/tfw/components/__init__.py
+++ b/lib/tfw/components/__init__.py
@@ -4,6 +4,5 @@
 from .commands_equal import CommandsEqual
 from .file_manager import FileManager
 from .history_monitor import HistoryMonitor, BashMonitor, GDBMonitor
-from .message_sender import MessageSender
 from .snapshot_provider import SnapshotProvider
 from .terminal_commands import TerminalCommands