diff --git a/.gitignore b/.gitignore
index 3d8b7ba..c98be1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 vendor
-am-i-working
+./am-i-working
 coverage.out
 dist
diff --git a/cmd/commands/flags.go b/cmd/am-i-working/commands/flags.go
similarity index 100%
rename from cmd/commands/flags.go
rename to cmd/am-i-working/commands/flags.go
diff --git a/cmd/commands/service.go b/cmd/am-i-working/commands/service.go
similarity index 100%
rename from cmd/commands/service.go
rename to cmd/am-i-working/commands/service.go
diff --git a/cmd/commands/watch.go b/cmd/am-i-working/commands/watch.go
similarity index 100%
rename from cmd/commands/watch.go
rename to cmd/am-i-working/commands/watch.go
diff --git a/cmd/am-i-working/main.go b/cmd/am-i-working/main.go
new file mode 100644
index 0000000..e71b5cc
--- /dev/null
+++ b/cmd/am-i-working/main.go
@@ -0,0 +1,31 @@
+package main
+
+import (
+	"log"
+	"os"
+
+	"github.com/caarlos0/am-i-working/cmd/am-i-working/commands"
+	"github.com/urfave/cli"
+)
+
+var version = "master"
+
+func main() {
+	app := cli.NewApp()
+	app.Name = "am-i-working"
+	app.Usage = "Logs your working activity based on /etc/resolv.conf domain"
+	app.Version = version
+	app.Author = "Carlos Alexandro Becker <@caarlos0>"
+	app.Copyright = "MIT"
+	app.Commands = []cli.Command{
+		commands.Watch,
+		commands.CreateService,
+		commands.RestartService,
+		commands.StartService,
+		commands.StopService,
+		commands.DeleteService,
+	}
+	if err := app.Run(os.Args); err != nil {
+		log.Fatal(err)
+	}
+}