diff --git a/flutter_custom_tabs_android/example/lib/main.dart b/flutter_custom_tabs_android/example/lib/main.dart
index 3a1b8ed5..8e1db727 100644
--- a/flutter_custom_tabs_android/example/lib/main.dart
+++ b/flutter_custom_tabs_android/example/lib/main.dart
@@ -188,4 +188,4 @@ Future<void> _launchInExternalBrowser() async {
   } catch (e) {
     debugPrint(e.toString());
   }
-}
\ No newline at end of file
+}
diff --git a/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart b/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart
index c9eb48e4..fdaaa1bc 100644
--- a/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart
+++ b/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 
-import 'message_converters.dart';
-import 'messages.g.dart';
+import 'messages/messages.dart';
 import 'types/types.dart';
 
 /// The Android implementation of [CustomTabsPlatform].
diff --git a/flutter_custom_tabs_android/lib/src/messages/messages.dart b/flutter_custom_tabs_android/lib/src/messages/messages.dart
new file mode 100644
index 00000000..ab72bc0a
--- /dev/null
+++ b/flutter_custom_tabs_android/lib/src/messages/messages.dart
@@ -0,0 +1,2 @@
+export 'messages.g.dart';
+export 'type_conversion.dart';
diff --git a/flutter_custom_tabs_android/lib/src/messages.g.dart b/flutter_custom_tabs_android/lib/src/messages/messages.g.dart
similarity index 100%
rename from flutter_custom_tabs_android/lib/src/messages.g.dart
rename to flutter_custom_tabs_android/lib/src/messages/messages.g.dart
diff --git a/flutter_custom_tabs_android/lib/src/message_converters.dart b/flutter_custom_tabs_android/lib/src/messages/type_conversion.dart
similarity index 98%
rename from flutter_custom_tabs_android/lib/src/message_converters.dart
rename to flutter_custom_tabs_android/lib/src/messages/type_conversion.dart
index fa3b53a6..9553362f 100644
--- a/flutter_custom_tabs_android/lib/src/message_converters.dart
+++ b/flutter_custom_tabs_android/lib/src/messages/type_conversion.dart
@@ -2,8 +2,8 @@ import 'dart:math';
 
 import 'package:flutter/painting.dart';
 
-import 'types/types.dart';
 import 'messages.g.dart';
