diff --git a/Makefile b/Makefile
index 4304027..c6f7a40 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ generate:
 	go generate ./...
 
 build:
-	go build -o bin/$(BINARY_NAME) -v .
+	go build -o bin/$(BINARY_NAME) -v ./cmd
 
 docker:
 	docker build -t bittwister .
diff --git a/cmd/root.go b/cmd/bittwister/root.go
similarity index 94%
rename from cmd/root.go
rename to cmd/bittwister/root.go
index cce7bcb..69a379d 100644
--- a/cmd/root.go
+++ b/cmd/bittwister/root.go
@@ -1,4 +1,4 @@
-package cmd
+package bittwister
 
 import (
 	"context"
diff --git a/cmd/serve.go b/cmd/bittwister/serve.go
similarity index 98%
rename from cmd/serve.go
rename to cmd/bittwister/serve.go
index 64d5018..fd25f1c 100644
--- a/cmd/serve.go
+++ b/cmd/bittwister/serve.go
@@ -1,4 +1,4 @@
-package cmd
+package bittwister
 
 import (
 	"fmt"
diff --git a/cmd/start.go b/cmd/bittwister/start.go
similarity index 99%
rename from cmd/start.go
rename to cmd/bittwister/start.go
index 7505f15..4bfbd2f 100644
--- a/cmd/start.go
+++ b/cmd/bittwister/start.go
@@ -1,4 +1,4 @@
-package cmd
+package bittwister
 
 import (
 	"context"
diff --git a/cmd/cmd_utils.go b/cmd/bittwister/utils.go
similarity index 98%
rename from cmd/cmd_utils.go
rename to cmd/bittwister/utils.go
index 5b2c536..07450f7 100644
--- a/cmd/cmd_utils.go
+++ b/cmd/bittwister/utils.go
@@ -1,4 +1,4 @@
-package cmd
+package bittwister
 
 import (
 	"fmt"
diff --git a/cmd/main.go b/cmd/main.go
new file mode 100644
index 0000000..66f24d4
--- /dev/null
+++ b/cmd/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/celestiaorg/bittwister/cmd/bittwister"
+)
+
+func main() {
+	bittwister.Execute()
+}
diff --git a/main.go b/main.go
deleted file mode 100644
index e4e09a1..0000000
--- a/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import (
-	"github.com/celestiaorg/bittwister/cmd"
-)
-
-func main() {
-	cmd.Execute()
-}