diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1c8b3b9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+
+*.swp
+*.swo
+
+birdwatcher
+birdwatcher-*
+
+
diff --git a/birdwatcher.go b/birdwatcher.go
index 89b84b6..df3197e 100644
--- a/birdwatcher.go
+++ b/birdwatcher.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/ecix/birdwatcher/bird"
+	"github.com/ecix/birdwatcher/endpoints"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
-	"github.com/mchackorg/birdwatcher/endpoints"
 )
 
 func makeRouter() *httprouter.Router {
diff --git a/endpoints/endpoint.go b/endpoints/endpoint.go
index a2000f9..fea8c17 100644
--- a/endpoints/endpoint.go
+++ b/endpoints/endpoint.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"github.com/ecix/birdwatcher/bird"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
 )
 
 func Endpoint(wrapped func(httprouter.Params) bird.Parsed) httprouter.Handle {
diff --git a/endpoints/protocols.go b/endpoints/protocols.go
index e2cae1b..c3b038b 100644
--- a/endpoints/protocols.go
+++ b/endpoints/protocols.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
+	"github.com/ecix/birdwatcher/bird"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
 )
 
 func Protocols(ps httprouter.Params) bird.Parsed {
diff --git a/endpoints/routes.go b/endpoints/routes.go
index ca3908c..b44d319 100644
--- a/endpoints/routes.go
+++ b/endpoints/routes.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
+	"github.com/ecix/birdwatcher/bird"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
 )
 
 func ProtoRoutes(ps httprouter.Params) bird.Parsed {
diff --git a/endpoints/status.go b/endpoints/status.go
index 16aff8f..76f5d3b 100644
--- a/endpoints/status.go
+++ b/endpoints/status.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
+	"github.com/ecix/birdwatcher/bird"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
 )
 
 func Status(ps httprouter.Params) bird.Parsed {
diff --git a/endpoints/symbols.go b/endpoints/symbols.go
index 6604ee1..505195d 100644
--- a/endpoints/symbols.go
+++ b/endpoints/symbols.go
@@ -1,8 +1,8 @@
 package endpoints
 
 import (
+	"github.com/ecix/birdwatcher/bird"
 	"github.com/julienschmidt/httprouter"
-	"github.com/mchackorg/birdwatcher/bird"
 )
 
 func Symbols(ps httprouter.Params) bird.Parsed {