diff --git a/packages/neon/neon/lib/src/app.dart b/packages/neon/neon/lib/src/app.dart
index e3e5dbed..51d12b51 100644
--- a/packages/neon/neon/lib/src/app.dart
+++ b/packages/neon/neon/lib/src/app.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 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';
@@ -18,7 +19,6 @@ import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/localizations.dart';
 import 'package:neon/src/utils/push_utils.dart';
 import 'package:neon/src/utils/theme.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:provider/provider.dart';
 import 'package:quick_actions/quick_actions.dart';
 import 'package:settings/settings.dart';
diff --git a/packages/neon/neon/lib/src/utils/bloc.dart b/packages/neon/neon/lib/src/bloc/bloc.dart
similarity index 100%
rename from packages/neon/neon/lib/src/utils/bloc.dart
rename to packages/neon/neon/lib/src/bloc/bloc.dart
diff --git a/packages/neon/neon/lib/src/utils/result.dart b/packages/neon/neon/lib/src/bloc/result.dart
similarity index 100%
rename from packages/neon/neon/lib/src/utils/result.dart
rename to packages/neon/neon/lib/src/bloc/result.dart
diff --git a/packages/neon/neon/lib/src/widgets/result_builder.dart b/packages/neon/neon/lib/src/bloc/result_builder.dart
similarity index 96%
rename from packages/neon/neon/lib/src/widgets/result_builder.dart
rename to packages/neon/neon/lib/src/bloc/result_builder.dart
index 7d6dd23f..f4a7ef61 100644
--- a/packages/neon/neon/lib/src/widgets/result_builder.dart
+++ b/packages/neon/neon/lib/src/bloc/result_builder.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:neon/src/utils/result.dart';
+import 'package:neon/src/bloc/result.dart';
 import 'package:rxdart/rxdart.dart';
 
 typedef ResultWidgetBuilder<T> = Widget Function(BuildContext context, Result<T> snapshot);
diff --git a/packages/neon/neon/lib/src/blocs/accounts.dart b/packages/neon/neon/lib/src/blocs/accounts.dart
index 3712d7f3..10c62a8c 100644
--- a/packages/neon/neon/lib/src/blocs/accounts.dart
+++ b/packages/neon/neon/lib/src/blocs/accounts.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/apps.dart';
 import 'package:neon/src/blocs/capabilities.dart';
 import 'package:neon/src/blocs/user_details.dart';
@@ -10,7 +11,6 @@ import 'package:neon/src/models/account.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/utils/account_options.dart';
 import 'package:neon/src/utils/app_implementation.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
 import 'package:neon/src/utils/storage.dart';
diff --git a/packages/neon/neon/lib/src/blocs/apps.dart b/packages/neon/neon/lib/src/blocs/apps.dart
index 9a9a350e..365fdff8 100644
--- a/packages/neon/neon/lib/src/blocs/apps.dart
+++ b/packages/neon/neon/lib/src/blocs/apps.dart
@@ -1,15 +1,15 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+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/utils/app_implementation.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/nextcloud_app_specific_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
diff --git a/packages/neon/neon/lib/src/blocs/capabilities.dart b/packages/neon/neon/lib/src/blocs/capabilities.dart
index dbb44227..8d1b74fe 100644
--- a/packages/neon/neon/lib/src/blocs/capabilities.dart
+++ b/packages/neon/neon/lib/src/blocs/capabilities.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:neon/src/bloc/bloc.dart';
+import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/request_manager.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 
diff --git a/packages/neon/neon/lib/src/blocs/first_launch.dart b/packages/neon/neon/lib/src/blocs/first_launch.dart
index 1feb3436..77e7e5ac 100644
--- a/packages/neon/neon/lib/src/blocs/first_launch.dart
+++ b/packages/neon/neon/lib/src/blocs/first_launch.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:neon/src/utils/bloc.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/packages/neon/neon/lib/src/blocs/login.dart b/packages/neon/neon/lib/src/blocs/login.dart
index f3df6f20..8ed9266c 100644
--- a/packages/neon/neon/lib/src/blocs/login.dart
+++ b/packages/neon/neon/lib/src/blocs/login.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:rxdart/rxdart.dart';
diff --git a/packages/neon/neon/lib/src/blocs/next_push.dart b/packages/neon/neon/lib/src/blocs/next_push.dart
index d9b6ea0f..e68651f5 100644
--- a/packages/neon/neon/lib/src/blocs/next_push.dart
+++ b/packages/neon/neon/lib/src/blocs/next_push.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:rxdart/rxdart.dart';
 
