diff --git a/packages/shorebird_cli/lib/src/archive_analysis/apple_archive_differ.dart b/packages/shorebird_cli/lib/src/archive_analysis/apple_archive_differ.dart
index 2446bfea..24ae11c5 100644
--- a/packages/shorebird_cli/lib/src/archive_analysis/apple_archive_differ.dart
+++ b/packages/shorebird_cli/lib/src/archive_analysis/apple_archive_differ.dart
@@ -9,7 +9,7 @@ import 'package:crypto/crypto.dart';
 import 'package:path/path.dart' as p;
 import 'package:shorebird_cli/src/archive_analysis/archive_differ.dart';
 import 'package:shorebird_cli/src/archive_analysis/file_set_diff.dart';
-import 'package:shorebird_cli/src/archive_analysis/macho.dart';
+import 'package:shorebird_cli/src/platform/apple/macho.dart';
 
 /// {@template apple_archive_differ}
 /// Finds differences between two IPAs, zipped Xcframeworks, or zipped macOS
diff --git a/packages/shorebird_cli/lib/src/archive_analysis/archive_analysis.dart b/packages/shorebird_cli/lib/src/archive_analysis/archive_analysis.dart
index 55b465d6..1a7cae5c 100644
--- a/packages/shorebird_cli/lib/src/archive_analysis/archive_analysis.dart
+++ b/packages/shorebird_cli/lib/src/archive_analysis/archive_analysis.dart
@@ -2,5 +2,4 @@ export 'android_archive_differ.dart';
 export 'apple_archive_differ.dart';
 export 'file_set_diff.dart';
 export 'linux_bundle_differ.dart';
-export 'plist.dart';
 export 'windows_archive_differ.dart';
diff --git a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
index e8624e95..0820bf0b 100644
--- a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
+++ b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
@@ -5,7 +5,6 @@ import 'package:mason_logger/mason_logger.dart';
 import 'package:path/path.dart' as p;
 import 'package:platform/platform.dart';
 import 'package:shorebird_cli/src/archive_analysis/apple_archive_differ.dart';
-import 'package:shorebird_cli/src/archive_analysis/plist.dart';
 import 'package:shorebird_cli/src/artifact_builder/artifact_builder.dart';
 import 'package:shorebird_cli/src/artifact_manager.dart';
 import 'package:shorebird_cli/src/code_push_client_wrapper.dart';
@@ -18,6 +17,7 @@ import 'package:shorebird_cli/src/extensions/arg_results.dart';
 import 'package:shorebird_cli/src/logging/shorebird_logger.dart';
 import 'package:shorebird_cli/src/metadata/metadata.dart';
 import 'package:shorebird_cli/src/patch_diff_checker.dart';
+import 'package:shorebird_cli/src/platform/apple/plist.dart';
 import 'package:shorebird_cli/src/platform/platform.dart';
 import 'package:shorebird_cli/src/release_type.dart';
 import 'package:shorebird_cli/src/shorebird_artifacts.dart';
diff --git a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart
index 03a4c1f2..86420555 100644
--- a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart
+++ b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart
@@ -13,7 +13,7 @@ import 'package:shorebird_cli/src/executables/xcodebuild.dart';
 import 'package:shorebird_cli/src/extensions/arg_results.dart';
 import 'package:shorebird_cli/src/logging/logging.dart';
 import 'package:shorebird_cli/src/metadata/metadata.dart';
-import 'package:shorebird_cli/src/platform/apple.dart';
+import 'package:shorebird_cli/src/platform/apple/apple.dart';
 import 'package:shorebird_cli/src/release_type.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_validator.dart';
diff --git a/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart
index ca0ff0df..29136c1e 100644
--- a/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart
+++ b/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart
@@ -4,7 +4,6 @@ import 'package:crypto/crypto.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:path/path.dart' as p;
 import 'package:platform/platform.dart';
-import 'package:shorebird_cli/src/archive_analysis/plist.dart';
 import 'package:shorebird_cli/src/artifact_builder/artifact_builder.dart';
 import 'package:shorebird_cli/src/artifact_manager.dart';
 import 'package:shorebird_cli/src/code_push_client_wrapper.dart';
