diff --git a/Makefile b/Makefile
index ce847ad..84195c1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ all:
 	@echo "no default"
 
 run:
-	go run cointop.go keybindings.go navigation.go sort.go layout.go status.go chart.go table.go
+	go run main.go
 
 # http://macappstore.org/upx
 build: clean
diff --git a/chart.go b/cointop/chart.go
similarity index 99%
rename from chart.go
rename to cointop/chart.go
index e8ee468..1f074e6 100644
--- a/chart.go
+++ b/cointop/chart.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"fmt"
diff --git a/cointop.go b/cointop/cointop.go
similarity index 97%
rename from cointop.go
rename to cointop/cointop.go
index 665e25c..01358c3 100644
--- a/cointop.go
+++ b/cointop/cointop.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"fmt"
@@ -64,7 +64,8 @@ func (ct *Cointop) updateMarket() error {
 	return nil
 }
 
-func main() {
+// Run runs cointop
+func Run() {
 	g, err := gocui.NewGui(gocui.Output256)
 	if err != nil {
 		log.Fatalf("new gocui: %v", err)
diff --git a/keybindings.go b/cointop/keybindings.go
similarity index 99%
rename from keybindings.go
rename to cointop/keybindings.go
index cd72383..f444515 100644
--- a/keybindings.go
+++ b/cointop/keybindings.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"log"
diff --git a/layout.go b/cointop/layout.go
similarity index 99%
rename from layout.go
rename to cointop/layout.go
index 16f14cb..4ecdfbe 100644
--- a/layout.go
+++ b/cointop/layout.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"github.com/jroimartin/gocui"
diff --git a/navigation.go b/cointop/navigation.go
similarity index 99%
rename from navigation.go
rename to cointop/navigation.go
index 7f77833..1530994 100644
--- a/navigation.go
+++ b/cointop/navigation.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"github.com/jroimartin/gocui"
diff --git a/sort.go b/cointop/sort.go
similarity index 99%
rename from sort.go
rename to cointop/sort.go
index 4ac578b..62df281 100644
--- a/sort.go
+++ b/cointop/sort.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"github.com/bradfitz/slice"
diff --git a/status.go b/cointop/status.go
similarity index 96%
rename from status.go
rename to cointop/status.go
index 3e13168..94e97e4 100644
--- a/status.go
+++ b/cointop/status.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"fmt"
diff --git a/table.go b/cointop/table.go
similarity index 99%
rename from table.go
rename to cointop/table.go
index ec511cf..c125747 100644
--- a/table.go
+++ b/cointop/table.go
@@ -1,4 +1,4 @@
-package main
+package cointop
 
 import (
 	"fmt"
diff --git a/main.go b/main.go
new file mode 100644
index 0000000..004cde1
--- /dev/null
+++ b/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/miguelmota/cointop/cointop"
+)
+
+func main() {
+	cointop.Run()
+}