diff --git a/README.md b/README.md
index 7fc3dda2b..a230caebb 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1 @@
-# myapp
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
-
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+# Ente Photos
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0c7e0b372..9f63df150 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.myapp"
+        applicationId "io.ente.photos"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 38ddf8976..1408e61e4 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapp">
+    package="io.ente.photos">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index a5a2867c6..051d5e2eb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapp">
+    package="io.ente.photos">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/android/app/src/main/kotlin/com/example/myapp/MainActivity.kt b/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt
similarity index 59%
rename from android/app/src/main/kotlin/com/example/myapp/MainActivity.kt
rename to android/app/src/main/kotlin/io/ente/photos/MainActivity.kt
index 626aa86bc..6d9fb8134 100644
--- a/android/app/src/main/kotlin/com/example/myapp/MainActivity.kt
+++ b/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt
@@ -1,12 +1,12 @@
-package com.example.myapp
+package io.ente.photos
 
-import androidx.annotation.NonNull;
+import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
 
-class MainActivity: FlutterActivity() {
+class MainActivity : FlutterActivity() {
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
+        GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
 }
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 406eff082..718370751 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapp">
+    package="io.ente.photos">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2f208e195..33bac8761 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,4 +1,9 @@
 PODS:
+  - connectivity (0.0.1):
+    - Flutter
+    - Reachability
+  - connectivity_macos (0.0.1):
+    - Flutter
   - esys_flutter_share (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -29,6 +34,7 @@ PODS:
     - Flutter
   - photo_manager (0.0.1):
     - Flutter
+  - Reachability (3.2)
   - SDWebImage/Core (5.7.3)
   - SDWebImageWebPCoder (0.6.1):
     - libwebp (~> 1.0)
@@ -44,6 +50,8 @@ PODS:
     - FMDB (~> 2.7.2)
 
 DEPENDENCIES:
+  - connectivity (from `.symlinks/plugins/connectivity/ios`)
+  - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
   - esys_flutter_share (from `.symlinks/plugins/esys_flutter_share/ios`)
   - Flutter (from `Flutter`)
   - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
@@ -61,10 +69,15 @@ SPEC REPOS:
     - FMDB
     - libwebp
     - Mantle
+    - Reachability
     - SDWebImage
     - SDWebImageWebPCoder
 
 EXTERNAL SOURCES:
+  connectivity:
+    :path: ".symlinks/plugins/connectivity/ios"
+  connectivity_macos:
+    :path: ".symlinks/plugins/connectivity_macos/ios"
   esys_flutter_share:
     :path: ".symlinks/plugins/esys_flutter_share/ios"
   Flutter:
@@ -89,6 +102,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/ios"
 
 SPEC CHECKSUMS:
+  connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75
+  connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
   esys_flutter_share: 403498dab005b36ce1f8d7aff377e81f0621b0b4
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   flutter_image_compress: 082f8daaf6c1b0c9fe798251c750ef0ecd98d7ae
@@ -99,6 +114,7 @@ SPEC CHECKSUMS:
   path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
   path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
   photo_manager: f7c619c2cc8c2adb8d85c63363babac477de9c67
+  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: 97351f6582ceca541ea294ba66a1fcb342a331c2
   SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
   shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index df3a65401..5b7269afd 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -378,7 +378,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = orma.app;
+				PRODUCT_BUNDLE_IDENTIFIER = io.ente.photos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -517,7 +517,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = orma.app;
+				PRODUCT_BUNDLE_IDENTIFIER = io.ente.photos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -549,7 +549,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = orma.app;
+				PRODUCT_BUNDLE_IDENTIFIER = io.ente.photos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 6491b2463..59f6c7e94 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>myapp</string>
+	<string>Photos</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/lib/core/image_cache.dart b/lib/core/image_cache.dart
index 72190b35d..050f3252d 100644
--- a/lib/core/image_cache.dart
+++ b/lib/core/image_cache.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
-import 'package:myapp/core/lru_map.dart';
-import 'package:myapp/models/photo.dart';
+import 'lru_map.dart';
+import 'package:photos/models/photo.dart';
 
 class ImageLruCache {
   static LRUMap<int, Uint8List> _map = LRUMap(500);
diff --git a/lib/core/thumbnail_cache.dart b/lib/core/thumbnail_cache.dart
index a7433eded..f68153ebf 100644
--- a/lib/core/thumbnail_cache.dart
+++ b/lib/core/thumbnail_cache.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
-import 'package:myapp/core/lru_map.dart';
-import 'package:myapp/models/photo.dart';
+import 'lru_map.dart';
+import 'package:photos/models/photo.dart';
 
 class ThumbnailLruCache {
   static LRUMap<_ThumbnailCacheKey, Uint8List> _map = LRUMap(5000);
diff --git a/lib/db/db_helper.dart b/lib/db/db_helper.dart
index 79c855aaa..3423a71d8 100644
--- a/lib/db/db_helper.dart
+++ b/lib/db/db_helper.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:myapp/models/photo.dart';
+import 'package:photos/models/photo.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path_provider/path_provider.dart';
diff --git a/lib/face_search_manager.dart b/lib/face_search_manager.dart
index f5ba62fbd..3fe395edb 100644
--- a/lib/face_search_manager.dart
+++ b/lib/face_search_manager.dart
@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/db/db_helper.dart';
+import 'core/configuration.dart';
+import 'db/db_helper.dart';
 
 import 'models/face.dart';
 import 'models/photo.dart';
diff --git a/lib/main.dart b/lib/main.dart
index ca5d54c6d..8d3cd9c63 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/photo_sync_manager.dart';
-import 'package:myapp/ui/home_widget.dart';
+import 'core/configuration.dart';
+import 'photo_loader.dart';
+import 'photo_sync_manager.dart';
+import 'ui/home_widget.dart';
 import 'package:provider/provider.dart';
 
 void main() async {
@@ -14,7 +14,7 @@ void main() async {
 }
 
 class MyApp extends StatelessWidget with WidgetsBindingObserver {
-  final _title = 'ente photos';
+  final _title = 'Photos';
   @override
   Widget build(BuildContext context) {
     WidgetsBinding.instance.addObserver(this);
diff --git a/lib/models/album.dart b/lib/models/album.dart
index cb587e781..e2489de7f 100644
--- a/lib/models/album.dart
+++ b/lib/models/album.dart
@@ -1,4 +1,4 @@
-import 'package:myapp/models/photo.dart';
+import 'photo.dart';
 
 class Album {
   final String name;
diff --git a/lib/photo_loader.dart b/lib/photo_loader.dart
index 03551ebff..e8954ba5a 100644
--- a/lib/photo_loader.dart
+++ b/lib/photo_loader.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/db/db_helper.dart';
-import 'package:myapp/models/photo.dart';
+import 'db/db_helper.dart';
+import 'models/photo.dart';
 
 class PhotoLoader extends ChangeNotifier {
   final logger = Logger();
diff --git a/lib/photo_sync_manager.dart b/lib/photo_sync_manager.dart
index 8706df39e..d7b2478bc 100644
--- a/lib/photo_sync_manager.dart
+++ b/lib/photo_sync_manager.dart
@@ -2,17 +2,17 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:logger/logger.dart';
-import 'package:myapp/core/event_bus.dart';
-import 'package:myapp/db/db_helper.dart';
-import 'package:myapp/events/user_authenticated_event.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/photo_provider.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: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 'package:myapp/models/photo.dart';
+import 'models/photo.dart';
 
 import 'core/configuration.dart';
 import 'events/remote_sync_event.dart';
diff --git a/lib/ui/album_list_widget.dart b/lib/ui/album_list_widget.dart
index 1df2a08dc..aa7b5ea65 100644
--- a/lib/ui/album_list_widget.dart
+++ b/lib/ui/album_list_widget.dart
@@ -2,10 +2,10 @@ import 'dart:collection';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:myapp/models/album.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/ui/album_widget.dart';
-import 'package:myapp/ui/thumbnail_widget.dart';
+import 'package:photos/models/album.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/ui/album_widget.dart';
+import 'package:photos/ui/thumbnail_widget.dart';
 import 'package:path/path.dart' as path;
 
 class AlbumListWidget extends StatefulWidget {
diff --git a/lib/ui/album_widget.dart b/lib/ui/album_widget.dart
index 910e12121..fc4e0148b 100644
--- a/lib/ui/album_widget.dart
+++ b/lib/ui/album_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/models/album.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/ui/gallery.dart';
-import 'package:myapp/ui/gallery_app_bar_widget.dart';
+import 'package:photos/models/album.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/ui/gallery.dart';
+import 'package:photos/ui/gallery_app_bar_widget.dart';
 
 class AlbumPage extends StatefulWidget {
   final Album album;
diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 45c993b38..fd1a9f785 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/lru_map.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/ui/extents_page_view.dart';
-import 'package:myapp/ui/zoomable_image.dart';
-import 'package:myapp/utils/share_util.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/utils/share_util.dart';
 
 class DetailPage extends StatefulWidget {
   final List<Photo> photos;
diff --git a/lib/ui/face_search_results_page.dart b/lib/ui/face_search_results_page.dart
index 8418cb00b..729e7da69 100644
--- a/lib/ui/face_search_results_page.dart
+++ b/lib/ui/face_search_results_page.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/face_search_manager.dart';
-import 'package:myapp/models/face.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/ui/circular_network_image_widget.dart';
-import 'package:myapp/ui/thumbnail_widget.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/face_search_manager.dart';
+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';
 
diff --git a/lib/ui/gallery.dart b/lib/ui/gallery.dart
index 855972eaa..a2d296e3f 100644
--- a/lib/ui/gallery.dart
+++ b/lib/ui/gallery.dart
@@ -4,15 +4,15 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/thumbnail_cache.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/ui/detail_page.dart';
-import 'package:myapp/ui/thumbnail_widget.dart';
-import 'package:myapp/utils/date_time_util.dart';
+import 'package:photos/core/thumbnail_cache.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/photo_loader.dart';
+import 'package:photos/ui/detail_page.dart';
+import 'package:photos/ui/thumbnail_widget.dart';
+import 'package:photos/utils/date_time_util.dart';
 import 'package:provider/provider.dart';
 import 'package:visibility_detector/visibility_detector.dart';
-import 'package:myapp/core/constants.dart';
+import 'package:photos/core/constants.dart';
 
 class Gallery extends StatefulWidget {
   final List<Photo> photos;
diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart
index 8bcbb6db0..a318ff1bf 100644
--- a/lib/ui/gallery_app_bar_widget.dart
+++ b/lib/ui/gallery_app_bar_widget.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/event_bus.dart';
-import 'package:myapp/db/db_helper.dart';
-import 'package:myapp/events/remote_sync_event.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/ui/setup_page.dart';
+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/ui/setup_page.dart';
 import 'package:photo_manager/photo_manager.dart';
-import 'package:myapp/utils/share_util.dart';
+import 'package:photos/utils/share_util.dart';
 
 class GalleryAppBarWidget extends StatefulWidget
     implements PreferredSizeWidget {
diff --git a/lib/ui/gallery_container_widget.dart b/lib/ui/gallery_container_widget.dart
index a4ea3745a..e24fc39b1 100644
--- a/lib/ui/gallery_container_widget.dart
+++ b/lib/ui/gallery_container_widget.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/ui/change_notifier_builder.dart';
-import 'package:myapp/ui/gallery.dart';
-import 'package:myapp/ui/loading_widget.dart';
-import 'package:myapp/ui/search_page.dart';
-import 'package:myapp/utils/important_items_filter.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/photo_loader.dart';
+import 'package:photos/ui/change_notifier_builder.dart';
+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
diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart
index 77604a2c3..b0afec76b 100644
--- a/lib/ui/home_widget.dart
+++ b/lib/ui/home_widget.dart
@@ -3,12 +3,12 @@ import 'dart:collection';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/photo_loader.dart';
-import 'package:myapp/ui/album_list_widget.dart';
-import 'package:myapp/ui/change_notifier_builder.dart';
-import 'package:myapp/ui/gallery_app_bar_widget.dart';
-import 'package:myapp/ui/gallery_container_widget.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/photo_loader.dart';
+import 'package:photos/ui/album_list_widget.dart';
+import 'package:photos/ui/change_notifier_builder.dart';
+import 'package:photos/ui/gallery_app_bar_widget.dart';
+import 'package:photos/ui/gallery_container_widget.dart';
 import 'package:provider/provider.dart';
 
 class HomeWidget extends StatefulWidget {
diff --git a/lib/ui/network_image_detail_page.dart b/lib/ui/network_image_detail_page.dart
index a6c0e9376..e09486097 100644
--- a/lib/ui/network_image_detail_page.dart
+++ b/lib/ui/network_image_detail_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/core/constants.dart' as Constants;
+import 'package:photos/core/configuration.dart';
 
 class NetworkImageDetailPage extends StatelessWidget {
   final String _path;
diff --git a/lib/ui/search_page.dart b/lib/ui/search_page.dart
index 616bd6ebe..ec36847a0 100644
--- a/lib/ui/search_page.dart
+++ b/lib/ui/search_page.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/face_search_manager.dart';
-import 'package:myapp/models/face.dart';
-import 'package:myapp/core/constants.dart' as Constants;
-import 'package:myapp/ui/circular_network_image_widget.dart';
-import 'package:myapp/ui/face_search_results_page.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/face_search_manager.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';
 
 class SearchPage extends StatelessWidget {
   final FaceSearchManager _faceSearchManager = FaceSearchManager.instance;
diff --git a/lib/ui/setup_page.dart b/lib/ui/setup_page.dart
index 06bea2dcc..0c549cf0a 100644
--- a/lib/ui/setup_page.dart
+++ b/lib/ui/setup_page.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:logger/logger.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/ui/sign_in_widget.dart';
-import 'package:myapp/utils/endpoint_finder.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/ui/sign_in_widget.dart';
+import 'package:photos/utils/endpoint_finder.dart';
 
 class SetupPage extends StatefulWidget {
   SetupPage({key}) : super(key: key);
diff --git a/lib/ui/sign_in_widget.dart b/lib/ui/sign_in_widget.dart
index 701e04ec9..f5bf68d96 100644
--- a/lib/ui/sign_in_widget.dart
+++ b/lib/ui/sign_in_widget.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/user_authenticator.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/user_authenticator.dart';
 
 class SignInWidget extends StatefulWidget {
   final Function() onReconfigurationRequested;
diff --git a/lib/ui/thumbnail_widget.dart b/lib/ui/thumbnail_widget.dart
index 2008f68be..44491b58f 100644
--- a/lib/ui/thumbnail_widget.dart
+++ b/lib/ui/thumbnail_widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:myapp/core/thumbnail_cache.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/core/constants.dart';
+import 'package:photos/core/thumbnail_cache.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/core/constants.dart';
 
 class ThumbnailWidget extends StatefulWidget {
   final Photo photo;
diff --git a/lib/ui/zoomable_image.dart b/lib/ui/zoomable_image.dart
index 8d154c227..4e098d7cb 100644
--- a/lib/ui/zoomable_image.dart
+++ b/lib/ui/zoomable_image.dart
@@ -1,12 +1,12 @@
 import 'dart:typed_data';
 import 'package:flutter/widgets.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/image_cache.dart';
-import 'package:myapp/core/thumbnail_cache.dart';
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/ui/loading_widget.dart';
+import 'package:photos/core/image_cache.dart';
+import 'package:photos/core/thumbnail_cache.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/ui/loading_widget.dart';
 import 'package:photo_view/photo_view.dart';
-import 'package:myapp/core/constants.dart';
+import 'package:photos/core/constants.dart';
 
 class ZoomableImage extends StatefulWidget {
   final Photo photo;
diff --git a/lib/user_authenticator.dart b/lib/user_authenticator.dart
index d2e0810f7..e6fcb3630 100644
--- a/lib/user_authenticator.dart
+++ b/lib/user_authenticator.dart
@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:logger/logger.dart';
-import 'package:myapp/core/configuration.dart';
-import 'package:myapp/core/event_bus.dart';
+import 'core/configuration.dart';
+import 'core/event_bus.dart';
 
 import 'events/user_authenticated_event.dart';
 
diff --git a/lib/utils/gallery_items_filter.dart b/lib/utils/gallery_items_filter.dart
index d1e8c3c92..0e8349b19 100644
--- a/lib/utils/gallery_items_filter.dart
+++ b/lib/utils/gallery_items_filter.dart
@@ -1,4 +1,4 @@
-import 'package:myapp/models/photo.dart';
+import 'package:photos/models/photo.dart';
 
 class GalleryItemsFilter {
   bool shouldInclude(Photo photo) {
diff --git a/lib/utils/important_items_filter.dart b/lib/utils/important_items_filter.dart
index 8b4e52ccd..5b64fdcac 100644
--- a/lib/utils/important_items_filter.dart
+++ b/lib/utils/important_items_filter.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:myapp/models/photo.dart';
-import 'package:myapp/utils/gallery_items_filter.dart';
+import 'package:photos/models/photo.dart';
+import 'package:photos/utils/gallery_items_filter.dart';
 import 'package:path/path.dart';
 
 class ImportantItemsFilter implements GalleryItemsFilter {
diff --git a/lib/utils/share_util.dart b/lib/utils/share_util.dart
index 54f6ab23b..5bf24a09d 100644
--- a/lib/utils/share_util.dart
+++ b/lib/utils/share_util.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:esys_flutter_share/esys_flutter_share.dart';
-import 'package:myapp/models/photo.dart';
+import 'package:photos/models/photo.dart';
 import 'package:path/path.dart';
 
 Future<void> share(Photo photo) async {
diff --git a/pubspec.yaml b/pubspec.yaml
index 8b1684f2c..13e88e17d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
-name: myapp
-description: A new Flutter project.
+name: photos
+description: ente photos application
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43