diff --git a/lib/photo_sync_manager.dart b/lib/file_sync_manager.dart
similarity index 98%
rename from lib/photo_sync_manager.dart
rename to lib/file_sync_manager.dart
index ba3c20b90..cf4497164 100644
--- a/lib/photo_sync_manager.dart
+++ b/lib/file_sync_manager.dart
@@ -18,7 +18,7 @@ import 'package:photos/models/file.dart';
 
 import 'package:photos/core/configuration.dart';
 
-class PhotoSyncManager {
+class FileSyncManager {
   final _logger = Logger("PhotoSyncManager");
   final _dio = Dio();
   final _db = FilesDB.instance;
@@ -34,14 +34,13 @@ class PhotoSyncManager {
   static final _dbUpdationTimeKey = "db_updation_time";
   static final _diffLimit = 100;
 
-  PhotoSyncManager._privateConstructor() {
+  FileSyncManager._privateConstructor() {
     Bus.instance.on<UserAuthenticatedEvent>().listen((event) {
       sync();
     });
   }
 
-  static final PhotoSyncManager instance =
-      PhotoSyncManager._privateConstructor();
+  static final FileSyncManager instance = FileSyncManager._privateConstructor();
 
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
diff --git a/lib/main.dart b/lib/main.dart
index 2043c9dad..2dfd75e48 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -5,10 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/configuration.dart';
-import 'package:photos/favorite_files_repository.dart';
-import 'package:photos/folder_service.dart';
-import 'package:photos/memories_service.dart';
-import 'package:photos/photo_sync_manager.dart';
+import 'package:photos/services/favorites_service.dart';
+import 'package:photos/services/folder_service.dart';
+import 'package:photos/services/memories_service.dart';
+import 'package:photos/file_sync_manager.dart';
 import 'package:photos/ui/home_widget.dart';
 import 'package:sentry/sentry.dart';
 import 'package:super_logging/super_logging.dart';
@@ -31,9 +31,9 @@ void _main() async {
     areLogsEnabled: false,
   );
   await Configuration.instance.init();
-  await PhotoSyncManager.instance.init();
+  await FileSyncManager.instance.init();
   await MemoriesService.instance.init();
-  await FavoriteFilesRepository.instance.init();
+  await FavoritesService.instance.init();
   _sync();
 
   final SentryClient sentry = new SentryClient(dsn: SENTRY_DSN);
@@ -54,7 +54,7 @@ void _sync() async {
   FolderSharingService.instance.sync().catchError((e) {
     _logger.warning(e);
   });
-  PhotoSyncManager.instance.sync().catchError((e) {
+  FileSyncManager.instance.sync().catchError((e) {
     _logger.warning(e);
   });
 }
diff --git a/lib/models/filters/favorite_items_filter.dart b/lib/models/filters/favorite_items_filter.dart
index 3f509aa4c..c7296296d 100644
--- a/lib/models/filters/favorite_items_filter.dart
+++ b/lib/models/filters/favorite_items_filter.dart
@@ -1,10 +1,10 @@
-import 'package:photos/favorite_files_repository.dart';
+import 'package:photos/services/favorites_service.dart';
 import 'package:photos/models/filters/gallery_items_filter.dart';
 import 'package:photos/models/file.dart';
 
 class FavoriteItemsFilter implements GalleryItemsFilter {
   @override
   bool shouldInclude(File file) {
-    return FavoriteFilesRepository.instance.isLiked(file);
+    return FavoritesService.instance.isLiked(file);
   }
 }
diff --git a/lib/face_search_manager.dart b/lib/services/face_search_service.dart
similarity index 93%
rename from lib/face_search_manager.dart
rename to lib/services/face_search_service.dart
index 9b46bfa77..9aa8ca360 100644
--- a/lib/face_search_manager.dart
+++ b/lib/services/face_search_service.dart
@@ -7,13 +7,13 @@ import 'package:photos/models/face.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/utils/file_name_util.dart';
 
-class FaceSearchManager {
+class FaceSearchService {
   final _logger = Logger("FaceSearchManager");
   final _dio = Dio();
 
-  FaceSearchManager._privateConstructor();
-  static final FaceSearchManager instance =
-      FaceSearchManager._privateConstructor();
+  FaceSearchService._privateConstructor();
+  static final FaceSearchService instance =
+      FaceSearchService._privateConstructor();
 
   Future<List<Face>> getFaces() {
     return _dio
diff --git a/lib/favorite_files_repository.dart b/lib/services/favorites_service.dart
similarity index 86%
rename from lib/favorite_files_repository.dart
rename to lib/services/favorites_service.dart
index 8beeef292..63dc9dceb 100644
--- a/lib/favorite_files_repository.dart
+++ b/lib/services/favorites_service.dart
@@ -3,11 +3,11 @@ import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/file.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-class FavoriteFilesRepository {
+class FavoritesService {
   static final _favoritePhotoIdsKey = "favorite_photo_ids";
-  FavoriteFilesRepository._privateConstructor();
-  static FavoriteFilesRepository instance =
-      FavoriteFilesRepository._privateConstructor();
+  FavoritesService._privateConstructor();
+  static FavoritesService instance =
+      FavoritesService._privateConstructor();
 
   SharedPreferences _preferences;
 
diff --git a/lib/folder_service.dart b/lib/services/folder_service.dart
similarity index 99%
rename from lib/folder_service.dart
rename to lib/services/folder_service.dart
index 64813ac48..73f8b0b52 100644
--- a/lib/folder_service.dart
+++ b/lib/services/folder_service.dart
@@ -10,7 +10,7 @@ import 'package:photos/events/user_authenticated_event.dart';
 import 'package:photos/models/folder.dart';
 import 'package:photos/models/file.dart';
 
-import 'core/event_bus.dart';
+import '../core/event_bus.dart';
 
 class FolderSharingService {
   final _logger = Logger("FolderSharingService");
diff --git a/lib/memories_service.dart b/lib/services/memories_service.dart
similarity index 100%
rename from lib/memories_service.dart
rename to lib/services/memories_service.dart
diff --git a/lib/user_authenticator.dart b/lib/services/user_service.dart
similarity index 96%
rename from lib/user_authenticator.dart
rename to lib/services/user_service.dart
index 5aae81e36..2f65ed139 100644
--- a/lib/user_authenticator.dart
+++ b/lib/services/user_service.dart
@@ -13,14 +13,13 @@ import 'package:photos/ui/passphrase_reentry_page.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
-class UserAuthenticator {
+class UserService {
   final _dio = Dio();
   final _logger = Logger("UserAuthenticator");
 
-  UserAuthenticator._privateConstructor();
+  UserService._privateConstructor();
 
-  static final UserAuthenticator instance =
-      UserAuthenticator._privateConstructor();
+  static final UserService instance = UserService._privateConstructor();
 
   Future<void> getOtt(BuildContext context, String email) async {
     final dialog = createProgressDialog(context, "Please wait...");
diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 5ff886478..7c0c9f939 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:like_button/like_button.dart';
-import 'package:photos/favorite_files_repository.dart';
+import 'package:photos/services/favorites_service.dart';
 import 'package:photos/file_repository.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/file.dart';
@@ -178,9 +178,9 @@ class _DetailPageState extends State<DetailPage> {
   Widget _getFavoriteButton() {
     final file = _files[_selectedIndex];
     return LikeButton(
-      isLiked: FavoriteFilesRepository.instance.isLiked(file),
+      isLiked: FavoritesService.instance.isLiked(file),
       onTap: (oldValue) {
-        return FavoriteFilesRepository.instance.setLiked(file, !oldValue);
+        return FavoritesService.instance.setLiked(file, !oldValue);
       },
       likeBuilder: (isLiked) {
         return Icon(
diff --git a/lib/ui/device_folders_gallery_widget.dart b/lib/ui/device_folders_gallery_widget.dart
index 980239f7f..674dc713e 100644
--- a/lib/ui/device_folders_gallery_widget.dart
+++ b/lib/ui/device_folders_gallery_widget.dart
@@ -5,7 +5,7 @@ import 'package:flutter/widgets.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/files_db.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
-import 'package:photos/favorite_files_repository.dart';
+import 'package:photos/services/favorites_service.dart';
 import 'package:photos/models/device_folder.dart';
 import 'package:photos/models/filters/favorite_items_filter.dart';
 import 'package:photos/models/filters/folder_name_filter.dart';
@@ -85,9 +85,9 @@ class _DeviceFolderGalleryWidgetState extends State<DeviceFolderGalleryWidget> {
       return second.thumbnail.creationTime
           .compareTo(first.thumbnail.creationTime);
     });
-    if (FavoriteFilesRepository.instance.hasFavorites()) {
+    if (FavoritesService.instance.hasFavorites()) {
       final file = await FilesDB.instance.getLatestFileAmongGeneratedIDs(
-          FavoriteFilesRepository.instance.getLiked().toList());
+          FavoritesService.instance.getLiked().toList());
       folders.insert(0,
           DeviceFolder("Favorites", "/Favorites", file, FavoriteItemsFilter()));
     }
diff --git a/lib/ui/email_entry_page.dart b/lib/ui/email_entry_page.dart
index af2990b5d..cc9ec1f23 100644
--- a/lib/ui/email_entry_page.dart
+++ b/lib/ui/email_entry_page.dart
@@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:photos/core/configuration.dart';
-import 'package:photos/user_authenticator.dart';
+import 'package:photos/services/user_service.dart';
 
 class EmailEntryPage extends StatefulWidget {
   EmailEntryPage({Key key}) : super(key: key);
@@ -54,7 +54,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                   onPressed: () {
                     final email = _emailController.text;
                     Configuration.instance.setEmail(email);
-                    UserAuthenticator.instance.getOtt(context, email);
+                    UserService.instance.getOtt(context, email);
                   },
                   padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
                   child: Text("Sign In"),
diff --git a/lib/ui/face_search_results_page.dart b/lib/ui/face_search_results_page.dart
index 4a9451d5f..6c33dcf0d 100644
--- a/lib/ui/face_search_results_page.dart
+++ b/lib/ui/face_search_results_page.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:photos/face_search_manager.dart';
+import 'package:photos/services/face_search_service.dart';
 import 'package:photos/models/face.dart';
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/ui/gallery.dart';
 import 'package:photos/ui/gallery_app_bar_widget.dart';
 
 class FaceSearchResultsPage extends StatelessWidget {
-  final FaceSearchManager _faceSearchManager = FaceSearchManager.instance;
+  final FaceSearchService _faceSearchManager = FaceSearchService.instance;
   final Face face;
   final selectedFiles = SelectedFiles();
 
diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart
index 3cb0ef950..fa0055561 100644
--- a/lib/ui/home_widget.dart
+++ b/lib/ui/home_widget.dart
@@ -11,7 +11,7 @@ import 'package:photos/models/filters/important_items_filter.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/file_repository.dart';
 import 'package:photos/models/selected_files.dart';
-import 'package:photos/photo_sync_manager.dart';
+import 'package:photos/file_sync_manager.dart';
 import 'package:photos/ui/device_folders_gallery_widget.dart';
 import 'package:photos/ui/gallery.dart';
 import 'package:photos/ui/gallery_app_bar_widget.dart';
@@ -20,7 +20,7 @@ import 'package:photos/ui/loading_widget.dart';
 import 'package:photos/ui/memories_widget.dart';
 import 'package:photos/ui/remote_folder_gallery_widget.dart';
 import 'package:photos/ui/search_page.dart';
-import 'package:photos/user_authenticator.dart';
+import 'package:photos/services/user_service.dart';
 import 'package:photos/utils/logging_util.dart';
 import 'package:shake/shake.dart';
 import 'package:logging/logging.dart';
@@ -76,7 +76,7 @@ class _HomeWidgetState extends State<HomeWidget> {
       bottomNavigationBar: _buildBottomNavigationBar(),
       body: IndexedStack(
         children: <Widget>[
-          PhotoSyncManager.instance.hasScannedDisk()
+          FileSyncManager.instance.hasScannedDisk()
               ? _getMainGalleryWidget()
               : LoadingPhotosWidget(),
           _deviceFolderGalleryWidget,
@@ -140,7 +140,7 @@ class _HomeWidgetState extends State<HomeWidget> {
     }
     final ott = Uri.parse(link).queryParameters["ott"];
     _logger.info("Ott: " + ott);
-    UserAuthenticator.instance.getCredentials(context, ott);
+    UserService.instance.getCredentials(context, ott);
   }
 
   Widget _getMainGalleryWidget() {
@@ -155,7 +155,7 @@ class _HomeWidgetState extends State<HomeWidget> {
               return _getFilteredPhotos(FileRepository.instance.files);
             },
             reloadEvent: Bus.instance.on<LocalPhotosUpdatedEvent>(),
-            onRefresh: PhotoSyncManager.instance.sync,
+            onRefresh: FileSyncManager.instance.sync,
             tagPrefix: "home_gallery",
             selectedFiles: _selectedFiles,
             headerWidget: _memoriesWidget,
diff --git a/lib/ui/memories_widget.dart b/lib/ui/memories_widget.dart
index 76f7359ea..6299a674c 100644
--- a/lib/ui/memories_widget.dart
+++ b/lib/ui/memories_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:photos/memories_service.dart';
+import 'package:photos/services/memories_service.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/memory.dart';
diff --git a/lib/ui/ott_verification_page.dart b/lib/ui/ott_verification_page.dart
index 07d1de76f..4924e097f 100644
--- a/lib/ui/ott_verification_page.dart
+++ b/lib/ui/ott_verification_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/ui/email_entry_page.dart';
-import 'package:photos/user_authenticator.dart';
+import 'package:photos/services/user_service.dart';
 
 class OTTVerificationPage extends StatefulWidget {
   OTTVerificationPage({Key key}) : super(key: key);
@@ -84,7 +84,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                           _verificationCodeController.text.isEmpty
                       ? null
                       : () {
-                          UserAuthenticator.instance.getCredentials(
+                          UserService.instance.getCredentials(
                               context, _verificationCodeController.text);
                         },
                   padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
diff --git a/lib/ui/passphrase_entry_page.dart b/lib/ui/passphrase_entry_page.dart
index 983108efb..79198742a 100644
--- a/lib/ui/passphrase_entry_page.dart
+++ b/lib/ui/passphrase_entry_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:photos/user_authenticator.dart';
+import 'package:photos/services/user_service.dart';
 import 'package:photos/utils/dialog_util.dart';
 
 class PassphraseEntryPage extends StatefulWidget {
@@ -142,7 +142,7 @@ class _PassphraseEntryPageState extends State<PassphraseEntryPage> {
           child: Text("Confirm"),
           onPressed: () {
             Navigator.of(context).pop();
-            UserAuthenticator.instance
+            UserService.instance
                 .setupKey(context, _passphraseController1.text);
           },
         ),
diff --git a/lib/ui/remote_folder_page.dart b/lib/ui/remote_folder_page.dart
index 62c72488d..2233a37f3 100644
--- a/lib/ui/remote_folder_page.dart
+++ b/lib/ui/remote_folder_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:photos/db/files_db.dart';
-import 'package:photos/folder_service.dart';
+import 'package:photos/services/folder_service.dart';
 import 'package:photos/models/folder.dart';
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/ui/gallery.dart';
diff --git a/lib/ui/search_page.dart b/lib/ui/search_page.dart
index f61249a0a..a8fe96254 100644
--- a/lib/ui/search_page.dart
+++ b/lib/ui/search_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:photos/face_search_manager.dart';
+import 'package:photos/services/face_search_service.dart';
 import 'package:photos/models/face.dart';
 import 'package:photos/ui/circular_network_image_widget.dart';
 import 'package:photos/ui/face_search_results_page.dart';
@@ -12,7 +12,7 @@ class SearchPage extends StatefulWidget {
 }
 
 class _SearchPageState extends State<SearchPage> {
-  final FaceSearchManager _faceSearchManager = FaceSearchManager.instance;
+  final FaceSearchService _faceSearchManager = FaceSearchService.instance;
   String _searchString = "";
 
   @override
diff --git a/lib/ui/share_folder_widget.dart b/lib/ui/share_folder_widget.dart
index d485ceeb3..d961122c8 100644
--- a/lib/ui/share_folder_widget.dart
+++ b/lib/ui/share_folder_widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:photos/folder_service.dart';
+import 'package:photos/services/folder_service.dart';
 import 'package:photos/models/folder.dart';
 import 'package:photos/ui/loading_widget.dart';
 import 'package:photos/utils/dialog_util.dart';
diff --git a/lib/ui/sync_indicator.dart b/lib/ui/sync_indicator.dart
index 911ebb64a..b2bcd9f69 100644
--- a/lib/ui/sync_indicator.dart
+++ b/lib/ui/sync_indicator.dart
@@ -4,7 +4,7 @@ import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/photo_upload_event.dart';
-import 'package:photos/photo_sync_manager.dart';
+import 'package:photos/file_sync_manager.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class SyncIndicator extends StatefulWidget {
@@ -67,7 +67,7 @@ class _SyncIndicatorState extends State<SyncIndicator> {
                   child: Text("YES"),
                   onPressed: () {
                     Navigator.of(context).pop();
-                    PhotoSyncManager.instance.stopSync();
+                    FileSyncManager.instance.stopSync();
                     _completeText = "Sync stopped.";
                     setState(() {});
                     widget.refreshController.refreshCompleted();