@@ -14,7 +13,8 @@ import 'package:shorebird_cli/src/executables/xcodebuild.dart';
 import 'package:shorebird_cli/src/extensions/arg_results.dart';
 import 'package:shorebird_cli/src/logging/logging.dart';
 import 'package:shorebird_cli/src/metadata/metadata.dart';
-import 'package:shorebird_cli/src/platform/apple.dart';
+import 'package:shorebird_cli/src/platform/apple/apple.dart';
+import 'package:shorebird_cli/src/platform/apple/plist.dart';
 import 'package:shorebird_cli/src/release_type.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_validator.dart';
diff --git a/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart
index 861b8be4..5e2f0313 100644
--- a/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart
+++ b/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart
@@ -4,7 +4,6 @@ import 'package:crypto/crypto.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:path/path.dart' as p;
 import 'package:platform/platform.dart';
-import 'package:shorebird_cli/src/archive_analysis/plist.dart';
 import 'package:shorebird_cli/src/artifact_builder/artifact_builder.dart';
 import 'package:shorebird_cli/src/artifact_manager.dart';
 import 'package:shorebird_cli/src/code_push_client_wrapper.dart';
@@ -14,6 +13,7 @@ import 'package:shorebird_cli/src/executables/xcodebuild.dart';
 import 'package:shorebird_cli/src/extensions/arg_results.dart';
 import 'package:shorebird_cli/src/logging/shorebird_logger.dart';
 import 'package:shorebird_cli/src/metadata/update_release_metadata.dart';
+import 'package:shorebird_cli/src/platform/apple/plist.dart';
 import 'package:shorebird_cli/src/platform/platform.dart';
 import 'package:shorebird_cli/src/release_type.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
diff --git a/packages/shorebird_cli/lib/src/platform/android.dart b/packages/shorebird_cli/lib/src/platform/android/android.dart
similarity index 100%
rename from packages/shorebird_cli/lib/src/platform/android.dart
rename to packages/shorebird_cli/lib/src/platform/android/android.dart
diff --git a/packages/shorebird_cli/lib/src/platform/apple.dart b/packages/shorebird_cli/lib/src/platform/apple/apple.dart
similarity index 99%
rename from packages/shorebird_cli/lib/src/platform/apple.dart
rename to packages/shorebird_cli/lib/src/platform/apple/apple.dart
index 8e58a1cd..1e380229 100644
--- a/packages/shorebird_cli/lib/src/platform/apple.dart
+++ b/packages/shorebird_cli/lib/src/platform/apple/apple.dart
@@ -14,6 +14,9 @@ import 'package:shorebird_cli/src/shorebird_artifacts.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:xml/xml.dart';
 
