diff --git a/lib/api.dart b/lib/api.dart
index 251213f5b..2a1def50d 100644
--- a/lib/api.dart
+++ b/lib/api.dart
@@ -1,5 +1,13 @@
 library api;
 
+export 'package:mineral/api/common/activity.dart';
+export 'package:mineral/api/common/activity_emoji.dart';
+export 'package:mineral/api/common/bot.dart';
+export 'package:mineral/api/common/channel.dart';
+export 'package:mineral/api/common/channel_methods.dart';
+export 'package:mineral/api/common/channel_permission_overwrite.dart';
+export 'package:mineral/api/common/channel_properties.dart';
+export 'package:mineral/api/common/color.dart';
 // Commons
 export 'package:mineral/api/common/commands/builder/command_builder.dart';
 export 'package:mineral/api/common/commands/builder/command_declaration_builder.dart';
@@ -7,7 +15,6 @@ export 'package:mineral/api/common/commands/builder/command_definition_builder.d
 export 'package:mineral/api/common/commands/builder/command_group_builder.dart';
 export 'package:mineral/api/common/commands/builder/sub_command_builder.dart';
 export 'package:mineral/api/common/commands/builder/translation.dart';
-
 export 'package:mineral/api/common/commands/command_choice_option.dart';
 export 'package:mineral/api/common/commands/command_context_type.dart';
 export 'package:mineral/api/common/commands/command_contract.dart';
@@ -17,21 +24,16 @@ export 'package:mineral/api/common/commands/command_helper.dart';
 export 'package:mineral/api/common/commands/command_option.dart';
 export 'package:mineral/api/common/commands/command_option_type.dart';
 export 'package:mineral/api/common/commands/command_type.dart';
-
 export 'package:mineral/api/common/components/buttons/button_builder.dart';
 export 'package:mineral/api/common/components/buttons/button_type.dart';
-
+export 'package:mineral/api/common/components/component_type.dart';
 export 'package:mineral/api/common/components/dialogs/dialog_builder.dart';
 export 'package:mineral/api/common/components/dialogs/dialog_element.dart';
 export 'package:mineral/api/common/components/dialogs/dialog_element_type.dart';
-
 export 'package:mineral/api/common/components/menus/select_menu_builder.dart';
 export 'package:mineral/api/common/components/menus/select_menu_option.dart';
-
-export 'package:mineral/api/common/components/component_type.dart';
 export 'package:mineral/api/common/components/message_component.dart';
 export 'package:mineral/api/common/components/row_builder.dart';
-
 export 'package:mineral/api/common/embed/message_embed.dart';
 export 'package:mineral/api/common/embed/message_embed_assets.dart';
 export 'package:mineral/api/common/embed/message_embed_author.dart';
@@ -42,30 +44,6 @@ export 'package:mineral/api/common/embed/message_embed_footer.dart';
 export 'package:mineral/api/common/embed/message_embed_image.dart';
 export 'package:mineral/api/common/embed/message_embed_provider.dart';
 export 'package:mineral/api/common/embed/message_embed_type.dart';
-
-export 'package:mineral/api/common/polls/poll.dart';
-export 'package:mineral/api/common/polls/poll_answer.dart';
-export 'package:mineral/api/common/polls/poll_builder.dart';
-export 'package:mineral/api/common/polls/poll_layout.dart';
-export 'package:mineral/api/common/polls/poll_question.dart';
-
-export 'package:mineral/api/common/types/activity_type.dart';
-export 'package:mineral/api/common/types/channel_type.dart';
-export 'package:mineral/api/common/types/enhanced_enum.dart';
-export 'package:mineral/api/common/types/format_type.dart';
-export 'package:mineral/api/common/types/interaction_type.dart';
-export 'package:mineral/api/common/types/message_flag_type.dart';
-export 'package:mineral/api/common/types/status_type.dart';
-export 'package:mineral/api/common/types/sticker_type.dart';
-
-export 'package:mineral/api/common/activity.dart';
-export 'package:mineral/api/common/activity_emoji.dart';
-export 'package:mineral/api/common/bot.dart';
-export 'package:mineral/api/common/channel.dart';
-export 'package:mineral/api/common/channel_methods.dart';
-export 'package:mineral/api/common/channel_permission_overwrite.dart';
-export 'package:mineral/api/common/channel_properties.dart';
-export 'package:mineral/api/common/color.dart';
 export 'package:mineral/api/common/emoji.dart';
 export 'package:mineral/api/common/image_asset.dart';
 export 'package:mineral/api/common/lang.dart';
