diff --git a/lib/client.dart b/example/client.dart
similarity index 79%
rename from lib/client.dart
rename to example/client.dart
index adf1fcc..2b465ce 100644
--- a/lib/client.dart
+++ b/example/client.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 
 import 'package:http/http.dart' as http;
-import 'package:webfeedclient/domain/rss_feed.dart';
+import 'package:webfeed/domain/rss_feed.dart';
 
 class WebFeedClient {
   http.Client client;
 
-  WebFeedClient() {
-    client = new http.Client();
+  WebFeedClient(http.Client httpClient) {
+    client = httpClient;
   }
 
   Future<RssFeed> fetch(String url) {
diff --git a/example/main.dart b/example/main.dart
index 57099a6..352362b 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,7 +1,8 @@
-import 'package:webfeedclient/client.dart';
+import 'package:http/http.dart' as http;
+import 'client.dart';
 
 void main() {
-  var client = new WebFeedClient();
+  var client = new WebFeedClient(new http.Client());
   client.fetch("https://developer.apple.com/news/releases/rss/releases.rss").then((channel) {
     print(channel);
   }).catchError((error) {
diff --git a/lib/domain/rss_category.dart b/lib/domain/rss_category.dart
index a5add9b..ef4da1e 100644
--- a/lib/domain/rss_category.dart
+++ b/lib/domain/rss_category.dart
@@ -1,7 +1,6 @@
 import 'package:xml/xml.dart';
 
 class RssCategory {
-
   String domain;
   String value;
 
@@ -21,4 +20,4 @@ class RssCategory {
       value: $value
     ''';
   }
-}
\ No newline at end of file
+}
diff --git a/lib/domain/rss_cloud.dart b/lib/domain/rss_cloud.dart
index 6a2c792..1d42e18 100644
--- a/lib/domain/rss_cloud.dart
+++ b/lib/domain/rss_cloud.dart
@@ -28,4 +28,4 @@ class RssCloud {
       protocol: $protocol
     ''';
   }
-}
\ No newline at end of file
+}
diff --git a/lib/domain/rss_feed.dart b/lib/domain/rss_feed.dart
index 7ef1d2b..36690fb 100644
--- a/lib/domain/rss_feed.dart
+++ b/lib/domain/rss_feed.dart
@@ -1,13 +1,12 @@
 import 'dart:core';
 
-import 'package:webfeedclient/domain/rss_category.dart';
-import 'package:webfeedclient/domain/rss_cloud.dart';
-import 'package:webfeedclient/domain/rss_item.dart';
-import 'package:webfeedclient/util/helpers.dart';
+import 'package:webfeed/domain/rss_category.dart';
+import 'package:webfeed/domain/rss_cloud.dart';
+import 'package:webfeed/domain/rss_image.dart';
+import 'package:webfeed/domain/rss_item.dart';
+import 'package:webfeed/util/helpers.dart';
 import 'package:xml/xml.dart';
 
-import 'package:webfeedclient/domain/rss_image.dart';
-
 class RssFeed {
   final String title;
   final String description;
diff --git a/lib/domain/rss_image.dart b/lib/domain/rss_image.dart
index 3b1d199..9e758af 100644
--- a/lib/domain/rss_image.dart
+++ b/lib/domain/rss_image.dart
@@ -1,4 +1,4 @@
-import 'package:webfeedclient/util/helpers.dart';
+import 'package:webfeed/util/helpers.dart';
 import 'package:xml/xml.dart';
 
 class RssImage {
diff --git a/lib/domain/rss_item.dart b/lib/domain/rss_item.dart
index eba3ecc..dfbbbcb 100644
--- a/lib/domain/rss_item.dart
+++ b/lib/domain/rss_item.dart
@@ -1,6 +1,6 @@
-import 'package:webfeedclient/domain/rss_category.dart';
-import 'package:webfeedclient/domain/rss_source.dart';
-import 'package:webfeedclient/util/helpers.dart';
+import 'package:webfeed/domain/rss_category.dart';
+import 'package:webfeed/domain/rss_source.dart';
+import 'package:webfeed/util/helpers.dart';
 import 'package:xml/xml.dart';
 
 class RssItem {
diff --git a/lib/main.dart b/lib/main.dart
deleted file mode 100644
index 74965ab..0000000
--- a/lib/main.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:webfeedclient/client.dart';
-
-void main() {
-  var client = new WebFeedClient();
-  client.fetch("https://developer.apple.com/news/releases/rss/releases.rss");
-}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index ebbfd28..12a75e2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
-name: webfeedclient
+name: webfeed
 dependencies:
   xml: "^3.0.0"
-  http: "^0.11.3+16"
 dev_dependencies:
-  test: ^0.12.0
\ No newline at end of file
+  test: ^0.12.0
+  http: "^0.11.3+16"
\ No newline at end of file
diff --git a/test/rss_test.dart b/test/rss_test.dart
index e2ef62e..f650ab4 100644
--- a/test/rss_test.dart
+++ b/test/rss_test.dart
@@ -1,8 +1,7 @@
 import 'dart:io';
 import 'dart:core';
 import 'package:test/test.dart';
-import 'package:webfeedclient/domain/rss_feed.dart';
-import 'package:xml/xml.dart' as xml;
+import 'package:webfeed/domain/rss_feed.dart';
 
 void main() {
   test("parsing Invalid.xml", () {