diff --git a/Makefile b/Makefile
index 49ee1e0..0842e36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 run:
-				go run ./mop/mop.go
+	go run ./cmd/mop.go
 
 install:
-				go install github.com/michaeldv/mop/mop
+	go install github.com/michaeldv/cmd/mop
diff --git a/mop/mop.go b/cmd/mop.go
similarity index 98%
rename from mop/mop.go
rename to cmd/mop.go
index 5c925a1..587ccde 100644
--- a/mop/mop.go
+++ b/cmd/mop.go
@@ -4,7 +4,7 @@ package main
 
 import (
 	`github.com/michaeldv/mop`
-	`github.com/nsf/termbox-go`
+	`github.com/michaeldv/termbox-go`
 	`time`
 )
 
diff --git a/column_editor.go b/column_editor.go
index 4124b51..36f4044 100644
--- a/column_editor.go
+++ b/column_editor.go
@@ -3,7 +3,7 @@
 package mop
 
 import (
-	`github.com/nsf/termbox-go`
+	`github.com/michaeldv/termbox-go`
 )
 
 type ColumnEditor struct {
diff --git a/line_editor.go b/line_editor.go
index 3170bdb..eafc3f7 100644
--- a/line_editor.go
+++ b/line_editor.go
@@ -5,7 +5,7 @@ package mop
 import (
 	`regexp`
 	`strings`
-	`github.com/nsf/termbox-go`
+	`github.com/michaeldv/termbox-go`
 )
 
 type LineEditor struct {
diff --git a/markup.go b/markup.go
index 5bb6a6d..ffcf910 100644
--- a/markup.go
+++ b/markup.go
@@ -3,7 +3,7 @@
 package mop
 
 import (
-	`github.com/nsf/termbox-go`
+	`github.com/michaeldv/termbox-go`
 	`regexp`
 	`strings`
 )
diff --git a/screen.go b/screen.go
index c5d8aad..55bcdac 100644
--- a/screen.go
+++ b/screen.go
@@ -3,7 +3,7 @@
 package mop
 
 import (
-	`github.com/nsf/termbox-go`
+	`github.com/michaeldv/termbox-go`
 	`strings`
 	`time`
 )