+export 'macho.dart';
+export 'plist.dart';
+
 /// Apple-specific platform options, corresponding to different Flutter target
 /// platforms.
 enum ApplePlatform {
diff --git a/packages/shorebird_cli/lib/src/archive_analysis/macho.dart b/packages/shorebird_cli/lib/src/platform/apple/macho.dart
similarity index 100%
rename from packages/shorebird_cli/lib/src/archive_analysis/macho.dart
rename to packages/shorebird_cli/lib/src/platform/apple/macho.dart
diff --git a/packages/shorebird_cli/lib/src/archive_analysis/plist.dart b/packages/shorebird_cli/lib/src/platform/apple/plist.dart
similarity index 100%
rename from packages/shorebird_cli/lib/src/archive_analysis/plist.dart
rename to packages/shorebird_cli/lib/src/platform/apple/plist.dart
diff --git a/packages/shorebird_cli/lib/src/platform/linux.dart b/packages/shorebird_cli/lib/src/platform/linux/linux.dart
similarity index 100%
rename from packages/shorebird_cli/lib/src/platform/linux.dart
rename to packages/shorebird_cli/lib/src/platform/linux/linux.dart
diff --git a/packages/shorebird_cli/lib/src/platform/platform.dart b/packages/shorebird_cli/lib/src/platform/platform.dart
index de102f7d..034b6e3d 100644
--- a/packages/shorebird_cli/lib/src/platform/platform.dart
+++ b/packages/shorebird_cli/lib/src/platform/platform.dart
@@ -1,7 +1,7 @@
-export 'android.dart';
-export 'apple.dart';
-export 'linux.dart';
-export 'windows.dart';
+export 'android/android.dart';
+export 'apple/apple.dart';
+export 'linux/linux.dart';
+export 'windows/windows.dart';
 
 /// {@template arch}
 /// Build architectures supported by Shorebird.
diff --git a/packages/shorebird_cli/lib/src/archive_analysis/portable_executable.dart b/packages/shorebird_cli/lib/src/platform/windows/portable_executable.dart
similarity index 99%
rename from packages/shorebird_cli/lib/src/archive_analysis/portable_executable.dart
rename to packages/shorebird_cli/lib/src/platform/windows/portable_executable.dart
index ac671350..f15588fa 100644
--- a/packages/shorebird_cli/lib/src/archive_analysis/portable_executable.dart
+++ b/packages/shorebird_cli/lib/src/platform/windows/portable_executable.dart
@@ -3,6 +3,8 @@ import 'dart:typed_data';
 
 import 'package:shorebird_cli/src/archive_analysis/byte_utils.dart';
 
+export 'portable_executable.dart';
+
 /// Utilities for interacting with Windows Portable Executable files.
 ///
 /// .exe and .dll files are examples of PE files. .dll files specifically "are
diff --git a/packages/shorebird_cli/lib/src/platform/windows.dart b/packages/shorebird_cli/lib/src/platform/windows/windows.dart
similarity index 100%
rename from packages/shorebird_cli/lib/src/platform/windows.dart
rename to packages/shorebird_cli/lib/src/platform/windows/windows.dart
diff --git a/packages/shorebird_cli/lib/src/validators/macos_network_entitlement_validator.dart b/packages/shorebird_cli/lib/src/validators/macos_network_entitlement_validator.dart
index 658f52cf..bd54ebaf 100644
--- a/packages/shorebird_cli/lib/src/validators/macos_network_entitlement_validator.dart
+++ b/packages/shorebird_cli/lib/src/validators/macos_network_entitlement_validator.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
-import 'package:shorebird_cli/src/archive_analysis/plist.dart';
+import 'package:shorebird_cli/src/platform/apple/plist.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 
diff --git a/packages/shorebird_cli/test/src/commands/init_command_test.dart b/packages/shorebird_cli/test/src/commands/init_command_test.dart
index 2ea11d95..4c629265 100644
--- a/packages/shorebird_cli/test/src/commands/init_command_test.dart
+++ b/packages/shorebird_cli/test/src/commands/init_command_test.dart
@@ -14,7 +14,7 @@ import 'package:shorebird_cli/src/doctor.dart';
 import 'package:shorebird_cli/src/executables/executables.dart';
 import 'package:shorebird_cli/src/logging/logging.dart';
 import 'package:shorebird_cli/src/platform.dart';
-import 'package:shorebird_cli/src/platform/apple.dart';
+import 'package:shorebird_cli/src/platform/apple/apple.dart';
 import 'package:shorebird_cli/src/pubspec_editor.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_process.dart';
diff --git a/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart b/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart
index adc6ca9a..3f41f211 100644
--- a/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart
+++ b/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart
@@ -131,7 +131,7 @@ void main() {
         expect(result, equals(ExitCode.success.code));
         verify(
           () => logger.warn(
-            'This command is deprecated and will be removed in a future release. Use `shorebird patches set-channel --channel=stable` instead.',
+            '''This command is deprecated and will be removed in a future release. Use `shorebird patches set-channel --channel=stable` instead.''',
           ),
         ).called(1);
       });
diff --git a/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart
index fff80a21..3f1b5d7c 100644
--- a/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart
+++ b/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart
@@ -21,7 +21,7 @@ import 'package:shorebird_cli/src/executables/xcodebuild.dart';
 import 'package:shorebird_cli/src/logging/logging.dart';
 import 'package:shorebird_cli/src/metadata/metadata.dart';
 import 'package:shorebird_cli/src/os/operating_system_interface.dart';
