diff --git a/packages/cutler/bin/cutler.dart b/packages/cutler/bin/cutler.dart
index 3c3849b5..34ef000b 100644
--- a/packages/cutler/bin/cutler.dart
+++ b/packages/cutler/bin/cutler.dart
@@ -4,8 +4,7 @@ import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
 import 'package:cutler/config.dart';
 import 'package:cutler/model.dart';
-import 'package:cutler/print_versions_command.dart';
-import 'package:cutler/rebase_command.dart';
+import 'package:cutler/commands/commands.dart';
 
 class Cutler extends CommandRunner<int> {
   Cutler() : super('cutler', 'A tool for maintaining forks of Flutter.') {
diff --git a/packages/cutler/lib/commands/commands.dart b/packages/cutler/lib/commands/commands.dart
new file mode 100644
index 00000000..ec88be6b
--- /dev/null
+++ b/packages/cutler/lib/commands/commands.dart
@@ -0,0 +1,2 @@
+export 'print_versions_command.dart';
+export 'rebase_command.dart';
diff --git a/packages/cutler/lib/print_versions_command.dart b/packages/cutler/lib/commands/print_versions_command.dart
similarity index 100%
rename from packages/cutler/lib/print_versions_command.dart
rename to packages/cutler/lib/commands/print_versions_command.dart
diff --git a/packages/cutler/lib/rebase_command.dart b/packages/cutler/lib/commands/rebase_command.dart
similarity index 100%
rename from packages/cutler/lib/rebase_command.dart
rename to packages/cutler/lib/commands/rebase_command.dart