Move more files around.

test/runner/isolate_listener_test.dart

Index: test/runner/isolate_listener_test.dart
diff --git a/test/vm_listener_test.dart b/test/runner/isolate_listener_test.dart
similarity index 94%
rename from test/vm_listener_test.dart
rename to test/runner/isolate_listener_test.dart
index 2da8f88f0d6bf7ea7ad14470e6a41312d19eeed6..4fec7919330e6b419ce95a4b765947299458f643 100644
--- a/test/vm_listener_test.dart
+++ b/test/runner/isolate_listener_test.dart
@@ -9,13 +9,13 @@ import 'package:unittest/src/backend/invoker.dart';
 import 'package:unittest/src/backend/live_test.dart';
 import 'package:unittest/src/backend/state.dart';
 import 'package:unittest/src/backend/suite.dart';
-import 'package:unittest/src/runner/isolate_test.dart';
-import 'package:unittest/src/runner/vm_listener.dart';
+import 'package:unittest/src/runner/vm/isolate_listener.dart';
+import 'package:unittest/src/runner/vm/isolate_test.dart';
 import 'package:unittest/src/util/io.dart';
 import 'package:unittest/src/util/remote_exception.dart';
 import 'package:unittest/unittest.dart';
 
-import 'utils.dart';
+import '../utils.dart';
 
 /// An isolate that's been spun up for the current test.
 ///
@@ -292,25 +292,25 @@ Future<ReceivePort> _spawnIsolate(void entryPoint(SendPort sendPort)) {
 
 /// An isolate entrypoint that throws immediately.
 void _loadError(SendPort sendPort) =>
-    VmListener.start(sendPort, () => () => throw 'oh no');
+    IsolateListener.start(sendPort, () => () => throw 'oh no');
 
 /// An isolate entrypoint that throws a NoSuchMethodError.
 void _noSuchMethodError(SendPort sendPort) {
-  return VmListener.start(sendPort, () =>
+  return IsolateListener.start(sendPort, () =>
       throw new NoSuchMethodError(null, #main, [], {}));
 }
 
 /// An isolate entrypoint that returns a non-function.
 void _nonFunction(SendPort sendPort) =>
-    VmListener.start(sendPort, () => null);
+    IsolateListener.start(sendPort, () => null);
 
 /// An isolate entrypoint that returns a function with the wrong arity.
 void _wrongArity(SendPort sendPort) =>
-    VmListener.start(sendPort, () => (_) {});
+    IsolateListener.start(sendPort, () => (_) {});
 
 /// An isolate entrypoint that defines three tests that succeed.
 void _successfulTests(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("successful 1", () {});
     test("successful 2", () {});
     test("successful 3", () {});
@@ -319,14 +319,14 @@ void _successfulTests(SendPort sendPort) {
 
 /// An isolate entrypoint that defines a test that fails.
 void _failingTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("failure", () => throw new TestFailure('oh no'));
   });
 }
 
 /// An isolate entrypoint that defines a test that fails after succeeding.
 void _failAfterSucceedTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("fail after succeed", () {
       pumpEventQueue().then((_) {
         throw new TestFailure('oh no');
@@ -337,7 +337,7 @@ void _failAfterSucceedTest(SendPort sendPort) {
 
 /// An isolate entrypoint that defines a test that fails multiple times.
 void _multiFailTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("multiple failures", () {
       Invoker.current.addOutstandingCallback();
       new Future(() => throw new TestFailure("one"));
@@ -350,14 +350,14 @@ void _multiFailTest(SendPort sendPort) {
 
 /// An isolate entrypoint that defines a test that errors.
 void _errorTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("error", () => throw 'oh no');
   });
 }
 
 /// An isolate entrypoint that defines a test that errors after succeeding.
 void _errorAfterSucceedTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("error after succeed", () {
       pumpEventQueue().then((_) => throw 'oh no');
     });
@@ -366,7 +366,7 @@ void _errorAfterSucceedTest(SendPort sendPort) {
 
 /// An isolate entrypoint that defines a test that errors multiple times.
 void _multiErrorTest(SendPort sendPort) {
-  VmListener.start(sendPort, () => () {
+  IsolateListener.start(sendPort, () => () {
     test("multiple errors", () {
       Invoker.current.addOutstandingCallback();
       new Future(() => throw "one");