treewide(refactor): rename files to follow the same style

lib/controllers/author.dart

@@ -1,6 +1,6 @@
 import "dart:async";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/user_controller.dart";
+import "package:nexus/controllers/user.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/event.dart";
 

lib/controllers/client.dart

@@ -5,30 +5,30 @@ import "dart:math";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:ffi/ffi.dart";
 import "package:flutter/foundation.dart";
-import "package:nexus/controllers/account_data_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/init_complete_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/controllers/space_edges_controller.dart";
-import "package:nexus/controllers/sync_status_controller.dart";
-import "package:nexus/controllers/top_level_spaces_controller.dart";
+import "package:nexus/controllers/account_data.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/init_complete.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/space_edges.dart";
+import "package:nexus/controllers/sync_status.dart";
+import "package:nexus/controllers/top_level_spaces.dart";
 import "package:nexus/helpers/extensions/gomuks_buffer.dart";
 import "package:nexus/main.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/paginate.dart";
-import "package:nexus/models/requests/get_event_request.dart";
-import "package:nexus/models/requests/get_related_events_request.dart";
-import "package:nexus/models/requests/get_room_state_request.dart";
-import "package:nexus/models/requests/join_room_request.dart";
-import "package:nexus/models/requests/login_request.dart";
+import "package:nexus/models/requests/get_event.dart";
+import "package:nexus/models/requests/get_related_events.dart";
+import "package:nexus/models/requests/get_room_state.dart";
+import "package:nexus/models/requests/join_room.dart";
+import "package:nexus/models/requests/login.dart";
 import "package:nexus/models/profile.dart";
-import "package:nexus/models/requests/paginate_request.dart";
-import "package:nexus/models/requests/redact_event_request.dart";
-import "package:nexus/models/requests/report_request.dart";
-import "package:nexus/models/requests/send_event_request.dart";
-import "package:nexus/models/requests/send_message_request.dart";
-import "package:nexus/models/requests/set_membership_request.dart";
-import "package:nexus/models/requests/set_state_request.dart";
+import "package:nexus/models/requests/paginate.dart";
+import "package:nexus/models/requests/redact_event.dart";
+import "package:nexus/models/requests/report.dart";
+import "package:nexus/models/requests/send_event.dart";
+import "package:nexus/models/requests/send_message.dart";
+import "package:nexus/models/requests/set_membership.dart";
+import "package:nexus/models/requests/set_state.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/models/sync_data.dart";
 import "package:nexus/src/third_party/gomuks.g.dart";

lib/controllers/event.dart

@@ -1,9 +1,9 @@
 import "package:collection/collection.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/rooms.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/get_event_request.dart";
