diff --git a/monkey/monkey_island/cc/island_event_handlers/__init__.py b/monkey/monkey_island/cc/island_event_handlers/__init__.py
new file mode 100644
index 000000000..7a20d4c44
--- /dev/null
+++ b/monkey/monkey_island/cc/island_event_handlers/__init__.py
@@ -0,0 +1 @@
+from .reset_agent_configuration import reset_agent_configuration
diff --git a/monkey/monkey_island/cc/services/reset_agent_configuration.py b/monkey/monkey_island/cc/island_event_handlers/reset_agent_configuration.py
similarity index 100%
rename from monkey/monkey_island/cc/services/reset_agent_configuration.py
rename to monkey/monkey_island/cc/island_event_handlers/reset_agent_configuration.py
diff --git a/monkey/monkey_island/cc/services/__init__.py b/monkey/monkey_island/cc/services/__init__.py
index a35bee933..9be3ac250 100644
--- a/monkey/monkey_island/cc/services/__init__.py
+++ b/monkey/monkey_island/cc/services/__init__.py
@@ -3,4 +3,3 @@ from .authentication_service import AuthenticationService
 from .aws import AWSService
 from .island_mode_service import IslandModeService
 from .repository_service import RepositoryService
-from .reset_agent_configuration import reset_agent_configuration
diff --git a/monkey/tests/unit_tests/monkey_island/cc/island_event_handlers/__init__.py b/monkey/tests/unit_tests/monkey_island/cc/island_event_handlers/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/test_reset_agent_configuration.py b/monkey/tests/unit_tests/monkey_island/cc/island_event_handlers/test_reset_agent_configuration.py
similarity index 96%
rename from monkey/tests/unit_tests/monkey_island/cc/services/test_reset_agent_configuration.py
rename to monkey/tests/unit_tests/monkey_island/cc/island_event_handlers/test_reset_agent_configuration.py
index 41d78fb13..d82c0bec2 100644
--- a/monkey/tests/unit_tests/monkey_island/cc/services/test_reset_agent_configuration.py
+++ b/monkey/tests/unit_tests/monkey_island/cc/island_event_handlers/test_reset_agent_configuration.py
@@ -4,8 +4,8 @@ import pytest
 from tests.monkey_island import InMemoryAgentConfigurationRepository
 
 from common.agent_configuration import AgentConfiguration
+from monkey_island.cc.island_event_handlers import reset_agent_configuration
 from monkey_island.cc.repository import IAgentConfigurationRepository, IFileRepository
-from monkey_island.cc.services import reset_agent_configuration
 
 LINUX_FILENAME = "linux_pba_file.sh"
 WINDOWS_FILENAME = "windows_pba_file.ps1"