diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt
index d38be145fc..85a9576ef0 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt
@@ -1,12 +1,12 @@
 package ftl.cli.firebase.test
 
 import ftl.cli.firebase.test.android.AndroidDoctorCommand
+import ftl.cli.firebase.test.android.AndroidLocalesCommand
+import ftl.cli.firebase.test.android.AndroidModelsCommand
+import ftl.cli.firebase.test.android.AndroidOrientationsCommand
 import ftl.cli.firebase.test.android.AndroidRunCommand
 import ftl.cli.firebase.test.android.AndroidTestEnvironmentCommand
-import ftl.cli.firebase.test.android.configuration.AndroidLocalesCommand
-import ftl.cli.firebase.test.android.models.AndroidModelsCommand
-import ftl.cli.firebase.test.android.orientations.AndroidOrientationsCommand
-import ftl.cli.firebase.test.android.versions.AndroidVersionsCommand
+import ftl.cli.firebase.test.android.AndroidVersionsCommand
 import picocli.CommandLine
 import picocli.CommandLine.Command
 
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt
index 77d3833993..f9f725244e 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt
@@ -1,12 +1,12 @@
 package ftl.cli.firebase.test
 
 import ftl.cli.firebase.test.ios.IosDoctorCommand
+import ftl.cli.firebase.test.ios.IosLocalesCommand
+import ftl.cli.firebase.test.ios.IosModelsCommand
+import ftl.cli.firebase.test.ios.IosOrientationsCommand
 import ftl.cli.firebase.test.ios.IosRunCommand
 import ftl.cli.firebase.test.ios.IosTestEnvironmentCommand
-import ftl.cli.firebase.test.ios.configuration.IosLocalesCommand
-import ftl.cli.firebase.test.ios.models.IosModelsCommand
-import ftl.cli.firebase.test.ios.orientations.IosOrientationsCommand
-import ftl.cli.firebase.test.ios.versions.IosVersionsCommand
+import ftl.cli.firebase.test.ios.IosVersionsCommand
 import picocli.CommandLine
 import picocli.CommandLine.Command
 
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt
similarity index 79%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt
index 4159c27070..0d054c10e7 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.configuration
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.configuration.AndroidLocalesDescribeCommand
+import ftl.cli.firebase.test.android.configuration.AndroidLocalesListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt
similarity index 80%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt
index d0149c3001..8522b9376a 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.models
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.models.AndroidModelDescribeCommand
+import ftl.cli.firebase.test.android.models.AndroidModelsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt
similarity index 85%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt
index 481eebe8bc..972b0688ab 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt
@@ -1,5 +1,6 @@
-package ftl.cli.firebase.test.android.orientations
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.orientations.AndroidOrientationsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt
similarity index 80%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt
index a56b124b87..072e2fbd37 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.versions
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.versions.AndroidVersionsDescribeCommand
+import ftl.cli.firebase.test.android.versions.AndroidVersionsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt
similarity index 81%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt
index aa45234a1a..121949ef01 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.configuration
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.configuration.IosLocalesDescribeCommand
+import ftl.cli.firebase.test.ios.configuration.IosLocalesListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt
similarity index 82%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt
index 36b126372d..06982fb4f3 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.models
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.models.IosModelDescribeCommand
+import ftl.cli.firebase.test.ios.models.IosModelsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt
similarity index 86%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt
index 9e17f4972b..50db970935 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt
@@ -1,5 +1,6 @@
-package ftl.cli.firebase.test.ios.orientations
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.orientations.IosOrientationsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt
similarity index 81%
rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsCommand.kt
rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt
index 03c8c0c8f7..d9f7d6f3de 100644
--- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsCommand.kt
+++ b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.versions
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.versions.IosVersionsDescribeCommand
+import ftl.cli.firebase.test.ios.versions.IosVersionsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(