diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1adc08d..fda14fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-## 0.6.0-dev.0.0
+## 0.6.1
+
+* Move binary subcommands under src folder. Otherwise, `pub global activate`
+  fails.
+
+## 0.6.0
 
 This release contains several **breaking changes**:
 
diff --git a/bin/code_deps.dart b/bin/src/code_deps.dart
similarity index 100%
rename from bin/code_deps.dart
rename to bin/src/code_deps.dart
diff --git a/bin/convert.dart b/bin/src/convert.dart
similarity index 100%
rename from bin/convert.dart
rename to bin/src/convert.dart
diff --git a/bin/coverage_log_server.dart b/bin/src/coverage_log_server.dart
similarity index 100%
rename from bin/coverage_log_server.dart
rename to bin/src/coverage_log_server.dart
diff --git a/bin/debug_info.dart b/bin/src/debug_info.dart
similarity index 100%
rename from bin/debug_info.dart
rename to bin/src/debug_info.dart
diff --git a/bin/deferred_library_check.dart b/bin/src/deferred_library_check.dart
similarity index 100%
rename from bin/deferred_library_check.dart
rename to bin/src/deferred_library_check.dart
diff --git a/bin/deferred_library_layout.dart b/bin/src/deferred_library_layout.dart
similarity index 100%
rename from bin/deferred_library_layout.dart
rename to bin/src/deferred_library_layout.dart
diff --git a/bin/deferred_library_size.dart b/bin/src/deferred_library_size.dart
similarity index 100%
rename from bin/deferred_library_size.dart
rename to bin/src/deferred_library_size.dart
diff --git a/bin/diff.dart b/bin/src/diff.dart
similarity index 100%
rename from bin/diff.dart
rename to bin/src/diff.dart
diff --git a/bin/function_size_analysis.dart b/bin/src/function_size_analysis.dart
similarity index 98%
rename from bin/function_size_analysis.dart
rename to bin/src/function_size_analysis.dart
index ad6e8ad..2ef9348 100644
--- a/bin/function_size_analysis.dart
+++ b/bin/src/function_size_analysis.dart
@@ -120,7 +120,7 @@
     var size = info.size;
     var min = dominatedSize[info];
     var max = nodeData[info].maxSize;
-    _showElement(longName(info), size, min, max, realTotal);
+    _showElement(longName(info, useLibraryUri: true), size, min, max, realTotal);
   });
 }
 
diff --git a/bin/inject_text.dart b/bin/src/inject_text.dart
similarity index 100%
rename from bin/inject_text.dart
rename to bin/src/inject_text.dart
diff --git a/bin/library_size_split.dart b/bin/src/library_size_split.dart
similarity index 100%
rename from bin/library_size_split.dart
rename to bin/src/library_size_split.dart
diff --git a/bin/live_code_size_analysis.dart b/bin/src/live_code_size_analysis.dart
similarity index 100%
rename from bin/live_code_size_analysis.dart
rename to bin/src/live_code_size_analysis.dart
diff --git a/bin/show_inferred_types.dart b/bin/src/show_inferred_types.dart
similarity index 100%
rename from bin/show_inferred_types.dart
rename to bin/src/show_inferred_types.dart
diff --git a/bin/text_print.dart b/bin/src/text_print.dart
similarity index 100%
rename from bin/text_print.dart
rename to bin/src/text_print.dart
diff --git a/bin/to_binary.dart b/bin/src/to_binary.dart
similarity index 100%
rename from bin/to_binary.dart
rename to bin/src/to_binary.dart
diff --git a/bin/to_json.dart b/bin/src/to_json.dart
similarity index 100%
rename from bin/to_json.dart
rename to bin/src/to_json.dart
diff --git a/bin/to_proto.dart b/bin/src/to_proto.dart
similarity index 100%
rename from bin/to_proto.dart
rename to bin/src/to_proto.dart
diff --git a/bin/usage_exception.dart b/bin/src/usage_exception.dart
similarity index 100%
rename from bin/usage_exception.dart
rename to bin/src/usage_exception.dart
diff --git a/bin/tools.dart b/bin/tools.dart
index 32e9e33..40495a8 100644
--- a/bin/tools.dart
+++ b/bin/tools.dart
@@ -4,19 +4,19 @@
 
 import 'package:args/command_runner.dart';
 
-import 'code_deps.dart';
-import 'coverage_log_server.dart';
-import 'debug_info.dart';
-import 'diff.dart';
-import 'deferred_library_check.dart';
-import 'deferred_library_size.dart';
-import 'deferred_library_layout.dart';
-import 'convert.dart';
-import 'function_size_analysis.dart';
-import 'library_size_split.dart';
-import 'live_code_size_analysis.dart';
-import 'show_inferred_types.dart';
-import 'text_print.dart';
+import 'src/code_deps.dart';
+import 'src/coverage_log_server.dart';
+import 'src/debug_info.dart';
+import 'src/diff.dart';
+import 'src/deferred_library_check.dart';
+import 'src/deferred_library_size.dart';
+import 'src/deferred_library_layout.dart';
+import 'src/convert.dart';
+import 'src/function_size_analysis.dart';
+import 'src/library_size_split.dart';
+import 'src/live_code_size_analysis.dart';
+import 'src/show_inferred_types.dart';
+import 'src/text_print.dart';
 
 /// Entrypoint to run all dart2js_info tools.
 void main(args) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 5a34a94..4dc7461 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dart2js_info
-version: 0.6.0
+version: 0.6.1
 
 description: >
   Libraries and tools to process data produced when running dart2js with