diff --git a/packages/flutter_tools/bin/sky_tools.dart b/packages/flutter_tools/bin/sky_tools.dart
index efbd046cf9f..137a9f207ff 100644
--- a/packages/flutter_tools/bin/sky_tools.dart
+++ b/packages/flutter_tools/bin/sky_tools.dart
@@ -9,17 +9,17 @@ import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:sky_tools/src/application_package.dart';
 import 'package:sky_tools/src/artifacts.dart';
-import 'package:sky_tools/src/build.dart';
-import 'package:sky_tools/src/cache.dart';
-import 'package:sky_tools/src/init.dart';
-import 'package:sky_tools/src/install.dart';
-import 'package:sky_tools/src/list.dart';
-import 'package:sky_tools/src/listen.dart';
-import 'package:sky_tools/src/logs.dart';
-import 'package:sky_tools/src/run_mojo.dart';
-import 'package:sky_tools/src/start.dart';
-import 'package:sky_tools/src/stop.dart';
-import 'package:sky_tools/src/trace.dart';
+import 'package:sky_tools/src/commands/build.dart';
+import 'package:sky_tools/src/commands/cache.dart';
+import 'package:sky_tools/src/commands/init.dart';
+import 'package:sky_tools/src/commands/install.dart';
+import 'package:sky_tools/src/commands/list.dart';
+import 'package:sky_tools/src/commands/listen.dart';
+import 'package:sky_tools/src/commands/logs.dart';
+import 'package:sky_tools/src/commands/run_mojo.dart';
+import 'package:sky_tools/src/commands/start.dart';
+import 'package:sky_tools/src/commands/stop.dart';
+import 'package:sky_tools/src/commands/trace.dart';
 
 class FlutterCommandRunner extends CommandRunner {
   FlutterCommandRunner()
diff --git a/packages/flutter_tools/lib/src/build.dart b/packages/flutter_tools/lib/src/commands/build.dart
similarity index 99%
rename from packages/flutter_tools/lib/src/build.dart
rename to packages/flutter_tools/lib/src/commands/build.dart
index 3bef1f40794..7874e9d039c 100644
--- a/packages/flutter_tools/lib/src/build.dart
+++ b/packages/flutter_tools/lib/src/commands/build.dart
@@ -11,7 +11,7 @@ import 'package:archive/archive.dart';
 import 'package:args/command_runner.dart';
 import 'package:yaml/yaml.dart';
 
-import 'artifacts.dart';
+import '../artifacts.dart';
 
 const String _kSnapshotKey = 'snapshot_blob.bin';
 const List<String> _kDensities = const ['drawable-xxhdpi'];
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/commands/cache.dart
similarity index 97%
rename from packages/flutter_tools/lib/src/cache.dart
rename to packages/flutter_tools/lib/src/commands/cache.dart
index 5571217e334..74c2ac62a4a 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/commands/cache.dart
@@ -9,7 +9,7 @@ import 'dart:async';
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 
-import 'artifacts.dart';
+import '../artifacts.dart';
 
 final Logger _logging = new Logger('sky_tools.cache');
 
diff --git a/packages/flutter_tools/lib/src/init.dart b/packages/flutter_tools/lib/src/commands/init.dart
similarity index 100%
rename from packages/flutter_tools/lib/src/init.dart
rename to packages/flutter_tools/lib/src/commands/init.dart
diff --git a/packages/flutter_tools/lib/src/install.dart b/packages/flutter_tools/lib/src/commands/install.dart
similarity index 95%
rename from packages/flutter_tools/lib/src/install.dart
rename to packages/flutter_tools/lib/src/commands/install.dart
index d29ded1df3e..459c03c4ba3 100644
--- a/packages/flutter_tools/lib/src/install.dart
+++ b/packages/flutter_tools/lib/src/commands/install.dart
@@ -8,8 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 
-import 'application_package.dart';
-import 'device.dart';
+import '../application_package.dart';
+import '../device.dart';
 
 class InstallCommand extends Command {
   final name = 'install';
diff --git a/packages/flutter_tools/lib/src/list.dart b/packages/flutter_tools/lib/src/commands/list.dart
similarity index 96%
rename from packages/flutter_tools/lib/src/list.dart
rename to packages/flutter_tools/lib/src/commands/list.dart
index 752fe35659d..507edfd6263 100644
--- a/packages/flutter_tools/lib/src/list.dart
+++ b/packages/flutter_tools/lib/src/commands/list.dart
@@ -8,7 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.list');
 
diff --git a/packages/flutter_tools/lib/src/listen.dart b/packages/flutter_tools/lib/src/commands/listen.dart
similarity index 96%
rename from packages/flutter_tools/lib/src/listen.dart
rename to packages/flutter_tools/lib/src/commands/listen.dart
index 7dc0cf39b2f..843bf408a95 100644
--- a/packages/flutter_tools/lib/src/listen.dart
+++ b/packages/flutter_tools/lib/src/commands/listen.dart
@@ -9,9 +9,10 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
-import 'package:sky_tools/src/process.dart';
+
+import '../application_package.dart';
+import '../device.dart';
+import '../process.dart';
 
 final Logger _logging = new Logger('sky_tools.listen');
 
diff --git a/packages/flutter_tools/lib/src/logs.dart b/packages/flutter_tools/lib/src/commands/logs.dart
similarity index 96%
rename from packages/flutter_tools/lib/src/logs.dart
rename to packages/flutter_tools/lib/src/commands/logs.dart
index 518b75e9856..8fb59a511e9 100644
--- a/packages/flutter_tools/lib/src/logs.dart
+++ b/packages/flutter_tools/lib/src/commands/logs.dart
@@ -8,7 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.logs');
 
diff --git a/packages/flutter_tools/lib/src/run_mojo.dart b/packages/flutter_tools/lib/src/commands/run_mojo.dart
similarity index 98%
rename from packages/flutter_tools/lib/src/run_mojo.dart
rename to packages/flutter_tools/lib/src/commands/run_mojo.dart
index 1b32b08a880..077fccbc9f3 100644
--- a/packages/flutter_tools/lib/src/run_mojo.dart
+++ b/packages/flutter_tools/lib/src/commands/run_mojo.dart
@@ -11,8 +11,8 @@ import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
 
-import 'artifacts.dart';
-import 'process.dart';
+import '../artifacts.dart';
+import '../process.dart';
 
 final Logger _logging = new Logger('sky_tools.run_mojo');
 
diff --git a/packages/flutter_tools/lib/src/start.dart b/packages/flutter_tools/lib/src/commands/start.dart
similarity index 92%
rename from packages/flutter_tools/lib/src/start.dart
rename to packages/flutter_tools/lib/src/commands/start.dart
index 8d2dbc0dc29..ed11b2645de 100644
--- a/packages/flutter_tools/lib/src/start.dart
+++ b/packages/flutter_tools/lib/src/commands/start.dart
@@ -9,10 +9,11 @@ import 'dart:async';
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
-import 'package:sky_tools/src/install.dart';
-import 'package:sky_tools/src/stop.dart';
+
+import '../application_package.dart';
+import '../device.dart';
+import 'install.dart';
+import 'stop.dart';
 
 final Logger _logging = new Logger('sky_tools.start');
 
diff --git a/packages/flutter_tools/lib/src/stop.dart b/packages/flutter_tools/lib/src/commands/stop.dart
similarity index 93%
rename from packages/flutter_tools/lib/src/stop.dart
rename to packages/flutter_tools/lib/src/commands/stop.dart
index d1f9844f0ec..c6f3573e900 100644
--- a/packages/flutter_tools/lib/src/stop.dart
+++ b/packages/flutter_tools/lib/src/commands/stop.dart
@@ -8,8 +8,9 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../application_package.dart';
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.stop');
 
diff --git a/packages/flutter_tools/lib/src/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart
similarity index 95%
rename from packages/flutter_tools/lib/src/trace.dart
rename to packages/flutter_tools/lib/src/commands/trace.dart
index 830485100e0..3f9e68f8a1d 100644
--- a/packages/flutter_tools/lib/src/trace.dart
+++ b/packages/flutter_tools/lib/src/commands/trace.dart
@@ -8,8 +8,9 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../application_package.dart';
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.trace');
 
diff --git a/packages/flutter_tools/test/init_test.dart b/packages/flutter_tools/test/init_test.dart
index 8a688049227..b69eaa74fc4 100644
--- a/packages/flutter_tools/test/init_test.dart
+++ b/packages/flutter_tools/test/init_test.dart
@@ -10,7 +10,7 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:path/path.dart' as p;
-import 'package:sky_tools/src/init.dart';
+import 'package:sky_tools/src/commands/init.dart';
 import 'package:test/test.dart';
 
 main() => defineTests();
diff --git a/packages/flutter_tools/test/install_test.dart b/packages/flutter_tools/test/install_test.dart
index ff9a91fcc8e..35173cbe56c 100644
--- a/packages/flutter_tools/test/install_test.dart
+++ b/packages/flutter_tools/test/install_test.dart
@@ -6,7 +6,7 @@ library install_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/install.dart';
+import 'package:sky_tools/src/commands/install.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/list_test.dart b/packages/flutter_tools/test/list_test.dart
index 2ff1cff888a..53096cef663 100644
--- a/packages/flutter_tools/test/list_test.dart
+++ b/packages/flutter_tools/test/list_test.dart
@@ -6,7 +6,7 @@ library list_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/list.dart';
+import 'package:sky_tools/src/commands/list.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/listen_test.dart b/packages/flutter_tools/test/listen_test.dart
index b2d40a1f59d..0f10bce3691 100644
--- a/packages/flutter_tools/test/listen_test.dart
+++ b/packages/flutter_tools/test/listen_test.dart
@@ -6,7 +6,7 @@ library listen_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/listen.dart';
+import 'package:sky_tools/src/commands/listen.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/logs_test.dart b/packages/flutter_tools/test/logs_test.dart
index e0f2c38dba5..595620f75de 100644
--- a/packages/flutter_tools/test/logs_test.dart
+++ b/packages/flutter_tools/test/logs_test.dart
@@ -6,7 +6,7 @@ library logs_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/logs.dart';
+import 'package:sky_tools/src/commands/logs.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/start_test.dart b/packages/flutter_tools/test/start_test.dart
index 9ddfb0e999f..c6d72a9cf83 100644
--- a/packages/flutter_tools/test/start_test.dart
+++ b/packages/flutter_tools/test/start_test.dart
@@ -6,7 +6,7 @@ library start_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/start.dart';
+import 'package:sky_tools/src/commands/start.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/stop_test.dart b/packages/flutter_tools/test/stop_test.dart
index 8d67d662bdf..2089c437ef3 100644
--- a/packages/flutter_tools/test/stop_test.dart
+++ b/packages/flutter_tools/test/stop_test.dart
@@ -6,7 +6,7 @@ library stop_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/stop.dart';
+import 'package:sky_tools/src/commands/stop.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';
diff --git a/packages/flutter_tools/test/trace_test.dart b/packages/flutter_tools/test/trace_test.dart
index 726c78fc1d2..7de1fd84c1a 100644
--- a/packages/flutter_tools/test/trace_test.dart
+++ b/packages/flutter_tools/test/trace_test.dart
@@ -6,7 +6,7 @@ library trace_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/trace.dart';
+import 'package:sky_tools/src/commands/trace.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';