diff --git a/client.go b/client.go
index b747d29..7e16004 100644
--- a/client.go
+++ b/client.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"fmt"
 	"os"
 	"bufio"
diff --git a/irc/Makefile b/client/Makefile
similarity index 88%
rename from irc/Makefile
rename to client/Makefile
index e3f1bec..35dfe19 100644
--- a/irc/Makefile
+++ b/client/Makefile
@@ -4,7 +4,7 @@
 
 include $(GOROOT)/src/Make.inc
 
-TARG=irc
+TARG=github.com/fluffle/goirc/client
 GOFILES=\
 	connection.go\
 	commands.go\
diff --git a/irc/commands.go b/client/commands.go
similarity index 99%
rename from irc/commands.go
rename to client/commands.go
index 5041bdd..0eaaead 100644
--- a/irc/commands.go
+++ b/client/commands.go
@@ -1,4 +1,4 @@
-package irc
+package client
 
 import "strings"
 
diff --git a/irc/connection.go b/client/connection.go
similarity index 99%
rename from irc/connection.go
rename to client/connection.go
index 03669b7..8cedfdf 100644
--- a/irc/connection.go
+++ b/client/connection.go
@@ -1,4 +1,4 @@
-package irc
+package client
 
 import (
 	"bufio"
diff --git a/irc/handlers.go b/client/handlers.go
similarity index 99%
rename from irc/handlers.go
rename to client/handlers.go
index e27be54..0051cd6 100644
--- a/irc/handlers.go
+++ b/client/handlers.go
@@ -1,4 +1,4 @@
-package irc
+package client
 
 // this file contains the basic set of event handlers
 // to manage tracking an irc connection etc.
diff --git a/irc/irc_test.go b/client/irc_test.go
similarity index 95%
rename from irc/irc_test.go
rename to client/irc_test.go
index 68ade89..1571355 100644
--- a/irc/irc_test.go
+++ b/client/irc_test.go
@@ -1,4 +1,4 @@
-package irc
+package client
 
 import (
 	"testing"
diff --git a/irc/nickchan.go b/client/nickchan.go
similarity index 99%
rename from irc/nickchan.go
rename to client/nickchan.go
index 8323ab0..87f1da7 100644
--- a/irc/nickchan.go
+++ b/client/nickchan.go
@@ -1,4 +1,4 @@
-package irc
+package client
 
 // Here you'll find the Channel and Nick structs
 // as well as the internal state maintenance code for the handlers