diff --git a/lib/pages/archive/archive.dart b/lib/pages/archive/archive.dart
index 78e735d05..55a7c3dfd 100644
--- a/lib/pages/archive/archive.dart
+++ b/lib/pages/archive/archive.dart
@@ -1,6 +1,6 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/pages/archive/archive_view.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 460de198c..a53f00536 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -17,7 +17,7 @@ import 'package:fluffychat/pages/chat_details/chat_details.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/enum/use_type.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/models/choreo_record.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
index 5fe1bc462..74766f054 100644
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@@ -4,7 +4,7 @@ import 'package:fluffychat/pages/chat/events/message.dart';
 import 'package:fluffychat/pages/chat/seen_by_row.dart';
 import 'package:fluffychat/pages/chat/typing_indicators.dart';
 import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/widgets/chat/locked_chat_message.dart';
 import 'package:fluffychat/utils/account_config.dart';
 import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 21789f527..8a4eacd7f 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -9,7 +9,7 @@ import 'package:fluffychat/pages/chat/reactions_picker.dart';
 import 'package:fluffychat/pages/chat/reply_display.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/has_error_button.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/language_permissions_warning_buttons.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/pages/class_analytics/measure_able.dart';
 import 'package:fluffychat/utils/account_config.dart';
 import 'package:fluffychat/widgets/chat_settings_popup_menu.dart';
@@ -116,8 +116,10 @@ class ChatView extends StatelessWidget {
       // #Pangea
     } else {
       return [
-        ChatSettingsPopupMenu(controller.room,
-            (!controller.room.isDirectChat && !controller.room.isArchived)),
+        ChatSettingsPopupMenu(
+          controller.room,
+          (!controller.room.isDirectChat && !controller.room.isArchived),
+        ),
       ];
     }
 
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index de93d04b7..6b7ce5616 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -2,7 +2,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat_details/chat_details.dart';
 import 'package:fluffychat/pages/chat_details/participant_list_item.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/pages/class_settings/class_name_header.dart';
 import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/class_description_button.dart';
 import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/class_details_toggle_add_students_tile.dart';
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index c0791c936..7d1370295 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -8,8 +8,8 @@ import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat_list/chat_list_view.dart';
 import 'package:fluffychat/pangea/constants/pangea_room_types.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/add_to_space.dart';
 import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
index a2bd7a012..c917c8eff 100644
--- a/lib/pages/chat_list/chat_list_item.dart
+++ b/lib/pages/chat_list/chat_list_item.dart
@@ -1,6 +1,6 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/get_chat_list_item_subtitle.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/utils/room_status_extension.dart';
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 6ad9feef3..5736cad77 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -3,7 +3,7 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/pages/chat_list/navi_rail_item.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/avatar.dart';
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index 73b7497f6..58b982cab 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -1,6 +1,6 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/utils/class_code.dart';
 import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart';
 import 'package:fluffychat/pangea/utils/logout.dart';
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 996f5218d..74bea0910 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -9,7 +9,7 @@ import 'package:fluffychat/pages/chat_list/search_title.dart';
 import 'package:fluffychat/pages/chat_list/utils/on_chat_tap.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
 import 'package:fluffychat/pangea/constants/pangea_room_types.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/extensions/sync_update_extension.dart';
 import 'package:fluffychat/pangea/utils/archive_space.dart';
 import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart';
diff --git a/lib/pages/invitation_selection/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart
index 5f2bd5027..751361e17 100644
--- a/lib/pages/invitation_selection/invitation_selection.dart
+++ b/lib/pages/invitation_selection/invitation_selection.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/matrix.dart';
diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart
index a310769cc..15420a4f5 100644
--- a/lib/pages/new_space/new_space.dart
+++ b/lib/pages/new_space/new_space.dart
@@ -4,7 +4,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:fluffychat/pages/new_space/new_space_view.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
 import 'package:fluffychat/pangea/utils/class_chat_power_levels.dart';
diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart
index 23f81b7ab..9c392241c 100644
--- a/lib/pages/new_space/new_space_view.dart
+++ b/lib/pages/new_space/new_space_view.dart
@@ -1,5 +1,5 @@
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart';
 import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart';
diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart
index 3a26676c6..973ca6984 100644
--- a/lib/pangea/choreographer/controllers/choreographer.dart
+++ b/lib/pangea/choreographer/controllers/choreographer.dart
@@ -10,7 +10,7 @@ import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
 import 'package:fluffychat/pangea/enum/edit_type.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/models/it_step.dart';
 import 'package:fluffychat/pangea/models/representation_content_model.dart';
diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart
index d59c5eb52..0820f769b 100644
--- a/lib/pangea/controllers/class_controller.dart
+++ b/lib/pangea/controllers/class_controller.dart
@@ -5,8 +5,8 @@ import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/constants/local.key.dart';
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/utils/class_code.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart
index 5b1a89490..e11053fe2 100644
--- a/lib/pangea/controllers/language_controller.dart
+++ b/lib/pangea/controllers/language_controller.dart
@@ -3,7 +3,7 @@ import 'dart:developer';
 import 'package:fluffychat/pangea/constants/language_keys.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';
 import 'package:flutter/foundation.dart';
diff --git a/lib/pangea/controllers/message_analytics_controller.dart b/lib/pangea/controllers/message_analytics_controller.dart
index f3e2b4674..36d0bdad5 100644
--- a/lib/pangea/controllers/message_analytics_controller.dart
+++ b/lib/pangea/controllers/message_analytics_controller.dart
@@ -11,8 +11,8 @@ import 'package:flutter/foundation.dart';
 import 'package:matrix/matrix.dart';
 
 import '../constants/class_default_values.dart';
-import '../extensions/client_extension.dart';
-import '../extensions/pangea_room_extension.dart';
+import '../extensions/client_extension/client_extension.dart';
+import '../extensions/pangea_room_extension/pangea_room_extension.dart';
 import '../matrix_event_wrappers/construct_analytics_event.dart';
 import '../models/chart_analytics_model.dart';
 import '../models/student_analytics_event.dart';
diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart
index 1e878f19b..4a0668880 100644
--- a/lib/pangea/controllers/message_data_controller.dart
+++ b/lib/pangea/controllers/message_data_controller.dart
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/controllers/base_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/representation_content_model.dart';
 import 'package:fluffychat/pangea/models/tokens_event_content_model.dart';
 import 'package:fluffychat/pangea/repo/tokens_repo.dart';
diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart
index 808355b47..b183ae5fb 100644
--- a/lib/pangea/controllers/my_analytics_controller.dart
+++ b/lib/pangea/controllers/my_analytics_controller.dart
@@ -8,8 +8,8 @@ import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:flutter/foundation.dart';
 import 'package:matrix/matrix.dart';
 
-import '../extensions/client_extension.dart';
-import '../extensions/pangea_room_extension.dart';
+import '../extensions/client_extension/client_extension.dart';
+import '../extensions/pangea_room_extension/pangea_room_extension.dart';
 import '../models/constructs_analytics_model.dart';
 import '../models/student_analytics_event.dart';
 
diff --git a/lib/pangea/controllers/pangea_controller.dart b/lib/pangea/controllers/pangea_controller.dart
index 753a8c9e6..ad2a27145 100644
--- a/lib/pangea/controllers/pangea_controller.dart
+++ b/lib/pangea/controllers/pangea_controller.dart
@@ -17,8 +17,8 @@ import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
 import 'package:fluffychat/pangea/controllers/text_to_speech_controller.dart';
 import 'package:fluffychat/pangea/controllers/user_controller.dart';
 import 'package:fluffychat/pangea/controllers/word_net_controller.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/guard/p_vguard.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart
index 6c9a06396..f83903473 100644
--- a/lib/pangea/controllers/permissions_controller.dart
+++ b/lib/pangea/controllers/permissions_controller.dart
@@ -2,7 +2,7 @@ import 'package:fluffychat/pangea/constants/age_limits.dart';
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/base_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/models/user_model.dart';
 import 'package:fluffychat/pangea/utils/p_extension.dart';