@@ -75,22 +53,32 @@ export 'package:mineral/api/common/message_type.dart';
 export 'package:mineral/api/common/partial_application.dart';
 export 'package:mineral/api/common/partial_emoji.dart';
 export 'package:mineral/api/common/permission.dart';
+export 'package:mineral/api/common/polls/poll.dart';
+export 'package:mineral/api/common/polls/poll_answer.dart';
+export 'package:mineral/api/common/polls/poll_builder.dart';
+export 'package:mineral/api/common/polls/poll_layout.dart';
+export 'package:mineral/api/common/polls/poll_question.dart';
 export 'package:mineral/api/common/premium_tier.dart';
 export 'package:mineral/api/common/presence.dart';
 export 'package:mineral/api/common/snowflake.dart';
 export 'package:mineral/api/common/sticker.dart';
+export 'package:mineral/api/common/types/activity_type.dart';
+export 'package:mineral/api/common/types/channel_type.dart';
+export 'package:mineral/api/common/types/enhanced_enum.dart';
+export 'package:mineral/api/common/types/format_type.dart';
+export 'package:mineral/api/common/types/interaction_type.dart';
+export 'package:mineral/api/common/types/message_flag_type.dart';
+export 'package:mineral/api/common/types/status_type.dart';
+export 'package:mineral/api/common/types/sticker_type.dart';
 export 'package:mineral/api/common/video_quality.dart';
-
 // Private
 export 'package:mineral/api/private/channels/private_channel.dart';
 export 'package:mineral/api/private/channels/private_group_channel.dart';
 export 'package:mineral/api/private/private_message.dart';
 export 'package:mineral/api/private/user.dart';
 export 'package:mineral/api/private/user_assets.dart';
-
 // Server
 export 'package:mineral/api/server/builders/member_builder.dart';
-
 export 'package:mineral/api/server/channels/server_announcement_channel.dart';
 export 'package:mineral/api/server/channels/server_category_channel.dart';
 export 'package:mineral/api/server/channels/server_channel.dart';
@@ -98,7 +86,6 @@ export 'package:mineral/api/server/channels/server_forum_channel.dart';
 export 'package:mineral/api/server/channels/server_stage_channel.dart';
 export 'package:mineral/api/server/channels/server_text_channel.dart';
 export 'package:mineral/api/server/channels/server_voice_channel.dart';
-
 export 'package:mineral/api/server/enums/default_message_notification.dart';
 export 'package:mineral/api/server/enums/explicit_content_filter.dart';
 export 'package:mineral/api/server/enums/forum_layout_types.dart';
@@ -108,14 +95,12 @@ export 'package:mineral/api/server/enums/nsfw_level.dart';
 export 'package:mineral/api/server/enums/sort_order_forum.dart';
 export 'package:mineral/api/server/enums/system_channel_flag.dart';
 export 'package:mineral/api/server/enums/verification_level.dart';
-
 export 'package:mineral/api/server/managers/channel_manager.dart';
 export 'package:mineral/api/server/managers/emoji_manager.dart';
 export 'package:mineral/api/server/managers/member_manager.dart';
 export 'package:mineral/api/server/managers/member_role_manager.dart';
 export 'package:mineral/api/server/managers/role_manager.dart';
 export 'package:mineral/api/server/managers/sticker_manager.dart';
