Revert "Make unittest follow the new package layout."

samples/tests/samples/dartcombat/dartcombat_test.dart

Index: samples/tests/samples/dartcombat/dartcombat_test.dart
diff --git a/samples/tests/samples/dartcombat/dartcombat_test.dart b/samples/tests/samples/dartcombat/dartcombat_test.dart
index b099ef688c93955918824d303b358984c6252748..b6113dd2e8f2fb3982bada7951433afc4f33b79c 100644
--- a/samples/tests/samples/dartcombat/dartcombat_test.dart
+++ b/samples/tests/samples/dartcombat/dartcombat_test.dart
@@ -7,8 +7,8 @@
 
 #import('dart:html');
 #import('dart:isolate');
-#import('../../../../pkg/unittest/lib/unittest.dart');
-#import('../../../../pkg/unittest/lib/html_config.dart');
+#import('../../../../pkg/unittest/unittest.dart');
+#import('../../../../pkg/unittest/html_config.dart');
 #import('../../../dartcombat/dartcombatlib.dart');
 
 ReceivePort testPort;
@@ -113,7 +113,7 @@ main() {
           Constants.HIT,  8, 6,  // down
           Constants.SUNK, 8, 7]; // down  (sunk - done)
         _expectShotSequence(expectedShots, p2OwnBoard, 2, callback);
-
+  
         // hit the boat from the enemy side.
         var p1EnemyBoard = document.query("#p1enemy");
         var hitCell = p1EnemyBoard.nodes[0].nodes[4].nodes[8];