diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..bf43e5d3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+build: syn-files
+	make build -C src
+	mv src/micro .
+
+install: syn-files
+	make install -C src
+
+syn-files:
+	mkdir -p ~/.micro/syntax
+	cp syntax_files/* ~/.micro/syntax
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 00000000..9a0ae288
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,8 @@
+build:
+	go get ./...
+	go build -o micro
+
+install:
+	go get ./...
+	go build -o micro
+	mv micro $(GOBIN)
diff --git a/buffer.go b/src/buffer.go
similarity index 100%
rename from buffer.go
rename to src/buffer.go
diff --git a/cursor.go b/src/cursor.go
similarity index 100%
rename from cursor.go
rename to src/cursor.go
diff --git a/eventhandler.go b/src/eventhandler.go
similarity index 100%
rename from eventhandler.go
rename to src/eventhandler.go
diff --git a/highlighter.go b/src/highlighter.go
similarity index 100%
rename from highlighter.go
rename to src/highlighter.go
diff --git a/micro.go b/src/micro.go
similarity index 100%
rename from micro.go
rename to src/micro.go
diff --git a/rope.go b/src/rope.go
similarity index 100%
rename from rope.go
rename to src/rope.go
diff --git a/stack.go b/src/stack.go
similarity index 100%
rename from stack.go
rename to src/stack.go
diff --git a/statusline.go b/src/statusline.go
similarity index 100%
rename from statusline.go
rename to src/statusline.go
diff --git a/util.go b/src/util.go
similarity index 100%
rename from util.go
rename to src/util.go
diff --git a/view.go b/src/view.go
similarity index 100%
rename from view.go
rename to src/view.go