diff --git a/packages/app/lib/apps.dart b/packages/app/lib/apps.dart
index a217459a..bf516df9 100644
--- a/packages/app/lib/apps.dart
+++ b/packages/app/lib/apps.dart
@@ -1,3 +1,4 @@
+import 'package:neon/models.dart';
 import 'package:neon/platform.dart';
 import 'package:neon/utils.dart';
 import 'package:neon_files/neon_files.dart';
diff --git a/packages/app/lib/branding.dart b/packages/app/lib/branding.dart
index c0af422b..e8e421d6 100644
--- a/packages/app/lib/branding.dart
+++ b/packages/app/lib/branding.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:neon/utils.dart';
+import 'package:neon/models.dart';
 
 Branding getNeonBranding() => Branding(
       name: 'Nextcloud Neon',
diff --git a/packages/neon/neon/lib/interfaces.dart b/packages/neon/neon/lib/interfaces.dart
deleted file mode 100644
index 45a240ce..00000000
--- a/packages/neon/neon/lib/interfaces.dart
+++ /dev/null
@@ -1 +0,0 @@
-export 'package:neon/src/interfaces/notifications.dart';
diff --git a/packages/neon/neon/lib/models.dart b/packages/neon/neon/lib/models.dart
index 8ef9a91d..76d9197c 100644
--- a/packages/neon/neon/lib/models.dart
+++ b/packages/neon/neon/lib/models.dart
@@ -1 +1,4 @@
 export 'package:neon/src/models/account.dart';
+export 'package:neon/src/models/app_implementation.dart';
+export 'package:neon/src/models/branding.dart';
+export 'package:neon/src/models/notifications_interface.dart';
diff --git a/packages/neon/neon/lib/neon.dart b/packages/neon/neon/lib/neon.dart
index f671b6aa..5b32f7a9 100644
--- a/packages/neon/neon/lib/neon.dart
+++ b/packages/neon/neon/lib/neon.dart
@@ -8,9 +8,9 @@ import 'package:neon/src/blocs/first_launch.dart';
 import 'package:neon/src/blocs/next_push.dart';
 import 'package:neon/src/blocs/push_notifications.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
+import 'package:neon/src/models/branding.dart';
 import 'package:neon/src/platform/platform.dart';
-import 'package:neon/src/utils/app_implementation.dart';
-import 'package:neon/src/utils/branding.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
 import 'package:package_info_plus/package_info_plus.dart';
diff --git a/packages/neon/neon/lib/src/app.dart b/packages/neon/neon/lib/src/app.dart
index bbb4eb77..1bf5e11e 100644
--- a/packages/neon/neon/lib/src/app.dart
+++ b/packages/neon/neon/lib/src/app.dart
@@ -8,13 +8,13 @@ import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/capabilities.dart';
-import 'package:neon/src/interfaces/notifications.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
+import 'package:neon/src/models/notifications_interface.dart';
 import 'package:neon/src/models/push_notification.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/router.dart';
 import 'package:neon/src/settings/widgets/option_builder.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/global.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/localizations.dart';
diff --git a/packages/neon/neon/lib/src/blocs/accounts.dart b/packages/neon/neon/lib/src/blocs/accounts.dart
index 03ea7c97..c3a5ef28 100644
--- a/packages/neon/neon/lib/src/blocs/accounts.dart
+++ b/packages/neon/neon/lib/src/blocs/accounts.dart
@@ -8,10 +8,10 @@ import 'package:neon/src/blocs/capabilities.dart';
 import 'package:neon/src/blocs/user_details.dart';
 import 'package:neon/src/blocs/user_statuses.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/settings/models/storage.dart';
 import 'package:neon/src/utils/account_options.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
 import 'package:rxdart/rxdart.dart';
diff --git a/packages/neon/neon/lib/src/blocs/apps.dart b/packages/neon/neon/lib/src/blocs/apps.dart
index 40e2b210..c44850b7 100644
--- a/packages/neon/neon/lib/src/blocs/apps.dart
+++ b/packages/neon/neon/lib/src/blocs/apps.dart
@@ -5,10 +5,10 @@ import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/capabilities.dart';
-import 'package:neon/src/interfaces/notifications.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
+import 'package:neon/src/models/notifications_interface.dart';
 import 'package:neon/src/settings/models/nextcloud_app_options.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/request_manager.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
diff --git a/packages/neon/neon/lib/src/utils/app_implementation.dart b/packages/neon/neon/lib/src/models/app_implementation.dart
similarity index 100%
rename from packages/neon/neon/lib/src/utils/app_implementation.dart
rename to packages/neon/neon/lib/src/models/app_implementation.dart
diff --git a/packages/neon/neon/lib/src/utils/branding.dart b/packages/neon/neon/lib/src/models/branding.dart
similarity index 100%
rename from packages/neon/neon/lib/src/utils/branding.dart
rename to packages/neon/neon/lib/src/models/branding.dart
diff --git a/packages/neon/neon/lib/src/interfaces/notifications.dart b/packages/neon/neon/lib/src/models/notifications_interface.dart
similarity index 92%
rename from packages/neon/neon/lib/src/interfaces/notifications.dart
rename to packages/neon/neon/lib/src/models/notifications_interface.dart
index 42c93b56..742be3a6 100644
--- a/packages/neon/neon/lib/src/interfaces/notifications.dart
+++ b/packages/neon/neon/lib/src/models/notifications_interface.dart
@@ -1,6 +1,6 @@
 import 'package:neon/src/bloc/bloc.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/settings/models/nextcloud_app_options.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 
 abstract interface class NotificationsAppInterface<T extends NotificationsBlocInterface,
     R extends NotificationsOptionsInterface> extends AppImplementation<T, R> {
diff --git a/packages/neon/neon/lib/src/pages/home.dart b/packages/neon/neon/lib/src/pages/home.dart
index 2986babf..db3c6419 100644
--- a/packages/neon/neon/lib/src/pages/home.dart
+++ b/packages/neon/neon/lib/src/pages/home.dart
@@ -6,8 +6,8 @@ import 'package:neon/src/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/apps.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/settings/widgets/option_builder.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/global_options.dart' as global_options;
 import 'package:neon/src/utils/global_popups.dart';
diff --git a/packages/neon/neon/lib/src/pages/login.dart b/packages/neon/neon/lib/src/pages/login.dart
index e0d01535..637b622b 100644
--- a/packages/neon/neon/lib/src/pages/login.dart
+++ b/packages/neon/neon/lib/src/pages/login.dart
@@ -3,9 +3,9 @@ import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/login.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/branding.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/router.dart';
-import 'package:neon/src/utils/branding.dart';
 import 'package:neon/src/utils/validators.dart';
 import 'package:neon/src/widgets/exception.dart';
 import 'package:neon/src/widgets/linear_progress_indicator.dart';
diff --git a/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
index 20a62489..bea73d1b 100644
--- a/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
+++ b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/l10n/localizations.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/settings/models/select_option.dart';
 import 'package:neon/src/settings/models/toggle_option.dart';
 import 'package:neon/src/settings/widgets/checkbox_settings_tile.dart';
 import 'package:neon/src/settings/widgets/dropdown_button_settings_tile.dart';
 import 'package:neon/src/settings/widgets/settings_category.dart';
 import 'package:neon/src/settings/widgets/settings_list.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/confirmation_dialog.dart';
 
 class NextcloudAppSettingsPage extends StatelessWidget {
diff --git a/packages/neon/neon/lib/src/pages/settings.dart b/packages/neon/neon/lib/src/pages/settings.dart
index 6a48c046..fa82ec24 100644
--- a/packages/neon/neon/lib/src/pages/settings.dart
+++ b/packages/neon/neon/lib/src/pages/settings.dart
@@ -7,6 +7,8 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
+import 'package:neon/src/models/branding.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/router.dart';
 import 'package:neon/src/settings/widgets/account_settings_tile.dart';
@@ -17,8 +19,6 @@ import 'package:neon/src/settings/widgets/settings_category.dart';
 import 'package:neon/src/settings/widgets/settings_list.dart';
 import 'package:neon/src/settings/widgets/settings_tile.dart';
 import 'package:neon/src/settings/widgets/text_settings_tile.dart';
-import 'package:neon/src/utils/app_implementation.dart';
-import 'package:neon/src/utils/branding.dart';
 import 'package:neon/src/utils/confirmation_dialog.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/save_file.dart';
diff --git a/packages/neon/neon/lib/src/router.dart b/packages/neon/neon/lib/src/router.dart
index 02fa7e70..70f514d2 100644
--- a/packages/neon/neon/lib/src/router.dart
+++ b/packages/neon/neon/lib/src/router.dart
@@ -3,12 +3,12 @@ import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/pages/account_settings.dart';
 import 'package:neon/src/pages/home.dart';
 import 'package:neon/src/pages/login.dart';
 import 'package:neon/src/pages/nextcloud_app_settings.dart';
 import 'package:neon/src/pages/settings.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/stream_listenable.dart';
 import 'package:provider/provider.dart';
 
diff --git a/packages/neon/neon/lib/src/utils/settings_export_helper.dart b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
index 13029683..011e76bd 100644
--- a/packages/neon/neon/lib/src/utils/settings_export_helper.dart
+++ b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
@@ -1,6 +1,6 @@
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/settings/models/option.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/utils/global_options.dart';
 
 class SettingsExportHelper {
diff --git a/packages/neon/neon/lib/src/widgets/app_bar.dart b/packages/neon/neon/lib/src/widgets/app_bar.dart
index e44a489b..383c85dc 100644
--- a/packages/neon/neon/lib/src/widgets/app_bar.dart
+++ b/packages/neon/neon/lib/src/widgets/app_bar.dart
@@ -6,10 +6,10 @@ import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/apps.dart';
-import 'package:neon/src/interfaces/notifications.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
+import 'package:neon/src/models/notifications_interface.dart';
 import 'package:neon/src/router.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/widgets/app_implementation_icon.dart';
 import 'package:neon/src/widgets/exception.dart';
 import 'package:neon/src/widgets/linear_progress_indicator.dart';
diff --git a/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart b/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
index 577e56f2..293e59d5 100644
--- a/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
+++ b/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:neon/src/utils/app_implementation.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/widgets/user_avatar.dart';
 
 class NeonAppImplementationIcon extends StatelessWidget {
diff --git a/packages/neon/neon/lib/src/widgets/drawer.dart b/packages/neon/neon/lib/src/widgets/drawer.dart
index 373745a2..488cf416 100644
--- a/packages/neon/neon/lib/src/widgets/drawer.dart
+++ b/packages/neon/neon/lib/src/widgets/drawer.dart
@@ -8,8 +8,8 @@ import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/apps.dart';
 import 'package:neon/src/blocs/capabilities.dart';
 import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/app_implementation.dart';
 import 'package:neon/src/router.dart';
-import 'package:neon/src/utils/app_implementation.dart';
 import 'package:neon/src/widgets/account_tile.dart';
 import 'package:neon/src/widgets/cached_image.dart';
 import 'package:neon/src/widgets/drawer_destination.dart';
diff --git a/packages/neon/neon/lib/utils.dart b/packages/neon/neon/lib/utils.dart
index 02ae85a9..465d3f1f 100644
--- a/packages/neon/neon/lib/utils.dart
+++ b/packages/neon/neon/lib/utils.dart
@@ -1,5 +1,3 @@
-export 'package:neon/src/utils/app_implementation.dart';
-export 'package:neon/src/utils/branding.dart';
 export 'package:neon/src/utils/confirmation_dialog.dart';
 export 'package:neon/src/utils/exceptions.dart';
 export 'package:neon/src/utils/hex_color.dart';
diff --git a/packages/neon/neon_notifications/lib/neon_notifications.dart b/packages/neon/neon_notifications/lib/neon_notifications.dart
index 68eabe14..e0d4d696 100644
--- a/packages/neon/neon_notifications/lib/neon_notifications.dart
+++ b/packages/neon/neon_notifications/lib/neon_notifications.dart
@@ -5,7 +5,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/blocs.dart';
-import 'package:neon/interfaces.dart';
 import 'package:neon/models.dart';
 import 'package:neon/settings.dart';
 import 'package:neon/utils.dart';