diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3f877a8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+all: test fmt build
+
+test:
+	go test ./...
+
+vet:
+	go vet ./...
+
+fmt:
+	go list -f '{{.Dir}}' ./... | grep -v /vendor/ | xargs -L1 gofmt -l
+	test -z $$(go list -f '{{.Dir}}' ./... | grep -v /vendor/ | xargs -L1 gofmt -l)
+
+lint:
+	go list ./... | grep -v /vendor/ | xargs -L1 golint -set_exit_status
+
+build:
+	go build -o bin/flokati ./cmd/flokati
diff --git a/irc.go b/cmd/flokati/irc.go
similarity index 100%
rename from irc.go
rename to cmd/flokati/irc.go
diff --git a/main.go b/cmd/flokati/main.go
similarity index 98%
rename from main.go
rename to cmd/flokati/main.go
index 5918515..d0b8fac 100644
--- a/main.go
+++ b/cmd/flokati/main.go
@@ -1,6 +1,6 @@
 // vi:ts=4:sts=4:sw=4:noet:tw=72
 //
-// flokatimx
+// flokati
 //
 // Copyright (c) 2015-2019 Andreas Neue <an@dnix.de>
 
diff --git a/matrix.go b/cmd/flokati/matrix.go
similarity index 100%
rename from matrix.go
rename to cmd/flokati/matrix.go
diff --git a/version.go b/cmd/flokati/version.go
similarity index 100%
rename from version.go
rename to cmd/flokati/version.go