diff --git a/mobile/lib/db/ml_data_db.dart b/mobile/lib/db/ml_data_db.dart
index 07150f09b5..46ca06466b 100644
--- a/mobile/lib/db/ml_data_db.dart
+++ b/mobile/lib/db/ml_data_db.dart
@@ -4,9 +4,9 @@ import 'package:logging/logging.dart';
 import 'package:path/path.dart' show join;
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/models/ml/ml_typedefs.dart';
-import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
-import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
-import "package:photos/services/face_ml/face_ml_result.dart";
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
+import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
 import 'package:sqflite/sqflite.dart';
 
 /// Stores all data for the ML-related features. The database can be accessed by `MlDataDB.instance.database`.
diff --git a/mobile/lib/face/db.dart b/mobile/lib/face/db.dart
index bc4b15885b..585f7d7bb2 100644
--- a/mobile/lib/face/db.dart
+++ b/mobile/lib/face/db.dart
@@ -11,7 +11,7 @@ import "package:photos/face/db_model_mappers.dart";
 import "package:photos/face/model/face.dart";
 import "package:photos/face/model/person.dart";
 import "package:photos/models/file/file.dart";
-import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
 import 'package:sqflite/sqflite.dart';
 
 /// Stores all data for the ML-related features. The database can be accessed by `MlDataDB.instance.database`.
diff --git a/mobile/lib/face/db_fields.dart b/mobile/lib/face/db_fields.dart
index 8b17195751..e43747f682 100644
--- a/mobile/lib/face/db_fields.dart
+++ b/mobile/lib/face/db_fields.dart
@@ -1,5 +1,5 @@
 // Faces Table Fields & Schema Queries
-import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
 
 const facesTable = 'faces';
 const fileIDColumn = 'file_id';
diff --git a/mobile/lib/face/model/face.dart b/mobile/lib/face/model/face.dart
index af151c2ecf..0df0987dff 100644
--- a/mobile/lib/face/model/face.dart
+++ b/mobile/lib/face/model/face.dart
@@ -1,5 +1,5 @@
 import "package:photos/face/model/detection.dart";