+import '../types/types.dart';
 
 extension CustomTabsOptionsConverter on CustomTabsOptions {
   CustomTabsOptionsMessage toMessage() {
diff --git a/flutter_custom_tabs_android/pigeons/messages.dart b/flutter_custom_tabs_android/pigeons/messages.dart
index 1f3d2f77..a500a493 100644
--- a/flutter_custom_tabs_android/pigeons/messages.dart
+++ b/flutter_custom_tabs_android/pigeons/messages.dart
@@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart';
     className: 'Messages',
     package: 'com.github.droibit.flutter.plugins.customtabs',
   ),
-  dartOut: 'lib/src/messages.g.dart',
+  dartOut: 'lib/src/messages/messages.g.dart',
 ))
 @HostApi()
 abstract class CustomTabsApi {
diff --git a/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart b/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart
index 572b1658..c7edb5f8 100644
--- a/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart
+++ b/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'messages.dart';
-
 void main() {
   late _MockCustomTabsApi api;
   late CustomTabsPluginAndroid customTabs;
diff --git a/flutter_custom_tabs_android/test/messages.dart b/flutter_custom_tabs_android/test/messages.dart
deleted file mode 100644
index 2f93d026..00000000
--- a/flutter_custom_tabs_android/test/messages.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'package:flutter_custom_tabs_android/src/message_converters.dart';
-export 'package:flutter_custom_tabs_android/src/messages.g.dart';
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart
index a3e89089..bc22ebbb 100644
--- a/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart
+++ b/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsAnimations', () {
     test('toMessage() returns empty message when animation values are null',
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart
index 54d27668..d6067d67 100644
--- a/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart
+++ b/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   test('toMessage() returns empty message when option values are null', () {
     const configuration = CustomTabsBrowserConfiguration();
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart
index 078618b0..33dac314 100644
--- a/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart
+++ b/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsCloseButton', () {
     test('toMessage() returns empty message when option values are null', () {
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart
index 4cbfc195..a74cb4c7 100644
--- a/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart
+++ b/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsColorSchemes', () {
     test('toMessage() returns empty message when option values are null', () {
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart
index dc62d5a2..55c610d2 100644
--- a/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart
+++ b/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/painting.dart';
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsOptions', () {
     test('toMessage() returns empty message when option values are null', () {
diff --git a/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart b/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart
index 6fd9fa70..f816a1f5 100644
--- a/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart
+++ b/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('PartialCustomTabsConfiguration', () {
     test('toMessage() returns expected message with default values', () {
diff --git a/flutter_custom_tabs_ios/example/lib/main.dart b/flutter_custom_tabs_ios/example/lib/main.dart
index 120ce76c..50e741d3 100644
--- a/flutter_custom_tabs_ios/example/lib/main.dart
+++ b/flutter_custom_tabs_ios/example/lib/main.dart
@@ -153,4 +153,4 @@ Future<void> _launchInExternalBrowser() async {
   } catch (e) {
     debugPrint(e.toString());
   }
-}
\ No newline at end of file
+}
diff --git a/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart b/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart
index 45ec1978..edc2044e 100644
--- a/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart
+++ b/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 
-import 'message_converters.dart';
-import 'messages.g.dart';
-import 'types/safari_view_controller_options.dart';
+import 'messages/messages.dart';
+import 'types/types.dart';
 
 /// The iOS implementation of [CustomTabsPlatform].
 ///
diff --git a/flutter_custom_tabs_ios/lib/src/messages/messages.dart b/flutter_custom_tabs_ios/lib/src/messages/messages.dart
new file mode 100644
index 00000000..ab72bc0a
--- /dev/null
+++ b/flutter_custom_tabs_ios/lib/src/messages/messages.dart
@@ -0,0 +1,2 @@
+export 'messages.g.dart';
+export 'type_conversion.dart';
diff --git a/flutter_custom_tabs_ios/lib/src/messages.g.dart b/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart
similarity index 100%
rename from flutter_custom_tabs_ios/lib/src/messages.g.dart
rename to flutter_custom_tabs_ios/lib/src/messages/messages.g.dart
diff --git a/flutter_custom_tabs_ios/lib/src/message_converters.dart b/flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart
similarity index 97%
rename from flutter_custom_tabs_ios/lib/src/message_converters.dart
rename to flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart
index 7ea34d8a..c275b247 100644
--- a/flutter_custom_tabs_ios/lib/src/message_converters.dart
+++ b/flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/painting.dart';
 
-import 'types/types.dart';
 import 'messages.g.dart';
+import '../types/types.dart';
 
 extension SafariViewControllerOptionsConverter on SafariViewControllerOptions {
   SafariViewControllerOptionsMessage toMessage() {
diff --git a/flutter_custom_tabs_ios/pigeons/messages.dart b/flutter_custom_tabs_ios/pigeons/messages.dart
index 0f4c9b9b..7d650893 100644
--- a/flutter_custom_tabs_ios/pigeons/messages.dart
+++ b/flutter_custom_tabs_ios/pigeons/messages.dart
@@ -2,7 +2,7 @@ import 'package:pigeon/pigeon.dart';
 
 @ConfigurePigeon(PigeonOptions(
   swiftOut: 'ios/Classes/messages.g.swift',
-  dartOut: 'lib/src/messages.g.dart',
+  dartOut: 'lib/src/messages/messages.g.dart',
 ))
 @HostApi()
 abstract class CustomTabsApi {
diff --git a/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart b/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart
index d305ba90..bccc187e 100644
--- a/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart
+++ b/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart';
+import 'package:flutter_custom_tabs_ios/src/messages/messages.dart';
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'messages.dart';
-
 void main() {
   late _MockCustomTabsApi api;
   late CustomTabsPluginIOS customTabs;
diff --git a/flutter_custom_tabs_ios/test/messages.dart b/flutter_custom_tabs_ios/test/messages.dart
deleted file mode 100644
index ef05c8c7..00000000
--- a/flutter_custom_tabs_ios/test/messages.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'package:flutter_custom_tabs_ios/src/message_converters.dart';
-export 'package:flutter_custom_tabs_ios/src/messages.g.dart';
diff --git a/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart b/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart
index 459c5e8a..56d4f596 100644
--- a/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart
+++ b/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/painting.dart';
 import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart';
+import 'package:flutter_custom_tabs_ios/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('SafariViewControllerOptions', () {
     test('toMessage() returns empty message when option values are null', () {
diff --git a/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart b/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart
index 30d056d9..72ae3690 100644
--- a/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart
+++ b/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart';
+import 'package:flutter_custom_tabs_ios/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('SheetPresentationControllerConfiguration', () {
     test('toMessage() returns expected message with default values', () {