diff --git a/packages/neon/neon/lib/src/blocs/push_notifications.dart b/packages/neon/neon/lib/src/blocs/push_notifications.dart
index e2bac132..fda53945 100644
--- a/packages/neon/neon/lib/src/blocs/push_notifications.dart
+++ b/packages/neon/neon/lib/src/blocs/push_notifications.dart
@@ -2,11 +2,11 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/models/push_notification.dart';
 import 'package:neon/src/platform/platform.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:neon/src/utils/push_utils.dart';
 import 'package:neon/src/utils/storage.dart';
diff --git a/packages/neon/neon/lib/src/blocs/timer.dart b/packages/neon/neon/lib/src/blocs/timer.dart
index 8b89a07a..b839b414 100644
--- a/packages/neon/neon/lib/src/blocs/timer.dart
+++ b/packages/neon/neon/lib/src/blocs/timer.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:ui';
 
 import 'package:meta/meta.dart';
-import 'package:neon/src/utils/bloc.dart';
+import 'package:neon/src/bloc/bloc.dart';
 
 abstract class TimerBlocEvents {
   /// Register a [callback] that will be called periodically.
diff --git a/packages/neon/neon/lib/src/blocs/user_details.dart b/packages/neon/neon/lib/src/blocs/user_details.dart
index 2f5d6ad1..1905f00a 100644
--- a/packages/neon/neon/lib/src/blocs/user_details.dart
+++ b/packages/neon/neon/lib/src/blocs/user_details.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:neon/src/bloc/bloc.dart';
+import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/request_manager.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 
diff --git a/packages/neon/neon/lib/src/blocs/user_statuses.dart b/packages/neon/neon/lib/src/blocs/user_statuses.dart
index b0d329ac..66d181fe 100644
--- a/packages/neon/neon/lib/src/blocs/user_statuses.dart
+++ b/packages/neon/neon/lib/src/blocs/user_statuses.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/bloc.dart';
+import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/blocs/timer.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/platform/platform.dart';
-import 'package:neon/src/utils/bloc.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:window_manager/window_manager.dart';
diff --git a/packages/neon/neon/lib/src/interfaces/notifications.dart b/packages/neon/neon/lib/src/interfaces/notifications.dart
index 3b49eb08..b1ad2fff 100644
--- a/packages/neon/neon/lib/src/interfaces/notifications.dart
+++ b/packages/neon/neon/lib/src/interfaces/notifications.dart
@@ -1,5 +1,5 @@
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/utils/app_implementation.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/nextcloud_app_specific_options.dart';
 
 abstract interface class NotificationsAppInterface<T extends NotificationsBlocInterface,
diff --git a/packages/neon/neon/lib/src/pages/account_settings.dart b/packages/neon/neon/lib/src/pages/account_settings.dart
index 1982184e..6034f7b2 100644
--- a/packages/neon/neon/lib/src/pages/account_settings.dart
+++ b/packages/neon/neon/lib/src/pages/account_settings.dart
@@ -2,13 +2,13 @@ import 'package:filesize/filesize.dart';
 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/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/router.dart';
 import 'package:neon/src/utils/confirmation_dialog.dart';
 import 'package:neon/src/widgets/exception.dart';
 import 'package:neon/src/widgets/linear_progress_indicator.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:settings/settings.dart';
 
diff --git a/packages/neon/neon/lib/src/pages/home.dart b/packages/neon/neon/lib/src/pages/home.dart
index f65552da..ab6b19b1 100644
--- a/packages/neon/neon/lib/src/pages/home.dart
+++ b/packages/neon/neon/lib/src/pages/home.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 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/models/account.dart';
@@ -12,7 +13,6 @@ import 'package:neon/src/utils/global_popups.dart';
 import 'package:neon/src/widgets/app_bar.dart';
 import 'package:neon/src/widgets/drawer.dart';
 import 'package:neon/src/widgets/exception.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:neon/src/widgets/user_avatar.dart';
 import 'package:provider/provider.dart';
 import 'package:settings/settings.dart';
diff --git a/packages/neon/neon/lib/src/utils/app_implementation.dart b/packages/neon/neon/lib/src/utils/app_implementation.dart
index fcc2efbf..19416f48 100644
--- a/packages/neon/neon/lib/src/utils/app_implementation.dart
+++ b/packages/neon/neon/lib/src/utils/app_implementation.dart
@@ -2,10 +2,10 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:neon/l10n/localizations.dart';
+import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/platform/platform.dart';
-import 'package:neon/src/utils/bloc.dart';
 import 'package:neon/src/utils/nextcloud_app_specific_options.dart';
 import 'package:neon/src/utils/request_manager.dart';
 import 'package:neon/src/utils/storage.dart';
diff --git a/packages/neon/neon/lib/src/utils/request_manager.dart b/packages/neon/neon/lib/src/utils/request_manager.dart
index a0ba17a8..dbc845c9 100644
--- a/packages/neon/neon/lib/src/utils/request_manager.dart
+++ b/packages/neon/neon/lib/src/utils/request_manager.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
+import 'package:neon/src/bloc/result.dart';
 import 'package:neon/src/platform/platform.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:path/path.dart' as p;
 import 'package:rxdart/rxdart.dart';
diff --git a/packages/neon/neon/lib/src/widgets/account_tile.dart b/packages/neon/neon/lib/src/widgets/account_tile.dart
index 392e3fb8..9ec66ef1 100644
--- a/packages/neon/neon/lib/src/widgets/account_tile.dart
+++ b/packages/neon/neon/lib/src/widgets/account_tile.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:neon/src/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
 import 'package:neon/src/widgets/exception.dart';
 import 'package:neon/src/widgets/linear_progress_indicator.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:neon/src/widgets/user_avatar.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
diff --git a/packages/neon/neon/lib/src/widgets/app_bar.dart b/packages/neon/neon/lib/src/widgets/app_bar.dart
index 42666abc..e44a489b 100644
--- a/packages/neon/neon/lib/src/widgets/app_bar.dart
+++ b/packages/neon/neon/lib/src/widgets/app_bar.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:meta/meta.dart';
 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';
@@ -12,7 +13,6 @@ 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';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:neon/src/widgets/user_avatar.dart';
 import 'package:provider/provider.dart';
 
diff --git a/packages/neon/neon/lib/src/widgets/drawer.dart b/packages/neon/neon/lib/src/widgets/drawer.dart
index 0e5f0242..373745a2 100644
--- a/packages/neon/neon/lib/src/widgets/drawer.dart
+++ b/packages/neon/neon/lib/src/widgets/drawer.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:meta/meta.dart';
 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/blocs/capabilities.dart';
@@ -14,7 +15,6 @@ import 'package:neon/src/widgets/cached_image.dart';
 import 'package:neon/src/widgets/drawer_destination.dart';
 import 'package:neon/src/widgets/exception.dart';
 import 'package:neon/src/widgets/linear_progress_indicator.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:provider/provider.dart';
 
 @internal
diff --git a/packages/neon/neon/lib/src/widgets/user_avatar.dart b/packages/neon/neon/lib/src/widgets/user_avatar.dart
index ecf89c36..55285bb9 100644
--- a/packages/neon/neon/lib/src/widgets/user_avatar.dart
+++ b/packages/neon/neon/lib/src/widgets/user_avatar.dart
@@ -4,11 +4,11 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:neon/src/bloc/result.dart';
+import 'package:neon/src/bloc/result_builder.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/utils/result.dart';
 import 'package:neon/src/widgets/cached_image.dart';
-import 'package:neon/src/widgets/result_builder.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
diff --git a/packages/neon/neon/lib/utils.dart b/packages/neon/neon/lib/utils.dart
index f8dc0a75..69328103 100644
--- a/packages/neon/neon/lib/utils.dart
+++ b/packages/neon/neon/lib/utils.dart
@@ -1,5 +1,4 @@
 export 'package:neon/src/utils/app_implementation.dart';
-export 'package:neon/src/utils/bloc.dart';
 export 'package:neon/src/utils/branding.dart';
 export 'package:neon/src/utils/confirmation_dialog.dart';
 export 'package:neon/src/utils/exceptions.dart';
@@ -7,7 +6,6 @@ export 'package:neon/src/utils/hex_color.dart';
 export 'package:neon/src/utils/nextcloud_app_specific_options.dart';
 export 'package:neon/src/utils/rename_dialog.dart';
 export 'package:neon/src/utils/request_manager.dart';
-export 'package:neon/src/utils/result.dart';
 export 'package:neon/src/utils/sort_box_builder.dart';
 export 'package:neon/src/utils/sort_box_order_option_values.dart';
 export 'package:neon/src/utils/storage.dart';
diff --git a/packages/neon/neon/lib/widgets.dart b/packages/neon/neon/lib/widgets.dart
index 60156447..7348c1d3 100644
--- a/packages/neon/neon/lib/widgets.dart
+++ b/packages/neon/neon/lib/widgets.dart
@@ -5,4 +5,3 @@ export 'package:neon/src/widgets/image_wrapper.dart';
 export 'package:neon/src/widgets/linear_progress_indicator.dart';
 export 'package:neon/src/widgets/list_view.dart';
 export 'package:neon/src/widgets/relative_time.dart';
-export 'package:neon/src/widgets/result_builder.dart';
diff --git a/packages/neon/neon/test/result_test.dart b/packages/neon/neon/test/result_test.dart
index e9df1143..58be8639 100644
--- a/packages/neon/neon/test/result_test.dart
+++ b/packages/neon/neon/test/result_test.dart
@@ -1,4 +1,4 @@
-import 'package:neon/utils.dart';
+import 'package:neon/blocs.dart';
 import 'package:test/test.dart';
 
 void main() {