diff --git a/monkey/monkey_island/cc/__init__.py b/monkey/monkey_island/cc/__init__.py
index d3308c2c6..1a7e6c0ea 100644
--- a/monkey/monkey_island/cc/__init__.py
+++ b/monkey/monkey_island/cc/__init__.py
@@ -1,2 +1 @@
 from .version import Version
-from .setup_island_event_handlers import setup_island_event_handlers
diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py
index 8682d345a..3a35538b9 100644
--- a/monkey/monkey_island/cc/server_setup.py
+++ b/monkey/monkey_island/cc/server_setup.py
@@ -10,7 +10,7 @@ import gevent.hub
 import requests
 from gevent.pywsgi import WSGIServer
 
-from monkey_island.cc import Version, setup_island_event_handlers
+from monkey_island.cc import Version
 from monkey_island.cc.deployment import Deployment
 from monkey_island.cc.server_utils.consts import ISLAND_PORT
 from monkey_island.cc.server_utils.island_logger import get_log_file_path
@@ -35,8 +35,8 @@ from monkey_island.cc.server_utils.consts import (  # noqa: E402
 from monkey_island.cc.server_utils.island_logger import reset_logger, setup_logging  # noqa: E402
 from monkey_island.cc.server_utils.network_utils import get_ip_addresses  # noqa: E402
 from monkey_island.cc.services.initialize import initialize_services  # noqa: E402
-from monkey_island.cc.setup import PyWSGILoggingFilter  # noqa: E402
 from monkey_island.cc.setup import island_config_options_validator  # noqa: E402
+from monkey_island.cc.setup import PyWSGILoggingFilter, setup_island_event_handlers  # noqa: E402
 from monkey_island.cc.setup.data_dir import IncompatibleDataDirectory, setup_data_dir  # noqa: E402
 from monkey_island.cc.setup.gevent_hub_error_handler import GeventHubErrorHandler  # noqa: E402
 from monkey_island.cc.setup.island_config_options import IslandConfigOptions  # noqa: E402
diff --git a/monkey/monkey_island/cc/setup/__init__.py b/monkey/monkey_island/cc/setup/__init__.py
index a28c5dd05..3642bf9b2 100644
--- a/monkey/monkey_island/cc/setup/__init__.py
+++ b/monkey/monkey_island/cc/setup/__init__.py
@@ -1 +1,2 @@
 from .pywsgi_logging_filter import PyWSGILoggingFilter
+from .island_event_handlers import setup_island_event_handlers
diff --git a/monkey/monkey_island/cc/setup_island_event_handlers.py b/monkey/monkey_island/cc/setup/island_event_handlers.py
similarity index 80%
rename from monkey/monkey_island/cc/setup_island_event_handlers.py
rename to monkey/monkey_island/cc/setup/island_event_handlers.py
index 03e97db36..0fcf2febc 100644
--- a/monkey/monkey_island/cc/setup_island_event_handlers.py
+++ b/monkey/monkey_island/cc/setup/island_event_handlers.py
@@ -1,6 +1,6 @@
 from common import DIContainer
 from monkey_island.cc.event_queue import IslandEventTopic, PyPubSubIslandEventQueue
-from monkey_island.cc.services.reset_agent_configuration import reset_agent_configuration
+from monkey_island.cc.island_event_handlers import reset_agent_configuration
 
 
 def setup_island_event_handlers(container: DIContainer):