diff --git a/lib/pangea/controllers/space_rules_edit_controller.dart b/lib/pangea/controllers/space_rules_edit_controller.dart
index 5f5a2ed72..a13fd9219 100644
--- a/lib/pangea/controllers/space_rules_edit_controller.dart
+++ b/lib/pangea/controllers/space_rules_edit_controller.dart
@@ -1,7 +1,7 @@
+import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
-import '../extensions/pangea_room_extension.dart';
+import '../extensions/pangea_room_extension/pangea_room_extension.dart';
 import '../models/class_model.dart';
 
 class RoomRulesEditController {
diff --git a/lib/pangea/controllers/speech_to_text_controller.dart b/lib/pangea/controllers/speech_to_text_controller.dart
index 8b61da79e..67462bcef 100644
--- a/lib/pangea/controllers/speech_to_text_controller.dart
+++ b/lib/pangea/controllers/speech_to_text_controller.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/representation_content_model.dart';
 import 'package:fluffychat/pangea/models/speech_to_text_models.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
diff --git a/lib/pangea/extensions/client_extension/classes_and_exchanges.dart b/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
similarity index 98%
rename from lib/pangea/extensions/client_extension/classes_and_exchanges.dart
rename to lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
index 5f28563db..5417df6ae 100644
--- a/lib/pangea/extensions/client_extension/classes_and_exchanges.dart
+++ b/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
@@ -1,4 +1,4 @@
-part of "../client_extension.dart";
+part of "client_extension.dart";
 
 extension PangeaClient2 on Client {
   List<Room> get _classes => rooms.where((e) => e.isPangeaClass).toList();
diff --git a/lib/pangea/extensions/client_extension/analytics.dart b/lib/pangea/extensions/client_extension/client_analytics_extension.dart
similarity index 99%
rename from lib/pangea/extensions/client_extension/analytics.dart
rename to lib/pangea/extensions/client_extension/client_analytics_extension.dart
index 6683629f6..b28bf28a9 100644
--- a/lib/pangea/extensions/client_extension/analytics.dart
+++ b/lib/pangea/extensions/client_extension/client_analytics_extension.dart
@@ -1,4 +1,4 @@
-part of "../client_extension.dart";
+part of "client_extension.dart";
 
 extension PangeaClient1 on Client {
   // get analytics room matching targetlanguage
diff --git a/lib/pangea/extensions/client_extension.dart b/lib/pangea/extensions/client_extension/client_extension.dart
similarity index 93%
rename from lib/pangea/extensions/client_extension.dart
rename to lib/pangea/extensions/client_extension/client_extension.dart
index 3e2be72f1..38e3c5582 100644
--- a/lib/pangea/extensions/client_extension.dart
+++ b/lib/pangea/extensions/client_extension/client_extension.dart
@@ -4,18 +4,18 @@ import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/constants/pangea_room_types.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:flutter/foundation.dart';
 import 'package:matrix/matrix.dart';
 
-import '../utils/p_store.dart';
+import '../../utils/p_store.dart';
 
-part "client_extension/analytics.dart";
-part "client_extension/classes_and_exchanges.dart";
-part "client_extension/general_info.dart";
+part "analytics_extension.dart";
+part "classes_and_exchanges_extension.dart";
+part "general_info_extension.dart";
 
 extension PangeaClient on Client {
 // analytics
diff --git a/lib/pangea/extensions/client_extension/general_info.dart b/lib/pangea/extensions/client_extension/general_info_extension.dart
similarity index 98%
rename from lib/pangea/extensions/client_extension/general_info.dart
rename to lib/pangea/extensions/client_extension/general_info_extension.dart
index 810e66328..0fb2fe26c 100644
--- a/lib/pangea/extensions/client_extension/general_info.dart
+++ b/lib/pangea/extensions/client_extension/general_info_extension.dart
@@ -1,4 +1,4 @@
-part of "../client_extension.dart";
+part of "client_extension.dart";
 
 extension PangeaClient3 on Client {
   Future<List<String>> get _teacherRoomIds async {
diff --git a/lib/pangea/extensions/pangea_room_extension/children_and_parents.dart b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
similarity index 99%
rename from lib/pangea/extensions/pangea_room_extension/children_and_parents.dart
rename to lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
index e4b5aa265..d7acfbd34 100644
--- a/lib/pangea/extensions/pangea_room_extension/children_and_parents.dart
+++ b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom2 on Room {
   //note this only will return rooms that the user has joined or been invited to
diff --git a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings.dart b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
similarity index 98%
rename from lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings.dart
rename to lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
index 123793ba1..7351d0272 100644
--- a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings.dart
+++ b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom3 on Room {
   DateTime? get _rulesUpdatedAt {
diff --git a/lib/pangea/extensions/pangea_room_extension/events.dart b/lib/pangea/extensions/pangea_room_extension/events_extension.dart
similarity index 99%
rename from lib/pangea/extensions/pangea_room_extension/events.dart
rename to lib/pangea/extensions/pangea_room_extension/events_extension.dart
index 594cc8fcb..f0d652f34 100644
--- a/lib/pangea/extensions/pangea_room_extension/events.dart
+++ b/lib/pangea/extensions/pangea_room_extension/events_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom4 on Room {
   Future<Event?> _sendPangeaEvent({
diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
similarity index 89%
rename from lib/pangea/extensions/pangea_room_extension.dart
rename to lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
index ffde0cc6e..fa9e494d5 100644
--- a/lib/pangea/extensions/pangea_room_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
@@ -20,26 +20,26 @@ import 'package:matrix/src/utils/markdown.dart';
 import 'package:matrix/src/utils/space_child.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
-import '../../config/app_config.dart';
-import '../constants/pangea_event_types.dart';
-import '../enum/construct_type_enum.dart';
-import '../enum/use_type.dart';
-import '../matrix_event_wrappers/construct_analytics_event.dart';
-import '../models/choreo_record.dart';
-import '../models/constructs_analytics_model.dart';
-import '../models/representation_content_model.dart';
-import '../models/student_analytics_event.dart';
-import '../models/student_analytics_summary_model.dart';
-import '../utils/p_store.dart';
-import 'client_extension.dart';
-
-part "pangea_room_extension/analytics.dart";
-part "pangea_room_extension/children_and_parents.dart";
-part "pangea_room_extension/class_and_exchange_settings.dart";
-part "pangea_room_extension/events.dart";
-part "pangea_room_extension/room_information.dart";
-part "pangea_room_extension/room_settings.dart";
-part "pangea_room_extension/user_permissions.dart";
+import '../../../config/app_config.dart';
+import '../../constants/pangea_event_types.dart';
+import '../../enum/construct_type_enum.dart';
+import '../../enum/use_type.dart';
+import '../../matrix_event_wrappers/construct_analytics_event.dart';
+import '../../models/choreo_record.dart';
+import '../../models/constructs_analytics_model.dart';
+import '../../models/representation_content_model.dart';
+import '../../models/student_analytics_event.dart';
+import '../../models/student_analytics_summary_model.dart';
+import '../../utils/p_store.dart';
+import '../client_extension/client_extension.dart';
+
+part "analytics_extension.dart";
+part "children_and_parents_extension.dart";
+part "class_and_exchange_settings_extension.dart";
+part "events_extension.dart";
+part "room_information_extension.dart";
+part "room_settings_extension.dart";
+part "user_permissions_extension.dart";
 
 extension PangeaRoom on Room {
 // analytics
diff --git a/lib/pangea/extensions/pangea_room_extension/analytics.dart b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
similarity index 99%
rename from lib/pangea/extensions/pangea_room_extension/analytics.dart
rename to lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
index 3540c1ee1..b23608170 100644
--- a/lib/pangea/extensions/pangea_room_extension/analytics.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom1 on Room {
   // Join analytics rooms in space
diff --git a/lib/pangea/extensions/pangea_room_extension/room_information.dart b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
similarity index 98%
rename from lib/pangea/extensions/pangea_room_extension/room_information.dart
rename to lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
index fd2d5a4da..fe57e8cc8 100644
--- a/lib/pangea/extensions/pangea_room_extension/room_information.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom5 on Room {
   DateTime? get _creationTime =>
diff --git a/lib/pangea/extensions/pangea_room_extension/room_settings.dart b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
similarity index 98%
rename from lib/pangea/extensions/pangea_room_extension/room_settings.dart
rename to lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
index cd4d2d50b..dfc9292d3 100644
--- a/lib/pangea/extensions/pangea_room_extension/room_settings.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom6 on Room {
   PangeaRoomRules? get _pangeaRoomRules {
diff --git a/lib/pangea/extensions/pangea_room_extension/user_permissions.dart b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
similarity index 98%
rename from lib/pangea/extensions/pangea_room_extension/user_permissions.dart
rename to lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
index 9e0349ac0..946f33071 100644
--- a/lib/pangea/extensions/pangea_room_extension/user_permissions.dart
+++ b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
@@ -1,4 +1,4 @@
-part of "../pangea_room_extension.dart";
+part of "pangea_room_extension.dart";
 
 extension PangeaRoom7 on Room {
   bool _isMadeByUser(String userId) =>
diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
index 91f19f6e7..5fa2e2659 100644
--- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
+++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
@@ -4,7 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/controllers/text_to_speech_controller.dart';
 import 'package:fluffychat/pangea/enum/audio_encoding_enum.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_representation_event.dart';
 import 'package:fluffychat/pangea/models/choreo_record.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
diff --git a/lib/pangea/models/student_analytics_event.dart b/lib/pangea/models/student_analytics_event.dart
index 1884b43b4..cb2b7de0e 100644
--- a/lib/pangea/models/student_analytics_event.dart
+++ b/lib/pangea/models/student_analytics_event.dart
@@ -1,7 +1,7 @@
 import 'dart:developer';
 
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:flutter/foundation.dart';
diff --git a/lib/pangea/pages/analytics/analytics_list_tile.dart b/lib/pangea/pages/analytics/analytics_list_tile.dart
index ab35b2610..37bb4e8e4 100644
--- a/lib/pangea/pages/analytics/analytics_list_tile.dart
+++ b/lib/pangea/pages/analytics/analytics_list_tile.dart
@@ -1,4 +1,4 @@
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/pangea/pages/analytics/base_analytics.dart b/lib/pangea/pages/analytics/base_analytics.dart
index 634a39980..a4ad03638 100644
--- a/lib/pangea/pages/analytics/base_analytics.dart
+++ b/lib/pangea/pages/analytics/base_analytics.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:fluffychat/pangea/enum/construct_type_enum.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/pages/analytics/base_analytics_view.dart';
 import 'package:fluffychat/pangea/pages/analytics/student_analytics/student_analytics.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart b/lib/pangea/pages/analytics/class_analytics/class_analytics.dart
index 877ae1788..4de8d4184 100644
--- a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart
+++ b/lib/pangea/pages/analytics/class_analytics/class_analytics.dart
@@ -4,7 +4,7 @@ import 'dart:developer';
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/constants/pangea_room_types.dart';
 import 'package:fluffychat/pangea/enum/construct_type_enum.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/chart_analytics_model.dart';
 import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
diff --git a/lib/pangea/pages/analytics/class_list/class_list_view.dart b/lib/pangea/pages/analytics/class_list/class_list_view.dart
index 6a0e7f21f..88bea1e01 100644
--- a/lib/pangea/pages/analytics/class_list/class_list_view.dart
+++ b/lib/pangea/pages/analytics/class_list/class_list_view.dart
@@ -1,4 +1,4 @@
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/pages/analytics/analytics_list_tile.dart';
 import 'package:fluffychat/pangea/pages/analytics/time_span_menu_button.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart
index 44843bd41..1970fa236 100644
--- a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart
+++ b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:developer';
 
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/chart_analytics_model.dart';
 import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart';
 import 'package:flutter/foundation.dart';
@@ -11,7 +11,7 @@ import 'package:matrix/matrix.dart';
 
 import '../../../../widgets/matrix.dart';
 import '../../../controllers/pangea_controller.dart';
-import '../../../extensions/client_extension.dart';
+import '../../../extensions/client_extension/client_extension.dart';
 import '../../../utils/sync_status_util_v2.dart';
 import '../base_analytics.dart';
 import 'student_analytics_view.dart';
diff --git a/lib/pangea/pages/class_settings/class_name_header.dart b/lib/pangea/pages/class_settings/class_name_header.dart
index 39adaa126..1f2788627 100644
--- a/lib/pangea/pages/class_settings/class_name_header.dart
+++ b/lib/pangea/pages/class_settings/class_name_header.dart
@@ -1,11 +1,9 @@
+import 'package:fluffychat/pages/chat_details/chat_details.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/src/widgets/visibility.dart' as visible;
-
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/pages/chat_details/chat_details.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
-
 class ClassNameHeader extends StatelessWidget {
   final Room room;
   final ChatDetailsController controller;
diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart
index 8c1cb0a6c..dd86c2010 100644
--- a/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart
+++ b/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart
@@ -1,16 +1,15 @@
+import 'package:fluffychat/pangea/config/environment.dart';
+import 'package:fluffychat/pangea/constants/url_query_parameter_keys.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 import 'package:universal_html/html.dart' as html;
 
-import 'package:fluffychat/pangea/config/environment.dart';
-import 'package:fluffychat/pangea/constants/url_query_parameter_keys.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 import '../../../../utils/fluffy_share.dart';
 import '../../../../widgets/avatar.dart';
 
diff --git a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart
index 56ab5c360..5a6616f37 100644
--- a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart
+++ b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart
@@ -7,7 +7,7 @@ import 'package:matrix/matrix.dart';
 import '../../../../config/app_config.dart';
 import '../../../../widgets/matrix.dart';
 import '../../../constants/pangea_event_types.dart';
-import '../../../extensions/pangea_room_extension.dart';
+import '../../../extensions/pangea_room_extension/pangea_room_extension.dart';
 
 class RoomRulesEditor extends StatefulWidget {
   final String? roomId;
diff --git a/lib/pangea/pages/p_user_age/p_user_age.dart b/lib/pangea/pages/p_user_age/p_user_age.dart
index 3cb1fccc5..54e98ab94 100644
--- a/lib/pangea/pages/p_user_age/p_user_age.dart
+++ b/lib/pangea/pages/p_user_age/p_user_age.dart
@@ -2,7 +2,7 @@ import 'dart:developer';
 
 import 'package:fluffychat/pangea/constants/age_limits.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
 import 'package:fluffychat/pangea/pages/p_user_age/p_user_age_view.dart';
 import 'package:fluffychat/pangea/utils/p_extension.dart';
 import 'package:fluffychat/widgets/fluffy_chat_app.dart';
diff --git a/lib/pangea/utils/archive_space.dart b/lib/pangea/utils/archive_space.dart
index ac83980fb..68b9f82fd 100644
--- a/lib/pangea/utils/archive_space.dart
+++ b/lib/pangea/utils/archive_space.dart
@@ -1,4 +1,4 @@
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:matrix/matrix.dart';
 
diff --git a/lib/pangea/utils/chat_list_handle_space_tap.dart b/lib/pangea/utils/chat_list_handle_space_tap.dart
index 01d99bda2..b1cb3d42c 100644
--- a/lib/pangea/utils/chat_list_handle_space_tap.dart
+++ b/lib/pangea/utils/chat_list_handle_space_tap.dart
@@ -1,7 +1,7 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
diff --git a/lib/pangea/utils/class_chat_power_levels.dart b/lib/pangea/utils/class_chat_power_levels.dart
index db19bb6ee..de2b0bdeb 100644
--- a/lib/pangea/utils/class_chat_power_levels.dart
+++ b/lib/pangea/utils/class_chat_power_levels.dart
@@ -1,11 +1,10 @@
+import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:flutter/material.dart';
-
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import '../../widgets/matrix.dart';
 import '../constants/class_default_values.dart';
-import '../extensions/pangea_room_extension.dart';
+import '../extensions/pangea_room_extension/pangea_room_extension.dart';
 
 class ClassChatPowerLevels {
   static Future<Map<String, dynamic>> powerLevelOverrideForClassChat(
diff --git a/lib/pangea/utils/report_message.dart b/lib/pangea/utils/report_message.dart
index 5b6ceb0ba..e1dc2d553 100644
--- a/lib/pangea/utils/report_message.dart
+++ b/lib/pangea/utils/report_message.dart
@@ -1,6 +1,6 @@
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
-import 'package:fluffychat/pangea/extensions/client_extension.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
diff --git a/lib/pangea/widgets/chat_list/chat_list_body_text.dart b/lib/pangea/widgets/chat_list/chat_list_body_text.dart
index c8984f8d7..8e8e531ea 100644
--- a/lib/pangea/widgets/chat_list/chat_list_body_text.dart
+++ b/lib/pangea/widgets/chat_list/chat_list_body_text.dart
@@ -1,11 +1,10 @@
+import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:flutter/material.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import '../../../pages/chat_list/chat_list.dart';
 import '../../../widgets/matrix.dart';
-import '../../extensions/pangea_room_extension.dart';
+import '../../extensions/pangea_room_extension/pangea_room_extension.dart';
 
 class ChatListBodyStartText extends StatelessWidget {
   const ChatListBodyStartText({
diff --git a/lib/pangea/widgets/class/add_class_and_invite.dart b/lib/pangea/widgets/class/add_class_and_invite.dart
index 06025eaa1..45c84c506 100644
--- a/lib/pangea/widgets/class/add_class_and_invite.dart
+++ b/lib/pangea/widgets/class/add_class_and_invite.dart
@@ -1,7 +1,7 @@
 import 'dart:developer';
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart
index eb06cd26a..d3bfdbd3d 100644
--- a/lib/pangea/widgets/class/add_space_toggles.dart
+++ b/lib/pangea/widgets/class/add_space_toggles.dart
@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
index d10fd6980..1ed7b549d 100644
--- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
@@ -14,7 +14,7 @@ import 'package:matrix/matrix.dart';
 
 import '../../../widgets/matrix.dart';
 import '../../constants/pangea_event_types.dart';
-import '../../extensions/pangea_room_extension.dart';
+import '../../extensions/pangea_room_extension/pangea_room_extension.dart';
 import '../../utils/error_handler.dart';
 
 class ConversationBotSettings extends StatefulWidget {
diff --git a/lib/pangea/widgets/space/class_settings.dart b/lib/pangea/widgets/space/class_settings.dart
index c9851ff03..c9743befd 100644
--- a/lib/pangea/widgets/space/class_settings.dart
+++ b/lib/pangea/widgets/space/class_settings.dart
@@ -13,7 +13,7 @@ import '../../constants/language_keys.dart';
 import '../../constants/pangea_event_types.dart';
 import '../../controllers/language_list_controller.dart';
 import '../../controllers/pangea_controller.dart';
-import '../../extensions/pangea_room_extension.dart';
+import '../../extensions/pangea_room_extension/pangea_room_extension.dart';
 import '../../models/language_model.dart';
 import '../../utils/error_handler.dart';
 import '../user_settings/p_language_dropdown.dart';
diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart
index 781b8ab61..fb90aa8db 100644
--- a/lib/widgets/chat_settings_popup_menu.dart
+++ b/lib/widgets/chat_settings_popup_menu.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/utils/download_chat.dart';
 import 'package:flutter/material.dart';