Refactoring analyzer_cli for code hygiene.

pkg/analyzer_cli/lib/src/analyzer_impl.dart

Index: pkg/analyzer_cli/lib/src/analyzer_impl.dart
diff --git a/pkg/analyzer_cli/lib/src/analyzer_impl.dart b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
index 90a94d9b55ff21a4ca219b23182f7f29fe2e4122..75d848f51edcb52b42f99e15713e0b973959a323 100644
--- a/pkg/analyzer_cli/lib/src/analyzer_impl.dart
+++ b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
@@ -17,10 +17,10 @@ import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
-import 'package:analyzer_cli/src/driver.dart';
+import 'package:analyzer_cli/src/analyzer_driver.dart';
+import 'package:analyzer_cli/src/analyzer_options.dart';
 import 'package:analyzer_cli/src/error_formatter.dart';
 import 'package:analyzer_cli/src/error_severity.dart';
-import 'package:analyzer_cli/src/options.dart';
 import 'package:path/path.dart' as path;
 
 int get currentTimeMillis => new DateTime.now().millisecondsSinceEpoch;