diff --git a/src/Makefile b/Makefile
similarity index 86%
rename from src/Makefile
rename to Makefile
index 108011a..61ca923 100644
--- a/src/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include $(GOROOT)/src/Make.inc
 
-TARG = feeder
+TARG = github.com/jteeuwen/go-pkg-rss
 GOFILES = feed.go rss.go atom.go channel.go image.go item.go cloud.go \
 	enclosure.go source.go input.go category.go generator.go link.go\
 	subtitle.go author.go content.go
diff --git a/src/atom.go b/atom.go
similarity index 98%
rename from src/atom.go
rename to atom.go
index e7fc7bb..1ed2487 100644
--- a/src/atom.go
+++ b/atom.go
@@ -1,7 +1,7 @@
 package feeder
 
 import "os"
-import "xmlx"
+import xmlx "github.com/jteeuwen/go-pkg-xmlx"
 
 func (this *Feed) readAtom(doc *xmlx.Document) (err os.Error) {
 	ns := "http://www.w3.org/2005/Atom"
diff --git a/src/author.go b/author.go
similarity index 100%
rename from src/author.go
rename to author.go
diff --git a/src/category.go b/category.go
similarity index 100%
rename from src/category.go
rename to category.go
diff --git a/src/channel.go b/channel.go
similarity index 100%
rename from src/channel.go
rename to channel.go
diff --git a/src/cloud.go b/cloud.go
similarity index 100%
rename from src/cloud.go
rename to cloud.go
diff --git a/src/content.go b/content.go
similarity index 100%
rename from src/content.go
rename to content.go
diff --git a/src/enclosure.go b/enclosure.go
similarity index 100%
rename from src/enclosure.go
rename to enclosure.go
diff --git a/src/feed.go b/feed.go
similarity index 99%
rename from src/feed.go
rename to feed.go
index 4196621..b6a4928 100644
--- a/src/feed.go
+++ b/feed.go
@@ -27,7 +27,7 @@ package feeder
 
 import "os"
 import "time"
-import "xmlx"
+import xmlx "github.com/jteeuwen/go-pkg-xmlx"
 import "fmt"
 import "strconv"
 import "strings"
diff --git a/src/feed_test.go b/feed_test.go
similarity index 100%
rename from src/feed_test.go
rename to feed_test.go
diff --git a/src/generator.go b/generator.go
similarity index 100%
rename from src/generator.go
rename to generator.go
diff --git a/src/image.go b/image.go
similarity index 100%
rename from src/image.go
rename to image.go
diff --git a/src/input.go b/input.go
similarity index 100%
rename from src/input.go
rename to input.go
diff --git a/src/item.go b/item.go
similarity index 100%
rename from src/item.go
rename to item.go
diff --git a/src/link.go b/link.go
similarity index 100%
rename from src/link.go
rename to link.go
diff --git a/src/rss.go b/rss.go
similarity index 99%
rename from src/rss.go
rename to rss.go
index 15b7787..4b1d412 100644
--- a/src/rss.go
+++ b/rss.go
@@ -1,7 +1,7 @@
 package feeder
 
 import "os"
-import "xmlx"
+import xmlx "github.com/jteeuwen/go-pkg-xmlx"
 
 func (this *Feed) readRss2(doc *xmlx.Document) (err os.Error) {
 	days := make(map[string]int)
diff --git a/src/source.go b/source.go
similarity index 100%
rename from src/source.go
rename to source.go
diff --git a/src/subtitle.go b/subtitle.go
similarity index 100%
rename from src/subtitle.go
rename to subtitle.go