diff --git a/lib/api.dart b/lib/api.dart
index 88db5468..436357bf 100644
--- a/lib/api.dart
+++ b/lib/api.dart
@@ -27,21 +27,22 @@ export 'package:mineral/src/api/common/commands/command_helper.dart';
 export 'package:mineral/src/api/common/commands/command_option.dart';
 export 'package:mineral/src/api/common/commands/command_option_type.dart';
 export 'package:mineral/src/api/common/commands/command_type.dart';
+export 'package:mineral/src/api/common/components/action_row.dart';
+export 'package:mineral/src/api/common/components/attached_file.dart';
+// Commons
+export 'package:mineral/src/api/common/components/builder/message_builder.dart';
+export 'package:mineral/src/api/common/components/builder/modal_builder.dart';
+export 'package:mineral/src/api/common/components/button.dart';
 export 'package:mineral/src/api/common/components/component.dart';
-export 'package:mineral/src/api/common/components/component_type.dart';
+export 'package:mineral/src/api/common/components/media_gallery.dart';
 export 'package:mineral/src/api/common/components/media_item.dart';
-// Commons
-export 'package:mineral/src/api/common/components/message/message_builder.dart';
-export 'package:mineral/src/api/common/components/message/message_button.dart';
-export 'package:mineral/src/api/common/components/message/message_file.dart';
-export 'package:mineral/src/api/common/components/message/message_gallery.dart';
-export 'package:mineral/src/api/common/components/message/message_row_builder.dart';
-export 'package:mineral/src/api/common/components/message/message_section.dart';
-export 'package:mineral/src/api/common/components/message/message_separator.dart';
-export 'package:mineral/src/api/common/components/message/message_thumbnail.dart';
-export 'package:mineral/src/api/common/components/modal/modal_builder.dart';
-export 'package:mineral/src/api/common/components/modal/modal_text_input.dart';
-export 'package:mineral/src/api/common/components/shared/select_menu.dart';
+export 'package:mineral/src/api/common/components/message_component.dart';
+export 'package:mineral/src/api/common/components/message_thumbnail.dart';
+export 'package:mineral/src/api/common/components/modal_component.dart';
+export 'package:mineral/src/api/common/components/section.dart';
+export 'package:mineral/src/api/common/components/select_menu.dart';
+export 'package:mineral/src/api/common/components/separator.dart';
+export 'package:mineral/src/api/common/components/text_input.dart';
 export 'package:mineral/src/api/common/embed/message_embed.dart';
 export 'package:mineral/src/api/common/embed/message_embed_assets.dart';
 export 'package:mineral/src/api/common/embed/message_embed_author.dart';
diff --git a/lib/events.dart b/lib/events.dart
index 8c02e5d8..bcd76234 100644
--- a/lib/events.dart
+++ b/lib/events.dart
@@ -11,12 +11,12 @@ export 'package:mineral/src/domains/events/contracts/private/private_channel_cre
 export 'package:mineral/src/domains/events/contracts/private/private_channel_delete_event.dart';
 export 'package:mineral/src/domains/events/contracts/private/private_channel_pins_update_event.dart';
 export 'package:mineral/src/domains/events/contracts/private/private_channel_update_event.dart';
-export 'package:mineral/src/domains/events/contracts/private/private_modal_submit_event.dart';
 export 'package:mineral/src/domains/events/contracts/private/private_message_create_event.dart';
-export 'package:mineral/src/domains/events/contracts/private/private_text_select_event.dart';
-export 'package:mineral/src/domains/events/contracts/private/private_user_select_event.dart';
 export 'package:mineral/src/domains/events/contracts/private/private_message_reaction_add_event.dart';
 export 'package:mineral/src/domains/events/contracts/private/private_message_reaction_remove_event.dart';
+export 'package:mineral/src/domains/events/contracts/private/private_modal_submit_event.dart';
+export 'package:mineral/src/domains/events/contracts/private/private_text_select_event.dart';
+export 'package:mineral/src/domains/events/contracts/private/private_user_select_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_ban_add_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_ban_remove_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_button_click_event.dart';
@@ -27,7 +27,6 @@ export 'package:mineral/src/domains/events/contracts/server/server_channel_selec
 export 'package:mineral/src/domains/events/contracts/server/server_channel_update_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_create_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_delete_event.dart';
-export 'package:mineral/src/domains/events/contracts/server/server_modal_submit_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_emojis_update_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_member_add_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_member_remove_event.dart';
@@ -36,6 +35,7 @@ export 'package:mineral/src/domains/events/contracts/server/server_member_update
 export 'package:mineral/src/domains/events/contracts/server/server_message_create_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_message_reaction_add_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_message_reaction_remove_event.dart';
+export 'package:mineral/src/domains/events/contracts/server/server_modal_submit_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_presence_update_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_role_select_event.dart';
 export 'package:mineral/src/domains/events/contracts/server/server_roles_create_event.dart';
diff --git a/lib/src/api/common/components/message/message_row_builder.dart b/lib/src/api/common/components/action_row.dart
similarity index 71%
rename from lib/src/api/common/components/message/message_row_builder.dart
rename to lib/src/api/common/components/action_row.dart
index 9840b323..25b13d76 100644
--- a/lib/src/api/common/components/message/message_row_builder.dart
+++ b/lib/src/api/common/components/action_row.dart
@@ -1,9 +1,9 @@
 import 'package:mineral/api.dart';
 
