diff --git a/monkey/monkey_island/cc/repository/__init__.py b/monkey/monkey_island/cc/repository/__init__.py
index 925a60dd5..153d57e27 100644
--- a/monkey/monkey_island/cc/repository/__init__.py
+++ b/monkey/monkey_island/cc/repository/__init__.py
@@ -1,5 +1,6 @@
 from .errors import RemovalError, RetrievalError, StorageError
-from .file_storage import FileNotFoundError, IFileRepository, LocalStorageFileRepository
+from .i_file_repository import FileNotFoundError, IFileRepository
+from .local_storage_file_repository import LocalStorageFileRepository
 from .i_agent_binary_repository import IAgentBinaryRepository
 from .agent_binary_repository import AgentBinaryRepository
 from .i_agent_configuration_repository import IAgentConfigurationRepository
diff --git a/monkey/monkey_island/cc/repository/file_storage/__init__.py b/monkey/monkey_island/cc/repository/file_storage/__init__.py
deleted file mode 100644
index 14227bc66..000000000
--- a/monkey/monkey_island/cc/repository/file_storage/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .i_file_repository import IFileRepository, FileNotFoundError
-from .local_storage_file_repository import LocalStorageFileRepository
diff --git a/monkey/monkey_island/cc/repository/file_storage/i_file_repository.py b/monkey/monkey_island/cc/repository/i_file_repository.py
similarity index 100%
rename from monkey/monkey_island/cc/repository/file_storage/i_file_repository.py
rename to monkey/monkey_island/cc/repository/i_file_repository.py
diff --git a/monkey/monkey_island/cc/repository/file_storage/local_storage_file_repository.py b/monkey/monkey_island/cc/repository/local_storage_file_repository.py
similarity index 100%
rename from monkey/monkey_island/cc/repository/file_storage/local_storage_file_repository.py
rename to monkey/monkey_island/cc/repository/local_storage_file_repository.py