diff --git a/monkey/infection_monkey/agent_event_handlers/__init__.py b/monkey/infection_monkey/agent_event_handlers/__init__.py
index 3e0f9b03c..925bf7f63 100644
--- a/monkey/infection_monkey/agent_event_handlers/__init__.py
+++ b/monkey/infection_monkey/agent_event_handlers/__init__.py
@@ -1 +1,2 @@
 from .notify_relay_on_propagation import notify_relay_on_propagation
+from .agent_event_forwarder import AgentEventForwarder
diff --git a/monkey/infection_monkey/agent_event_forwarder.py b/monkey/infection_monkey/agent_event_handlers/agent_event_forwarder.py
similarity index 100%
rename from monkey/infection_monkey/agent_event_forwarder.py
rename to monkey/infection_monkey/agent_event_handlers/agent_event_forwarder.py
diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
index e38cbc96e..7ca2162f5 100644
--- a/monkey/infection_monkey/monkey.py
+++ b/monkey/infection_monkey/monkey.py
@@ -21,8 +21,7 @@ from common.types import SocketAddress
 from common.utils.argparse_types import positive_int
 from common.utils.attack_utils import ScanStatus, UsageEnum
 from common.version import get_version
-from infection_monkey.agent_event_forwarder import AgentEventForwarder
-from infection_monkey.agent_event_handlers import notify_relay_on_propagation
+from infection_monkey.agent_event_handlers import AgentEventForwarder, notify_relay_on_propagation
 from infection_monkey.config import GUID
 from infection_monkey.control import ControlClient
 from infection_monkey.credential_collectors import (
diff --git a/monkey/tests/unit_tests/infection_monkey/test_agent_event_forwarder.py b/monkey/tests/unit_tests/infection_monkey/test_agent_event_forwarder.py
index aa2d1381a..07c7b5d52 100644
--- a/monkey/tests/unit_tests/infection_monkey/test_agent_event_forwarder.py
+++ b/monkey/tests/unit_tests/infection_monkey/test_agent_event_forwarder.py
@@ -3,7 +3,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from infection_monkey.agent_event_forwarder import BatchingAgentEventForwarder
+from infection_monkey.agent_event_handlers.agent_event_forwarder import BatchingAgentEventForwarder
 from infection_monkey.island_api_client import IIslandAPIClient
 
 SERVER = "1.1.1.1:9999"