diff --git a/lib/core/image_cache.dart b/lib/core/image_cache.dart
index 050f3252d..696885487 100644
--- a/lib/core/image_cache.dart
+++ b/lib/core/image_cache.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'lru_map.dart';
+import 'package:photos/core/lru_map.dart';
 import 'package:photos/models/photo.dart';
 
 class ImageLruCache {
diff --git a/lib/core/thumbnail_cache.dart b/lib/core/thumbnail_cache.dart
index f68153ebf..aa87028e4 100644
--- a/lib/core/thumbnail_cache.dart
+++ b/lib/core/thumbnail_cache.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'lru_map.dart';
+import 'package:photos/core/lru_map.dart';
 import 'package:photos/models/photo.dart';
 
 class ThumbnailLruCache {
diff --git a/lib/face_search_manager.dart b/lib/face_search_manager.dart
index c18ac63a8..c4b11a63c 100644
--- a/lib/face_search_manager.dart
+++ b/lib/face_search_manager.dart
@@ -1,10 +1,10 @@
 import 'package:dio/dio.dart';
-import 'core/configuration.dart';
-import 'db/db_helper.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/db/db_helper.dart';
 import 'package:logging/logging.dart';
 
-import 'models/face.dart';
-import 'models/photo.dart';
+import 'package:photos/models/face.dart';
+import 'package:photos/models/photo.dart';
 
 class FaceSearchManager {
   final logger = Logger("FaceSearchManager");
diff --git a/lib/main.dart b/lib/main.dart
index 8531483a4..721c74967 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,9 +3,9 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/core/constants.dart';
-import 'core/configuration.dart';
-import 'photo_sync_manager.dart';
-import 'ui/home_widget.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/photo_sync_manager.dart';
+import 'package:photos/ui/home_widget.dart';
 import 'package:sentry/sentry.dart';
 import 'package:super_logging/super_logging.dart';
 import 'package:logging/logging.dart';
diff --git a/lib/models/album.dart b/lib/models/album.dart
index e2489de7f..30e2e644e 100644
--- a/lib/models/album.dart
+++ b/lib/models/album.dart
@@ -1,4 +1,4 @@
-import 'photo.dart';
+import 'package:photos/models/photo.dart';
 
 class Album {
   final String name;
diff --git a/lib/photo_loader.dart b/lib/photo_loader.dart
index f8bca42a0..2ee51c63d 100644
--- a/lib/photo_loader.dart
+++ b/lib/photo_loader.dart
@@ -1,8 +1,8 @@
 import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
-import 'db/db_helper.dart';
-import 'events/local_photos_updated_event.dart';
-import 'models/photo.dart';
+import 'package:photos/db/db_helper.dart';
+import 'package:photos/events/local_photos_updated_event.dart';
+import 'package:photos/models/photo.dart';
 
 class PhotoLoader {
   final logger = Logger("PhotoLoader");
diff --git a/lib/photo_sync_manager.dart b/lib/photo_sync_manager.dart
index 8dd30407f..62271ced1 100644
--- a/lib/photo_sync_manager.dart
+++ b/lib/photo_sync_manager.dart
@@ -2,20 +2,20 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:logging/logging.dart';
-import 'core/event_bus.dart';
-import 'db/db_helper.dart';
-import 'events/user_authenticated_event.dart';
-import 'photo_loader.dart';
-import 'photo_provider.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_provider.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:dio/dio.dart';
-import 'models/photo.dart';
+import 'package:photos/models/photo.dart';
 
-import 'core/configuration.dart';
-import 'events/remote_sync_event.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/events/remote_sync_event.dart';
 
 class PhotoSyncManager {
   final _logger = Logger("PhotoSyncManager");
diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 1d16f79bf..cdd87fe1b 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/core/lru_map.dart';
 import 'package:photos/models/photo.dart';
-import 'extents_page_view.dart';
-import 'zoomable_image.dart';
+import 'package:photos/ui/extents_page_view.dart';
+import 'package:photos/ui/zoomable_image.dart';
 import 'package:photos/utils/share_util.dart';
 import 'package:logging/logging.dart';
 
diff --git a/lib/ui/face_search_results_page.dart b/lib/ui/face_search_results_page.dart
index 729e7da69..1ce5f3640 100644
--- a/lib/ui/face_search_results_page.dart
+++ b/lib/ui/face_search_results_page.dart
@@ -5,8 +5,7 @@ import 'package:photos/models/face.dart';
 import 'package:photos/models/photo.dart';
 import 'package:photos/ui/circular_network_image_widget.dart';
 import 'package:photos/ui/thumbnail_widget.dart';
-
-import 'detail_page.dart';
+import 'package:photos/ui/detail_page.dart';
 
 class FaceSearchResultsPage extends StatelessWidget {
   final FaceSearchManager _faceSearchManager = FaceSearchManager.instance;
diff --git a/lib/ui/gallery_container_widget.dart b/lib/ui/gallery_container_widget.dart
index 57c948bf7..87c89116f 100644
--- a/lib/ui/gallery_container_widget.dart
+++ b/lib/ui/gallery_container_widget.dart
@@ -6,7 +6,6 @@ import 'package:photos/ui/gallery.dart';
 import 'package:photos/ui/loading_widget.dart';
 import 'package:photos/ui/search_page.dart';
 import 'package:photos/utils/important_items_filter.dart';
-import 'package:provider/provider.dart';
 
 // TODO: Remove redundant layer
 class GalleryContainer extends StatefulWidget {
diff --git a/lib/user_authenticator.dart b/lib/user_authenticator.dart
index d2a87ad3a..5d70466df 100644
--- a/lib/user_authenticator.dart
+++ b/lib/user_authenticator.dart
@@ -1,9 +1,9 @@
 import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';
-import 'core/configuration.dart';
-import 'core/event_bus.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/core/event_bus.dart';
 
-import 'events/user_authenticated_event.dart';
+import 'package:photos/events/user_authenticated_event.dart';
 
 class UserAuthenticator {
   final _dio = Dio();