diff --git a/monkey/monkey_island/cc/environment/server_config_handler.py b/monkey/monkey_island/cc/environment/server_config_handler.py
index fc5938694..f1e2358c4 100644
--- a/monkey/monkey_island/cc/environment/server_config_handler.py
+++ b/monkey/monkey_island/cc/environment/server_config_handler.py
@@ -6,7 +6,7 @@ from monkey_island.cc.server_utils.consts import (
     DEFAULT_DEVELOP_SERVER_CONFIG_PATH,
     DEFAULT_SERVER_CONFIG_PATH,
 )
-from monkey_island.setup.island_config_options import IslandConfigOptions
+from monkey_island.cc.setup.island_config_options import IslandConfigOptions
 
 
 def create_default_server_config_file() -> None:
diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py
index 095d7197f..4eaa13131 100644
--- a/monkey/monkey_island/cc/server_setup.py
+++ b/monkey/monkey_island/cc/server_setup.py
@@ -28,6 +28,7 @@ from monkey_island.cc.server_utils.island_logger import reset_logger, setup_logg
 from monkey_island.cc.services.initialize import initialize_services  # noqa: E402
 from monkey_island.cc.services.reporting.exporter_init import populate_exporter_list  # noqa: E402
 from monkey_island.cc.services.utils.network_utils import local_ip_addresses  # noqa: E402
+from monkey_island.cc.setup.island_config_options import IslandConfigOptions  # noqa: E402
 from monkey_island.cc.setup.mongo.database_initializer import init_collections  # noqa: E402
 from monkey_island.cc.setup.mongo.mongo_setup import (  # noqa: E402
     MONGO_URL,
@@ -35,7 +36,6 @@ from monkey_island.cc.setup.mongo.mongo_setup import (  # noqa: E402
     register_mongo_shutdown_callback,
     start_mongodb,
 )
-from monkey_island.setup.island_config_options import IslandConfigOptions  # noqa: E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/monkey/monkey_island/cc/setup/config_setup.py b/monkey/monkey_island/cc/setup/config_setup.py
index f33d2ff24..6cc036760 100644
--- a/monkey/monkey_island/cc/setup/config_setup.py
+++ b/monkey/monkey_island/cc/setup/config_setup.py
@@ -5,7 +5,7 @@ from monkey_island.cc.arg_parser import IslandCmdArgs
 from monkey_island.cc.environment import server_config_handler
 from monkey_island.cc.environment.utils import create_secure_directory
 from monkey_island.cc.server_utils.consts import DEFAULT_DATA_DIR, DEFAULT_SERVER_CONFIG_PATH
-from monkey_island.setup.island_config_options import IslandConfigOptions
+from monkey_island.cc.setup.island_config_options import IslandConfigOptions
 
 
 def setup_data_dir(island_args: IslandCmdArgs) -> Tuple[IslandConfigOptions, str]:
diff --git a/monkey/monkey_island/setup/island_config_options.py b/monkey/monkey_island/cc/setup/island_config_options.py
similarity index 100%
rename from monkey/monkey_island/setup/island_config_options.py
rename to monkey/monkey_island/cc/setup/island_config_options.py
diff --git a/monkey/tests/unit_tests/monkey_island/setup/test_island_config_options.py b/monkey/tests/unit_tests/monkey_island/cc/setup/test_island_config_options.py
similarity index 96%
rename from monkey/tests/unit_tests/monkey_island/setup/test_island_config_options.py
rename to monkey/tests/unit_tests/monkey_island/cc/setup/test_island_config_options.py
index 35126a278..ae26d5145 100644
--- a/monkey/tests/unit_tests/monkey_island/setup/test_island_config_options.py
+++ b/monkey/tests/unit_tests/monkey_island/cc/setup/test_island_config_options.py
@@ -5,7 +5,7 @@ from monkey_island.cc.server_utils.consts import (
     DEFAULT_LOG_LEVEL,
     DEFAULT_START_MONGO_DB,
 )
-from monkey_island.setup.island_config_options import IslandConfigOptions
+from monkey_island.cc.setup.island_config_options import IslandConfigOptions
 
 TEST_CONFIG_FILE_CONTENTS_SPECIFIED = {
     "data_dir": "/tmp",