+import "package:nexus/models/requests/get_event.dart";
 
 class EventController extends AsyncNotifier<Event?> {
   final GetEventRequest request;

lib/controllers/header.dart

@@ -1,6 +1,6 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/client_state.dart";
 
 class HeaderController extends AsyncNotifier<Map<String, String>> {
   @override

lib/controllers/key.dart

@@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/shared_prefs_controller.dart";
+import "package:nexus/controllers/shared_prefs.dart";
 
 class KeyController extends Notifier<String?> {
   final String key;

lib/controllers/members.dart

@@ -1,10 +1,10 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/rooms.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/get_room_state_request.dart";
+import "package:nexus/models/requests/get_room_state.dart";
 
 class MembersController extends AsyncNotifier<ISet<Event>> {
   final String roomId;

lib/controllers/members_by_status.dart

@@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members_controller.dart";
-import "package:nexus/models/configs/members_by_status_config.dart";
+import "package:nexus/controllers/members.dart";
+import "package:nexus/models/configs/members_by_status.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/event.dart";
 

lib/controllers/members_grouped.dart

@@ -1,9 +1,9 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members_by_status_controller.dart";
-import "package:nexus/controllers/room_creators_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/models/configs/members_by_status_config.dart";
+import "package:nexus/controllers/members_by_status.dart";
+import "package:nexus/controllers/room_creators.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/models/configs/members_by_status.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/power_levels.dart";
 import "package:nexus/models/event.dart";

lib/controllers/pinned_events.dart

@@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/event_controller.dart";
-import "package:nexus/controllers/pinned_ids_controller.dart";
+import "package:nexus/controllers/event.dart";
+import "package:nexus/controllers/pinned_ids.dart";
 import "package:nexus/models/event.dart";
 
 class PinnedEventsController extends AsyncNotifier<IList<Event>> {

lib/controllers/pinned_ids.dart

@@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/rooms.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/pinned_events.dart";
 

lib/controllers/power_level.dart

@@ -1,8 +1,8 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/room_creators_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/models/configs/power_level_config.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/room_creators.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/models/configs/power_level.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/power_levels.dart";
 

lib/controllers/profile.dart

@@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/profile.dart";
 
 class ProfileController extends AsyncNotifier<Profile> {

lib/controllers/reactions.dart

@@ -1,8 +1,8 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/models/configs/reactions_config.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/models/configs/reactions.dart";
 import "package:nexus/models/content/reaction.dart";
 
 class ReactionsController extends AsyncNotifier<IMap<String, IList<String>>> {

lib/controllers/room_chat.dart

@@ -4,14 +4,14 @@ import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:fluttertagger/fluttertagger.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/rooms.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/reaction.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/redact_event_request.dart";
+import "package:nexus/models/requests/redact_event.dart";
 import "package:nexus/models/relation_type.dart";
-import "package:nexus/models/requests/send_message_request.dart";
+import "package:nexus/models/requests/send_message.dart";
 import "package:nexus/models/room.dart";
 
 class RoomChatController extends AsyncNotifier<IList<Event>?> {

lib/controllers/settings.dart

@@ -1,6 +1,6 @@
 import "dart:convert";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/settings_file_controller.dart";
+import "package:nexus/controllers/settings_file.dart";
 import "package:nexus/models/settings.dart";
 
 class SettingsController extends AsyncNotifier<Settings> {

lib/controllers/settings_sections.dart

@@ -3,7 +3,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:intl/intl.dart";
-import "package:nexus/controllers/settings_controller.dart";
+import "package:nexus/controllers/settings.dart";
 import "package:nexus/models/settings_category.dart";
 import "package:nexus/main.dart";
 import "package:nexus/widgets/settings/dialog_list_tile.dart";

lib/controllers/spaces.dart

@@ -2,10 +2,10 @@ import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/account_data_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/controllers/top_level_spaces_controller.dart";
-import "package:nexus/controllers/space_edges_controller.dart";
+import "package:nexus/controllers/account_data.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/top_level_spaces.dart";
+import "package:nexus/controllers/space_edges.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/models/space.dart";
 import "package:nexus/models/subspace.dart";

lib/controllers/url_preview.dart

@@ -1,8 +1,8 @@
 import "dart:convert";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:http/http.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/header_controller.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/header.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/open_graph_data.dart";
 

lib/controllers/user.dart

@@ -1,10 +1,10 @@
 import "dart:async";
 import "package:collection/collection.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members_controller.dart";
-import "package:nexus/controllers/profile_controller.dart";
+import "package:nexus/controllers/members.dart";
+import "package:nexus/controllers/profile.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
-import "package:nexus/models/configs/user_config.dart";
+import "package:nexus/models/configs/user.dart";
 import "package:nexus/models/content/membership.dart";
 
 class UserController extends AsyncNotifier<MembershipContent> {

lib/controllers/via.dart

@@ -1,7 +1,7 @@
 import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/client_state.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/content/power_levels.dart";

lib/helpers/extensions/get_headers.dart

@@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/header_controller.dart";
+import "package:nexus/controllers/header.dart";
 
 extension GetHeaders on WidgetRef {
   Map<String, String> get headers =>

lib/main.dart

@@ -4,18 +4,18 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:media_kit/media_kit.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/header_controller.dart";
-import "package:nexus/controllers/multi_provider_controller.dart";
-import "package:nexus/controllers/settings_controller.dart";
-import "package:nexus/controllers/shared_prefs_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/header.dart";
+import "package:nexus/controllers/multi_provider.dart";
+import "package:nexus/controllers/settings.dart";
+import "package:nexus/controllers/shared_prefs.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/scheme_to_theme.dart";
 import "package:nexus/helpers/font_licenses.dart";
-import "package:nexus/pages/chat_page.dart";
-import "package:nexus/pages/select_server_page.dart";
-import "package:nexus/pages/verify_page.dart";
+import "package:nexus/pages/chat.dart";
+import "package:nexus/pages/select_server.dart";
+import "package:nexus/pages/verify.dart";
 import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/widgets/loading.dart";
 import "package:window_manager/window_manager.dart";

lib/models/configs/members_by_status.dart

@@ -1,7 +1,7 @@
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/membership_status.dart";
-part "members_by_status_config.freezed.dart";
-part "members_by_status_config.g.dart";
+part "members_by_status.freezed.dart";
+part "members_by_status.g.dart";
 
 @freezed
 abstract class MembersByStatusConfig with _$MembersByStatusConfig {

lib/models/configs/power_level.dart

@@ -1,7 +1,7 @@
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/content/content.dart";
-import "package:nexus/models/requests/membership_action.dart";
-part "power_level_config.freezed.dart";
+import "package:nexus/models/membership_action.dart";
+part "power_level.freezed.dart";
 
 @freezed
 sealed class PowerLevelConfig with _$PowerLevelConfig {

lib/models/configs/reactions.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "reactions_config.freezed.dart";
-part "reactions_config.g.dart";
+part "reactions.freezed.dart";
+part "reactions.g.dart";
 
 @freezed
 abstract class ReactionsConfig with _$ReactionsConfig {

lib/models/configs/user.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "user_config.freezed.dart";
-part "user_config.g.dart";
+part "user.freezed.dart";
+part "user.g.dart";
 
 @freezed
 abstract class UserConfig with _$UserConfig {

lib/models/requests/get_event.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "get_event_request.freezed.dart";
-part "get_event_request.g.dart";
+part "get_event.freezed.dart";
+part "get_event.g.dart";
 
 @Freezed()
 abstract class GetEventRequest with _$GetEventRequest {

lib/models/requests/get_related_events.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "get_related_events_request.freezed.dart";
-part "get_related_events_request.g.dart";
+part "get_related_events.freezed.dart";
+part "get_related_events.g.dart";
 
 @freezed
 abstract class GetRelatedEventsRequest with _$GetRelatedEventsRequest {

lib/models/requests/get_room_state.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "get_room_state_request.freezed.dart";
-part "get_room_state_request.g.dart";
+part "get_room_state.freezed.dart";
+part "get_room_state.g.dart";
 
 @freezed
 abstract class GetRoomStateRequest with _$GetRoomStateRequest {

lib/models/requests/join_room.dart

@@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:freezed_annotation/freezed_annotation.dart";
-part "join_room_request.freezed.dart";
-part "join_room_request.g.dart";
+part "join_room.freezed.dart";
+part "join_room.g.dart";
 
 @freezed
 abstract class JoinRoomRequest with _$JoinRoomRequest {

lib/models/requests/login.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "login_request.freezed.dart";
-part "login_request.g.dart";
+part "login.freezed.dart";
+part "login.g.dart";
 
 @freezed
 abstract class LoginRequest with _$LoginRequest {

lib/models/requests/paginate.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "paginate_request.freezed.dart";
-part "paginate_request.g.dart";
+part "paginate.freezed.dart";
+part "paginate.g.dart";
 
 @freezed
 abstract class PaginateRequest with _$PaginateRequest {

lib/models/requests/redact_event.dart

@@ -0,0 +1,3 @@
+import "package:nexus/models/requests/report.dart";
+
+typedef RedactEventRequest = ReportRequest;

lib/models/requests/redact_event_request.dart

@@ -1,3 +0,0 @@
-import "package:nexus/models/requests/report_request.dart";
-
-typedef RedactEventRequest = ReportRequest;

lib/models/requests/report.dart

@@ -1,6 +1,6 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-part "report_request.freezed.dart";
-part "report_request.g.dart";
+part "report.freezed.dart";
+part "report.g.dart";
 
 @freezed
 abstract class ReportRequest with _$ReportRequest {

lib/models/requests/send_event.dart

@@ -1,7 +1,7 @@
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/content/content.dart";
-part "send_event_request.freezed.dart";
-part "send_event_request.g.dart";
+part "send_event.freezed.dart";
+part "send_event.g.dart";
 
 @freezed
 abstract class SendEventRequest with _$SendEventRequest {

lib/models/requests/send_message.dart

@@ -1,8 +1,8 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/relation_type.dart";
-part "send_message_request.freezed.dart";
-part "send_message_request.g.dart";
+part "send_message.freezed.dart";
+part "send_message.g.dart";
 
 @freezed
 abstract class SendMessageRequest with _$SendMessageRequest {

lib/models/requests/set_membership.dart

@@ -1,7 +1,7 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-import "package:nexus/models/requests/membership_action.dart";
-part "set_membership_request.freezed.dart";
-part "set_membership_request.g.dart";
+import "package:nexus/models/membership_action.dart";
+part "set_membership.freezed.dart";
+part "set_membership.g.dart";
 
 @freezed
 abstract class SetMembershipRequest with _$SetMembershipRequest {

lib/models/requests/set_state.dart

@@ -1,8 +1,8 @@
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/ms_duration.dart";
-part "set_state_request.freezed.dart";
-part "set_state_request.g.dart";
+part "set_state.freezed.dart";
+part "set_state.g.dart";
 
 @freezed
 abstract class SetStateRequest with _$SetStateRequest {

lib/pages/chat.dart

@@ -1,8 +1,8 @@
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/emoji_controller.dart";
-import "package:nexus/controllers/init_complete_controller.dart";
-import "package:nexus/controllers/key_controller.dart";
+import "package:nexus/controllers/emoji.dart";
+import "package:nexus/controllers/init_complete.dart";
+import "package:nexus/controllers/key.dart";
 import "package:nexus/widgets/appbar.dart";
 import "package:nexus/widgets/sidebar.dart";
 import "package:nexus/widgets/room_chat.dart";

lib/pages/login.dart

@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/widgets/appbar.dart";
 import "package:nexus/helpers/required_validator_helper.dart";
 
@@ -96,4 +96,4 @@ class LoginPage extends HookConsumerWidget {
       ),
     );
   }
-}
+}

lib/pages/select_server.dart

@@ -2,10 +2,10 @@ import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:flutter_svg/flutter_svg.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/helpers/launch_helper.dart";
 import "package:nexus/models/homeserver.dart";
-import "package:nexus/pages/login_page.dart";
+import "package:nexus/pages/login.dart";
 import "package:nexus/widgets/appbar.dart";
 import "package:nexus/widgets/divider_text.dart";
 

lib/pages/settings.dart

@@ -5,10 +5,10 @@ import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:m3e_card_list/m3e_card_list.dart";
 import "package:navigation_rail_m3e/navigation_rail_m3e.dart";
-import "package:nexus/controllers/settings_sections_controller.dart";
+import "package:nexus/controllers/settings_sections.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/show_about_dialog.dart";
-import "package:nexus/pages/settings_category_page.dart";
+import "package:nexus/pages/settings_category.dart";
 import "package:nexus/widgets/divider_text.dart";
 import "package:nexus/widgets/highlight_wrapper.dart";
 import "package:super_sliver_list/super_sliver_list.dart";

lib/pages/settings_category.dart

@@ -4,7 +4,7 @@ import "package:collection/collection.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/settings_sections_controller.dart";
+import "package:nexus/controllers/settings_sections.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/widgets/highlight_wrapper.dart";
 import "package:super_sliver_list/super_sliver_list.dart";

lib/pages/verify.dart

@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/widgets/appbar.dart";
 import "package:nexus/helpers/required_validator_helper.dart";
 

lib/widgets/appbar.dart

@@ -2,7 +2,7 @@ import "dart:io";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/settings_controller.dart";
+import "package:nexus/controllers/settings.dart";
 import "package:window_manager/window_manager.dart";
 
 class Appbar extends ConsumerWidget implements PreferredSizeWidget {

lib/widgets/avatar_or_hash.dart

@@ -2,8 +2,8 @@ import "package:color_hash/color_hash.dart";
 import "package:cross_cache/cross_cache.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/cross_cache.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 

lib/widgets/composer/composer.dart

@@ -4,7 +4,7 @@ import "package:flutter/services.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:fluttertagger/fluttertagger.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/power_level_controller.dart";
+import "package:nexus/controllers/power_level.dart";
 import "package:nexus/models/content/message.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/relation_type.dart";

lib/widgets/composer/mention_overlay.dart

@@ -1,8 +1,8 @@
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/members_by_status_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/controllers/via_controller.dart";
+import "package:nexus/controllers/members_by_status.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/via.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/models/content/membership.dart";

lib/widgets/emoji_picker_button.dart

@@ -1,7 +1,7 @@
 import "package:emoji_text_field/emoji_text_field.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/emoji_controller.dart";
+import "package:nexus/controllers/emoji.dart";
 
 class EmojiPickerButton extends HookConsumerWidget {
   final TextEditingController? controller;

lib/widgets/expandable_image.dart

@@ -2,7 +2,7 @@ import "package:cross_cache/cross_cache.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:m3e_buttons/m3e_buttons.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
+import "package:nexus/controllers/cross_cache.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/widgets/error_dialog.dart";
 

lib/widgets/html/html.dart

@@ -3,8 +3,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/cross_cache.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/extensions/link_to_mention.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";

lib/widgets/html/mention_chip.dart

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/user_controller.dart";
+import "package:nexus/controllers/user.dart";
 import "package:nexus/helpers/extensions/link_to_mention.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
 

lib/widgets/join_dialog.dart

@@ -2,9 +2,9 @@ import "package:collection/collection.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/key_controller.dart";
-import "package:nexus/controllers/spaces_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/key.dart";
+import "package:nexus/controllers/spaces.dart";
 import "package:nexus/helpers/extensions/link_to_mention.dart";
 
 class JoinDialog extends HookWidget {

lib/widgets/lazy_loading/message_avatar.dart

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/author_controller.dart";
+import "package:nexus/controllers/author.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
 import "package:nexus/models/event.dart";

lib/widgets/lazy_loading/message_displayname.dart

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/author_controller.dart";
+import "package:nexus/controllers/author.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
 import "package:nexus/helpers/extensions/string_to_color.dart";

lib/widgets/member_list.dart

@@ -4,8 +4,8 @@ import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:m3e_buttons/m3e_buttons.dart";
 import "package:m3e_card_list/m3e_card_list.dart";
-import "package:nexus/controllers/members_by_status_controller.dart";
-import "package:nexus/controllers/members_grouped_controller.dart";
+import "package:nexus/controllers/members_by_status.dart";
+import "package:nexus/controllers/members_grouped.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/string_to_color.dart";
 import "package:nexus/models/content/membership.dart";

lib/widgets/message_image.dart

@@ -2,7 +2,7 @@ import "package:cross_cache/cross_cache.dart";
 import "package:flutter/material.dart";
 import "package:flutter_blurhash/flutter_blurhash.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
+import "package:nexus/controllers/cross_cache.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/models/info/image.dart" as i;
 import "package:nexus/widgets/expandable_image.dart";

lib/widgets/pinned_events_drawer.dart

@@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/pinned_events_controller.dart";
+import "package:nexus/controllers/pinned_events.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/widgets/loading.dart";

lib/widgets/reaction_row.dart

@@ -2,10 +2,10 @@ import "package:cross_cache/cross_cache.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
-import "package:nexus/controllers/reactions_controller.dart";
-import "package:nexus/controllers/room_chat_controller.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/cross_cache.dart";
+import "package:nexus/controllers/reactions.dart";
+import "package:nexus/controllers/room_chat.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/event.dart";

lib/widgets/renderers/message.dart

@@ -2,8 +2,8 @@ import "package:collection/collection.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:linkify/linkify.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/event_controller.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/event.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/content/encrypted.dart";
 import "package:nexus/models/content/message.dart";

lib/widgets/room_appbar.dart

@@ -1,11 +1,11 @@
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/rooms.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/widgets/appbar.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/widgets/expandable_image.dart";
-import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/client_state.dart";
 import "package:nexus/widgets/linkified_text.dart";
 import "package:nexus/widgets/room_menu.dart";
 

lib/widgets/room_chat.dart

@@ -4,14 +4,14 @@ import "package:flutter/services.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:measure_size/measure_size.dart";
-import "package:nexus/controllers/account_data_controller.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/pinned_ids_controller.dart";
-import "package:nexus/controllers/power_level_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/controllers/room_chat_controller.dart";
-import "package:nexus/controllers/via_controller.dart";
+import "package:nexus/controllers/account_data.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/pinned_ids.dart";
+import "package:nexus/controllers/power_level.dart";
+import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/room_chat.dart";
+import "package:nexus/controllers/via.dart";
 import "package:nexus/models/content/message.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/relation_type.dart";

lib/widgets/room_menu.dart

@@ -2,8 +2,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/via_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/via.dart";
 import "package:nexus/models/room.dart";
 
 class RoomMenu extends ConsumerWidget {

lib/widgets/sidebar.dart

@@ -3,10 +3,10 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:navigation_rail_m3e/navigation_rail_m3e.dart";
-import "package:nexus/controllers/key_controller.dart";
-import "package:nexus/controllers/spaces_controller.dart";
+import "package:nexus/controllers/key.dart";
+import "package:nexus/controllers/spaces.dart";
 import "package:nexus/models/room.dart";
-import "package:nexus/pages/settings_page.dart";
+import "package:nexus/pages/settings.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/widgets/divider_widget.dart";
 import "package:nexus/widgets/join_dialog.dart";

lib/widgets/url_preview.dart

@@ -1,8 +1,8 @@
 import "package:cross_cache/cross_cache.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/cross_cache_controller.dart";
-import "package:nexus/controllers/url_preview_controller.dart";
+import "package:nexus/controllers/cross_cache.dart";
+import "package:nexus/controllers/url_preview.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/launch_helper.dart";

lib/widgets/user_bottom_sheet.dart

@@ -4,15 +4,15 @@ import "package:flutter_hooks/flutter_hooks.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:intl/intl.dart";
 import "package:m3e_buttons/m3e_buttons.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/power_level_controller.dart";
-import "package:nexus/controllers/profile_controller.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/power_level.dart";
+import "package:nexus/controllers/profile.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/content/membership.dart";
-import "package:nexus/models/requests/membership_action.dart";
+import "package:nexus/models/membership_action.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/main.dart";
 import "package:nexus/widgets/expandable_image.dart";