Make args package follow new layout.

pkg/args/lib/args.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * This library lets you define parsers for parsing raw command-line arguments
  * into a set of options and values using [GNU][] and [POSIX][] style options.
  *
  * ## Defining options ##
  *
@@ skipping 164 matching lines @@
  *           [arm]       ARM Holding 32-bit chip
  *           [ia32]      Intel x86
  *
  * [posix]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html#tag_12_02
  * [gnu]: http://www.gnu.org/prep/standards/standards.html#Command_002dLine-Interfaces
  */
 #library('args');
 
 #import('dart:math');
 
-#import('utils.dart');
+// TODO(rnystrom): Use "package:" URL here when test.dart can handle pub.
+#import('src/utils.dart');
 
 /**
  * A class for taking a list of raw command line arguments and parsing out
  * options and flags from them.
  */
 class ArgParser {
   static const _SOLO_OPT = const RegExp(@'^-([a-zA-Z0-9])$');
   static const _ABBR_OPT = const RegExp(@'^-([a-zA-Z0-9]+)(.*)$');
   static const _LONG_OPT = const RegExp(@'^--([a-zA-Z\-_0-9]+)(=(.*))?$');
 
@@ skipping 569 matching lines @@
       allowedBuffer.add(allowed);
       if (allowed == option.defaultValue) {
         allowedBuffer.add(' (default)');
       }
       first = false;
     }
     allowedBuffer.add(']');
     return allowedBuffer.toString();
   }
 }