diff --git a/Makefile b/Makefile
index ebdad632..973ed610 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 build:
-	go build -o bin/files/allmark ./cli
+	go build -o bin/files/ ./cmd/...
 
 install:
-	go build -o bin/files/allmark ./cli
+	go build -o bin/files/ ./cmd/...
 
 test:
-	go test ./cli ./common/... ./dataaccess/... ./model/... ./services/... ./web/...
+	go test ./common/... ./cmd/... ./dataaccess/... ./model/... ./services/... ./web/...
 
 crosscompile:
-	GOOS=linux GOARCH=amd64 go build -o bin/files/allmark_linux_amd64 ./cli
-	GOOS=linux GOARCH=arm GOARM=5 go build -o bin/files/allmark_linux_arm_5 ./cli
-	GOOS=linux GOARCH=arm GOARM=6 go build -o bin/files/allmark_linux_arm_6 ./cli
-	GOOS=linux GOARCH=arm GOARM=7 go build -o bin/files/allmark_linux_arm_7 ./cli
-	GOOS=darwin GOARCH=amd64 go build -o bin/files/allmark_darwin_amd64 ./cli
-	GOOS=windows GOARCH=amd64 go build -o bin/files/allmark_windows_amd64 ./cli
+	GOOS=linux GOARCH=amd64 go build -o bin/files/allmark_linux_amd64 ./cmd/allmark
+	GOOS=linux GOARCH=arm GOARM=5 go build -o bin/files/allmark_linux_arm_5 ./cmd/allmark
+	GOOS=linux GOARCH=arm GOARM=6 go build -o bin/files/allmark_linux_arm_6 ./cmd/allmark
+	GOOS=linux GOARCH=arm GOARM=7 go build -o bin/files/allmark_linux_arm_7 ./cmd/allmark
+	GOOS=darwin GOARCH=amd64 go build -o bin/files/allmark_darwin_amd64 ./cmd/allmark
+	GOOS=windows GOARCH=amd64 go build -o bin/files/allmark_windows_amd64 ./cmd/allmark
diff --git a/cli/allmark.go b/cmd/allmark/allmark.go
similarity index 100%
rename from cli/allmark.go
rename to cmd/allmark/allmark.go
diff --git a/go.mod b/go.mod
new file mode 100644
index 00000000..75fbcfdc
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/andreaskoch/allmark
+
+go 1.19