diff --git a/Makefile b/Makefile
deleted file mode 100644
index 870adf1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(GOROOT)/src/Make.inc
-
-TARG=github.com/lye/cleanirc
-GOFILES=\
-	src/irc.go \
-	src/irc_struct.go \
-	src/irc_callback.go
-
-include $(GOROOT)/src/Make.pkg 
diff --git a/src/irc.go b/irc.go
similarity index 99%
rename from src/irc.go
rename to irc.go
index 14e5cfe..1961027 100644
--- a/src/irc.go
+++ b/irc.go
@@ -10,7 +10,7 @@ import (
 	"net"
 	"strings"
 	"time"
-	"tls"
+	"crypto/tls"
 )
 
 const (
diff --git a/src/irc_callback.go b/irc_callback.go
similarity index 100%
rename from src/irc_callback.go
rename to irc_callback.go
diff --git a/src/irc_struct.go b/irc_struct.go
similarity index 98%
rename from src/irc_struct.go
rename to irc_struct.go
index b7e4035..95fecd4 100644
--- a/src/irc_struct.go
+++ b/irc_struct.go
@@ -7,7 +7,7 @@ package irc
 import (
 	"net"
 	"time"
-	"tls"
+	"crypto/tls"
 )
 
 type IRCConnection struct {