diff --git a/lib/app_config.dart b/lib/config/app_config.dart
similarity index 100%
rename from lib/app_config.dart
rename to lib/config/app_config.dart
diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 7fd63550c..f450e36c6 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 
-import '../app_config.dart';
+import 'app_config.dart';
 
 abstract class FluffyThemes {
   static const double columnWidth = 360.0;
diff --git a/lib/controllers/homeserver_picker_controller.dart b/lib/controllers/homeserver_picker_controller.dart
index ad103d5da..b0afa5329 100644
--- a/lib/controllers/homeserver_picker_controller.dart
+++ b/lib/controllers/homeserver_picker_controller.dart
@@ -4,7 +4,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/homeserver_picker_view.dart';
 import 'package:fluffychat/views/widgets/matrix.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index 911fc1215..29df24c65 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -18,7 +18,7 @@ import 'package:universal_html/prefer_universal/html.dart' as html;
 
 import 'views/widgets/matrix.dart';
 import 'config/themes.dart';
-import 'app_config.dart';
+import 'config/app_config.dart';
 import 'utils/fluffy_client.dart';
 import 'utils/platform_infos.dart';
 import 'utils/background_push.dart';
diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
index 25d2e0bb6..5cbf26527 100644
--- a/lib/utils/background_push.dart
+++ b/lib/utils/background_push.dart
@@ -36,7 +36,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'platform_infos.dart';
-import '../app_config.dart';
+import '../config/app_config.dart';
 import '../config/setting_keys.dart';
 import 'famedlysdk_store.dart';
 import 'fluffy_client.dart';
diff --git a/lib/utils/filtered_timeline_extension.dart b/lib/utils/filtered_timeline_extension.dart
index c87fcde95..ab0edfdaa 100644
--- a/lib/utils/filtered_timeline_extension.dart
+++ b/lib/utils/filtered_timeline_extension.dart
@@ -1,6 +1,6 @@
 import 'package:famedlysdk/famedlysdk.dart';
 
-import '../app_config.dart';
+import '../config/app_config.dart';
 
 extension FilteredTimelineExtension on Timeline {
   List<Event> getFilteredEvents({Set<String> unfolded = const {}}) {
diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart
index dd6e0cedb..1e72d01a5 100644
--- a/lib/utils/platform_infos.dart
+++ b/lib/utils/platform_infos.dart
@@ -7,7 +7,7 @@ import 'package:package_info/package_info.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../app_config.dart';
+import '../config/app_config.dart';
 
 abstract class PlatformInfos {
   static bool get isWeb => kIsWeb;
diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart
index 94a8c02d5..7d8d50c91 100644
--- a/lib/utils/room_status_extension.dart
+++ b/lib/utils/room_status_extension.dart
@@ -2,7 +2,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'filtered_timeline_extension.dart';
-import '../app_config.dart';
+import '../config/app_config.dart';
 import 'date_time_extension.dart';
 
 extension RoomStatusExtension on Room {
diff --git a/lib/utils/sentry_controller.dart b/lib/utils/sentry_controller.dart
index 61090ba13..09e383711 100644
--- a/lib/utils/sentry_controller.dart
+++ b/lib/utils/sentry_controller.dart
@@ -1,5 +1,5 @@
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
 import 'package:sentry/sentry.dart';
diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart
index b4521dcb8..2c4fbc800 100644
--- a/lib/utils/url_launcher.dart
+++ b/lib/utils/url_launcher.dart
@@ -3,7 +3,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:fluffychat/views/widgets/matrix.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index 23206c26b..8c7c8c863 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -8,7 +8,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:emoji_picker/emoji_picker.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/views/widgets/avatar.dart';
 import 'package:fluffychat/views/widgets/chat_settings_popup_menu.dart';
 import 'package:fluffychat/views/widgets/connection_status_header.dart';
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index e7f497895..b5f336019 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -1,6 +1,6 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/views/widgets/avatar.dart';
 import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index e4a84ccb6..b08f69e90 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -8,7 +8,7 @@ import 'package:fluffychat/views/widgets/connection_status_header.dart';
 import 'package:fluffychat/views/widgets/list_items/chat_list_item.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/views/homeserver_picker_view.dart b/lib/views/homeserver_picker_view.dart
index ff1282792..a77b325a2 100644
--- a/lib/views/homeserver_picker_view.dart
+++ b/lib/views/homeserver_picker_view.dart
@@ -1,7 +1,7 @@
 import 'package:fluffychat/controllers/homeserver_picker_controller.dart';
 import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
 import 'package:fluffychat/views/widgets/fluffy_banner.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/views/widgets/one_page_card.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index 69aa73ded..451dc9c6f 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -10,7 +10,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
 import 'package:fluffychat/utils/beautify_string_extension.dart';
 
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/sentry_controller.dart';
 import 'package:flutter/material.dart';
@@ -24,7 +24,7 @@ import 'package:url_launcher/url_launcher.dart';
 import '../views/widgets/content_banner.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import '../views/widgets/matrix.dart';
-import '../app_config.dart';
+import '../config/app_config.dart';
 import '../config/setting_keys.dart';
 
 class Settings extends StatefulWidget {
diff --git a/lib/views/settings_notifications.dart b/lib/views/settings_notifications.dart
index d09989753..21078226b 100644
--- a/lib/views/settings_notifications.dart
+++ b/lib/views/settings_notifications.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/app_config.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
diff --git a/lib/views/settings_style.dart b/lib/views/settings_style.dart
index a1becbf57..0d1a4256d 100644
--- a/lib/views/settings_style.dart
+++ b/lib/views/settings_style.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:image_picker/image_picker.dart';
 
-import '../app_config.dart';
+import '../config/app_config.dart';
 import '../views/widgets/matrix.dart';
 
 class SettingsStyle extends StatefulWidget {
diff --git a/lib/views/widgets/default_app_bar_search_field.dart b/lib/views/widgets/default_app_bar_search_field.dart
index 0830bf344..63bbb5acf 100644
--- a/lib/views/widgets/default_app_bar_search_field.dart
+++ b/lib/views/widgets/default_app_bar_search_field.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../../app_config.dart';
+import '../../config/app_config.dart';
 
 class DefaultAppBarSearchField extends StatefulWidget {
   final TextEditingController searchController;
diff --git a/lib/views/widgets/list_items/message.dart b/lib/views/widgets/list_items/message.dart
index 21048925e..bf6f83110 100644
--- a/lib/views/widgets/list_items/message.dart
+++ b/lib/views/widgets/list_items/message.dart
@@ -7,7 +7,7 @@ import 'package:fluffychat/utils/event_extension.dart';
 import 'package:fluffychat/utils/string_color.dart';
 import 'package:flutter/material.dart';
 
-import '../../../app_config.dart';
+import '../../../config/app_config.dart';
 import '../avatar.dart';
 import '../matrix.dart';
 import '../message_reactions.dart';
diff --git a/lib/views/widgets/list_items/state_message.dart b/lib/views/widgets/list_items/state_message.dart
index 7e382da7b..91bc90dde 100644
--- a/lib/views/widgets/list_items/state_message.dart
+++ b/lib/views/widgets/list_items/state_message.dart
@@ -3,7 +3,7 @@ import 'package:fluffychat/utils/matrix_locals.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../../../app_config.dart';
+import '../../../config/app_config.dart';
 
 class StateMessage extends StatelessWidget {
   final Event event;
diff --git a/lib/views/widgets/matrix.dart b/lib/views/widgets/matrix.dart
index dec8faf2f..46a8ecb68 100644
--- a/lib/views/widgets/matrix.dart
+++ b/lib/views/widgets/matrix.dart
@@ -29,7 +29,7 @@ import '../../utils/localized_exception_extension.dart';
 import '../../utils/famedlysdk_store.dart';
 import 'dialogs/key_verification_dialog.dart';
 import '../../utils/platform_infos.dart';
-import '../../app_config.dart';
+import '../../config/app_config.dart';
 import '../../config/setting_keys.dart';
 import '../../utils/fluffy_client.dart';
 import '../../utils/background_push.dart';
diff --git a/lib/views/widgets/message_content.dart b/lib/views/widgets/message_content.dart
index 214fd9e86..652bb3edb 100644
--- a/lib/views/widgets/message_content.dart
+++ b/lib/views/widgets/message_content.dart
@@ -14,7 +14,7 @@ import 'package:matrix_link_text/link_text.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../utils/url_launcher.dart';
-import '../../app_config.dart';
+import '../../config/app_config.dart';
 import 'html_message.dart';
 import 'matrix.dart';
 import 'message_download_content.dart';
diff --git a/lib/views/widgets/reply_content.dart b/lib/views/widgets/reply_content.dart
index 99d1ac247..89ad004bc 100644
--- a/lib/views/widgets/reply_content.dart
+++ b/lib/views/widgets/reply_content.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'html_message.dart';
-import '../../app_config.dart';
+import '../../config/app_config.dart';
 
 class ReplyContent extends StatelessWidget {
   final Event replyEvent;
diff --git a/lib/views/widgets/unread_badge_back_button.dart b/lib/views/widgets/unread_badge_back_button.dart
index 8cbc2ec7f..dd1367c64 100644
--- a/lib/views/widgets/unread_badge_back_button.dart
+++ b/lib/views/widgets/unread_badge_back_button.dart
@@ -1,7 +1,7 @@
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter/material.dart';
 
-import '../../app_config.dart';
+import '../../config/app_config.dart';
 import 'matrix.dart';
 
 class UnreadBadgeBackButton extends StatelessWidget {