diff --git a/android/app/build.gradle b/android/app/build.gradle
index 474c2f0..98f697d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -43,7 +43,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "de.antonjstu.flutter_paperless_mobile"
+        applicationId "de.astubenbord.paperless_mobile"
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 12e47ca..308ee41 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.flutter_paperless_mobile">
+    package="com.example.paperless_mobile">
     <!-- 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 57e8b5c..7ed9d63 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.flutter_paperless_mobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.paperless_mobile">
     <application android:label="Paperless Mobile" android:name="${applicationName}" android:icon="@mipmap/launcher_icon">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt
index 3a7ae22..a0d5adf 100644
--- a/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.flutter_paperless_mobile
+package com.example.paperless_mobile
 
 import android.os.Bundle
 import android.view.WindowManager.LayoutParams
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 12e47ca..308ee41 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.flutter_paperless_mobile">
+    package="com.example.paperless_mobile">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 3aaff9b..f20953e 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -15,7 +15,7 @@
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>flutter_paperless_mobile</string>
+		<string>paperless_mobile</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
diff --git a/lib/core/bloc/connectivity_cubit.dart b/lib/core/bloc/connectivity_cubit.dart
index 2b9b97f..911c920 100644
--- a/lib/core/bloc/connectivity_cubit.dart
+++ b/lib/core/bloc/connectivity_cubit.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/service/connectivity_status.service.dart';
+import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/core/bloc/document_status_cubit.dart b/lib/core/bloc/document_status_cubit.dart
index e996fdd..25ae3bb 100644
--- a/lib/core/bloc/document_status_cubit.dart
+++ b/lib/core/bloc/document_status_cubit.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/document_processing_status.dart';
+import 'package:paperless_mobile/core/model/document_processing_status.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/core/bloc/label_bloc_provider.dart b/lib/core/bloc/label_bloc_provider.dart
index 1354282..78d56f9 100644
--- a/lib/core/bloc/label_bloc_provider.dart
+++ b/lib/core/bloc/label_bloc_provider.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
 
 class LabelBlocProvider extends StatelessWidget {
   final Widget child;
diff --git a/lib/core/bloc/label_cubit.dart b/lib/core/bloc/label_cubit.dart
index 20776da..89a480a 100644
--- a/lib/core/bloc/label_cubit.dart
+++ b/lib/core/bloc/label_cubit.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/repository/label_repository.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/repository/label_repository.dart';
 
 abstract class LabelCubit<T extends Label> extends Cubit<Map<int, T>> {
   final LabelRepository labelRepository;
diff --git a/lib/core/interceptor/authentication.interceptor.dart b/lib/core/interceptor/authentication.interceptor.dart
index cd6f8ae..2c23798 100644
--- a/lib/core/interceptor/authentication.interceptor.dart
+++ b/lib/core/interceptor/authentication.interceptor.dart
@@ -1,8 +1,8 @@
 import 'dart:developer';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/core/interceptor/connection_state.interceptor.dart b/lib/core/interceptor/connection_state.interceptor.dart
index cfa19bf..d6d1758 100644
--- a/lib/core/interceptor/connection_state.interceptor.dart
+++ b/lib/core/interceptor/connection_state.interceptor.dart
@@ -1,6 +1,6 @@
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/service/connectivity_status.service.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 
@@ -8,16 +8,14 @@ import 'package:injectable/injectable.dart';
 class ConnectionStateInterceptor implements InterceptorContract {
   final AuthenticationCubit authenticationCubit;
   final ConnectivityStatusService connectivityStatusService;
-  ConnectionStateInterceptor(
-      this.authenticationCubit, this.connectivityStatusService);
+  ConnectionStateInterceptor(this.authenticationCubit, this.connectivityStatusService);
 
   @override
   Future<BaseRequest> interceptRequest({required BaseRequest request}) async {
     if (!(await connectivityStatusService.isConnectedToInternet())) {
       throw const ErrorMessage(ErrorCode.deviceOffline);
     }
-    final isServerReachable =
-        await connectivityStatusService.isServerReachable(request.url.origin);
+    final isServerReachable = await connectivityStatusService.isServerReachable(request.url.origin);
     if (!isServerReachable) {
       throw const ErrorMessage(ErrorCode.serverUnreachable);
     }
@@ -25,7 +23,5 @@ class ConnectionStateInterceptor implements InterceptorContract {
   }
 
   @override
-  Future<BaseResponse> interceptResponse(
-          {required BaseResponse response}) async =>
-      response;
+  Future<BaseResponse> interceptResponse({required BaseResponse response}) async => response;
 }
diff --git a/lib/core/interceptor/language_header.interceptor.dart b/lib/core/interceptor/language_header.interceptor.dart
index 5a7ec79..1d5a856 100644
--- a/lib/core/interceptor/language_header.interceptor.dart
+++ b/lib/core/interceptor/language_header.interceptor.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/core/logic/error_code_localization_mapper.dart b/lib/core/logic/error_code_localization_mapper.dart
index 22838e8..7e23fec 100644
--- a/lib/core/logic/error_code_localization_mapper.dart
+++ b/lib/core/logic/error_code_localization_mapper.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 String translateError(BuildContext context, ErrorCode code) {
   switch (code) {
diff --git a/lib/core/logic/timeout_client.dart b/lib/core/logic/timeout_client.dart
index 781434d..4103ec6 100644
--- a/lib/core/logic/timeout_client.dart
+++ b/lib/core/logic/timeout_client.dart
@@ -2,9 +2,9 @@ import 'dart:typed_data';
 
 import 'dart:convert';
 
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/di_initializer.dart';
 import 'package:http/http.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/core/service/connectivity_status.service.dart b/lib/core/service/connectivity_status.service.dart
index 704fd22..430fc28 100644
--- a/lib/core/service/connectivity_status.service.dart
+++ b/lib/core/service/connectivity_status.service.dart
@@ -17,22 +17,19 @@ class ConnectivityStatusServiceImpl implements ConnectivityStatusService {
 
   @override
   Stream<bool> connectivityChanges() {
-    return connectivity.onConnectivityChanged
-        .map(_hasActiveInternetConnection)
-        .asBroadcastStream();
+    return connectivity.onConnectivityChanged.map(_hasActiveInternetConnection).asBroadcastStream();
   }
 
   @override
   Future<bool> isConnectedToInternet() async {
-    return _hasActiveInternetConnection(
-        await (Connectivity().checkConnectivity()));
+    return _hasActiveInternetConnection(await (Connectivity().checkConnectivity()));
   }
 
   @override
   Future<bool> isServerReachable(String serverAddress) async {
     try {
-      final result = await InternetAddress.lookup(
-          serverAddress.replaceAll(RegExp(r"https?://"), ""));
+      var uri = Uri.parse(serverAddress);
+      final result = await InternetAddress.lookup(uri.host);
       if (result.isNotEmpty && result.first.rawAddress.isNotEmpty) {
         return true;
       } else {
diff --git a/lib/core/service/status.service.dart b/lib/core/service/status.service.dart
index 225c414..c29a8b0 100644
--- a/lib/core/service/status.service.dart
+++ b/lib/core/service/status.service.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter_paperless_mobile/core/bloc/document_status_cubit.dart';
-import 'package:flutter_paperless_mobile/core/model/document_processing_status.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/document_status_cubit.dart';
+import 'package:paperless_mobile/core/model/document_processing_status.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 import 'package:web_socket_channel/io.dart';
diff --git a/lib/core/store/local_vault.dart b/lib/core/store/local_vault.dart
index 2cf51fa..a89aa5a 100644
--- a/lib/core/store/local_vault.dart
+++ b/lib/core/store/local_vault.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart';
-import 'package:flutter_paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/core/util.dart b/lib/core/util.dart
index 1acfe63..75149b6 100644
--- a/lib/core/util.dart
+++ b/lib/core/util.dart
@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:flutter_paperless_mobile/core/logic/timeout_client.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/core/logic/timeout_client.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/di_initializer.dart';
 import 'package:http/http.dart';
 import 'package:path_provider/path_provider.dart';
 
diff --git a/lib/core/widgets/offline_banner.dart b/lib/core/widgets/offline_banner.dart
index 0836014..4d78214 100644
--- a/lib/core/widgets/offline_banner.dart
+++ b/lib/core/widgets/offline_banner.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class OfflineBanner extends StatelessWidget with PreferredSizeWidget {
   const OfflineBanner({super.key});
diff --git a/lib/core/widgets/offline_widget.dart b/lib/core/widgets/offline_widget.dart
index a721316..b34e6d3 100644
--- a/lib/core/widgets/offline_widget.dart
+++ b/lib/core/widgets/offline_widget.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class OfflineWidget extends StatelessWidget {
   const OfflineWidget({super.key});
diff --git a/lib/di_initializer.dart b/lib/di_initializer.dart
index abed715..0652c12 100644
--- a/lib/di_initializer.dart
+++ b/lib/di_initializer.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:flutter_paperless_mobile/di_initializer.config.dart';
-import 'package:flutter_paperless_mobile/di_modules.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/di_initializer.config.dart';
+import 'package:paperless_mobile/di_modules.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
 import 'package:get_it/get_it.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/di_modules.dart b/lib/di_modules.dart
index 3fdcc2b..aeffcd3 100644
--- a/lib/di_modules.dart
+++ b/lib/di_modules.dart
@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/authentication.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/connection_state.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/language_header.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/response_conversion.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/authentication.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/connection_state.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/language_header.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/response_conversion.interceptor.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:http_interceptor/http/http.dart';
diff --git a/lib/features/app_intro/application_intro_slideshow.dart b/lib/features/app_intro/application_intro_slideshow.dart
index f34eb8d..d178091 100644
--- a/lib/features/app_intro/application_intro_slideshow.dart
+++ b/lib/features/app_intro/application_intro_slideshow.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/biometric_authentication_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/configuration_done_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/welcome_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/home/view/home_page.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/biometric_authentication_intro_slide.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/configuration_done_intro_slide.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/welcome_intro_slide.dart';
+import 'package:paperless_mobile/features/home/view/home_page.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
 import 'package:intro_slider/intro_slider.dart';
 
 class ApplicationIntroSlideshow extends StatelessWidget {
diff --git a/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart b/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart
index 06bf214..d46b015 100644
--- a/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart
+++ b/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/login/services/authentication.service.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/login/services/authentication.service.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/util.dart';
 
 class BiometricAuthenticationIntroSlide extends StatefulWidget {
   const BiometricAuthenticationIntroSlide({
diff --git a/lib/features/documents/bloc/documents_cubit.dart b/lib/features/documents/bloc/documents_cubit.dart
index d963ee2..a301539 100644
--- a/lib/features/documents/bloc/documents_cubit.dart
+++ b/lib/features/documents/bloc/documents_cubit.dart
@@ -1,11 +1,11 @@
 import 'dart:typed_data';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/documents/bloc/documents_state.dart b/lib/features/documents/bloc/documents_state.dart
index e02bf96..6820f85 100644
--- a/lib/features/documents/bloc/documents_state.dart
+++ b/lib/features/documents/bloc/documents_state.dart
@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
 
 class DocumentsState extends Equatable {
   final bool isLoaded;
diff --git a/lib/features/documents/bloc/saved_view_cubit.dart b/lib/features/documents/bloc/saved_view_cubit.dart
index a3dd1bc..1194a4d 100644
--- a/lib/features/documents/bloc/saved_view_cubit.dart
+++ b/lib/features/documents/bloc/saved_view_cubit.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/saved_views_repository.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_state.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/repository/saved_views_repository.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/documents/bloc/saved_view_state.dart b/lib/features/documents/bloc/saved_view_state.dart
index 8f009f5..b82739b 100644
--- a/lib/features/documents/bloc/saved_view_state.dart
+++ b/lib/features/documents/bloc/saved_view_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
 
 class SavedViewState with EquatableMixin {
   final Map<int, SavedView> value;
diff --git a/lib/features/documents/model/bulk_edit.model.dart b/lib/features/documents/model/bulk_edit.model.dart
index 9fb7d65..74c09dd 100644
--- a/lib/features/documents/model/bulk_edit.model.dart
+++ b/lib/features/documents/model/bulk_edit.model.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/type/json.dart';
 
 class BulkEditAction {
   final List<int> documents;
diff --git a/lib/features/documents/model/document.model.dart b/lib/features/documents/model/document.model.dart
index b180deb..b8d41a5 100644
--- a/lib/features/documents/model/document.model.dart
+++ b/lib/features/documents/model/document.model.dart
@@ -1,9 +1,9 @@
 // ignore_for_file: non_constant_identifier_names
 
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 
 class DocumentModel extends Equatable {
   static const idKey = 'id';
diff --git a/lib/features/documents/model/document_filter.dart b/lib/features/documents/model/document_filter.dart
index c288120..826f5da 100644
--- a/lib/features/documents/model/document_filter.dart
+++ b/lib/features/documents/model/document_filter.dart
@@ -1,13 +1,13 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/util.dart';
 
 class DocumentFilter with EquatableMixin {
   static const _oneDay = Duration(days: 1);
diff --git a/lib/features/documents/model/filter_rule.model.dart b/lib/features/documents/model/filter_rule.model.dart
index 145717b..daa633c 100644
--- a/lib/features/documents/model/filter_rule.model.dart
+++ b/lib/features/documents/model/filter_rule.model.dart
@@ -1,12 +1,12 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/util.dart';
 
 class FilterRule with EquatableMixin {
   static const int titleRule = 0;
diff --git a/lib/features/documents/model/paged_search_result.dart b/lib/features/documents/model/paged_search_result.dart
index dfe625b..d5c9d3d 100644
--- a/lib/features/documents/model/paged_search_result.dart
+++ b/lib/features/documents/model/paged_search_result.dart
@@ -1,6 +1,6 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
 
 const pageRegex = r".*page=(\d+).*";
 
diff --git a/lib/features/documents/model/query_parameters/asn_query.dart b/lib/features/documents/model/query_parameters/asn_query.dart
index 9379428..ef8003f 100644
--- a/lib/features/documents/model/query_parameters/asn_query.dart
+++ b/lib/features/documents/model/query_parameters/asn_query.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
 
 class AsnQuery extends IdQueryParameter {
   const AsnQuery.fromId(super.id) : super.fromId();
diff --git a/lib/features/documents/model/query_parameters/correspondent_query.dart b/lib/features/documents/model/query_parameters/correspondent_query.dart
index 0369590..27239f3 100644
--- a/lib/features/documents/model/query_parameters/correspondent_query.dart
+++ b/lib/features/documents/model/query_parameters/correspondent_query.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
 
 class CorrespondentQuery extends IdQueryParameter {
   const CorrespondentQuery.fromId(super.id) : super.fromId();
diff --git a/lib/features/documents/model/query_parameters/document_type_query.dart b/lib/features/documents/model/query_parameters/document_type_query.dart
index 0a88595..b8df06b 100644
--- a/lib/features/documents/model/query_parameters/document_type_query.dart
+++ b/lib/features/documents/model/query_parameters/document_type_query.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
 
 class DocumentTypeQuery extends IdQueryParameter {
   const DocumentTypeQuery.fromId(super.id) : super.fromId();
diff --git a/lib/features/documents/model/query_parameters/storage_path_query.dart b/lib/features/documents/model/query_parameters/storage_path_query.dart
index 4becd0d..65cc915 100644
--- a/lib/features/documents/model/query_parameters/storage_path_query.dart
+++ b/lib/features/documents/model/query_parameters/storage_path_query.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
 
 class StoragePathQuery extends IdQueryParameter {
   const StoragePathQuery.fromId(super.id) : super.fromId();
diff --git a/lib/features/documents/model/saved_view.model.dart b/lib/features/documents/model/saved_view.model.dart
index 9069453..f03beae 100644
--- a/lib/features/documents/model/saved_view.model.dart
+++ b/lib/features/documents/model/saved_view.model.dart
@@ -1,9 +1,9 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/filter_rule.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/filter_rule.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
 
 class SavedView with EquatableMixin {
   final int? id;
diff --git a/lib/features/documents/model/similar_document.model.dart b/lib/features/documents/model/similar_document.model.dart
index 0679ee1..c60a686 100644
--- a/lib/features/documents/model/similar_document.model.dart
+++ b/lib/features/documents/model/similar_document.model.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
 
 class SimilarDocumentModel extends DocumentModel {
   final SearchHit searchHit;
diff --git a/lib/features/documents/repository/document_repository.dart b/lib/features/documents/repository/document_repository.dart
index eefbcc5..2ad1ff2 100644
--- a/lib/features/documents/repository/document_repository.dart
+++ b/lib/features/documents/repository/document_repository.dart
@@ -1,10 +1,10 @@
 import 'dart:typed_data';
 
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_meta_data.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/similar_document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/document_meta_data.model.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/model/similar_document.model.dart';
 
 abstract class DocumentRepository {
   Future<void> create(
diff --git a/lib/features/documents/repository/document_repository_impl.dart b/lib/features/documents/repository/document_repository_impl.dart
index 6be24c0..1e25e54 100644
--- a/lib/features/documents/repository/document_repository_impl.dart
+++ b/lib/features/documents/repository/document_repository_impl.dart
@@ -5,23 +5,23 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/store/local_vault.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/core/util.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/dart_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/bulk_edit.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_meta_data.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/similar_document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/store/local_vault.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/dart_extensions.dart';
+import 'package:paperless_mobile/features/documents/model/bulk_edit.model.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/document_meta_data.model.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
+import 'package:paperless_mobile/features/documents/model/similar_document.model.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:http/http.dart';
 import 'package:http/src/boundary_characters.dart'; //TODO: remove once there is either a paperless API update or there is a better solution...
 import 'package:injectable/injectable.dart';
diff --git a/lib/features/documents/repository/saved_views_repository.dart b/lib/features/documents/repository/saved_views_repository.dart
index 22976dd..0b7275f 100644
--- a/lib/features/documents/repository/saved_views_repository.dart
+++ b/lib/features/documents/repository/saved_views_repository.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/util.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
 import 'package:http/http.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/features/documents/view/pages/document_details_page.dart b/lib/features/documents/view/pages/document_details_page.dart
index 9223188..8a459e9 100644
--- a/lib/features/documents/view/pages/document_details_page.dart
+++ b/lib/features/documents/view/pages/document_details_page.dart
@@ -5,27 +5,27 @@ import 'dart:math';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/widgets/highlighted_text.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_meta_data.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/pages/document_edit_page.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/pages/document_view.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/delete_document_confirmation_dialog.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/document_preview.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/widgets/storage_path_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/widgets/highlighted_text.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_meta_data.model.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/documents/view/pages/document_edit_page.dart';
+import 'package:paperless_mobile/features/documents/view/pages/document_view.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/delete_document_confirmation_dialog.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_widget.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
diff --git a/lib/features/documents/view/pages/document_edit_page.dart b/lib/features/documents/view/pages/document_edit_page.dart
index 201a074..aaf1f75 100644
--- a/lib/features/documents/view/pages/document_edit_page.dart
+++ b/lib/features/documents/view/pages/document_edit_page.dart
@@ -3,29 +3,29 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/pages/add_storage_path_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_form_field.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/pages/add_storage_path_page.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/intl.dart';
 
diff --git a/lib/features/documents/view/pages/document_view.dart b/lib/features/documents/view/pages/document_view.dart
index 274b0a7..2f8a4ba 100644
--- a/lib/features/documents/view/pages/document_view.dart
+++ b/lib/features/documents/view/pages/document_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:pdfx/pdfx.dart';
 
 class DocumentView extends StatefulWidget {
diff --git a/lib/features/documents/view/pages/documents_page.dart b/lib/features/documents/view/pages/documents_page.dart
index 8a50af3..6276565 100644
--- a/lib/features/documents/view/pages/documents_page.dart
+++ b/lib/features/documents/view/pages/documents_page.dart
@@ -1,27 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/connectivity_cubit.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/widgets/offline_banner.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/pages/document_details_page.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/documents_empty_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/grid/document_grid.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/list/document_list.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/search/document_filter_panel.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/selection/documents_page_app_bar.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
-import 'package:flutter_paperless_mobile/features/home/view/widget/info_drawer.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/widgets/offline_banner.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/view/pages/document_details_page.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/documents_empty_state.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/list/document_list.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/search/document_filter_panel.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/selection/documents_page_app_bar.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
+import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 
diff --git a/lib/features/documents/view/widgets/delete_document_confirmation_dialog.dart b/lib/features/documents/view/widgets/delete_document_confirmation_dialog.dart
index b1b5c23..e00b647 100644
--- a/lib/features/documents/view/widgets/delete_document_confirmation_dialog.dart
+++ b/lib/features/documents/view/widgets/delete_document_confirmation_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class DeleteDocumentConfirmationDialog extends StatelessWidget {
   final DocumentModel document;
diff --git a/lib/features/documents/view/widgets/document_preview.dart b/lib/features/documents/view/widgets/document_preview.dart
index 16f2cd4..e99c8ad 100644
--- a/lib/features/documents/view/widgets/document_preview.dart
+++ b/lib/features/documents/view/widgets/document_preview.dart
@@ -1,8 +1,8 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:shimmer/shimmer.dart';
 
 class DocumentPreview extends StatelessWidget {
diff --git a/lib/features/documents/view/widgets/documents_empty_state.dart b/lib/features/documents/view/widgets/documents_empty_state.dart
index 5bf6c84..51d4a1d 100644
--- a/lib/features/documents/view/widgets/documents_empty_state.dart
+++ b/lib/features/documents/view/widgets/documents_empty_state.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/widgets/empty_state.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/widgets/empty_state.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class DocumentsEmptyState extends StatelessWidget {
   final DocumentsState state;
diff --git a/lib/features/documents/view/widgets/grid/document_grid.dart b/lib/features/documents/view/widgets/grid/document_grid.dart
index 34580ba..7fc9e7b 100644
--- a/lib/features/documents/view/widgets/grid/document_grid.dart
+++ b/lib/features/documents/view/widgets/grid/document_grid.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/core/widgets/documents_list_loading_widget.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/grid/document_grid_item.dart';
+import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 
 class DocumentGridView extends StatelessWidget {
diff --git a/lib/features/documents/view/widgets/grid/document_grid_item.dart b/lib/features/documents/view/widgets/grid/document_grid_item.dart
index 7824f33..d92a13e 100644
--- a/lib/features/documents/view/widgets/grid/document_grid_item.dart
+++ b/lib/features/documents/view/widgets/grid/document_grid_item.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/document_preview.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
 import 'package:intl/intl.dart';
 
 class DocumentGridItem extends StatelessWidget {
diff --git a/lib/features/documents/view/widgets/list/document_list.dart b/lib/features/documents/view/widgets/list/document_list.dart
index 8a11491..8234f33 100644
--- a/lib/features/documents/view/widgets/list/document_list.dart
+++ b/lib/features/documents/view/widgets/list/document_list.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/core/widgets/documents_list_loading_widget.dart';
-import 'package:flutter_paperless_mobile/core/widgets/offline_widget.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/list/document_list_item.dart';
+import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
+import 'package:paperless_mobile/core/widgets/offline_widget.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/list/document_list_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 
 class DocumentListView extends StatelessWidget {
diff --git a/lib/features/documents/view/widgets/list/document_list_item.dart b/lib/features/documents/view/widgets/list/document_list_item.dart
index d382c26..90e009d 100644
--- a/lib/features/documents/view/widgets/list/document_list_item.dart
+++ b/lib/features/documents/view/widgets/list/document_list_item.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/document_preview.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
 
 class DocumentListItem extends StatelessWidget {
   static const a4AspectRatio = 1 / 1.4142;
diff --git a/lib/features/documents/view/widgets/order_by_dropdown.dart b/lib/features/documents/view/widgets/order_by_dropdown.dart
index 7732f76..32f8a12 100644
--- a/lib/features/documents/view/widgets/order_by_dropdown.dart
+++ b/lib/features/documents/view/widgets/order_by_dropdown.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
 
 class OrderByDropdown extends StatefulWidget {
   static const fkOrderBy = "orderBy";
diff --git a/lib/features/documents/view/widgets/search/document_filter_panel.dart b/lib/features/documents/view/widgets/search/document_filter_panel.dart
index 643fb84..f1f56d1 100644
--- a/lib/features/documents/view/widgets/search/document_filter_panel.dart
+++ b/lib/features/documents/view/widgets/search/document_filter_panel.dart
@@ -1,28 +1,28 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/search/query_type_form_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_form_field.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/search/query_type_form_field.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:intl/intl.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 
diff --git a/lib/features/documents/view/widgets/search/query_type_form_field.dart b/lib/features/documents/view/widgets/search/query_type_form_field.dart
index 10b2316..0dca57c 100644
--- a/lib/features/documents/view/widgets/search/query_type_form_field.dart
+++ b/lib/features/documents/view/widgets/search/query_type_form_field.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class QueryTypeFormField extends StatelessWidget {
   static const fkQueryType = 'queryType';
diff --git a/lib/features/documents/view/widgets/selection/add_saved_view_page.dart b/lib/features/documents/view/widgets/selection/add_saved_view_page.dart
index 30cc377..e493758 100644
--- a/lib/features/documents/view/widgets/selection/add_saved_view_page.dart
+++ b/lib/features/documents/view/widgets/selection/add_saved_view_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class AddSavedViewPage extends StatefulWidget {
diff --git a/lib/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart b/lib/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart
index 086a7fa..ec90101 100644
--- a/lib/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart
+++ b/lib/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class BulkDeleteConfirmationDialog extends StatelessWidget {
   static const _bulletPoint = "\u2022";
   final DocumentsState state;
-  const BulkDeleteConfirmationDialog({Key? key, required this.state})
-      : super(key: key);
+  const BulkDeleteConfirmationDialog({Key? key, required this.state}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -20,12 +19,8 @@ class BulkDeleteConfirmationDialog extends StatelessWidget {
           Text(
             //TODO: use plurals, didn't use because of crash... investigate later.
             state.selection.length == 1
-                ? S
-                    .of(context)
-                    .documentsPageSelectionBulkDeleteDialogWarningTextOne
-                : S
-                    .of(context)
-                    .documentsPageSelectionBulkDeleteDialogWarningTextMany,
+                ? S.of(context).documentsPageSelectionBulkDeleteDialogWarningTextOne
+                : S.of(context).documentsPageSelectionBulkDeleteDialogWarningTextMany,
           ),
           const SizedBox(height: 16),
           ConstrainedBox(
@@ -36,8 +31,7 @@ class BulkDeleteConfirmationDialog extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 16),
-          Text(
-              S.of(context).documentsPageSelectionBulkDeleteDialogContinueText),
+          Text(S.of(context).documentsPageSelectionBulkDeleteDialogContinueText),
         ],
       ),
       actions: [
@@ -47,8 +41,7 @@ class BulkDeleteConfirmationDialog extends StatelessWidget {
         ),
         TextButton(
           style: ButtonStyle(
-            foregroundColor:
-                MaterialStateProperty.all(Theme.of(context).colorScheme.error),
+            foregroundColor: MaterialStateProperty.all(Theme.of(context).colorScheme.error),
           ),
           onPressed: () {
             Navigator.pop(context, true);
diff --git a/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart b/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart
index 3b5a78f..61ba9af 100644
--- a/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart
+++ b/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 
 class ConfirmDeleteSavedViewDialog extends StatelessWidget {
   const ConfirmDeleteSavedViewDialog({
diff --git a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
index 6fe6725..1340b49 100644
--- a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
+++ b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/selection/saved_view_selection_widget.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/selection/saved_view_selection_widget.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 
 class DocumentsPageAppBar extends StatefulWidget with PreferredSizeWidget {
   final List<Widget> actions;
diff --git a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
index 2172d94..389495a 100644
--- a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
+++ b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
@@ -2,16 +2,16 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/selection/add_saved_view_page.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_state.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/selection/add_saved_view_page.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 
 class SavedViewSelectionWidget extends StatelessWidget {
   const SavedViewSelectionWidget({
diff --git a/lib/features/documents/view/widgets/sort_documents_button.dart b/lib/features/documents/view/widgets/sort_documents_button.dart
index 97c2e73..31f1dc1 100644
--- a/lib/features/documents/view/widgets/sort_documents_button.dart
+++ b/lib/features/documents/view/widgets/sort_documents_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class SortDocumentsButton extends StatefulWidget {
diff --git a/lib/features/home/view/home_page.dart b/lib/features/home/view/home_page.dart
index 4a818a5..b8eb2ff 100644
--- a/lib/features/home/view/home_page.dart
+++ b/lib/features/home/view/home_page.dart
@@ -1,21 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/connectivity_cubit.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/pages/documents_page.dart';
-import 'package:flutter_paperless_mobile/features/home/view/widget/bottom_navigation_bar.dart';
-import 'package:flutter_paperless_mobile/features/home/view/widget/info_drawer.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/labels_page.dart';
-import 'package:flutter_paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
-import 'package:flutter_paperless_mobile/features/scan/view/scanner_page.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/view/pages/documents_page.dart';
+import 'package:paperless_mobile/features/home/view/widget/bottom_navigation_bar.dart';
+import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/view/pages/labels_page.dart';
+import 'package:paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
+import 'package:paperless_mobile/features/scan/view/scanner_page.dart';
+import 'package:paperless_mobile/util.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({Key? key}) : super(key: key);
diff --git a/lib/features/home/view/widget/bottom_navigation_bar.dart b/lib/features/home/view/widget/bottom_navigation_bar.dart
index ed15ec8..aff1740 100644
--- a/lib/features/home/view/widget/bottom_navigation_bar.dart
+++ b/lib/features/home/view/widget/bottom_navigation_bar.dart
@@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class BottomNavBar extends StatelessWidget {
   final int selectedIndex;
   final void Function(int) onNavigationChanged;
 
-  const BottomNavBar(
-      {Key? key,
-      required this.selectedIndex,
-      required this.onNavigationChanged})
+  const BottomNavBar({Key? key, required this.selectedIndex, required this.onNavigationChanged})
       : super(key: key);
 
   @override
diff --git a/lib/features/home/view/widget/info_drawer.dart b/lib/features/home/view/widget/info_drawer.dart
index 74ecdd3..1b6f5af 100644
--- a/lib/features/home/view/widget/info_drawer.dart
+++ b/lib/features/home/view/widget/info_drawer.dart
@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/settings_page.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
-import 'package:flutter_paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/settings/view/settings_page.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:url_launcher/url_launcher_string.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 
 class InfoDrawer extends StatelessWidget {
   const InfoDrawer({Key? key}) : super(key: key);
diff --git a/lib/features/labels/correspondent/bloc/correspondents_cubit.dart b/lib/features/labels/correspondent/bloc/correspondents_cubit.dart
index c4a175d..c21a49c 100644
--- a/lib/features/labels/correspondent/bloc/correspondents_cubit.dart
+++ b/lib/features/labels/correspondent/bloc/correspondents_cubit.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/labels/correspondent/model/correspondent.model.dart b/lib/features/labels/correspondent/model/correspondent.model.dart
index 4e382a9..8f0fa71 100644
--- a/lib/features/labels/correspondent/model/correspondent.model.dart
+++ b/lib/features/labels/correspondent/model/correspondent.model.dart
@@ -1,7 +1,7 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/extensions/dart_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/extensions/dart_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
 
 class Correspondent extends Label {
   static const lastCorrespondenceKey = 'last_correspondence';
@@ -20,8 +20,7 @@ class Correspondent extends Label {
   });
 
   Correspondent.fromJson(JSON json)
-      : lastCorrespondence =
-            DateTime.tryParse(json[lastCorrespondenceKey] ?? ''),
+      : lastCorrespondence = DateTime.tryParse(json[lastCorrespondenceKey] ?? ''),
         super.fromJson(json);
 
   @override
diff --git a/lib/features/labels/correspondent/view/pages/add_correspondent_page.dart b/lib/features/labels/correspondent/view/pages/add_correspondent_page.dart
index c992d02..51dca79 100644
--- a/lib/features/labels/correspondent/view/pages/add_correspondent_page.dart
+++ b/lib/features/labels/correspondent/view/pages/add_correspondent_page.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/add_label_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/add_label_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class AddCorrespondentPage extends StatelessWidget {
   final String? initalValue;
diff --git a/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart b/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
index 4b24e8f..1031768 100644
--- a/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
+++ b/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/edit_label_page.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/edit_label_page.dart';
+import 'package:paperless_mobile/util.dart';
 
 class EditCorrespondentPage extends StatelessWidget {
   final Correspondent correspondent;
diff --git a/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart b/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
index 02a2057..aa1c060 100644
--- a/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
+++ b/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
 
 class CorrespondentWidget extends StatelessWidget {
   final int? correspondentId;
diff --git a/lib/features/labels/document_type/bloc/document_type_cubit.dart b/lib/features/labels/document_type/bloc/document_type_cubit.dart
index 659dd31..7e05773 100644
--- a/lib/features/labels/document_type/bloc/document_type_cubit.dart
+++ b/lib/features/labels/document_type/bloc/document_type_cubit.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/labels/document_type/model/document_type.model.dart b/lib/features/labels/document_type/model/document_type.model.dart
index b3371fe..968d8fa 100644
--- a/lib/features/labels/document_type/model/document_type.model.dart
+++ b/lib/features/labels/document_type/model/document_type.model.dart
@@ -1,6 +1,6 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
 
 class DocumentType extends Label {
   DocumentType({
diff --git a/lib/features/labels/document_type/view/pages/add_document_type_page.dart b/lib/features/labels/document_type/view/pages/add_document_type_page.dart
index 6e4b220..f05491c 100644
--- a/lib/features/labels/document_type/view/pages/add_document_type_page.dart
+++ b/lib/features/labels/document_type/view/pages/add_document_type_page.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/add_label_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/add_label_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class AddDocumentTypePage extends StatelessWidget {
   final String? initialName;
diff --git a/lib/features/labels/document_type/view/pages/edit_document_type_page.dart b/lib/features/labels/document_type/view/pages/edit_document_type_page.dart
index f941fce..f910fde 100644
--- a/lib/features/labels/document_type/view/pages/edit_document_type_page.dart
+++ b/lib/features/labels/document_type/view/pages/edit_document_type_page.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/edit_label_page.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/edit_label_page.dart';
+import 'package:paperless_mobile/util.dart';
 
 class EditDocumentTypePage extends StatelessWidget {
   final DocumentType documentType;
diff --git a/lib/features/labels/document_type/view/widgets/document_type_widget.dart b/lib/features/labels/document_type/view/widgets/document_type_widget.dart
index 31c160b..3d23817 100644
--- a/lib/features/labels/document_type/view/widgets/document_type_widget.dart
+++ b/lib/features/labels/document_type/view/widgets/document_type_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
 
 class DocumentTypeWidget extends StatelessWidget {
   final int? documentTypeId;
diff --git a/lib/features/labels/model/label.model.dart b/lib/features/labels/model/label.model.dart
index e30b4e8..aa43b0c 100644
--- a/lib/features/labels/model/label.model.dart
+++ b/lib/features/labels/model/label.model.dart
@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/extensions/dart_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/extensions/dart_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
 
 abstract class Label with EquatableMixin implements Comparable {
   static const idKey = "id";
@@ -37,8 +37,7 @@ abstract class Label with EquatableMixin implements Comparable {
         name = json[nameKey],
         slug = json[slugKey],
         match = json[matchKey],
-        matchingAlgorithm =
-            MatchingAlgorithm.fromInt(json[matchingAlgorithmKey]),
+        matchingAlgorithm = MatchingAlgorithm.fromInt(json[matchingAlgorithmKey]),
         isInsensitive = json[isInsensitiveKey],
         documentCount = json[documentCountKey];
 
diff --git a/lib/features/labels/repository/label_repository.dart b/lib/features/labels/repository/label_repository.dart
index 3034683..1c59676 100644
--- a/lib/features/labels/repository/label_repository.dart
+++ b/lib/features/labels/repository/label_repository.dart
@@ -1,7 +1,7 @@
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 
 abstract class LabelRepository {
   Future<Correspondent?> getCorrespondent(int id);
diff --git a/lib/features/labels/repository/label_repository_impl.dart b/lib/features/labels/repository/label_repository_impl.dart
index 1842177..df34c44 100644
--- a/lib/features/labels/repository/label_repository_impl.dart
+++ b/lib/features/labels/repository/label_repository_impl.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/util.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/repository/label_repository.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/repository/label_repository.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 import 'package:http/http.dart';
 import 'package:injectable/injectable.dart';
 
diff --git a/lib/features/labels/storage_path/bloc/storage_path_cubit.dart b/lib/features/labels/storage_path/bloc/storage_path_cubit.dart
index e199663..4a8f90c 100644
--- a/lib/features/labels/storage_path/bloc/storage_path_cubit.dart
+++ b/lib/features/labels/storage_path/bloc/storage_path_cubit.dart
@@ -1,6 +1,6 @@
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/labels/storage_path/model/storage_path.model.dart b/lib/features/labels/storage_path/model/storage_path.model.dart
index 22ee605..a2f328b 100644
--- a/lib/features/labels/storage_path/model/storage_path.model.dart
+++ b/lib/features/labels/storage_path/model/storage_path.model.dart
@@ -1,7 +1,7 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/extensions/dart_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/extensions/dart_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
 
 class StoragePath extends Label {
   static const pathKey = 'path';
diff --git a/lib/features/labels/storage_path/view/pages/add_storage_path_page.dart b/lib/features/labels/storage_path/view/pages/add_storage_path_page.dart
index 9274980..2c83293 100644
--- a/lib/features/labels/storage_path/view/pages/add_storage_path_page.dart
+++ b/lib/features/labels/storage_path/view/pages/add_storage_path_page.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/add_label_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
+import 'package:paperless_mobile/features/labels/view/pages/add_label_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class AddStoragePathPage extends StatelessWidget {
   final String? initalValue;
diff --git a/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart b/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
index 0424d12..ec9913a 100644
--- a/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
+++ b/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/edit_label_page.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
+import 'package:paperless_mobile/features/labels/view/pages/edit_label_page.dart';
+import 'package:paperless_mobile/util.dart';
 
 class EditStoragePathPage extends StatelessWidget {
   final StoragePath storagePath;
diff --git a/lib/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart b/lib/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart
index ec3e8ba..50c04dc 100644
--- a/lib/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart
+++ b/lib/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/src/widgets/container.dart';
 import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class StoragePathAutofillFormBuilderField extends StatefulWidget {
diff --git a/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart b/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
index de84646..8626e54 100644
--- a/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
+++ b/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
 
 class StoragePathWidget extends StatelessWidget {
   final int? pathId;
diff --git a/lib/features/labels/tags/bloc/tags_cubit.dart b/lib/features/labels/tags/bloc/tags_cubit.dart
index d9588c7..19e2611 100644
--- a/lib/features/labels/tags/bloc/tags_cubit.dart
+++ b/lib/features/labels/tags/bloc/tags_cubit.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/labels/tags/model/tag.model.dart b/lib/features/labels/tags/model/tag.model.dart
index 4447706..4085f84 100644
--- a/lib/features/labels/tags/model/tag.model.dart
+++ b/lib/features/labels/tags/model/tag.model.dart
@@ -1,10 +1,10 @@
 import 'dart:developer';
 import 'dart:ui';
 
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/extensions/dart_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/extensions/dart_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
 
 class Tag extends Label {
   static const colorKey = 'color';
diff --git a/lib/features/labels/tags/view/pages/add_tag_page.dart b/lib/features/labels/tags/view/pages/add_tag_page.dart
index 0e800db..e5259e7 100644
--- a/lib/features/labels/tags/view/pages/add_tag_page.dart
+++ b/lib/features/labels/tags/view/pages/add_tag_page.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/add_label_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/add_label_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_extra_fields/form_builder_extra_fields.dart';
 
 class AddTagPage extends StatelessWidget {
diff --git a/lib/features/labels/tags/view/pages/edit_tag_page.dart b/lib/features/labels/tags/view/pages/edit_tag_page.dart
index a0360ee..101d9a9 100644
--- a/lib/features/labels/tags/view/pages/edit_tag_page.dart
+++ b/lib/features/labels/tags/view/pages/edit_tag_page.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/pages/edit_label_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/view/pages/edit_label_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_extra_fields/form_builder_extra_fields.dart';
 
 class EditTagPage extends StatelessWidget {
diff --git a/lib/features/labels/tags/view/widgets/tag_widget.dart b/lib/features/labels/tags/view/widgets/tag_widget.dart
index bb07c87..0cb91dd 100644
--- a/lib/features/labels/tags/view/widgets/tag_widget.dart
+++ b/lib/features/labels/tags/view/widgets/tag_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 
 class TagWidget extends StatelessWidget {
   final Tag tag;
diff --git a/lib/features/labels/tags/view/widgets/tags_form_field.dart b/lib/features/labels/tags/view/widgets/tags_form_field.dart
index 99e61c0..e856b6c 100644
--- a/lib/features/labels/tags/view/widgets/tags_form_field.dart
+++ b/lib/features/labels/tags/view/widgets/tags_form_field.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class TagFormField extends StatefulWidget {
   final TagsQuery? initialValue;
diff --git a/lib/features/labels/tags/view/widgets/tags_widget.dart b/lib/features/labels/tags/view/widgets/tags_widget.dart
index eb2a563..9894c36 100644
--- a/lib/features/labels/tags/view/widgets/tags_widget.dart
+++ b/lib/features/labels/tags/view/widgets/tags_widget.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tag_widget.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tag_widget.dart';
 
 class TagsWidget extends StatefulWidget {
   final List<int> tagIds;
diff --git a/lib/features/labels/view/pages/add_label_page.dart b/lib/features/labels/view/pages/add_label_page.dart
index c660a44..0b2206b 100644
--- a/lib/features/labels/view/pages/add_label_page.dart
+++ b/lib/features/labels/view/pages/add_label_page.dart
@@ -2,14 +2,14 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class AddLabelPage<T extends Label> extends StatefulWidget {
diff --git a/lib/features/labels/view/pages/edit_label_page.dart b/lib/features/labels/view/pages/edit_label_page.dart
index 30a3fa8..d23afc7 100644
--- a/lib/features/labels/view/pages/edit_label_page.dart
+++ b/lib/features/labels/view/pages/edit_label_page.dart
@@ -2,14 +2,14 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class EditLabelPage<T extends Label> extends StatefulWidget {
diff --git a/lib/features/labels/view/pages/labels_page.dart b/lib/features/labels/view/pages/labels_page.dart
index 7ddade5..8a016db 100644
--- a/lib/features/labels/view/pages/labels_page.dart
+++ b/lib/features/labels/view/pages/labels_page.dart
@@ -1,34 +1,34 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/pages/edit_correspondent_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/home/view/widget/info_drawer.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/pages/edit_document_type_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/pages/add_storage_path_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/view/pages/edit_storage_path_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/pages/add_tag_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/pages/edit_tag_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_item.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_tab_view.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/pages/edit_correspondent_page.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/pages/edit_document_type_page.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/pages/add_storage_path_page.dart';
+import 'package:paperless_mobile/features/labels/storage_path/view/pages/edit_storage_path_page.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/tags/view/pages/add_tag_page.dart';
+import 'package:paperless_mobile/features/labels/tags/view/pages/edit_tag_page.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_item.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_tab_view.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class LabelsPage extends StatefulWidget {
   const LabelsPage({Key? key}) : super(key: key);
diff --git a/lib/features/labels/view/widgets/label_form_field.dart b/lib/features/labels/view/widgets/label_form_field.dart
index 83898bd..52eac9f 100644
--- a/lib/features/labels/view/widgets/label_form_field.dart
+++ b/lib/features/labels/view/widgets/label_form_field.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_extra_fields/form_builder_extra_fields.dart';
 
 ///
diff --git a/lib/features/labels/view/widgets/label_item.dart b/lib/features/labels/view/widgets/label_item.dart
index 3d4f97a..b27b8cd 100644
--- a/lib/features/labels/view/widgets/label_item.dart
+++ b/lib/features/labels/view/widgets/label_item.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/linked_documents_preview.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/linked_documents_preview.dart';
 
 class LabelItem<T extends Label> extends StatelessWidget {
   final T label;
diff --git a/lib/features/labels/view/widgets/label_list_tile.dart b/lib/features/labels/view/widgets/label_list_tile.dart
index 459fb4e..0039264 100644
--- a/lib/features/labels/view/widgets/label_list_tile.dart
+++ b/lib/features/labels/view/widgets/label_list_tile.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/linked_documents_preview.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/linked_documents_preview.dart';
 
 class LabelListTile<T extends Label> extends StatelessWidget {
   final T label;
diff --git a/lib/features/labels/view/widgets/label_tab_view.dart b/lib/features/labels/view/widgets/label_tab_view.dart
index 9f31444..68d566f 100644
--- a/lib/features/labels/view/widgets/label_tab_view.dart
+++ b/lib/features/labels/view/widgets/label_tab_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_item.dart';
+import 'package:paperless_mobile/core/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_item.dart';
 
 class LabelTabView<T extends Label> extends StatelessWidget {
   final LabelCubit<T> cubit;
diff --git a/lib/features/labels/view/widgets/linked_documents_preview.dart b/lib/features/labels/view/widgets/linked_documents_preview.dart
index c55a54b..9543b8c 100644
--- a/lib/features/labels/view/widgets/linked_documents_preview.dart
+++ b/lib/features/labels/view/widgets/linked_documents_preview.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/pages/document_details_page.dart';
-import 'package:flutter_paperless_mobile/features/documents/view/widgets/list/document_list.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/view/pages/document_details_page.dart';
+import 'package:paperless_mobile/features/documents/view/widgets/list/document_list.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 
 class LinkedDocumentsPreview extends StatefulWidget {
diff --git a/lib/features/login/bloc/authentication_cubit.dart b/lib/features/login/bloc/authentication_cubit.dart
index 4cc93be..0510221 100644
--- a/lib/features/login/bloc/authentication_cubit.dart
+++ b/lib/features/login/bloc/authentication_cubit.dart
@@ -1,14 +1,14 @@
 import 'dart:io';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/store/local_vault.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
-import 'package:flutter_paperless_mobile/features/login/model/user_credentials.model.dart';
-import 'package:flutter_paperless_mobile/features/login/services/authentication.service.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/store/local_vault.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/features/login/model/user_credentials.model.dart';
+import 'package:paperless_mobile/features/login/services/authentication.service.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 import 'package:injectable/injectable.dart';
 
 const authenticationKey = "authentication";
diff --git a/lib/features/login/bloc/local_authentication_cubit.dart b/lib/features/login/bloc/local_authentication_cubit.dart
index d6d5ecb..9a857ff 100644
--- a/lib/features/login/bloc/local_authentication_cubit.dart
+++ b/lib/features/login/bloc/local_authentication_cubit.dart
@@ -1,14 +1,14 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/di_initializer.dart';
 import 'package:local_auth/local_auth.dart';
 
 class LocalAuthenticationCubit extends Cubit<LocalAuthenticationState> {
   LocalAuthenticationCubit() : super(LocalAuthenticationState(false));
 
   Future<void> authorize(String localizedMessage) async {
-    final isAuthenticationSuccessful = await getIt<LocalAuthentication>()
-        .authenticate(localizedReason: localizedMessage);
+    final isAuthenticationSuccessful =
+        await getIt<LocalAuthentication>().authenticate(localizedReason: localizedMessage);
     if (isAuthenticationSuccessful) {
       emit(LocalAuthenticationState(true));
     } else {
diff --git a/lib/features/login/model/authentication_information.dart b/lib/features/login/model/authentication_information.dart
index 5bbb4be..c8b29a7 100644
--- a/lib/features/login/model/authentication_information.dart
+++ b/lib/features/login/model/authentication_information.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
 
 class AuthenticationInformation {
   static const usernameKey = 'username';
@@ -59,8 +59,8 @@ class AuthenticationInformation {
       password: password ?? this.password,
       token: token ?? this.token,
       serverUrl: serverUrl ?? this.serverUrl,
-      clientCertificate: clientCertificate ??
-          (removeClientCertificate ? null : this.clientCertificate),
+      clientCertificate:
+          clientCertificate ?? (removeClientCertificate ? null : this.clientCertificate),
     );
   }
 }
diff --git a/lib/features/login/model/client_certificate.dart b/lib/features/login/model/client_certificate.dart
index be1c457..4941ebb 100644
--- a/lib/features/login/model/client_certificate.dart
+++ b/lib/features/login/model/client_certificate.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:flutter_paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/type/json.dart';
 
 class ClientCertificate {
   static const bytesKey = 'bytes';
diff --git a/lib/features/login/services/authentication.service.dart b/lib/features/login/services/authentication.service.dart
index 9fe5186..b1bf424 100644
--- a/lib/features/login/services/authentication.service.dart
+++ b/lib/features/login/services/authentication.service.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/store/local_vault.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/store/local_vault.dart';
 import 'package:http/http.dart';
 import 'package:injectable/injectable.dart';
 import 'package:local_auth/local_auth.dart';
diff --git a/lib/features/login/view/login_page.dart b/lib/features/login/view/login_page.dart
index be3eec5..6992850 100644
--- a/lib/features/login/view/login_page.dart
+++ b/lib/features/login/view/login_page.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
-import 'package:flutter_paperless_mobile/features/login/view/widgets/client_certificate_form_field.dart';
-import 'package:flutter_paperless_mobile/features/login/view/widgets/server_address_form_field.dart';
-import 'package:flutter_paperless_mobile/features/login/view/widgets/user_credentials_form_field.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/features/login/view/widgets/client_certificate_form_field.dart';
+import 'package:paperless_mobile/features/login/view/widgets/server_address_form_field.dart';
+import 'package:paperless_mobile/features/login/view/widgets/user_credentials_form_field.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 
 class LoginPage extends StatefulWidget {
   const LoginPage({Key? key}) : super(key: key);
diff --git a/lib/features/login/view/widgets/client_certificate_form_field.dart b/lib/features/login/view/widgets/client_certificate_form_field.dart
index 1d82956..e7f1184 100644
--- a/lib/features/login/view/widgets/client_certificate_form_field.dart
+++ b/lib/features/login/view/widgets/client_certificate_form_field.dart
@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
-import 'package:flutter_paperless_mobile/features/login/view/widgets/password_text_field.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/features/login/view/widgets/password_text_field.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class ClientCertificateFormField extends StatefulWidget {
   static const fkClientCertificate = 'clientCertificate';
diff --git a/lib/features/login/view/widgets/server_address_form_field.dart b/lib/features/login/view/widgets/server_address_form_field.dart
index 6177867..a0b8fd1 100644
--- a/lib/features/login/view/widgets/server_address_form_field.dart
+++ b/lib/features/login/view/widgets/server_address_form_field.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/service/connectivity_status.service.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class ServerAddressFormField extends StatefulWidget {
@@ -30,7 +30,7 @@ class _ServerAddressFormFieldState extends State<ServerAddressFormField> {
         hintText: "http://192.168.1.50:8000",
         labelText: S.of(context).loginPageServerUrlFieldLabel,
       ),
-      onSubmitted: _updateIsAddressReachableStatus,
+      onChanged: _updateIsAddressReachableStatus,
     );
   }
 
diff --git a/lib/features/login/view/widgets/user_credentials_form_field.dart b/lib/features/login/view/widgets/user_credentials_form_field.dart
index d799e5f..6fd6575 100644
--- a/lib/features/login/view/widgets/user_credentials_form_field.dart
+++ b/lib/features/login/view/widgets/user_credentials_form_field.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/login/model/user_credentials.model.dart';
-import 'package:flutter_paperless_mobile/features/login/view/widgets/password_text_field.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/login/model/user_credentials.model.dart';
+import 'package:paperless_mobile/features/login/view/widgets/password_text_field.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class UserCredentialsFormField extends StatefulWidget {
@@ -11,8 +11,7 @@ class UserCredentialsFormField extends StatefulWidget {
   const UserCredentialsFormField({Key? key}) : super(key: key);
 
   @override
-  State<UserCredentialsFormField> createState() =>
-      _UserCredentialsFormFieldState();
+  State<UserCredentialsFormField> createState() => _UserCredentialsFormFieldState();
 }
 
 class _UserCredentialsFormFieldState extends State<UserCredentialsFormField> {
@@ -29,8 +28,7 @@ class _UserCredentialsFormFieldState extends State<UserCredentialsFormField> {
               // USERNAME
               autocorrect: false,
               onChanged: (username) => field.didChange(
-                field.value?.copyWith(username: username) ??
-                    UserCredentials(username: username),
+                field.value?.copyWith(username: username) ?? UserCredentials(username: username),
               ),
               validator: FormBuilderValidators.required(
                 errorText: S.of(context).loginPageUsernameValidatorMessageText,
@@ -43,8 +41,7 @@ class _UserCredentialsFormFieldState extends State<UserCredentialsFormField> {
             ObscuredInputTextFormField(
               label: S.of(context).loginPagePasswordFieldLabel,
               onChanged: (password) => field.didChange(
-                field.value?.copyWith(password: password) ??
-                    UserCredentials(password: password),
+                field.value?.copyWith(password: password) ?? UserCredentials(password: password),
               ),
               validator: FormBuilderValidators.required(
                 errorText: S.of(context).loginPagePasswordValidatorMessageText,
diff --git a/lib/features/scan/bloc/document_scanner_cubit.dart b/lib/features/scan/bloc/document_scanner_cubit.dart
index d4b65a3..3be042b 100644
--- a/lib/features/scan/bloc/document_scanner_cubit.dart
+++ b/lib/features/scan/bloc/document_scanner_cubit.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/scan/view/document_upload_page.dart b/lib/features/scan/view/document_upload_page.dart
index 7b68c2a..292364d 100644
--- a/lib/features/scan/view/document_upload_page.dart
+++ b/lib/features/scan/view/document_upload_page.dart
@@ -3,26 +3,26 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
-import 'package:flutter_paperless_mobile/features/labels/view/widgets/label_form_field.dart';
-import 'package:flutter_paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.dart';
+import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
+import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
+import 'package:paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/features/scan/view/scanner_page.dart b/lib/features/scan/view/scanner_page.dart
index 17a4afa..4932e37 100644
--- a/lib/features/scan/view/scanner_page.dart
+++ b/lib/features/scan/view/scanner_page.dart
@@ -4,14 +4,14 @@ import 'dart:math';
 import 'package:edge_detection/edge_detection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/home/view/widget/info_drawer.dart';
-import 'package:flutter_paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
-import 'package:flutter_paperless_mobile/features/scan/view/document_upload_page.dart';
-import 'package:flutter_paperless_mobile/features/scan/view/widgets/grid_image_item_widget.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
+import 'package:paperless_mobile/features/scan/bloc/document_scanner_cubit.dart';
+import 'package:paperless_mobile/features/scan/view/document_upload_page.dart';
+import 'package:paperless_mobile/features/scan/view/widgets/grid_image_item_widget.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:permission_handler/permission_handler.dart';
diff --git a/lib/features/settings/bloc/application_settings_cubit.dart b/lib/features/settings/bloc/application_settings_cubit.dart
index f6ddfb9..e299014 100644
--- a/lib/features/settings/bloc/application_settings_cubit.dart
+++ b/lib/features/settings/bloc/application_settings_cubit.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/store/local_vault.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/core/store/local_vault.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton
diff --git a/lib/features/settings/model/application_settings_state.dart b/lib/features/settings/model/application_settings_state.dart
index a85996e..0ec8301 100644
--- a/lib/features/settings/model/application_settings_state.dart
+++ b/lib/features/settings/model/application_settings_state.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/type/json.dart';
 
 ///
 /// State holding the current application settings such as selected language, theme mode and more.
diff --git a/lib/features/settings/view/pages/application_settings_page.dart b/lib/features/settings/view/pages/application_settings_page.dart
index 14dc0c2..befaf29 100644
--- a/lib/features/settings/view/pages/application_settings_page.dart
+++ b/lib/features/settings/view/pages/application_settings_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/widgets/language_selection_setting.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/widgets/theme_mode_setting.dart';
+import 'package:paperless_mobile/features/settings/view/widgets/language_selection_setting.dart';
+import 'package:paperless_mobile/features/settings/view/widgets/theme_mode_setting.dart';
 
 class ApplicationSettingsPage extends StatelessWidget {
   const ApplicationSettingsPage({super.key});
diff --git a/lib/features/settings/view/pages/security_settings_page.dart b/lib/features/settings/view/pages/security_settings_page.dart
index 2e81cc9..3e9b7d2 100644
--- a/lib/features/settings/view/pages/security_settings_page.dart
+++ b/lib/features/settings/view/pages/security_settings_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/widgets/biometric_authentication_setting.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/settings/view/widgets/biometric_authentication_setting.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class SecuritySettingsPage extends StatelessWidget {
   const SecuritySettingsPage({super.key});
diff --git a/lib/features/settings/view/settings_page.dart b/lib/features/settings/view/settings_page.dart
index 7aefd50..2381135 100644
--- a/lib/features/settings/view/settings_page.dart
+++ b/lib/features/settings/view/settings_page.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/pages/application_settings_page.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/pages/security_settings_page.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/view/pages/application_settings_page.dart';
+import 'package:paperless_mobile/features/settings/view/pages/security_settings_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class SettingsPage extends StatefulWidget {
   const SettingsPage({super.key});
diff --git a/lib/features/settings/view/widgets/biometric_authentication_setting.dart b/lib/features/settings/view/widgets/biometric_authentication_setting.dart
index 445cabc..a1a6c37 100644
--- a/lib/features/settings/view/widgets/biometric_authentication_setting.dart
+++ b/lib/features/settings/view/widgets/biometric_authentication_setting.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/login/services/authentication.service.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/login/services/authentication.service.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class BiometricAuthenticationSetting extends StatelessWidget {
   const BiometricAuthenticationSetting({super.key});
diff --git a/lib/features/settings/view/widgets/language_selection_setting.dart b/lib/features/settings/view/widgets/language_selection_setting.dart
index ae643d9..297a990 100644
--- a/lib/features/settings/view/widgets/language_selection_setting.dart
+++ b/lib/features/settings/view/widgets/language_selection_setting.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/widgets/radio_settings_dialog.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/features/settings/view/widgets/radio_settings_dialog.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class LanguageSelectionSetting extends StatefulWidget {
   const LanguageSelectionSetting({super.key});
diff --git a/lib/features/settings/view/widgets/radio_settings_dialog.dart b/lib/features/settings/view/widgets/radio_settings_dialog.dart
index bc41d2a..47c337c 100644
--- a/lib/features/settings/view/widgets/radio_settings_dialog.dart
+++ b/lib/features/settings/view/widgets/radio_settings_dialog.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class RadioSettingsDialog<T> extends StatefulWidget {
   final List<RadioOption<T>> options;
diff --git a/lib/features/settings/view/widgets/theme_mode_setting.dart b/lib/features/settings/view/widgets/theme_mode_setting.dart
index 1b8552a..255a0c1 100644
--- a/lib/features/settings/view/widgets/theme_mode_setting.dart
+++ b/lib/features/settings/view/widgets/theme_mode_setting.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/features/settings/view/widgets/radio_settings_dialog.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/features/settings/view/widgets/radio_settings_dialog.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class ThemeModeSetting extends StatelessWidget {
   const ThemeModeSetting({super.key});
diff --git a/lib/main.dart b/lib/main.dart
index 5adc6e0..2f3f779 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,18 +4,18 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:flutter_paperless_mobile/core/bloc/connectivity_cubit.dart';
-import 'package:flutter_paperless_mobile/core/bloc/label_bloc_provider.dart';
-import 'package:flutter_paperless_mobile/core/global/http_self_signed_certificate_override.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/application_intro_slideshow.dart';
-import 'package:flutter_paperless_mobile/features/home/view/home_page.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
-import 'package:flutter_paperless_mobile/features/login/view/login_page.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
+import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/core/global/http_self_signed_certificate_override.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/app_intro/application_intro_slideshow.dart';
+import 'package:paperless_mobile/features/home/view/home_page.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/features/login/view/login_page.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/intl.dart';
 import 'package:intl/intl_standalone.dart';
diff --git a/lib/util.dart b/lib/util.dart
index 92af1a6..d490510 100644
--- a/lib/util.dart
+++ b/lib/util.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:intl/intl.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 1c48cdf..c9e67af 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: flutter_paperless_mobile
+name: paperless_mobile
 description:
   Application to conveniently scan and share documents with a paperless-ng
   server.
diff --git a/test/src/bloc/document_cubit_test.dart b/test/src/bloc/document_cubit_test.dart
index d18fa4e..ba70749 100644
--- a/test/src/bloc/document_cubit_test.dart
+++ b/test/src/bloc/document_cubit_test.dart
@@ -1,13 +1,13 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/model/document_type.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/model/tag.model.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
+import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
diff --git a/test/src/saved_view_test.dart b/test/src/saved_view_test.dart
index 85f5b8c..0d96f83 100644
--- a/test/src/saved_view_test.dart
+++ b/test/src/saved_view_test.dart
@@ -1,13 +1,13 @@
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/filter_rule.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/filter_rule.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/test/utils.dart b/test/utils.dart
index 711bd41..93e56fd 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:flutter/services.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/type/json.dart';
 
 Future<T> loadOne<T>(String filePath, T Function(JSON) transformFn, int? id) async {
   if (id != null) {