diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..49ee1e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+run:
+				go run ./mop/mop.go
+
+install:
+				go install github.com/michaeldv/mop/mop
diff --git a/lib/column_editor.go b/column_editor.go
similarity index 100%
rename from lib/column_editor.go
rename to column_editor.go
diff --git a/lib/layout.go b/layout.go
similarity index 100%
rename from lib/layout.go
rename to layout.go
diff --git a/lib/line_editor.go b/line_editor.go
similarity index 100%
rename from lib/line_editor.go
rename to line_editor.go
diff --git a/lib/markup.go b/markup.go
similarity index 100%
rename from lib/markup.go
rename to markup.go
diff --git a/at.go b/misc/at.go
similarity index 100%
rename from at.go
rename to misc/at.go
diff --git a/dj.go b/misc/dj.go
similarity index 100%
rename from dj.go
rename to misc/dj.go
diff --git a/lib/google_finance.go b/misc/google_finance.go
similarity index 100%
rename from lib/google_finance.go
rename to misc/google_finance.go
diff --git a/in.go b/misc/in.go
similarity index 100%
rename from in.go
rename to misc/in.go
diff --git a/js.go b/misc/js.go
similarity index 100%
rename from js.go
rename to misc/js.go
diff --git a/mop.go b/mop/mop.go
similarity index 98%
rename from mop.go
rename to mop/mop.go
index 1c6ca91..c8f55af 100644
--- a/mop.go
+++ b/mop/mop.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	`github.com/michaeldv/mop/lib`
+	`github.com/michaeldv/mop`
 	`github.com/nsf/termbox-go`
 	`time`
 )
diff --git a/lib/profile.go b/profile.go
similarity index 100%
rename from lib/profile.go
rename to profile.go
diff --git a/lib/screen.go b/screen.go
similarity index 100%
rename from lib/screen.go
rename to screen.go
diff --git a/lib/sorter.go b/sorter.go
similarity index 100%
rename from lib/sorter.go
rename to sorter.go
diff --git a/lib/yahoo_market.go b/yahoo_market.go
similarity index 100%
rename from lib/yahoo_market.go
rename to yahoo_market.go
diff --git a/lib/yahoo_quotes.go b/yahoo_quotes.go
similarity index 100%
rename from lib/yahoo_quotes.go
rename to yahoo_quotes.go