diff --git a/monkey/infection_monkey/system_info/windows_cred_collector/__init__.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/__init__.py
similarity index 100%
rename from monkey/infection_monkey/system_info/windows_cred_collector/__init__.py
rename to monkey/infection_monkey/credential_collectors/mimikatz_collector/__init__.py
diff --git a/monkey/infection_monkey/system_info/windows_cred_collector/mimikatz_cred_collector.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_cred_collector.py
similarity index 84%
rename from monkey/infection_monkey/system_info/windows_cred_collector/mimikatz_cred_collector.py
rename to monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_cred_collector.py
index ff31667cf..7c58fbe12 100644
--- a/monkey/infection_monkey/system_info/windows_cred_collector/mimikatz_cred_collector.py
+++ b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_cred_collector.py
@@ -1,5 +1,7 @@
 from typing import List
 
+import pypykatz_handler
+
 from infection_monkey.credential_collectors import (
     Credentials,
     ICredentialCollector,
@@ -7,10 +9,8 @@ from infection_monkey.credential_collectors import (
     Password,
     Username,
 )
-from infection_monkey.system_info.windows_cred_collector import pypykatz_handler
-from infection_monkey.system_info.windows_cred_collector.windows_credentials import (
-    WindowsCredentials,
-)
+
+from .windows_credentials import WindowsCredentials
 
 
 class MimikatzCredentialCollector(ICredentialCollector):
diff --git a/monkey/infection_monkey/system_info/windows_cred_collector/pypykatz_handler.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/pypykatz_handler.py
similarity index 96%
rename from monkey/infection_monkey/system_info/windows_cred_collector/pypykatz_handler.py
rename to monkey/infection_monkey/credential_collectors/mimikatz_collector/pypykatz_handler.py
index 23bcce771..2b7ceec65 100644
--- a/monkey/infection_monkey/system_info/windows_cred_collector/pypykatz_handler.py
+++ b/monkey/infection_monkey/credential_collectors/mimikatz_collector/pypykatz_handler.py
@@ -3,9 +3,7 @@ from typing import Any, Dict, List, NewType
 
 from pypykatz.pypykatz import pypykatz
 
-from infection_monkey.system_info.windows_cred_collector.windows_credentials import (
-    WindowsCredentials,
-)
+from .windows_credentials import WindowsCredentials
 
 CREDENTIAL_TYPES = [
     "msv_creds",
diff --git a/monkey/infection_monkey/system_info/windows_cred_collector/windows_credentials.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/windows_credentials.py
similarity index 100%
rename from monkey/infection_monkey/system_info/windows_cred_collector/windows_credentials.py
rename to monkey/infection_monkey/credential_collectors/mimikatz_collector/windows_credentials.py
diff --git a/monkey/infection_monkey/system_info/windows_info_collector.py b/monkey/infection_monkey/system_info/windows_info_collector.py
index f3242922e..6285fee0f 100644
--- a/monkey/infection_monkey/system_info/windows_info_collector.py
+++ b/monkey/infection_monkey/system_info/windows_info_collector.py
@@ -2,7 +2,7 @@ import logging
 import sys
 
 from common.common_consts.system_info_collectors_names import MIMIKATZ_COLLECTOR
-from infection_monkey.system_info.windows_cred_collector.mimikatz_cred_collector import (
+from infection_monkey.credential_collectors.windows_cred_collector.mimikatz_cred_collector import (
     MimikatzCredentialCollector,
 )
 
diff --git a/monkey/tests/unit_tests/infection_monkey/system_info/windows_cred_collector/test_pypykatz_handler.py b/monkey/tests/unit_tests/infection_monkey/system_info/windows_cred_collector/test_pypykatz_handler.py
index 4d3259e67..9bacb2070 100644
--- a/monkey/tests/unit_tests/infection_monkey/system_info/windows_cred_collector/test_pypykatz_handler.py
+++ b/monkey/tests/unit_tests/infection_monkey/system_info/windows_cred_collector/test_pypykatz_handler.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from infection_monkey.system_info.windows_cred_collector.pypykatz_handler import (
+from infection_monkey.credential_collectors.mimikatz_collector.pypykatz_handler import (
     _get_creds_from_pypykatz_session,
 )