-
 export 'package:mineral/api/server/member.dart';
 export 'package:mineral/api/server/member_assets.dart';
 export 'package:mineral/api/server/member_flags.dart';
diff --git a/lib/api/server/channels/server_announcement_channel.dart b/lib/api/server/channels/server_announcement_channel.dart
index 1a6b106e2..10c66a0c4 100644
--- a/lib/api/server/channels/server_announcement_channel.dart
+++ b/lib/api/server/channels/server_announcement_channel.dart
@@ -1,14 +1,6 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_methods.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
 import 'package:mineral/api/common/managers/message_manager.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/server/channels/server_category_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
-import 'package:mineral/api/server/server_message.dart';
 
 final class ServerAnnouncementChannel extends ServerChannel {
   final ChannelProperties _properties;
diff --git a/lib/api/server/channels/server_category_channel.dart b/lib/api/server/channels/server_category_channel.dart
index 1a3250238..0679b57e8 100644
--- a/lib/api/server/channels/server_category_channel.dart
+++ b/lib/api/server/channels/server_category_channel.dart
@@ -1,10 +1,4 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_methods.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
 
 final class ServerCategoryChannel extends ServerChannel {
diff --git a/lib/api/server/channels/server_forum_channel.dart b/lib/api/server/channels/server_forum_channel.dart
index e0f24ef66..003bc50e5 100644
--- a/lib/api/server/channels/server_forum_channel.dart
+++ b/lib/api/server/channels/server_forum_channel.dart
@@ -1,12 +1,4 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/server/channels/server_category_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
-import 'package:mineral/api/server/enums/forum_layout_types.dart';
-import 'package:mineral/api/server/enums/sort_order_forum.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
 
 final class ServerForumChannel extends ServerChannel {
diff --git a/lib/api/server/channels/server_stage_channel.dart b/lib/api/server/channels/server_stage_channel.dart
index 02f3d8b00..79ebf6558 100644
--- a/lib/api/server/channels/server_stage_channel.dart
+++ b/lib/api/server/channels/server_stage_channel.dart
@@ -1,16 +1,6 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_methods.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
-import 'package:mineral/api/common/embed/message_embed.dart';
 import 'package:mineral/api/common/managers/message_manager.dart';
-import 'package:mineral/api/common/polls/poll.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/server/channels/server_category_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
-import 'package:mineral/api/server/server_message.dart';
 
 final class ServerStageChannel extends ServerChannel {
   final ChannelProperties _properties;
diff --git a/lib/api/server/channels/server_text_channel.dart b/lib/api/server/channels/server_text_channel.dart
index 331f222e3..3d07fda5d 100644
--- a/lib/api/server/channels/server_text_channel.dart
+++ b/lib/api/server/channels/server_text_channel.dart
@@ -1,17 +1,6 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_methods.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
-import 'package:mineral/api/common/components/message_component.dart';
-import 'package:mineral/api/common/embed/message_embed.dart';
 import 'package:mineral/api/common/managers/message_manager.dart';
-import 'package:mineral/api/common/polls/poll.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/server/channels/server_category_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
-import 'package:mineral/api/server/server_message.dart';
 
 final class ServerTextChannel extends ServerChannel {
   final ChannelProperties _properties;
diff --git a/lib/api/server/channels/server_voice_channel.dart b/lib/api/server/channels/server_voice_channel.dart
index f1f4eebd5..778694d9d 100644
--- a/lib/api/server/channels/server_voice_channel.dart
+++ b/lib/api/server/channels/server_voice_channel.dart
@@ -1,15 +1,6 @@
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel_methods.dart';
-import 'package:mineral/api/common/channel_permission_overwrite.dart';
-import 'package:mineral/api/common/channel_properties.dart';
 import 'package:mineral/api/common/managers/message_manager.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
-import 'package:mineral/api/common/video_quality.dart';
-import 'package:mineral/api/server/channels/server_category_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/managers/threads_manager.dart';
-import 'package:mineral/api/server/server_message.dart';
 
 final class ServerVoiceChannel extends ServerChannel {
   final ChannelProperties _properties;
diff --git a/lib/domains/events/buckets/server_bucket.dart b/lib/domains/events/buckets/server_bucket.dart
index 5f321a31a..b06198ebd 100644
--- a/lib/domains/events/buckets/server_bucket.dart
+++ b/lib/domains/events/buckets/server_bucket.dart
@@ -1,10 +1,3 @@
-import 'package:mineral/domains/events/contracts/server/server_thread_create_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_delete_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_member_add_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_member_remove_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_member_update_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_update_event.dart';
-import 'package:mineral/domains/events/event_bucket.dart';
 import 'package:mineral/domains/events/contracts/server/server_ban_add_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_ban_remove_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_button_click_event.dart';
@@ -29,8 +22,15 @@ import 'package:mineral/domains/events/contracts/server/server_roles_remove_even
 import 'package:mineral/domains/events/contracts/server/server_roles_update_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_stickers_update_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_text_select_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_create_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_delete_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_member_add_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_member_remove_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_member_update_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_update_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_update_event.dart';
 import 'package:mineral/domains/events/event.dart';
+import 'package:mineral/domains/events/event_bucket.dart';
 
 final class ServerBucket {
   final EventBucket _events;
diff --git a/lib/domains/events/contracts/server/server_thread_member_add_event.dart b/lib/domains/events/contracts/server/server_thread_member_add_event.dart
index e9441021e..14899e5a0 100644
--- a/lib/domains/events/contracts/server/server_thread_member_add_event.dart
+++ b/lib/domains/events/contracts/server/server_thread_member_add_event.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:mineral/api.dart';
 import 'package:mineral/api/server/channels/thread_channel.dart';
-import 'package:mineral/api/server/server.dart';
 import 'package:mineral/domains/events/event.dart';
 import 'package:mineral/domains/events/types/listenable_event.dart';
 
diff --git a/lib/domains/events/contracts/server/server_thread_member_remove_event.dart b/lib/domains/events/contracts/server/server_thread_member_remove_event.dart
index 2cbfd2c52..d1cf2d748 100644
--- a/lib/domains/events/contracts/server/server_thread_member_remove_event.dart
+++ b/lib/domains/events/contracts/server/server_thread_member_remove_event.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:mineral/api.dart';
 import 'package:mineral/api/server/channels/thread_channel.dart';
-import 'package:mineral/api/server/server.dart';
 import 'package:mineral/domains/events/event.dart';
 import 'package:mineral/domains/events/types/listenable_event.dart';
 
diff --git a/lib/domains/events/contracts/server/server_thread_member_update_event.dart b/lib/domains/events/contracts/server/server_thread_member_update_event.dart
index 2d11d7a65..844ca4c7c 100644
--- a/lib/domains/events/contracts/server/server_thread_member_update_event.dart
+++ b/lib/domains/events/contracts/server/server_thread_member_update_event.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:mineral/api.dart';
 import 'package:mineral/api/server/channels/thread_channel.dart';
-import 'package:mineral/api/server/server.dart';
 import 'package:mineral/domains/events/event.dart';
 import 'package:mineral/domains/events/types/listenable_event.dart';
 
diff --git a/lib/domains/events/event.dart b/lib/domains/events/event.dart
index 0b4742324..48f060319 100644
--- a/lib/domains/events/event.dart
+++ b/lib/domains/events/event.dart
@@ -32,8 +32,8 @@ import 'package:mineral/domains/events/contracts/server/server_roles_create_even
 import 'package:mineral/domains/events/contracts/server/server_roles_remove_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_roles_update_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_stickers_update_event.dart';
-import 'package:mineral/domains/events/contracts/server/server_thread_create_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_text_select_event.dart';
+import 'package:mineral/domains/events/contracts/server/server_thread_create_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_thread_delete_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_thread_list_sync_event.dart';
 import 'package:mineral/domains/events/contracts/server/server_thread_member_add_event.dart';
diff --git a/lib/events.dart b/lib/events.dart
index ee6c5e3b9..dc78e8ff6 100644
--- a/lib/events.dart
+++ b/lib/events.dart
@@ -1,7 +1,6 @@
 library events;
 
 export 'package:mineral/domains/events/contracts/common/ready_event.dart';
-
 export 'package:mineral/domains/events/contracts/private/private_button_click_event.dart';
 export 'package:mineral/domains/events/contracts/private/private_channel_create_event.dart';
 export 'package:mineral/domains/events/contracts/private/private_channel_delete_event.dart';
@@ -11,7 +10,6 @@ export 'package:mineral/domains/events/contracts/private/private_dialog_submit_e
 export 'package:mineral/domains/events/contracts/private/private_message_create_event.dart';
 export 'package:mineral/domains/events/contracts/private/private_text_select_event.dart';
 export 'package:mineral/domains/events/contracts/private/private_user_select_event.dart';
-
 export 'package:mineral/domains/events/contracts/server/server_ban_add_event.dart';
 export 'package:mineral/domains/events/contracts/server/server_ban_remove_event.dart';
 export 'package:mineral/domains/events/contracts/server/server_button_click_event.dart';
diff --git a/lib/infrastructure/internals/datastore/parts/channel_part.dart b/lib/infrastructure/internals/datastore/parts/channel_part.dart
index dab194f7b..b5e836139 100644
--- a/lib/infrastructure/internals/datastore/parts/channel_part.dart
+++ b/lib/infrastructure/internals/datastore/parts/channel_part.dart
@@ -2,14 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:mineral/api.dart';
-import 'package:mineral/api/common/channel.dart';
-import 'package:mineral/api/common/components/message_component.dart';
-import 'package:mineral/api/common/embed/message_embed.dart';
-import 'package:mineral/api/common/message.dart';
-import 'package:mineral/api/common/polls/poll.dart';
-import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/private/channels/private_channel.dart';
-import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/channels/thread_channel.dart';
 import 'package:mineral/infrastructure/commons/helper.dart';
 import 'package:mineral/infrastructure/internals/datastore/data_store_part.dart';
diff --git a/lib/infrastructure/internals/marshaller/serializer_bucket.dart b/lib/infrastructure/internals/marshaller/serializer_bucket.dart
index 6f8dfc85a..b096cdb22 100644
--- a/lib/infrastructure/internals/marshaller/serializer_bucket.dart
+++ b/lib/infrastructure/internals/marshaller/serializer_bucket.dart
@@ -6,8 +6,8 @@ import 'package:mineral/api/common/polls/poll.dart';
 import 'package:mineral/api/common/sticker.dart';
 import 'package:mineral/api/private/private_message.dart';
 import 'package:mineral/api/private/user.dart';
-import 'package:mineral/api/server/channels/thread_channel.dart';
 import 'package:mineral/api/private/user_assets.dart';
+import 'package:mineral/api/server/channels/thread_channel.dart';
 import 'package:mineral/api/server/member.dart';
 import 'package:mineral/api/server/member_assets.dart';
 import 'package:mineral/api/server/role.dart';
@@ -32,8 +32,8 @@ import 'package:mineral/infrastructure/internals/marshaller/serializers/server_s
 import 'package:mineral/infrastructure/internals/marshaller/serializers/server_settings_serializer.dart';
 import 'package:mineral/infrastructure/internals/marshaller/serializers/server_subscription_serializer.dart';
 import 'package:mineral/infrastructure/internals/marshaller/serializers/sticker_serializer.dart';
-import 'package:mineral/infrastructure/internals/marshaller/serializers/user_assets_serializer.dart';
 import 'package:mineral/infrastructure/internals/marshaller/serializers/thread_serializer.dart';
+import 'package:mineral/infrastructure/internals/marshaller/serializers/user_assets_serializer.dart';
 import 'package:mineral/infrastructure/internals/marshaller/serializers/user_serializer.dart';
 import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';