-import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
 
 class Face {
   final int fileID;
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index d800336dfe..cc0bb60b15 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -25,13 +25,13 @@ import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/billing_service.dart';
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/entity_service.dart";
-import "package:photos/services/face_ml/face_ml_service.dart";
 import 'package:photos/services/favorites_service.dart';
 import 'package:photos/services/feature_flag_service.dart';
 import 'package:photos/services/home_widget_service.dart';
 import 'package:photos/services/local_file_update_service.dart';
 import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/location_service.dart";
+import 'package:photos/services/machine_learning/face_ml/face_ml_service.dart';
 import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
diff --git a/mobile/lib/services/face_ml/face_alignment/alignment_result.dart b/mobile/lib/services/machine_learning/face_ml/face_alignment/alignment_result.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_alignment/alignment_result.dart
rename to mobile/lib/services/machine_learning/face_ml/face_alignment/alignment_result.dart
diff --git a/mobile/lib/services/face_ml/face_alignment/similarity_transform.dart b/mobile/lib/services/machine_learning/face_ml/face_alignment/similarity_transform.dart
similarity index 98%
rename from mobile/lib/services/face_ml/face_alignment/similarity_transform.dart
rename to mobile/lib/services/machine_learning/face_ml/face_alignment/similarity_transform.dart
index 4ae27794b4..0d8e7ab3ae 100644
--- a/mobile/lib/services/face_ml/face_alignment/similarity_transform.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_alignment/similarity_transform.dart
@@ -1,7 +1,7 @@
 import 'dart:math' show atan2;
 import 'package:ml_linalg/linalg.dart';
 import 'package:photos/extensions/ml_linalg_extensions.dart';
-import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
+import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
 
 /// Class to compute the similarity transform between two sets of points.
 ///
diff --git a/mobile/lib/services/face_ml/face_clustering/cosine_distance.dart b/mobile/lib/services/machine_learning/face_ml/face_clustering/cosine_distance.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_clustering/cosine_distance.dart
rename to mobile/lib/services/machine_learning/face_ml/face_clustering/cosine_distance.dart
diff --git a/mobile/lib/services/face_ml/face_clustering/linear_clustering_service.dart b/mobile/lib/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart
similarity index 99%
rename from mobile/lib/services/face_ml/face_clustering/linear_clustering_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart
index 8e77838592..b9cb5345db 100644
--- a/mobile/lib/services/face_ml/face_clustering/linear_clustering_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart
@@ -6,7 +6,7 @@ import "dart:typed_data";
 
 import "package:logging/logging.dart";
 import "package:photos/generated/protos/ente/common/vector.pb.dart";
-import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
+import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
 import "package:synchronized/synchronized.dart";
 
 class FaceInfo {
diff --git a/mobile/lib/services/face_ml/face_detection/detection.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_detection/detection.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
diff --git a/mobile/lib/services/face_ml/face_detection/naive_non_max_suppression.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart
similarity index 94%
rename from mobile/lib/services/face_ml/face_detection/naive_non_max_suppression.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart
index ca1e4aba5a..624181a669 100644
--- a/mobile/lib/services/face_ml/face_detection/naive_non_max_suppression.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart
@@ -1,6 +1,6 @@
 import 'dart:math' as math show max, min;
 
-import "package:photos/services/face_ml/face_detection/detection.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
 
 List<FaceDetectionRelative> naiveNonMaxSuppression({
   required List<FaceDetectionRelative> detections,
diff --git a/mobile/lib/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart
similarity index 98%
rename from mobile/lib/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart
index c67c4a3fc6..a2138fe7a5 100644
--- a/mobile/lib/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart
@@ -9,10 +9,10 @@ import "package:computer/computer.dart";
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import 'package:onnxruntime/onnxruntime.dart';
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import "package:photos/services/face_ml/face_detection/naive_non_max_suppression.dart";
-import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart";
-import "package:photos/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart';
 import "package:photos/services/remote_assets_service.dart";
 import "package:photos/utils/image_ml_isolate.dart";
 import "package:photos/utils/image_ml_util.dart";
diff --git a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart
diff --git a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart
diff --git a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
similarity index 96%
rename from mobile/lib/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
index 168d06df88..ec546533ab 100644
--- a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
@@ -1,6 +1,6 @@
 import 'dart:developer' as dev show log;
 
-import "package:photos/services/face_ml/face_detection/detection.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
 
 List<FaceDetectionRelative> yoloOnnxFilterExtractDetections(
   double minScoreSigmoidThreshold,
diff --git a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_model_config.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_model_config.dart
similarity index 70%
rename from mobile/lib/services/face_ml/face_detection/yolov5face/yolo_model_config.dart
rename to mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_model_config.dart
index c803beffd4..578036bc25 100644
--- a/mobile/lib/services/face_ml/face_detection/yolov5face/yolo_model_config.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_model_config.dart
@@ -1,5 +1,5 @@
-import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart";
-import "package:photos/services/face_ml/model_file.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart';
+import 'package:photos/services/machine_learning/face_ml/model_file.dart';
 
 class YOLOModelConfig {
   final String modelPath;
diff --git a/mobile/lib/services/face_ml/face_embedding/face_embedding_exceptions.dart b/mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_embedding/face_embedding_exceptions.dart
rename to mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart
diff --git a/mobile/lib/services/face_ml/face_embedding/face_embedding_options.dart b/mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_embedding/face_embedding_options.dart
rename to mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart
diff --git a/mobile/lib/services/face_ml/face_embedding/face_embedding_service.dart b/mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_service.dart
similarity index 95%
rename from mobile/lib/services/face_ml/face_embedding/face_embedding_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_service.dart
index 2711550bdb..1a3dcf4167 100644
--- a/mobile/lib/services/face_ml/face_embedding/face_embedding_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_service.dart
@@ -6,10 +6,10 @@ import 'dart:typed_data' show Uint8List;
 import "package:flutter/foundation.dart";
 import "package:logging/logging.dart";
 import 'package:photos/models/ml/ml_typedefs.dart';
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import "package:photos/services/face_ml/face_embedding/face_embedding_exceptions.dart";
-import "package:photos/services/face_ml/face_embedding/face_embedding_options.dart";
-import "package:photos/services/face_ml/face_embedding/mobilefacenet_model_config.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart';
+import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart';
+import 'package:photos/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart';
 import 'package:photos/utils/image_ml_isolate.dart';
 import 'package:photos/utils/image_ml_util.dart';
 import 'package:tflite_flutter/tflite_flutter.dart';
diff --git a/mobile/lib/services/face_ml/face_embedding/mobilefacenet_model_config.dart b/mobile/lib/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart
similarity index 71%
rename from mobile/lib/services/face_ml/face_embedding/mobilefacenet_model_config.dart
rename to mobile/lib/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart
index d55a2d3331..fd45f51674 100644
--- a/mobile/lib/services/face_ml/face_embedding/mobilefacenet_model_config.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart
@@ -1,5 +1,5 @@
-import "package:photos/services/face_ml/face_embedding/face_embedding_options.dart";
-import "package:photos/services/face_ml/model_file.dart";
+import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart';
+import 'package:photos/services/machine_learning/face_ml/model_file.dart';
 
 class MobileFaceNetModelConfig {
   final String modelPath;
diff --git a/mobile/lib/services/face_ml/face_embedding/onnx_face_embedding.dart b/mobile/lib/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart
similarity index 98%
rename from mobile/lib/services/face_ml/face_embedding/onnx_face_embedding.dart
rename to mobile/lib/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart
index f15b25b46c..bdf2ac5cfb 100644
--- a/mobile/lib/services/face_ml/face_embedding/onnx_face_embedding.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart
@@ -5,7 +5,7 @@ import 'dart:typed_data' show Float32List;
 import 'package:computer/computer.dart';
 import 'package:logging/logging.dart';
 import 'package:onnxruntime/onnxruntime.dart';
-import "package:photos/services/face_ml/face_detection/detection.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
 import "package:photos/services/remote_assets_service.dart";
 import "package:photos/utils/image_ml_isolate.dart";
 import "package:synchronized/synchronized.dart";
diff --git a/mobile/lib/services/face_ml/face_feedback.dart/cluster_feedback.dart b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart
similarity index 97%
rename from mobile/lib/services/face_ml/face_feedback.dart/cluster_feedback.dart
rename to mobile/lib/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart
index b99d3950ab..a7da4fa556 100644
--- a/mobile/lib/services/face_ml/face_feedback.dart/cluster_feedback.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart
@@ -1,8 +1,8 @@
 import "dart:convert";
 
-import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
-import "package:photos/services/face_ml/face_feedback.dart/feedback.dart";
-import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
+import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback.dart';
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
 
 abstract class ClusterFeedback extends Feedback {
   static final Map<FeedbackType, Function(String)> fromJsonStringRegistry = {
diff --git a/mobile/lib/services/face_ml/face_feedback.dart/face_feedback_service.dart b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/face_feedback_service.dart
similarity index 98%
rename from mobile/lib/services/face_ml/face_feedback.dart/face_feedback_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_feedback.dart/face_feedback_service.dart
index 0e95e3d7cc..c94c8c8d85 100644
--- a/mobile/lib/services/face_ml/face_feedback.dart/face_feedback_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/face_feedback_service.dart
@@ -1,8 +1,8 @@
 import "package:logging/logging.dart";
 import "package:photos/db/ml_data_db.dart";
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
-import "package:photos/services/face_ml/face_ml_result.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
+import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
 
 class FaceFeedbackService {
   final _logger = Logger("FaceFeedbackService");
diff --git a/mobile/lib/services/face_ml/face_feedback.dart/feedback.dart b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback.dart
similarity index 90%
rename from mobile/lib/services/face_ml/face_feedback.dart/feedback.dart
rename to mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback.dart
index 320ec64e92..8b3eb3c6ad 100644
--- a/mobile/lib/services/face_ml/face_feedback.dart/feedback.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback.dart
@@ -1,5 +1,5 @@
 import "package:photos/models/ml/ml_versions.dart";
-import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
 import "package:uuid/uuid.dart";
 
 abstract class Feedback {
diff --git a/mobile/lib/services/face_ml/face_feedback.dart/feedback_types.dart b/mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_feedback.dart/feedback_types.dart
rename to mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart
diff --git a/mobile/lib/services/face_ml/face_filtering/blur_detection_service.dart b/mobile/lib/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart
similarity index 96%
rename from mobile/lib/services/face_ml/face_filtering/blur_detection_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart
index 9c15523648..43f6b252d2 100644
--- a/mobile/lib/services/face_ml/face_filtering/blur_detection_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart
@@ -1,5 +1,5 @@
 import 'package:logging/logging.dart';
-import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
 
 class BlurDetectionService {
   final _logger = Logger('BlurDetectionService');
diff --git a/mobile/lib/services/face_ml/face_filtering/face_filtering_constants.dart b/mobile/lib/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart
similarity index 81%
rename from mobile/lib/services/face_ml/face_filtering/face_filtering_constants.dart
rename to mobile/lib/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart
index a1970fd4d6..6606e858ec 100644
--- a/mobile/lib/services/face_ml/face_filtering/face_filtering_constants.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart
@@ -1,4 +1,4 @@
-import "package:photos/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart";
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
 
 /// Blur detection threshold
 const kLaplacianThreshold = 15;
diff --git a/mobile/lib/services/face_ml/face_ml_exceptions.dart b/mobile/lib/services/machine_learning/face_ml/face_ml_exceptions.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_ml_exceptions.dart
rename to mobile/lib/services/machine_learning/face_ml/face_ml_exceptions.dart
diff --git a/mobile/lib/services/face_ml/face_ml_methods.dart b/mobile/lib/services/machine_learning/face_ml/face_ml_methods.dart
similarity index 97%
rename from mobile/lib/services/face_ml/face_ml_methods.dart
rename to mobile/lib/services/machine_learning/face_ml/face_ml_methods.dart
index a6c967e52f..5745234b58 100644
--- a/mobile/lib/services/face_ml/face_ml_methods.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_ml_methods.dart
@@ -1,4 +1,4 @@
-import "package:photos/services/face_ml/face_ml_version.dart";
+import 'package:photos/services/machine_learning/face_ml/face_ml_version.dart';
 
 /// Represents a face detection method with a specific version.
 class FaceDetectionMethod extends VersionedMethod {
diff --git a/mobile/lib/services/face_ml/face_ml_result.dart b/mobile/lib/services/machine_learning/face_ml/face_ml_result.dart
similarity index 97%
rename from mobile/lib/services/face_ml/face_ml_result.dart
rename to mobile/lib/services/machine_learning/face_ml/face_ml_result.dart
index 3a981b377e..da0f9f6ed4 100644
--- a/mobile/lib/services/face_ml/face_ml_result.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_ml_result.dart
@@ -6,12 +6,12 @@ import "package:photos/db/ml_data_db.dart";
 import "package:photos/models/file/file.dart";
 import 'package:photos/models/ml/ml_typedefs.dart';
 import "package:photos/models/ml/ml_versions.dart";
-import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
-import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
-import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
-import "package:photos/services/face_ml/face_ml_methods.dart";
+import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
+import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_ml_methods.dart';
 
 final _logger = Logger('ClusterResult_FaceMlResult');
 
diff --git a/mobile/lib/services/face_ml/face_ml_service.dart b/mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
similarity index 97%
rename from mobile/lib/services/face_ml/face_ml_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
index a3b36e192d..34e265dcf0 100644
--- a/mobile/lib/services/face_ml/face_ml_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
@@ -25,15 +25,15 @@ import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/file/file_type.dart";
 import "package:photos/models/ml/ml_versions.dart";
-import "package:photos/services/face_ml/face_clustering/linear_clustering_service.dart";
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import 'package:photos/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
-import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart";
-import "package:photos/services/face_ml/face_embedding/face_embedding_exceptions.dart";
-import 'package:photos/services/face_ml/face_embedding/onnx_face_embedding.dart';
-import "package:photos/services/face_ml/face_filtering/face_filtering_constants.dart";
-import "package:photos/services/face_ml/face_ml_exceptions.dart";
-import "package:photos/services/face_ml/face_ml_result.dart";
+import 'package:photos/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart';
+import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart';
+import 'package:photos/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
+import 'package:photos/services/machine_learning/face_ml/face_ml_exceptions.dart';
+import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
 import 'package:photos/services/machine_learning/file_ml/file_ml.dart';
 import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
 import "package:photos/services/search_service.dart";
diff --git a/mobile/lib/services/face_ml/face_ml_version.dart b/mobile/lib/services/machine_learning/face_ml/face_ml_version.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_ml_version.dart
rename to mobile/lib/services/machine_learning/face_ml/face_ml_version.dart
diff --git a/mobile/lib/services/face_ml/face_search_service.dart b/mobile/lib/services/machine_learning/face_ml/face_search_service.dart
similarity index 100%
rename from mobile/lib/services/face_ml/face_search_service.dart
rename to mobile/lib/services/machine_learning/face_ml/face_search_service.dart
diff --git a/mobile/lib/services/face_ml/feedback/cluster_feedback.dart b/mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
similarity index 99%
rename from mobile/lib/services/face_ml/feedback/cluster_feedback.dart
rename to mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
index 129eee83f3..6a6fc28c0c 100644
--- a/mobile/lib/services/face_ml/feedback/cluster_feedback.dart
+++ b/mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
@@ -11,7 +11,7 @@ import "package:photos/face/db.dart";
 import "package:photos/face/model/person.dart";
 import "package:photos/generated/protos/ente/common/vector.pb.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
+import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
 import "package:photos/services/search_service.dart";
 
 class ClusterFeedbackService {
diff --git a/mobile/lib/services/face_ml/model_file.dart b/mobile/lib/services/machine_learning/face_ml/model_file.dart
similarity index 100%
rename from mobile/lib/services/face_ml/model_file.dart
rename to mobile/lib/services/machine_learning/face_ml/model_file.dart
diff --git a/mobile/lib/ui/settings/debug/face_debug_section_widget.dart b/mobile/lib/ui/settings/debug/face_debug_section_widget.dart
index f94e4ba614..80983309f7 100644
--- a/mobile/lib/ui/settings/debug/face_debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/face_debug_section_widget.dart
@@ -8,8 +8,8 @@ import "package:photos/events/people_changed_event.dart";
 import "package:photos/extensions/stop_watch.dart";
 import "package:photos/face/db.dart";
 import "package:photos/face/model/person.dart";
-import "package:photos/services/face_ml/face_ml_service.dart";
-import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
+import 'package:photos/services/machine_learning/face_ml/face_ml_service.dart';
+import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index 3692696739..a87cca795b 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -20,8 +20,8 @@ import 'package:photos/models/gallery_type.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
 import 'package:photos/services/hidden_service.dart';
+import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/actions/collection/collection_file_actions.dart';
diff --git a/mobile/lib/ui/viewer/people/add_person_action_sheet.dart b/mobile/lib/ui/viewer/people/add_person_action_sheet.dart
index 4a072280fe..935af98801 100644
--- a/mobile/lib/ui/viewer/people/add_person_action_sheet.dart
+++ b/mobile/lib/ui/viewer/people/add_person_action_sheet.dart
@@ -10,7 +10,7 @@ import "package:photos/events/people_changed_event.dart";
 import "package:photos/face/db.dart";
 import "package:photos/face/model/person.dart";
 import "package:photos/generated/l10n.dart";
-import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
+import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/loading_widget.dart';
diff --git a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
index 3ec179856e..1bbcb4390b 100644
--- a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
+++ b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
@@ -6,7 +6,7 @@ import "package:photos/events/people_changed_event.dart";
 import "package:photos/face/db.dart";
 import "package:photos/face/model/person.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
+import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
diff --git a/mobile/lib/utils/image_ml_isolate.dart b/mobile/lib/utils/image_ml_isolate.dart
index f9869ef8fd..157615d8e7 100644
--- a/mobile/lib/utils/image_ml_isolate.dart
+++ b/mobile/lib/utils/image_ml_isolate.dart
@@ -9,8 +9,8 @@ import 'package:flutter_isolate/flutter_isolate.dart';
 import "package:logging/logging.dart";
 import "package:photos/face/model/box.dart";
 import 'package:photos/models/ml/ml_typedefs.dart';
-import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
-import "package:photos/services/face_ml/face_detection/detection.dart";
+import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
 import "package:photos/utils/image_ml_util.dart";
 import "package:synchronized/synchronized.dart";
 
diff --git a/mobile/lib/utils/image_ml_util.dart b/mobile/lib/utils/image_ml_util.dart
index 9b11efa8ad..1ba29df6b0 100644
--- a/mobile/lib/utils/image_ml_util.dart
+++ b/mobile/lib/utils/image_ml_util.dart
@@ -18,10 +18,10 @@ import 'package:flutter/painting.dart' as paint show decodeImageFromList;
 import 'package:ml_linalg/linalg.dart';
 import "package:photos/face/model/box.dart";
 import 'package:photos/models/ml/ml_typedefs.dart';
-import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
-import "package:photos/services/face_ml/face_alignment/similarity_transform.dart";
-import "package:photos/services/face_ml/face_detection/detection.dart";
-import 'package:photos/services/face_ml/face_filtering/blur_detection_service.dart';
+import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
+import 'package:photos/services/machine_learning/face_ml/face_alignment/similarity_transform.dart';
+import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
+import 'package:photos/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart';
 
 /// All of the functions in this file are helper functions for the [ImageMlIsolate] isolate.
 /// Don't use them outside of the isolate, unless you are okay with UI jank!!!!