-final class MessageRowBuilder implements Component {
+final class ActionRow implements MessageComponent {
   final List<Component> components;
 
-  MessageRowBuilder({this.components = const []});
+  ActionRow({this.components = const []});
 
   @override
   Map<String, dynamic> toJson() {
diff --git a/lib/src/api/common/components/attached_file.dart b/lib/src/api/common/components/attached_file.dart
new file mode 100644
index 00000000..2b673c2e
--- /dev/null
+++ b/lib/src/api/common/components/attached_file.dart
@@ -0,0 +1,133 @@
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+import 'package:mineral/api.dart';
+
+final class AttachedFile implements MessageComponent {
+  ComponentType get type => ComponentType.file;
+
+  MediaItem item;
+
+  AttachedFile._(this.item);
+
+  /// Creates an [AttachedFile] from a local file.
+  ///
+  /// Example:
+  /// ```dart
+  /// final file = File('assets/image.png');
+  /// final attachedFile = AttachedFile.fromFile(file, 'image.png', spoiler: false);
+  /// ```
+  factory AttachedFile.fromFile(
+    File file,
+    String name, {
+    bool? spoiler,
+    String? proxyUrl,
+    int? height,
+    int? width,
+    String? contentType,
+    String? description,
+  }) {
+    final mediaItem = MediaItem.fromFile(
+      file,
+      name,
+      spoiler: spoiler,
+      proxyUrl: proxyUrl,
+      height: height,
+      width: width,
+      contentType: contentType,
+      description: description,
+    );
+    return AttachedFile._(mediaItem);
+  }
+
+  /// Creates an [AttachedFile] from a [MediaItem].
+  ///
+  /// If the [MediaItem] was created using [MediaItem.fromNetwork] and doesn't
+  /// have bytes yet, this method will fetch the file from the network URL.
+  ///
+  /// Example:
+  /// ```dart
+  /// final mediaItem = MediaItem.fromNetwork('https://example.com/image.png');
+  /// final attachedFile = await AttachedFile.fromMediaItem(mediaItem);
+  /// ```
+  static Future<AttachedFile> fromMediaItem(MediaItem mediaItem) async {
+    // If bytes are already present (e.g., from MediaItem.fromFile), use them directly
+    if (mediaItem.bytes != null) {
+      return AttachedFile._(mediaItem);
+    }
+
+    // If no bytes, fetch from the network URL
+    final uri = Uri.parse(mediaItem.url);
+    final response = await http.get(uri);
+
+    // Extract filename from the URL or use a default
+    final name =
+        uri.pathSegments.isNotEmpty ? uri.pathSegments.last : 'file.txt';
+
+    // Create a new MediaItem with the fetched bytes and attachment:// URL
+    final media = MediaItem.fromNetwork(
+      'attachment://$name',
+      spoiler: mediaItem.spoiler,
+      proxyUrl: mediaItem.proxyUrl,
+      height: mediaItem.height,
+      width: mediaItem.width,
+      contentType: mediaItem.contentType,
+      description: mediaItem.description,
+    )..bytes = response.bodyBytes;
+
+    return AttachedFile._(media);
+  }
+
+  /// Creates an [AttachedFile] by fetching a file from a network URL.
+  ///
+  /// This method downloads the file from the specified [url] and prepares it
+  /// for attachment to a Discord message. The file is automatically converted
+  /// to use Discord's `attachment://` protocol with the provided [name].
+  ///
+  /// Example:
+  /// ```dart
+  /// final attachedFile = await AttachedFile.fromNetwork(
+  ///   'https://example.com/data/data.json',
+  ///   'data.json',
+  ///   spoiler: true,
+  /// );
+  ///
+  /// final builder = MessageBuilder()
+  ///   ..addText('Check out these datas!')
+  ///   ..addFile(attachedFile);
+  /// ```
+  static Future<AttachedFile> fromNetwork(
+    String url,
+    String name, {
+    bool? spoiler,
+    String? proxyUrl,
+    int? height,
+    int? width,
+    String? contentType,
+    String? description,
+  }) async {
+    // Fetch bytes from the network URL
+    final uri = Uri.parse(url);
+    final response = await http.get(uri);
+
+    // Create a MediaItem with the fetched bytes
+    final media = MediaItem.fromNetwork(
+      'attachment://$name',
+      spoiler: spoiler,
+      proxyUrl: proxyUrl,
+      height: height,
+      width: width,
+      contentType: contentType,
+      description: description,
+    )
+      ..bytes = response.bodyBytes
+      ..spoiler = spoiler;
+
+    return AttachedFile._(media);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {'type': type.value, ...item.toJson()};
+  }
+}
diff --git a/lib/src/api/common/components/builder/message_builder.dart b/lib/src/api/common/components/builder/message_builder.dart
new file mode 100644
index 00000000..9087e620
--- /dev/null
+++ b/lib/src/api/common/components/builder/message_builder.dart
@@ -0,0 +1,539 @@
+import 'package:mineral/api.dart';
+import 'package:mineral/src/api/common/components/container.dart';
+import 'package:mineral/src/api/common/components/text_display.dart';
+
+/// A builder for constructing Discord messages using message components v2.
+///
+/// The [MessageBuilder] provides a fluent API for composing messages with [TextDisplay],
+/// interactive elements [Button], [SelectMenu], media [AttachedFile], [MediaGallery],
+/// and layout components [Section], [Container], [Separator] using Discord's
+/// message components v2 specification.
+///
+/// ## Usage
+///
+/// Create a builder and add components using the cascade operator or method chaining:
+///
+/// ```dart
+/// final builder = MessageBuilder()
+///   ..addText('# Welcome to our server!')
+///   ..addSeparator()
+///   ..addText('Please read the rules before posting.')
+///   ..addButtons([
+///     MessageButton.primary('accept_rules', label: 'Accept Rules'),
+///     MessageButton.secondary('learn_more', label: 'Learn More'),
+///   ]);
+///
+/// builder.addText("-# PS: Dont forget to have fun!");
+///
+/// // Send the message
+/// await channel.send(builder);
+/// ```
+///
+/// ## Features
+///
+/// - **Text & Formatting**: Add markdown-formatted text and separators
+/// - **Interactive Components**: Buttons and select menus for user interaction
+/// - **Media**: Attach files and create image galleries
+/// - **Layout**: Organize content with sections and containers
+/// - **Composition**: Combine multiple builders or copy existing ones
+///
+/// ## Examples
+///
+/// ### Simple text message
+///
+/// ```dart
+/// final message = MessageBuilder.text('Hello, world!');
+/// ```
+///
+/// ### Message with buttons
+///
+/// ```dart
+/// final builder = MessageBuilder()
+///   ..addText('Choose an option:')
+///   ..addButtons([
+///     MessageButton.primary('option_1', label: 'Option 1'),
+///     MessageButton.secondary('option_2', label: 'Option 2'),
+///     MessageButton.danger('cancel', label: 'Cancel'),
+///   ]);
+/// ```
+///
+/// ### Message with file attachments
+///
+/// ```dart
+/// // Using MediaItem
+/// final mediaFromFile = MediaItem.fromFile(File('assets/logo.png'), 'logo.png');
+/// final mediaFromNetwork = MediaItem.fromNetwork('https://example.com/image.jpg');
+///
+/// final builder = MessageBuilder()
+///   ..addText('Check out these images:')
+///   ..addFile(await AttachedFile.fromMediaItem(mediaFromFile))
+///   ..addFile(await AttachedFile.fromMediaItem(mediaFromNetwork));
+///
+/// // Or use the convenience factory
+/// final builder2 = MessageBuilder()
+///   ..addText('Another way:')
+///   ..addFile(AttachedFile.fromFile(File('assets/logo.png'), 'logo.png'))
+///   ..addFile(await AttachedFile.fromNetwork('https://example.com/image.jpg', 'image.jpg));
+/// ```
+///
+/// ### Using containers for visual grouping
+///
+/// ```dart
+/// final container = MessageBuilder()
+///   ..addText('This is inside a container')
+///   ..addText('With multiple lines')
+///   ..addText('And even interactive components')
+///   ..addButton(MessageButton.primary('click_me', label: 'Click Me!'));
+///
+/// final builder = MessageBuilder()
+///   ..addText('Main message')
+///   ..addContainer(
+///     builder: container,
+///     color: Color.blue,
+///     spoiler: false,
+///   );
+/// ```
+final class MessageBuilder {
+  final List<MessageComponent> _components = [];
+
+  /// Creates an empty [MessageBuilder].
+  MessageBuilder();
+
+  /// Creates a [MessageBuilder] with initial text content.
+  ///
+  /// This factory constructor is a convenience for creating a builder with
+  /// a single text component.
+  ///
+  /// Example:
+  /// ```dart
+  /// final builder = MessageBuilder.text('Hello, world!');
+  ///
+  /// // Equivalent to:
+  /// final builder = MessageBuilder()..addText('Hello, world!');
+  /// ```
+  factory MessageBuilder.text(String text) {
+    return MessageBuilder()..addText(text);
+  }
+
+  /// Adds a single button to the message.
+  ///
+  /// Each button is automatically wrapped in an [ActionRow].
+  ///
+  /// Example:
+  /// ```dart
+  /// builder.addButton(
+  ///   MessageButton.primary('confirm', label: 'Confirm'),
+  /// );
+  /// ```
+  ///
+  /// See also:
+  /// - [addButtons] to add multiple buttons in a single row
+  /// - [Button] for button types and options
+  void addButton(Button button) {
+    final row = ActionRow(components: [button]);
+    _components.add(row);
+  }
+
+  /// Adds multiple buttons in a single row.
+  ///
+  /// Discord supports up to 5 buttons per action row. If you need more buttons,
+  /// call this method multiple times to create separate rows.
+  ///
+  /// Example:
+  /// ```dart
+  /// builder.addButtons([
+  ///   MessageButton.primary('yes', label: 'Yes'),
+  ///   MessageButton.secondary('no', label: 'No'),
+  ///   MessageButton.danger('cancel', label: 'Cancel'),
+  /// ]);
+  /// ```
+  ///
+  /// Throws an [ArgumentError] if more than 5 buttons are provided.
+  ///
+  /// See also:
+  /// - [addButton] to add a single button
+  void addButtons(List<Button> buttons) {
+    if (buttons.length > 5) {
+      throw ArgumentError.value(
+        buttons.length,
+        'buttons',
+        'A row can contain at most 5 buttons (received ${buttons.length}).',
+      );
+    }
+
+    final row = ActionRow(components: buttons);
+    _components.add(row);
+  }
+
+  /// Adds a container with nested content.
+  ///
+  /// Containers provide visual grouping with optional color theming and
+  /// spoiler protection. The nested [builder] must not contain components that
+  /// are top-level-only like [AttachedFile] or [Section].
+  ///
+  /// Example:
+  /// ```dart
+  /// final nested = MessageBuilder()
+  ///   ..addText('This content is in a container')
+  ///   ..addText('With a blue background');
+  ///
+  /// builder.addContainer(
+  ///   builder: nested,
+  ///   color: Color.blue,
+  ///   spoiler: false,
+  /// );
+  /// ```
+  void addContainer({
+    required MessageBuilder builder,
+    Color? color,
+    bool? spoiler,
+  }) {
+    _components.add(Container(color, spoiler, builder));
+  }
+
+  /// Attaches a file to the message.
+  ///
+  /// Files can be attached from local files or network URLs using various
+  /// [AttachedFile] factory constructors. Each file attachment can include
+  /// optional metadata such as spoiler flags, dimensions, and descriptions.
+  ///
+  /// Example:
+  /// ```dart
+  /// // From local file
+  /// builder.addFile(
+  ///   AttachedFile.fromFile(
+  ///     File('assets/document.pdf'),
+  ///     'document.pdf',
+  ///     description: 'Monthly report',
+  ///   ),
+  /// );
+  ///
+  /// // From network URL
+  /// builder.addFile(
+  ///   await AttachedFile.fromNetwork(
+  ///     'https://example.com/image.png',
+  ///     'image.png',
+  ///     spoiler: true,
+  ///   ),
+  /// );
+  ///
+  /// // From MediaItem
+  /// final mediaItem = MediaItem.fromFile(File('assets/logo.png'), 'logo.png');
+  /// builder.addFile(await AttachedFile.fromMediaItem(mediaItem));
+  /// ```
+  ///
+  /// See also:
+  /// - [addGallery] for displaying multiple images in a grid
+  /// - [AttachedFile.fromFile] for attaching local files
+  /// - [AttachedFile.fromNetwork] for downloading and attaching remote files
+  /// - [AttachedFile.fromMediaItem] for converting [MediaItem] instances
+  void addFile(AttachedFile file) {
+    _components.add(file);
+  }
+
+  /// Adds a media gallery to the message.
+  ///
+  /// Galleries display multiple images in a grid layout, providing a more
+  /// compact and visually appealing way to show multiple media items. This
+  /// method directly accepts a list of [MediaItem] instances.
+  ///
+  /// Discord supports up to 10 items per gallery. The gallery must contain
+  /// at least one item.
+  ///
+  /// Example:
+  /// ```dart
+  /// // Create gallery from local files
+  /// builder.addGallery([
+  ///   MediaItem.fromFile(File('assets/image1.png'), 'image1.png'),
+  ///   MediaItem.fromFile(File('assets/image2.png'), 'image2.png'),
+  ///   MediaItem.fromFile(File('assets/image3.png'), 'image3.png'),
+  /// ]);
+  ///
+  /// // Mix local and network sources with metadata
+  /// builder.addGallery([
+  ///   MediaItem.fromFile(
+  ///     File('assets/local.png'),
+  ///     'local.png',
+  ///     description: 'Local image',
+  ///   ),
+  ///   MediaItem.fromNetwork(
+  ///     'https://example.com/remote.jpg',
+  ///     description: 'Remote image',
+  ///     spoiler: true,
+  ///   ),
+  /// ]);
+  /// ```
+  ///
+  /// Throws:
+  /// - [ArgumentError] if the list is empty
+  /// - [ArgumentError] if the list contains more than 10 items
+  ///
+  /// See also:
+  /// - [addFile] for single file attachments
+  /// - [MediaItem.fromFile] for creating media items from local files
+  /// - [MediaItem.fromNetwork] for creating media items from URLs
+  void addGallery(List<MediaItem> items) {
+    _components.add(MediaGallery(items: items));
+  }
+
+  /// Adds a section to the message.
+  ///
+  /// A section is a top-level layout component that allows you to contextually
+  /// associate text content with an optional accessory component (either a button
+  /// or a thumbnail). Sections are useful for organizing related content with
+  /// interactive or visual elements.
+  ///
+  /// The section's [builder] should contain only text components. The optional accessory
+  /// can be either a [button] or a [thumbnail], but not both.
+  ///
+  /// Example:
+  /// ```dart
+  /// // Section with text only
+  /// builder.addSection(
+  ///   builder: MessageBuilder()
+  ///     ..addText('## Important Notice')
+  ///     ..addText('Please read this carefully.'),
+  /// );
+  ///
+  /// // Section with text and button accessory
+  /// builder.addSection(
+  ///   builder: MessageBuilder()
+  ///     ..addText('**New Feature Available**')
+  ///     ..addText('Click to learn more about our latest update.'),
+  ///   button: MessageButton.link('https://example.com', label: 'Learn More'),
+  /// );
+  ///
+  /// // Section with text and thumbnail accessory
+  /// builder.addSection(
+  ///   builder: MessageBuilder()
+  ///     ..addText('## User Profile')
+  ///     ..addText('John Doe - Senior Developer'),
+  ///   thumbnail: Thumbnail(
+  ///     MediaItem.fromNetwork('https://example.com/avatar.png'),
+  ///   ),
+  /// );
+  /// ```
+  ///
+  /// Throws:
+  /// - [FormatException] if the section contains non-text components
+  /// - [FormatException] if both button and thumbnail are provided
+  ///
+  /// See also:
+  /// - [addContainer] for general-purpose containers that support any component type
+  /// - [Section] for section configuration details
+  /// - [Button] for button types and options
+  /// - [Thumbnail] for thumbnail accessory options
+  void addSection({
+    required MessageBuilder builder,
+    Button? button,
+    Thumbnail? thumbnail,
+  }) {
+    for (final component in builder._components) {
+      if (component is! TextDisplay) {
+        throw FormatException('Section components must be text only');
+      }
+    }
+
+    _components.add(Section(
+      builder: builder,
+      button: button,
+      thumbnail: thumbnail,
+    ));
+  }
+
+  /// Adds a select menu (dropdown) to the message.
+  ///
+  /// Select menus allow users to choose from a list of options. Discord supports
+  /// various types of select menus including text, user, role, channel, and mentionable.
+  ///
+  /// Example:
+  /// ```dart
+  /// // Channel select menu
+  /// builder.addSelectMenu(
+  ///   SelectMenu.channel(
+  ///     'channel_select',
+  ///     channelTypes: [ChannelType.guildText, ChannelType.guildVoice],
+  ///     placeholder: 'Choose a channel',
+  ///   ),
+  /// );
+  ///
+  /// // String select menu
+  /// builder.addSelectMenu(
+  ///   SelectMenu.string(
+  ///     'color_select',
+  ///     options: [
+  ///       SelectMenuOption('Red', 'red'),
+  ///       SelectMenuOption('Blue', 'blue'),
+  ///       SelectMenuOption('Green', 'green'),
+  ///     ],
+  ///   ),
+  /// );
+  /// ```
+  ///
+  /// See also:
+  /// - [SelectMenu] for select menu types and configuration
+  void addSelectMenu(SelectMenu menu) {
+    final row = ActionRow(components: [menu]);
+    _components.add(row);
+  }
+
+  /// Adds a visual separator between content sections.
+  ///
+  /// Separators help organize message content by creating visual breaks.
+  /// They can be shown or hidden and support different spacing sizes.
+  ///
+  /// Example:
+  /// ```dart
+  /// builder
+  ///   ..addText('First section')
+  ///   ..addSeparator(spacing: SeparatorSize.medium)
+  ///   ..addText('Second section')
+  ///   ..addSeparator(show: false, spacing: SeparatorSize.large)
+  ///   ..addText('Third section');
+  /// ```
+  ///
+  /// Parameters:
+  /// - [show]: Whether to display the separator line (default: true)
+  /// - [spacing]: The amount of vertical space (default: [SeparatorSize.small])
+  void addSeparator({
+    bool show = true,
+    SeparatorSize spacing = SeparatorSize.small,
+  }) {
+    _components.add(Separator(show, spacing));
+  }
+
+  /// Adds text content to the message.
+  ///
+  /// Supports Discord markdown formatting including bold, italic, code blocks,
+  /// headers, lists, and more.
+  ///
+  /// Example:
+  /// ```dart
+  /// builder
+  ///   ..addText('# This is a header')
+  ///   ..addText('**Bold text** and *italic text*')
+  ///   ..addText('`inline code` and ```code block```')
+  ///   ..addText(
+  ///     '- List item 1\n'
+  ///     '- List item 2\n'
+  ///     '- List item 3',
+  ///   );
+  /// ```
+  ///
+  /// See also:
+  /// - [MessageBuilder.text] factory constructor for convenience
+  void addText(String text) {
+    _components.add(TextDisplay(text));
+  }
+
+  /// Appends all components from another builder to the end of this one.
+  ///
+  /// This is useful for composing messages from reusable parts or
+  /// combining multiple builder instances.
+  ///
+  /// Example:
+  /// ```dart
+  /// final header = MessageBuilder()
+  ///   ..addText('# Welcome!')
+  ///   ..addSeparator();
+  ///
+  /// final footer = MessageBuilder()
+  ///   ..addSeparator()
+  ///   ..addText('Thank you for reading!');
+  ///
+  /// final message = MessageBuilder()
+  ///   ..appendFrom(header)
+  ///   ..addText('Main content here')
+  ///   ..appendFrom(footer);
+  /// ```
+  ///
+  /// See also:
+  /// - [prependFrom] to add components at the beginning
+  /// - [copyWith] to create a new builder with combined components
+  void appendFrom(MessageBuilder builder) {
+    _components.addAll(builder._components);
+  }
+
+  /// Converts the builder to a JSON representation for the Discord API.
+  ///
+  /// This method is typically called internally when sending messages and
+  /// should not need to be called directly in most cases.
+  ///
+  /// Returns a list of JSON objects representing all components in the builder.
+  List<Map<String, dynamic>> build() {
+    return _components.map((e) => e.toJson()).toList();
+  }
+
+  /// Creates a copy of this builder with all its components.
+  ///
+  /// The returned builder is a new instance with the same components,
+  /// but modifications to either builder won't affect the other.
+  ///
+  /// Example:
+  /// ```dart
+  /// final original = MessageBuilder()
+  ///   ..addText('Original content');
+  ///
+  /// final duplicate = original.copy()
+  ///   ..addText('Additional content');
+  ///
+  /// // original still only has one text component
+  /// // duplicate has two text components
+  /// ```
+  ///
+  /// See also:
+  /// - [copyWith] to create a copy combined with another builder
+  MessageBuilder copy() {
+    return MessageBuilder().._components.addAll(_components);
+  }
+
+  /// Creates a new builder combining this builder's components with another's.
+  ///
+  /// The returned builder contains all components from this builder followed
+  /// by all components from the provided [builder]. Neither original builder
+  /// is modified.
+  ///
+  /// Example:
+  /// ```dart
+  /// final header = MessageBuilder.text('# Title');
+  /// final body = MessageBuilder.text('Content');
+  ///
+  /// final combined = header.copyWith(body);
+  /// // combined has both title and content
+  /// // header and body remain unchanged
+  /// ```
+  ///
+  /// See also:
+  /// - [copy] to create a simple copy without merging
+  /// - [appendFrom] to modify this builder instead of creating a new one
+  MessageBuilder copyWith(MessageBuilder builder) {
+    return MessageBuilder()
+      .._components.addAll(_components)
+      .._components.addAll(builder._components);
+  }
+
+  /// Prepends all components from another builder to the beginning of this one.
+  ///
+  /// This is useful when you want to add a header or prefix to an existing
+  /// message builder.
+  ///
+  /// Example:
+  /// ```dart
+  /// final header = MessageBuilder()
+  ///   ..addText('# Announcement')
+  ///   ..addSeparator();
+  ///
+  /// final message = MessageBuilder()
+  ///   ..addText('Important content here');
+  ///
+  /// message.prependFrom(header);
+  /// // message now has header content first, then the original content
+  /// ```
+  ///
+  /// See also:
+  /// - [appendFrom] to add components at the end
+  /// - [copyWith] to create a new builder instead of modifying this one
+  void prependFrom(MessageBuilder builder) {
+    _components.insertAll(0, builder._components);
+  }
+}
diff --git a/lib/src/api/common/components/builder/modal_builder.dart b/lib/src/api/common/components/builder/modal_builder.dart
new file mode 100644
index 00000000..3bec888e
--- /dev/null
+++ b/lib/src/api/common/components/builder/modal_builder.dart
@@ -0,0 +1,367 @@
+import 'package:mineral/api.dart';
+import 'package:mineral/src/api/common/components/label.dart';
+import 'package:mineral/src/api/common/components/text_display.dart';
+
+/// A builder for constructing Discord modal dialogs (popup forms).
+///
+/// The [ModalBuilder] provides a fluent API for creating interactive modal dialogs
+/// that collect user input through [TextInput] fields, [SelectMenu] components,
+/// and informational [TextDisplay] elements using Discord's modal specification.
+///
+/// Modals are popup forms that appear when triggered by interactions (like button clicks)
+/// and require user input before submission. Each modal must have a unique [customId]
+/// for tracking submissions.
+///
+/// ## Usage
+///
+/// Create a modal and add input components using method chaining:
+///
+/// ```dart
+/// final modal = ModalBuilder('user_feedback')
+///   ..setTitle('Share Your Feedback')
+///   ..addTextInput(
+///     customId: 'feedback_text',
+///     label: 'Your Feedback',
+///     style: TextInputStyle.paragraph,
+///     placeholder: 'Tell us what you think...',
+///     minLength: 10,
+///     maxLength: 500,
+///     isRequired: true,
+///   )
+///   ..addTextInput(
+///     customId: 'email',
+///     label: 'Email (Optional)',
+///     style: TextInputStyle.short,
+///     placeholder: 'your.email@example.com',
+///     isRequired: false,
+///   );
+///
+/// // Show the modal in response to an interaction
+/// await interaction.showModal(modal);
+/// ```
+///
+/// ## Features
+///
+/// - **Text Inputs**: Short single-line or paragraph multi-line text fields
+/// - **Select Menus**: Dropdown selection components for choosing from options
+/// - **Text Display**: Non-editable informational text
+/// - **Validation**: Built-in min/max length validation for text inputs
+/// - **Flexible Layout**: Automatic component organization with labels and descriptions
+///
+/// ## Examples
+///
+/// ### Simple feedback form
+///
+/// ```dart
+/// final modal = ModalBuilder('feedback_form')
+///   .setTitle('Quick Feedback')
+///   .addTextInput(
+///     customId: 'message',
+///     label: 'Your Message',
+///     style: TextInputStyle.paragraph,
+///     placeholder: 'What would you like to tell us?',
+///     maxLength: 1000,
+///   );
+/// ```
+///
+/// ### User registration form
+///
+/// ```dart
+/// final modal = ModalBuilder('user_registration')
+///   .setTitle('Create Your Profile')
+///   .addText('Please fill in all required fields below:')
+///   .addTextInput(
+///     customId: 'username',
+///     label: 'Username',
+///     style: TextInputStyle.short,
+///     placeholder: 'Choose a unique username',
+///     minLength: 3,
+///     maxLength: 20,
+///     isRequired: true,
+///     description: 'Must be 3-20 characters',
+///   )
+///   .addTextInput(
+///     customId: 'display_name',
+///     label: 'Display Name',
+///     style: TextInputStyle.short,
+///     placeholder: 'How should we display your name?',
+///     maxLength: 32,
+///     isRequired: true,
+///   )
+///   .addTextInput(
+///     customId: 'bio',
+///     label: 'Bio',
+///     style: TextInputStyle.paragraph,
+///     placeholder: 'Tell us about yourself...',
+///     maxLength: 500,
+///     isRequired: false,
+///     description: 'Optional - max 500 characters',
+///   );
+/// ```
+///
+/// ### Support ticket form with select menu
+///
+/// ```dart
+/// final categoryMenu = SelectMenu(
+///   customId: 'ticket_category',
+///   placeholder: 'Choose a category',
+///   options: [
+///     SelectMenuOption(label: 'Technical Issue', value: 'tech'),
+///     SelectMenuOption(label: 'Billing Question', value: 'billing'),
+///     SelectMenuOption(label: 'Feature Request', value: 'feature'),
+///     SelectMenuOption(label: 'Other', value: 'other'),
+///   ],
+/// );
+///
+/// final modal = ModalBuilder('support_ticket')
+///   .setTitle('Open Support Ticket')
+///   .addText('We\'re here to help! Please provide details about your issue.')
+///   .addSelectMenu(
+///     customId: 'category',
+///     label: 'Issue Category',
+///     menu: categoryMenu,
+///     description: 'Select the category that best matches your issue',
+///   )
+///   .addTextInput(
+///     customId: 'subject',
+///     label: 'Subject',
+///     style: TextInputStyle.short,
+///     placeholder: 'Brief summary of your issue',
+///     maxLength: 100,
+///     isRequired: true,
+///   )
+///   .addTextInput(
+///     customId: 'description',
+///     label: 'Detailed Description',
+///     style: TextInputStyle.paragraph,
+///     placeholder: 'Please provide as much detail as possible...',
+///     minLength: 20,
+///     maxLength: 2000,
+///     isRequired: true,
+///   );
+/// ```
+///
+/// ### Pre-filled form (editing existing data)
+///
+/// ```dart
+/// final modal = ModalBuilder('edit_profile')
+///   .setTitle('Edit Profile')
+///   .addTextInput(
+///     customId: 'bio',
+///     label: 'Biography',
+///     style: TextInputStyle.paragraph,
+///     value: existingUser.bio, // Pre-fill with existing value
+///     maxLength: 500,
+///   )
+///   .addTextInput(
+///     customId: 'location',
+///     label: 'Location',
+///     style: TextInputStyle.short,
+///     value: existingUser.location, // Pre-fill with existing value
+///     maxLength: 50,
+///   );
+/// ```
+///
+/// ## Best Practices
+///
+/// - **Keep it focused**: Modals should be quick to fill out (5 fields or fewer)
+/// - **Clear labels**: Use descriptive labels that explain what input is expected
+/// - **Helpful placeholders**: Provide example text in placeholders
+/// - **Appropriate validation**: Set reasonable min/max lengths for text inputs
+/// - **Descriptions**: Use descriptions for complex or optional fields
+/// - **Pre-fill when editing**: Use the `value` parameter to pre-populate fields
+/// - **Handle all cases**: Always handle both successful submissions and dismissals
+///
+/// See also:
+/// - [TextInput] for text input field configuration
+/// - [SelectMenu] for dropdown selection components
+/// - [TextInputStyle] for input style options (short vs paragraph)
+final class ModalBuilder {
+  final List<ModalComponent> _components = [];
+
+  final String _customId;
+  String? _title;
+
+  /// Creates a new [ModalBuilder] with the specified [customId].
+  ///
+  /// The [customId] is used to identify this modal when handling submissions.
+  /// It must be unique within your application's modal interactions.
+  ///
+  /// Example:
+  /// ```dart
+  /// final modal = ModalBuilder('feedback_form');
+  /// ```
+  ModalBuilder(this._customId);
+
+  /// Adds a select menu (dropdown) to the modal.
+  ///
+  /// Creates a labeled dropdown selection component that allows users to choose
+  /// from predefined options. The [menu] must be a fully configured [SelectMenu]
+  /// instance with options.
+  ///
+  /// ## Example
+  ///
+  /// ```dart
+  /// final roleMenu = SelectMenu(
+  ///   customId: 'user_role',
+  ///   placeholder: 'Choose your role',
+  ///   options: [
+  ///     SelectMenuOption(label: 'Developer', value: 'dev', emoji: '💻'),
+  ///     SelectMenuOption(label: 'Designer', value: 'design', emoji: '🎨'),
+  ///     SelectMenuOption(label: 'Manager', value: 'mgr', emoji: '📊'),
+  ///   ],
+  ///   minValues: 1,
+  ///   maxValues: 1,
+  /// );
+  ///
+  /// modal.addSelectMenu(
+  ///   label: 'Select Your Role',
+  ///   menu: roleMenu,
+  ///   description: 'This helps us personalize your experience',
+  /// );
+  /// ```
+  void addSelectMenu({
+    required String label,
+    required SelectMenu menu,
+    String? description,
+  }) {
+    _components.add(
+      Label(
+        label: label,
+        component: menu,
+        description: description,
+      ),
+    );
+  }
+
+  /// Adds non-editable text to the modal.
+  ///
+  /// Creates a text display component that shows informational text without
+  /// user input. Useful for instructions, warnings, or contextual information.
+  ///
+  /// The [text] supports Discord markdown formatting for rich text display.
+  ///
+  /// ## Example
+  ///
+  /// ```dart
+  /// modal
+  ///   ..addText('**Important**: Please read the guidelines before submitting.')
+  ///   ..addText('All fields marked with * are required.')
+  ///   ..addTextInput(
+  ///     customId: 'feedback',
+  ///     label: 'Your Feedback *',
+  ///     style: TextInputStyle.paragraph,
+  ///   );
+  /// ```
+  void addText(String text) {
+    _components.add(TextDisplay(text));
+  }
+
+  /// Adds a text input field to the modal.
+  ///
+  /// Creates a labeled text input component that allows users to enter text.
+  /// The [customId] identifies this input when the modal is submitted.
+  ///
+  /// ## Examples
+  ///
+  /// ### Short text input (single-line)
+  ///
+  /// ```dart
+  /// modal.addTextInput(
+  ///   customId: 'username',
+  ///   label: 'Username',
+  ///   style: TextInputStyle.short,
+  ///   placeholder: 'Enter your username',
+  ///   minLength: 3,
+  ///   maxLength: 20,
+  ///   isRequired: true,
+  /// );
+  /// ```
+  ///
+  /// ### Paragraph input (multi-line)
+  ///
+  /// ```dart
+  /// modal.addTextInput(
+  ///   customId: 'feedback',
+  ///   label: 'Your Feedback',
+  ///   style: TextInputStyle.paragraph,
+  ///   placeholder: 'Tell us what you think...',
+  ///   minLength: 10,
+  ///   maxLength: 500,
+  ///   isRequired: true,
+  ///   description: 'Please be specific and constructive',
+  /// );
+  /// ```
+  ///
+  /// ### Pre-filled input (for editing)
+  ///
+  /// ```dart
+  /// modal.addTextInput(
+  ///   customId: 'bio',
+  ///   label: 'Biography',
+  ///   style: TextInputStyle.paragraph,
+  ///   value: currentUser.bio, // Pre-fill with existing value
+  ///   maxLength: 500,
+  ///   description: 'Update your profile bio',
+  /// );
+  /// ```
+  void addTextInput({
+    required String customId,
+    required String label,
+    TextInputStyle style = TextInputStyle.short,
+    String? placeholder,
+    String? value,
+    int? minLength,
+    int? maxLength,
+    bool? isRequired,
+    String? description,
+  }) {
+    final textInput = TextInput(
+      customId,
+      style: style,
+      placeholder: placeholder,
+      value: value,
+      minLength: minLength,
+      maxLength: maxLength,
+      isRequired: isRequired,
+    );
+
+    _components.add(
+      Label(
+        label: label,
+        component: textInput,
+        description: description,
+      ),
+    );
+  }
+
+  /// Sets the modal's title.
+  ///
+  /// The title appears at the top of the modal dialog and should clearly
+  /// describe the modal's purpose. Discord displays this prominently in
+  /// the modal header.
+  ///
+  /// ## Example
+  ///
+  /// ```dart
+  /// final modal = ModalBuilder('user_feedback')
+  ///   .setTitle('Share Your Feedback')
+  ///   .addTextInput(
+  ///     customId: 'message',
+  ///     label: 'Message',
+  ///     style: TextInputStyle.paragraph,
+  ///   );
+  /// ```
+  ///
+  void setTitle(String title) {
+    _title = title;
+  }
+
+  Map<String, dynamic> build() {
+    return {
+      'custom_id': _customId,
+      'title': _title,
+      'components': _components.map((e) => e.toJson()).toList(),
+    };
+  }
+}
diff --git a/lib/src/api/common/components/message/message_button.dart b/lib/src/api/common/components/button.dart
similarity index 83%
rename from lib/src/api/common/components/message/message_button.dart
rename to lib/src/api/common/components/button.dart
index 8fd198ef..162ddb65 100644
--- a/lib/src/api/common/components/message/message_button.dart
+++ b/lib/src/api/common/components/button.dart
@@ -14,7 +14,7 @@ enum ButtonType implements EnhancedEnum<int> {
   const ButtonType(this.value);
 }
 
-final class MessageButton implements Component {
+final class Button implements MessageComponent {
   final ButtonType _type;
   final String? _customId;
   final String? _label;
@@ -22,7 +22,7 @@ final class MessageButton implements Component {
   final PartialEmoji? _emoji;
   final bool _disabled;
 
-  MessageButton(
+  Button(
       {required ButtonType type,
       String? customId,
       String? label,
@@ -36,54 +36,54 @@ final class MessageButton implements Component {
         _emoji = emoji,
         _disabled = disabled ?? false;
 
-  factory MessageButton.primary(String customId,
+  factory Button.primary(String customId,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.primary,
           customId: customId,
           label: label,
           emoji: emoji,
           disabled: disabled);
 
-  factory MessageButton.secondary(String customId,
+  factory Button.secondary(String customId,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.secondary,
           customId: customId,
           label: label,
           emoji: emoji,
           disabled: disabled);
 
-  factory MessageButton.success(String customId,
+  factory Button.success(String customId,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.success,
           customId: customId,
           label: label,
           emoji: emoji,
           disabled: disabled);
 
-  factory MessageButton.danger(String customId,
+  factory Button.danger(String customId,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.danger,
           customId: customId,
           label: label,
           emoji: emoji,
           disabled: disabled);
 
-  factory MessageButton.link(String url,
+  factory Button.link(String url,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.link,
           url: url,
           label: label,
           emoji: emoji,
           disabled: disabled);
 
-  factory MessageButton.premium(String skuId,
+  factory Button.premium(String skuId,
           {String? label, PartialEmoji? emoji, bool? disabled}) =>
-      MessageButton(
+      Button(
           type: ButtonType.premium,
           customId: skuId,
           label: label,
diff --git a/lib/src/api/common/components/component.dart b/lib/src/api/common/components/component.dart
index 3e79b5b8..d68fe728 100644
--- a/lib/src/api/common/components/component.dart
+++ b/lib/src/api/common/components/component.dart
@@ -1,3 +1,37 @@
+import 'package:mineral/src/api/common/types/enhanced_enum.dart';
+
+enum ComponentType implements EnhancedEnum<int> {
+  actionRow(1),
+  button(2),
+  textSelectMenu(3),
+  textInput(4),
+  userSelectMenu(5),
+  roleSelectMenu(6),
+  mentionableSelectMenu(7),
+  channelSelectMenu(8),
+  section(9),
+  textDisplay(10),
+  thumbnail(11),
+  mediaGallery(12),
+  file(13),
+  separator(14),
+  container(17),
+  label(18);
+
+  static const selectMenus = [
+    textSelectMenu,
+    userSelectMenu,
+    roleSelectMenu,
+    mentionableSelectMenu,
+    channelSelectMenu,
+  ];
+
+  @override
+  final int value;
+
+  const ComponentType(this.value);
+}
+
 abstract interface class Component {
   Map<String, dynamic> toJson();
 }
diff --git a/lib/src/api/common/components/component_type.dart b/lib/src/api/common/components/component_type.dart
deleted file mode 100644
index 05dbc60c..00000000
--- a/lib/src/api/common/components/component_type.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:mineral/src/api/common/types/enhanced_enum.dart';
-
-enum ComponentType implements EnhancedEnum<int> {
-  actionRow(1),
-  button(2),
-  textSelectMenu(3),
-  textInput(4),
-  userSelectMenu(5),
-  roleSelectMenu(6),
-  mentionableSelectMenu(7),
-  channelSelectMenu(8),
-  section(9),
-  textDisplay(10),
-  thumbnail(11),
-  mediaGallery(12),
-  file(13),
-  separator(14),
-  container(17),
-  label(18);
-
-  static const selectMenus = [
-    textSelectMenu,
-    userSelectMenu,
-    roleSelectMenu,
-    mentionableSelectMenu,
-    channelSelectMenu,
-  ];
-
-  @override
-  final int value;
-
-  const ComponentType(this.value);
-}
diff --git a/lib/src/api/common/components/message/message_container.dart b/lib/src/api/common/components/container.dart
similarity index 83%
rename from lib/src/api/common/components/message/message_container.dart
rename to lib/src/api/common/components/container.dart
index d5d040fa..4ea988e7 100644
--- a/lib/src/api/common/components/message/message_container.dart
+++ b/lib/src/api/common/components/container.dart
@@ -1,13 +1,13 @@
 import 'package:mineral/api.dart';
 
-final class MessageContainer implements Component {
+final class Container implements MessageComponent {
   ComponentType get type => ComponentType.container;
 
   final Color? _color;
   final bool? _spoiler;
   final MessageBuilder? _components;
 
-  MessageContainer(this._color, this._spoiler, this._components);
+  Container(this._color, this._spoiler, this._components);
 
   @override
   Map<String, dynamic> toJson() {
diff --git a/lib/src/api/common/components/modal/modal_label.dart b/lib/src/api/common/components/label.dart
similarity index 72%
rename from lib/src/api/common/components/modal/modal_label.dart
rename to lib/src/api/common/components/label.dart
index 1ccef9c6..45577f3c 100644
--- a/lib/src/api/common/components/modal/modal_label.dart
+++ b/lib/src/api/common/components/label.dart
@@ -1,15 +1,14 @@
-import 'package:mineral/src/api/common/components/component.dart';
-import 'package:mineral/src/api/common/components/component_type.dart';
+import 'package:mineral/api.dart';
 import 'package:mineral/src/domains/common/utils/helper.dart';
 
-final class ModalLabel implements Component {
+final class Label implements ModalComponent {
   ComponentType get type => ComponentType.label;
 
   final String label;
   final Component component;
   final String? description;
 
-  ModalLabel({
+  Label({
     required this.label,
     required this.component,
     this.description,
diff --git a/lib/src/api/common/components/message/message_gallery.dart b/lib/src/api/common/components/media_gallery.dart
similarity index 51%
rename from lib/src/api/common/components/message/message_gallery.dart
rename to lib/src/api/common/components/media_gallery.dart
index ca36e6f4..ffffacbd 100644
--- a/lib/src/api/common/components/message/message_gallery.dart
+++ b/lib/src/api/common/components/media_gallery.dart
@@ -1,10 +1,15 @@
 import 'package:mineral/api.dart';
 
-final class MessageGallery implements Component {
+final class MediaGallery implements MessageComponent {
   ComponentType get type => ComponentType.mediaGallery;
   final List<MediaItem> _items;
 
-  MessageGallery({required List<MediaItem> items}) : _items = items;
+  MediaGallery({required List<MediaItem> items})
+      : assert(
+          items.isNotEmpty && items.length <= 10,
+          'MediaGallery must contain between 1 and 10 items.',
+        ),
+        _items = items;
 
   @override
   Map<String, dynamic> toJson() {
diff --git a/lib/src/api/common/components/media_item.dart b/lib/src/api/common/components/media_item.dart
index 00a4ad0c..6ffe7d45 100644
--- a/lib/src/api/common/components/media_item.dart
+++ b/lib/src/api/common/components/media_item.dart
@@ -11,9 +11,16 @@ final class MediaItem {
   final String? contentType;
   final String? description;
 
-  MediaItem(this.url, {this.spoiler, this.proxyUrl, this.height, this.width, this.contentType, this.description});
-
-  factory MediaItem.file(File file, String name, {bool? spoiler, String? proxyUrl, int? height, int? width, String? contentType, String? description}) {
+  factory MediaItem.fromFile(
+    File file,
+    String name, {
+    bool? spoiler,
+    String? proxyUrl,
+    int? height,
+    int? width,
+    String? contentType,
+    String? description,
+  }) {
     if (!file.existsSync()) {
       throw ArgumentError('File ${file.path} does not exist');
     }
@@ -24,7 +31,7 @@ final class MediaItem {
 
     final bytes = file.readAsBytesSync();
 
-    return MediaItem(
+    return MediaItem._(
       'attachment://$name',
       spoiler: spoiler,
       proxyUrl: proxyUrl,
@@ -35,6 +42,26 @@ final class MediaItem {
     )..bytes = bytes;
   }
 
+  MediaItem.fromNetwork(
+    this.url, {
+    this.spoiler,
+    this.proxyUrl,
+    this.height,
+    this.width,
+    this.contentType,
+    this.description,
+  });
+
+  MediaItem._(
+    this.url, {
+    required this.proxyUrl,
+    required this.height,
+    required this.width,
+    required this.contentType,
+    required this.description,
+    this.spoiler,
+  });
+
   Map<String, dynamic> toJson() {
     return {
       if (description != null) 'description': description,
diff --git a/lib/src/api/common/components/message/message_builder.dart b/lib/src/api/common/components/message/message_builder.dart
deleted file mode 100644
index eeade4c3..00000000
--- a/lib/src/api/common/components/message/message_builder.dart
+++ /dev/null
@@ -1,104 +0,0 @@
-import 'package:mineral/api.dart';
-import 'package:mineral/src/api/common/components/message/message_container.dart';
-import 'package:mineral/src/api/common/components/shared/text_display.dart';
-
-/// ```dart
-/// {@template message_builder}
-/// final buttons = [
-///   MessageButton.primary('primary', label: 'label'),
-///   MessageButton.secondary('secondary', label: 'label'),
-///   MessageButton.danger('danger', label: 'label'),
-///   MessageButton.link('https://google.com', label: 'label'),
-/// ];
-///
-/// final channelSelectMenu = SelectMenu.channel('channel',
-///   channelTypes: [ChannelType.guildText],
-///   defaultValues: [Snowflake.parse('1322554770057068636')]);
-///
-/// final builder = MessageBuilder()
-///   ..text('# Hello from World')
-///   ..separator()
-///   ..text('Hello from ${message.channelId}')
-///   ..file(Attachment.path('assets/logo.png'))
-///   ..file(await Attachment.network('https://i.redd.it/d2hd73xxwvaa1.jpg'));
-/// {@endtemplate}
-/// ```
-final class MessageBuilder {
-  final List<Component> _components = [];
-
-  void text(String text) {
-    _components.add(TextDisplay(text));
-  }
-
-  void separator(
-      {bool show = true, SeparatorSize spacing = SeparatorSize.small}) {
-    _components.add(MessageSeparator(show, spacing));
-  }
-
-  void container({
-    required MessageBuilder builder,
-    Color? color,
-    bool? spoiler,
-  }) {
-    _components.add(MessageContainer(color, spoiler, builder));
-  }
-
-  void button(MessageButton button) {
-    if (_components.length > 5) {
-      throw Exception('You can only add up to 5 buttons to a message');
-    }
-
-    final row = MessageRowBuilder(components: [button]);
-    _components.add(row);
-  }
-
-  void buttons(List<MessageButton> buttons) {
-    final row = MessageRowBuilder(components: buttons);
-    _components.add(row);
-  }
-
-  void selectMenu(SelectMenu menu) {
-    final row = MessageRowBuilder(components: [menu]);
-    _components.add(row);
-  }
-
-  void section(MessageSection section) {
-    for (final component in section.builder._components) {
-      if (component is! TextDisplay) {
-        throw FormatException('Section components must be text only');
-      }
-    }
-
-    _components.add(section);
-  }
-
-  void gallery(MessageGallery gallery) {
-    _components.add(gallery);
-  }
-
-  void file(MessageFile file) {
-    _components.add(file);
-  }
-
-  List<Map<String, dynamic>> build() {
-    return _components.map((e) => e.toJson()).toList();
-  }
-
-  void prepend(MessageBuilder builder) {
-    _components.insertAll(0, builder._components);
-  }
-
-  void append(MessageBuilder builder) {
-    _components.addAll(builder._components);
-  }
-
-  MessageBuilder clone() {
-    return MessageBuilder().._components.addAll(_components);
-  }
-
-  MessageBuilder cloneFrom(MessageBuilder builder) {
-    return MessageBuilder()
-      .._components.addAll(_components)
-      .._components.addAll(builder._components);
-  }
-}
diff --git a/lib/src/api/common/components/message/message_file.dart b/lib/src/api/common/components/message/message_file.dart
deleted file mode 100644
index 854a5c52..00000000
--- a/lib/src/api/common/components/message/message_file.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:mineral/api.dart';
-
-final class MessageFile implements Component {
-  ComponentType get type => ComponentType.file;
-
-  MediaItem item;
-
-  MessageFile(this.item);
-
-  static Future<MessageFile> network(String url, {bool? spoiler}) async {
-    final uri = Uri.parse(url);
-    final response = await http.get(uri);
-    final name = uri.pathSegments.isNotEmpty ? uri.pathSegments.last : 'file.txt';
-    final media = MediaItem('attachment://$name')
-    ..bytes = response.bodyBytes
-    ..spoiler = spoiler;
-
-    return MessageFile(media);
-  }
-
-  @override
-  Map<String, dynamic> toJson() {
-    return {'type': type.value, ...item.toJson()};
-  }
-}
diff --git a/lib/src/api/common/components/message_component.dart b/lib/src/api/common/components/message_component.dart
new file mode 100644
index 00000000..a7db58e9
--- /dev/null
+++ b/lib/src/api/common/components/message_component.dart
@@ -0,0 +1,3 @@
+import 'package:mineral/src/api/common/components/component.dart';
+
+abstract interface class MessageComponent implements Component {}
diff --git a/lib/src/api/common/components/message/message_thumbnail.dart b/lib/src/api/common/components/message_thumbnail.dart
similarity index 73%
rename from lib/src/api/common/components/message/message_thumbnail.dart
rename to lib/src/api/common/components/message_thumbnail.dart
index 2e42c1bd..b4de852b 100644
--- a/lib/src/api/common/components/message/message_thumbnail.dart
+++ b/lib/src/api/common/components/message_thumbnail.dart
@@ -1,10 +1,10 @@
 import 'package:mineral/api.dart';
 
-final class MessageThumbnail implements Component {
+final class Thumbnail implements MessageComponent {
   ComponentType get type => ComponentType.thumbnail;
   final MediaItem media;
 
-  MessageThumbnail(this.media);
+  Thumbnail(this.media);
 
   @override
   Map<String, dynamic> toJson() {
diff --git a/lib/src/api/common/components/modal/modal_builder.dart b/lib/src/api/common/components/modal/modal_builder.dart
deleted file mode 100644
index 1387476c..00000000
--- a/lib/src/api/common/components/modal/modal_builder.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'package:mineral/api.dart';
-import 'package:mineral/src/api/common/components/modal/modal_label.dart';
-import 'package:mineral/src/api/common/components/shared/text_display.dart';
-
-final class ModalBuilder {
-  final List<Component> _components = [];
-
-  final String _customId;
-  String? _title;
-
-  ModalBuilder(this._customId);
-
-  ModalBuilder setTitle(String title) {
-    _title = title;
-    return this;
-  }
-
-  void text(String text) {
-    _components.add(TextDisplay(text));
-  }
-
-  void label({
-    required String label,
-    required Component component,
-    String? description,
-  }) {
-    _components.add(
-      ModalLabel(
-        label: label,
-        component: component,
-        description: description,
-      ),
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'custom_id': _customId,
-      'title': _title,
-      'components': _components.map((e) => e.toJson()).toList(),
-    };
-  }
-}
diff --git a/lib/src/api/common/components/modal_component.dart b/lib/src/api/common/components/modal_component.dart
new file mode 100644
index 00000000..64a91d73
--- /dev/null
+++ b/lib/src/api/common/components/modal_component.dart
@@ -0,0 +1,3 @@
+import 'package:mineral/src/api/common/components/component.dart';
+
+abstract interface class ModalComponent implements Component {}
diff --git a/lib/src/api/common/components/message/message_section.dart b/lib/src/api/common/components/section.dart
similarity index 54%
rename from lib/src/api/common/components/message/message_section.dart
rename to lib/src/api/common/components/section.dart
index 9b995f73..c6b6af25 100644
--- a/lib/src/api/common/components/message/message_section.dart
+++ b/lib/src/api/common/components/section.dart
@@ -1,25 +1,25 @@
 import 'package:mineral/api.dart';
 
-final class MessageSection implements Component {
+final class Section implements MessageComponent {
   ComponentType get type => ComponentType.section;
 
   final MessageBuilder builder;
-  final MessageButton? _button;
-  final MessageThumbnail? _thumbnail;
+  final Button? _button;
+  final Thumbnail? _thumbnail;
 
-  MessageSection({
+  Section({
     required this.builder,
-    MessageButton? button,
-    MessageThumbnail? thumbnail,
-  })  : _button = button,
+    Button? button,
+    Thumbnail? thumbnail,
+  })  : assert(
+          button == null || thumbnail == null,
+          'Accessory must be either a button or a thumbnail, not both.',
+        ),
+        _button = button,
         _thumbnail = thumbnail;
 
   @override
   Map<String, dynamic> toJson() {
-    if (_button != null && _thumbnail != null) {
-      throw FormatException('Accessory must be either a button or a thumbnail');
-    }
-
     return {
       'type': type.value,
       if (_button != null || _thumbnail != null)
diff --git a/lib/src/api/common/components/shared/select_menu.dart b/lib/src/api/common/components/select_menu.dart
similarity index 92%
rename from lib/src/api/common/components/shared/select_menu.dart
rename to lib/src/api/common/components/select_menu.dart
index 009180b3..ed123685 100644
--- a/lib/src/api/common/components/shared/select_menu.dart
+++ b/lib/src/api/common/components/select_menu.dart
@@ -1,10 +1,6 @@
-import 'package:mineral/src/api/common/components/component.dart';
-import 'package:mineral/src/api/common/components/component_type.dart';
-import 'package:mineral/src/api/common/partial_emoji.dart';
-import 'package:mineral/src/api/common/snowflake.dart';
-import 'package:mineral/src/api/common/types/channel_type.dart';
+import 'package:mineral/api.dart';
 
-final class SelectMenu<T> implements Component {
+final class SelectMenu<T> implements MessageComponent, ModalComponent {
   final ComponentType _type;
   final String _customId;
 
diff --git a/lib/src/api/common/components/message/message_separator.dart b/lib/src/api/common/components/separator.dart
similarity index 80%
rename from lib/src/api/common/components/message/message_separator.dart
rename to lib/src/api/common/components/separator.dart
index 7275d0f5..6c38b607 100644
--- a/lib/src/api/common/components/message/message_separator.dart
+++ b/lib/src/api/common/components/separator.dart
@@ -8,13 +8,13 @@ enum SeparatorSize {
   const SeparatorSize(this.value);
 }
 
-final class MessageSeparator implements Component {
+final class Separator implements MessageComponent {
   ComponentType get type => ComponentType.separator;
 
   final bool _show;
   final SeparatorSize _spacing;
 
-  MessageSeparator(this._show, this._spacing);
+  Separator(this._show, this._spacing);
 
   @override
   Map<String, dynamic> toJson() {
diff --git a/lib/src/api/common/components/shared/text_display.dart b/lib/src/api/common/components/text_display.dart
similarity index 79%
rename from lib/src/api/common/components/shared/text_display.dart
rename to lib/src/api/common/components/text_display.dart
index bf35e8dc..5fbac964 100644
--- a/lib/src/api/common/components/shared/text_display.dart
+++ b/lib/src/api/common/components/text_display.dart
@@ -1,6 +1,6 @@
 import 'package:mineral/api.dart';
 
-final class TextDisplay implements Component {
+final class TextDisplay implements MessageComponent, ModalComponent {
   ComponentType get type => ComponentType.textDisplay;
 
   final String _content;
diff --git a/lib/src/api/common/components/modal/modal_text_input.dart b/lib/src/api/common/components/text_input.dart
similarity index 74%
rename from lib/src/api/common/components/modal/modal_text_input.dart
rename to lib/src/api/common/components/text_input.dart
index 1107725d..836e6311 100644
--- a/lib/src/api/common/components/modal/modal_text_input.dart
+++ b/lib/src/api/common/components/text_input.dart
@@ -1,30 +1,28 @@
-import 'package:mineral/src/api/common/components/component.dart';
-import 'package:mineral/src/api/common/components/component_type.dart';
-import 'package:mineral/src/api/common/types/enhanced_enum.dart';
+import 'package:mineral/api.dart';
 import 'package:mineral/src/domains/common/utils/helper.dart';
 
-enum ModalTextInputStyle implements EnhancedEnum<int> {
+enum TextInputStyle implements EnhancedEnum<int> {
   short(1),
   paragraph(2);
 
   @override
   final int value;
 
-  const ModalTextInputStyle(this.value);
+  const TextInputStyle(this.value);
 }
 
-final class ModalTextInput implements Component {
+final class TextInput implements ModalComponent {
   ComponentType get type => ComponentType.textInput;
 
   final String customId;
-  final ModalTextInputStyle style;
+  final TextInputStyle style;
   final int? minLength;
   final int? maxLength;
   final bool? isRequired;
   final String? value;
   final String? placeholder;
 
-  ModalTextInput(
+  TextInput(
     this.customId, {
     required this.style,
     this.minLength,
diff --git a/lib/src/domains/common/utils/attachment.dart b/lib/src/domains/common/utils/attachment.dart
index 36be0ea4..36342d90 100644
--- a/lib/src/domains/common/utils/attachment.dart
+++ b/lib/src/domains/common/utils/attachment.dart
@@ -61,4 +61,4 @@ http.MultipartFile? _prepareAsset(dynamic payload, int filesLength) {
   }
 
   return null;
-}
\ No newline at end of file
+}
diff --git a/lib/src/domains/components/interactives/components/interactive_button.dart b/lib/src/domains/components/interactives/components/interactive_button.dart
index 7bb5d691..4c072f47 100644
--- a/lib/src/domains/components/interactives/components/interactive_button.dart
+++ b/lib/src/domains/components/interactives/components/interactive_button.dart
@@ -4,6 +4,6 @@ import 'package:mineral/api.dart';
 import 'package:mineral/src/domains/components/interactives/components/interactive_component.dart';
 
 abstract interface class InteractiveButton
-    implements InteractiveComponent<MessageButton> {
+    implements InteractiveComponent<Button> {
   FutureOr<void> handle(ButtonContext ctx);
 }
diff --git a/lib/src/infrastructure/internals/datastore/parts/interaction_part.dart b/lib/src/infrastructure/internals/datastore/parts/interaction_part.dart
index 9fe55c92..ea2f0ae0 100644
--- a/lib/src/infrastructure/internals/datastore/parts/interaction_part.dart
+++ b/lib/src/infrastructure/internals/datastore/parts/interaction_part.dart
@@ -146,7 +146,7 @@ final class InteractionPart implements InteractionPartContract {
     final req =
         Request.json(endpoint: '/interactions/$id/$token/callback', body: {
       'type': InteractionCallbackType.modal.value,
-      'data': modal.toJson(),
+      'data': modal.build(),
     });
     await _dataStore.client.post(req);
   }