-import 'package:shorebird_cli/src/platform/apple.dart';
+import 'package:shorebird_cli/src/platform/apple/apple.dart';
 import 'package:shorebird_cli/src/release_type.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_flutter.dart';
diff --git a/packages/shorebird_cli/test/src/platform/android_test.dart b/packages/shorebird_cli/test/src/platform/android/android_test.dart
similarity index 99%
rename from packages/shorebird_cli/test/src/platform/android_test.dart
rename to packages/shorebird_cli/test/src/platform/android/android_test.dart
index 1168c061..1f22d410 100644
--- a/packages/shorebird_cli/test/src/platform/android_test.dart
+++ b/packages/shorebird_cli/test/src/platform/android/android_test.dart
@@ -7,7 +7,7 @@ import 'package:shorebird_cli/src/engine_config.dart';
 import 'package:shorebird_cli/src/platform/platform.dart';
 import 'package:test/test.dart';
 
-import '../mocks.dart';
+import '../../mocks.dart';
 
 void main() {
   group('AndroidArch', () {
diff --git a/packages/shorebird_cli/test/src/platform/apple_test.dart b/packages/shorebird_cli/test/src/platform/apple/apple_test.dart
similarity index 99%
rename from packages/shorebird_cli/test/src/platform/apple_test.dart
rename to packages/shorebird_cli/test/src/platform/apple/apple_test.dart
index 3df95597..5700af07 100644
--- a/packages/shorebird_cli/test/src/platform/apple_test.dart
+++ b/packages/shorebird_cli/test/src/platform/apple/apple_test.dart
@@ -13,7 +13,7 @@ import 'package:shorebird_cli/src/shorebird_artifacts.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-import '../mocks.dart';
+import '../../mocks.dart';
 
 void main() {
   group(InvalidExportOptionsPlistException, () {
diff --git a/packages/shorebird_cli/test/src/platform/linux_test.dart b/packages/shorebird_cli/test/src/platform/linux/linux_test.dart
similarity index 96%
rename from packages/shorebird_cli/test/src/platform/linux_test.dart
rename to packages/shorebird_cli/test/src/platform/linux/linux_test.dart
index 1867af50..a716b514 100644
--- a/packages/shorebird_cli/test/src/platform/linux_test.dart
+++ b/packages/shorebird_cli/test/src/platform/linux/linux_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:pub_semver/pub_semver.dart';
-import 'package:shorebird_cli/src/platform/linux.dart';
+import 'package:shorebird_cli/src/platform/linux/linux.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/shorebird_cli/test/src/archive_analysis/portable_executable_test.dart b/packages/shorebird_cli/test/src/platform/windows/portable_executable_test.dart
similarity index 97%
rename from packages/shorebird_cli/test/src/archive_analysis/portable_executable_test.dart
rename to packages/shorebird_cli/test/src/platform/windows/portable_executable_test.dart
index 13dfcd26..0ac1d609 100644
--- a/packages/shorebird_cli/test/src/archive_analysis/portable_executable_test.dart
+++ b/packages/shorebird_cli/test/src/platform/windows/portable_executable_test.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:archive/archive_io.dart';
 import 'package:path/path.dart' as p;
-import 'package:shorebird_cli/src/archive_analysis/portable_executable.dart';
+import 'package:shorebird_cli/src/platform/windows/portable_executable.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/shorebird_cli/test/src/platform/windows_test.dart b/packages/shorebird_cli/test/src/platform/windows/windows_test.dart
similarity index 97%
rename from packages/shorebird_cli/test/src/platform/windows_test.dart
rename to packages/shorebird_cli/test/src/platform/windows/windows_test.dart
index eb845d07..534aaa9e 100644
--- a/packages/shorebird_cli/test/src/platform/windows_test.dart
+++ b/packages/shorebird_cli/test/src/platform/windows/windows_test.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:path/path.dart' as p;
 import 'package:scoped_deps/scoped_deps.dart';
-import 'package:shorebird_cli/src/platform/windows.dart';
+import 'package:shorebird_cli/src/platform/windows/windows.dart';
 import 'package:test/test.dart';
 
 void main() {