diff --git a/monkey/monkey_island/cc/services/__init__.py b/monkey/monkey_island/cc/services/__init__.py
index 7d96ee5c4..f50990ce3 100644
--- a/monkey/monkey_island/cc/services/__init__.py
+++ b/monkey/monkey_island/cc/services/__init__.py
@@ -4,4 +4,8 @@ from .directory_file_storage_service import DirectoryFileStorageService
 from .authentication.authentication_service import AuthenticationService
 from .authentication.json_file_user_datastore import JsonFileUserDatastore
 
-from .aws_service import AWSService
+from .aws import AWSService
+
+# TODO: This is a temporary import to keep some tests passing. Remove it before merging #1928 to
+#       develop.
+from .aws import aws_service
diff --git a/monkey/monkey_island/cc/services/aws/__init__.py b/monkey/monkey_island/cc/services/aws/__init__.py
new file mode 100644
index 000000000..ff20c89a2
--- /dev/null
+++ b/monkey/monkey_island/cc/services/aws/__init__.py
@@ -0,0 +1 @@
+from .aws_service import AWSService
diff --git a/monkey/monkey_island/cc/services/aws_service.py b/monkey/monkey_island/cc/services/aws/aws_service.py
similarity index 100%
rename from monkey/monkey_island/cc/services/aws_service.py
rename to monkey/monkey_island/cc/services/aws/aws_service.py