diff --git a/lib/core/image_cache.dart b/lib/core/cache/image_cache.dart
similarity index 87%
rename from lib/core/image_cache.dart
rename to lib/core/cache/image_cache.dart
index 696885487..472732f94 100644
--- a/lib/core/image_cache.dart
+++ b/lib/core/cache/image_cache.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:photos/core/lru_map.dart';
+import 'package:photos/core/cache/lru_map.dart';
 import 'package:photos/models/photo.dart';
 
 class ImageLruCache {
diff --git a/lib/core/lru_map.dart b/lib/core/cache/lru_map.dart
similarity index 100%
rename from lib/core/lru_map.dart
rename to lib/core/cache/lru_map.dart
diff --git a/lib/core/thumbnail_cache.dart b/lib/core/cache/thumbnail_cache.dart
similarity index 94%
rename from lib/core/thumbnail_cache.dart
rename to lib/core/cache/thumbnail_cache.dart
index aa87028e4..d515da3e9 100644
--- a/lib/core/thumbnail_cache.dart
+++ b/lib/core/cache/thumbnail_cache.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:photos/core/lru_map.dart';
+import 'package:photos/core/cache/lru_map.dart';
 import 'package:photos/models/photo.dart';
 
 class ThumbnailLruCache {
diff --git a/lib/photo_provider.dart b/lib/photo_provider.dart
index a25af829f..2cdc3c9d5 100644
--- a/lib/photo_provider.dart
+++ b/lib/photo_provider.dart
@@ -1,7 +1,6 @@
-import 'package:flutter/foundation.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-class PhotoProvider extends ChangeNotifier {
+class PhotoProvider {
   PhotoProvider._privateConstructor();
   static final PhotoProvider instance = PhotoProvider._privateConstructor();
 
diff --git a/lib/photo_loader.dart b/lib/photo_repository.dart
similarity index 82%
rename from lib/photo_loader.dart
rename to lib/photo_repository.dart
index 2ee51c63d..6db78e030 100644
--- a/lib/photo_loader.dart
+++ b/lib/photo_repository.dart
@@ -4,12 +4,12 @@ import 'package:photos/db/db_helper.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/photo.dart';
 
-class PhotoLoader {
+class PhotoRepository {
   final logger = Logger("PhotoLoader");
   final _photos = List<Photo>();
 
-  PhotoLoader._privateConstructor();
-  static final PhotoLoader instance = PhotoLoader._privateConstructor();
+  PhotoRepository._privateConstructor();
+  static final PhotoRepository instance = PhotoRepository._privateConstructor();
 
   List<Photo> get photos {
     return _photos;
diff --git a/lib/photo_sync_manager.dart b/lib/photo_sync_manager.dart
index 62271ced1..ebf345e01 100644
--- a/lib/photo_sync_manager.dart
+++ b/lib/photo_sync_manager.dart
@@ -5,7 +5,7 @@ import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/db_helper.dart';
 import 'package:photos/events/user_authenticated_event.dart';
-import 'package:photos/photo_loader.dart';
+import 'package:photos/photo_repository.dart';
 import 'package:photos/photo_provider.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
@@ -144,7 +144,7 @@ class PhotoSyncManager {
       // TODO: Save path
       photo.pathName = localPath;
       await DatabaseHelper.instance.insertPhoto(photo);
-      PhotoLoader.instance.reloadPhotos();
+      PhotoRepository.instance.reloadPhotos();
       await prefs.setInt(_lastSyncTimestampKey, photo.syncTimestamp);
     }
   }
@@ -212,7 +212,7 @@ class PhotoSyncManager {
       List<Photo> photos, SharedPreferences prefs, int timestamp) async {
     await DatabaseHelper.instance.insertPhotos(photos);
     _logger.info("Inserted " + photos.length.toString() + " photos.");
-    PhotoLoader.instance.reloadPhotos();
+    PhotoRepository.instance.reloadPhotos();
     return await prefs.setInt(_lastDBUpdateTimestampKey, timestamp);
   }
 }
diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index cdd87fe1b..170460e4f 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:photos/core/lru_map.dart';
+import 'package:photos/core/cache/lru_map.dart';
 import 'package:photos/models/photo.dart';
 import 'package:photos/ui/extents_page_view.dart';
 import 'package:photos/ui/zoomable_image.dart';
diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart
index 1cb0caf72..7e2da660c 100644
--- a/lib/ui/gallery_app_bar_widget.dart
+++ b/lib/ui/gallery_app_bar_widget.dart
@@ -4,7 +4,7 @@ import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/db_helper.dart';
 import 'package:photos/events/remote_sync_event.dart';
 import 'package:photos/models/photo.dart';
-import 'package:photos/photo_loader.dart';
+import 'package:photos/photo_repository.dart';
 import 'package:photos/ui/setup_page.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/utils/share_util.dart';
@@ -135,7 +135,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           : await DatabaseHelper.instance.deletePhoto(photo);
     }
     Navigator.of(context, rootNavigator: true).pop();
-    PhotoLoader.instance.reloadPhotos();
+    PhotoRepository.instance.reloadPhotos();
     if (widget.onPhotosDeleted != null) {
       widget.onPhotosDeleted(widget.selectedPhotos.toList());
     }
diff --git a/lib/ui/gallery_container_widget.dart b/lib/ui/gallery_container_widget.dart
index 87c89116f..c49ba85c0 100644
--- a/lib/ui/gallery_container_widget.dart
+++ b/lib/ui/gallery_container_widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:photos/models/photo.dart';
-import 'package:photos/photo_loader.dart';
+import 'package:photos/photo_repository.dart';
 import 'package:photos/ui/gallery.dart';
 import 'package:photos/ui/loading_widget.dart';
 import 'package:photos/ui/search_page.dart';
@@ -34,12 +34,12 @@ class _GalleryContainerState extends State<GalleryContainer> {
 
   FutureBuilder<bool> _buildGallery() {
     return FutureBuilder<bool>(
-      future: PhotoLoader.instance.loadPhotos(),
+      future: PhotoRepository.instance.loadPhotos(),
       builder: (context, snapshot) {
         if (snapshot.hasData) {
           return Flexible(
             child: Gallery(
-              getFilteredPhotos(PhotoLoader.instance.photos),
+              getFilteredPhotos(PhotoRepository.instance.photos),
               widget.selectedPhotos,
               photoSelectionChangeCallback: widget.photoSelectionChangeCallback,
             ),
diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart
index ac9e19527..3fdaa0342 100644
--- a/lib/ui/home_widget.dart
+++ b/lib/ui/home_widget.dart
@@ -6,7 +6,7 @@ import 'package:flutter/widgets.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/photo.dart';
-import 'package:photos/photo_loader.dart';
+import 'package:photos/photo_repository.dart';
 import 'package:photos/ui/album_list_widget.dart';
 import 'package:photos/ui/gallery_app_bar_widget.dart';
 import 'package:photos/ui/gallery_container_widget.dart';
@@ -72,7 +72,7 @@ class _HomeWidgetState extends State<HomeWidget> {
               });
             },
           ),
-          AlbumListWidget(PhotoLoader.instance.photos)
+          AlbumListWidget(PhotoRepository.instance.photos)
         ],
         index: _selectedNavBarItem,
       ),
diff --git a/lib/ui/thumbnail_widget.dart b/lib/ui/thumbnail_widget.dart
index 8fcc185c7..09e670693 100644
--- a/lib/ui/thumbnail_widget.dart
+++ b/lib/ui/thumbnail_widget.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:photos/core/thumbnail_cache.dart';
+import 'package:photos/core/cache/thumbnail_cache.dart';
 import 'package:photos/models/photo.dart';
 import 'package:photos/core/constants.dart';
 
diff --git a/lib/ui/zoomable_image.dart b/lib/ui/zoomable_image.dart
index 62a74477e..f58e2db95 100644
--- a/lib/ui/zoomable_image.dart
+++ b/lib/ui/zoomable_image.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter/widgets.dart';
-import 'package:photos/core/image_cache.dart';
-import 'package:photos/core/thumbnail_cache.dart';
+import 'package:photos/core/cache/image_cache.dart';
+import 'package:photos/core/cache/thumbnail_cache.dart';
 import 'package:photos/models/photo.dart';
 import 'package:photos/ui/loading_widget.dart';
 import 'package:photo_view/photo_view.dart';