Merge pull request #88 from dart-lang/expose_uuid

expose the uuid library
diff --git a/changelog.md b/changelog.md
index f62e4dd..68d72da 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@
 - removed the use of configurable imports
 - removed the Flutter specific entry-point; Flutter apps can now use the
   regular `dart:io` entrypoint (AnalyticsIO)
+- moved the uuid library from `lib/src/` to `lib/uuid/`
 
 ## 2.2.2
 - adjust the Flutter usage client to Flutter API changes
diff --git a/lib/src/usage_impl.dart b/lib/src/usage_impl.dart
index 290c5fb..075acd1 100644
--- a/lib/src/usage_impl.dart
+++ b/lib/src/usage_impl.dart
@@ -6,7 +6,7 @@
 import 'dart:math' as math;
 
 import '../usage.dart';
-import 'uuid.dart';
+import '../uuid/uuid.dart';
 
 final int _MAX_EXCEPTION_LENGTH = 100;
 
diff --git a/lib/src/usage_impl_default.dart b/lib/src/usage_impl_default.dart
deleted file mode 100644
index 78b3f46..0000000
--- a/lib/src/usage_impl_default.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, 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.
-
-import 'dart:async';
-
-import '../usage.dart';
-
-Future<Analytics> createAnalytics(
-  String trackingId,
-  String applicationName,
-  String applicationVersion, {
-  String analyticsUrl
-}) {
-  throw new UnimplementedError();
-}
diff --git a/lib/src/uuid.dart b/lib/uuid/uuid.dart
similarity index 86%
rename from lib/src/uuid.dart
rename to lib/uuid/uuid.dart
index 66e99ac..361e1b3 100644
--- a/lib/src/uuid.dart
+++ b/lib/uuid/uuid.dart
@@ -5,19 +5,20 @@
 /**
  * A UUID generator library.
  */
-library usage.uuid;
+library uuid;
 
 import 'dart:math' show Random;
 
 /**
- * A UUID generator. This will generate unique IDs in the format:
+ * A UUID generator.
+ *
+ * This will generate unique IDs in the format:
  *
  *     f47ac10b-58cc-4372-a567-0e02b2c3d479
  *
  * The generated uuids are 128 bit numbers encoded in a specific string format.
- *
  * For more information, see
- * http://en.wikipedia.org/wiki/Universally_unique_identifier.
+ * [en.wikipedia.org/wiki/Universally_unique_identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier).
  */
 class Uuid {
   Random _random = new Random();
diff --git a/readme.md b/readme.md
index 9b2331f..5308ae1 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@
 ## For Flutter apps
 
 Flutter applications can use the `AnalyticsIO` version of this library. They will need
-to specify the documents directory in the constructor, in order to tell the library where
+to specify the documents directory in the constructor in order to tell the library where
 to save the analytics preferences:
 
 ```dart
diff --git a/test/uuid_test.dart b/test/uuid_test.dart
index 335d878..98dbab8 100644
--- a/test/uuid_test.dart
+++ b/test/uuid_test.dart
@@ -5,7 +5,7 @@
 library usage.uuid_test;
 
 import 'package:test/test.dart';
-import 'package:usage/src/uuid.dart';
+import 'package:usage/uuid/uuid.dart';
 
 main() => defineTests();