diff --git a/.gitignore b/.gitignore
index 877caa7a..8dc155a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 micro
+!cmd/micro
 binaries/
diff --git a/Makefile b/Makefile
index 13870c43..d6077eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 build: syn-files
-	go get -d ./src
-	go build -o micro ./src
+	go get -d ./cmd/micro
+	go build -o micro ./cmd/micro
 
 install: syn-files build
 	mv micro $(GOBIN)
@@ -10,8 +10,8 @@ syn-files:
 	cp -r runtime/* ~/.micro
 
 test:
-	go get -d ./src
-	go test ./src
+	go get -d ./cmd/micro
+	go test ./cmd/micro
 
 clean:
 	rm -f micro
diff --git a/src/buffer.go b/cmd/micro/buffer.go
similarity index 100%
rename from src/buffer.go
rename to cmd/micro/buffer.go
diff --git a/src/colorscheme.go b/cmd/micro/colorscheme.go
similarity index 100%
rename from src/colorscheme.go
rename to cmd/micro/colorscheme.go
diff --git a/src/command.go b/cmd/micro/command.go
similarity index 100%
rename from src/command.go
rename to cmd/micro/command.go
diff --git a/src/cursor.go b/cmd/micro/cursor.go
similarity index 100%
rename from src/cursor.go
rename to cmd/micro/cursor.go
diff --git a/src/eventhandler.go b/cmd/micro/eventhandler.go
similarity index 100%
rename from src/eventhandler.go
rename to cmd/micro/eventhandler.go
diff --git a/src/help.go b/cmd/micro/help.go
similarity index 100%
rename from src/help.go
rename to cmd/micro/help.go
diff --git a/src/highlighter.go b/cmd/micro/highlighter.go
similarity index 100%
rename from src/highlighter.go
rename to cmd/micro/highlighter.go
diff --git a/src/messenger.go b/cmd/micro/messenger.go
similarity index 100%
rename from src/messenger.go
rename to cmd/micro/messenger.go
diff --git a/src/micro.go b/cmd/micro/micro.go
similarity index 100%
rename from src/micro.go
rename to cmd/micro/micro.go
diff --git a/src/search.go b/cmd/micro/search.go
similarity index 100%
rename from src/search.go
rename to cmd/micro/search.go
diff --git a/src/settings.go b/cmd/micro/settings.go
similarity index 100%
rename from src/settings.go
rename to cmd/micro/settings.go
diff --git a/src/stack.go b/cmd/micro/stack.go
similarity index 100%
rename from src/stack.go
rename to cmd/micro/stack.go
diff --git a/src/stack_test.go b/cmd/micro/stack_test.go
similarity index 100%
rename from src/stack_test.go
rename to cmd/micro/stack_test.go
diff --git a/src/statusline.go b/cmd/micro/statusline.go
similarity index 100%
rename from src/statusline.go
rename to cmd/micro/statusline.go
diff --git a/src/util.go b/cmd/micro/util.go
similarity index 100%
rename from src/util.go
rename to cmd/micro/util.go
diff --git a/src/util_test.go b/cmd/micro/util_test.go
similarity index 100%
rename from src/util_test.go
rename to cmd/micro/util_test.go
diff --git a/src/view.go b/cmd/micro/view.go
similarity index 100%
rename from src/view.go
rename to cmd/micro/view.go