diff --git a/.gitignore b/.gitignore
index 341e77d23..9f15b8cf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,9 +22,7 @@ _testmain.go
 *.exe
 *.test
 *.prof
-gitbase
 
 # CI
 .ci/
-gitbase
-gitbase.exe
+build/
diff --git a/cli/gitbase/main.go b/cli/gitbase/main.go
deleted file mode 100644
index a601d1d43..000000000
--- a/cli/gitbase/main.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/src-d/gitbase/cli/gitbase/cmd"
-
-	"github.com/jessevdk/go-flags"
-)
-
-const (
-	name = "gitbase"
-)
-
-func main() {
-	parser := flags.NewNamedParser(name, flags.Default)
-
-	parser.AddCommand("server", cmd.ServerDescription, cmd.ServerHelp, &cmd.Server{
-		UnstableSquash: os.Getenv("GITBASE_UNSTABLE_SQUASH_ENABLE") != "",
-		SkipGitErrors:  os.Getenv("GITBASE_SKIP_GIT_ERRORS") != "",
-	})
-
-	parser.AddCommand("version", cmd.VersionDescription, cmd.VersionHelp, &cmd.Version{
-		Name: name,
-	})
-
-	_, err := parser.Parse()
-	if err != nil {
-		if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrCommandRequired {
-			parser.WriteHelp(os.Stdout)
-		}
-
-		os.Exit(1)
-	}
-}
diff --git a/cli/gitbase/cmd/server.go b/cmd/gitbase/command/server.go
similarity index 99%
rename from cli/gitbase/cmd/server.go
rename to cmd/gitbase/command/server.go
index 317dbee55..004ce6f37 100644
--- a/cli/gitbase/cmd/server.go
+++ b/cmd/gitbase/command/server.go
@@ -1,4 +1,4 @@
-package cmd
+package command
 
 import (
 	"net"
diff --git a/cli/gitbase/cmd/version.go b/cmd/gitbase/command/version.go
similarity index 97%
rename from cli/gitbase/cmd/version.go
rename to cmd/gitbase/command/version.go
index 9d6393c3f..22cd934fb 100644
--- a/cli/gitbase/cmd/version.go
+++ b/cmd/gitbase/command/version.go
@@ -1,4 +1,4 @@
-package cmd
+package command
 
 import "fmt"
 
diff --git a/cmd/gitbase/main.go b/cmd/gitbase/main.go
new file mode 100644
index 000000000..02f69a353
--- /dev/null
+++ b/cmd/gitbase/main.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"os"
+
+	"github.com/src-d/gitbase/cmd/gitbase/command"
+
+	"github.com/jessevdk/go-flags"
+)
+
+const (
+	name = "gitbase"
+)
+
+func main() {
+	parser := flags.NewNamedParser(name, flags.Default)
+
+	parser.AddCommand("server", command.ServerDescription, command.ServerHelp,
+		&command.Server{
+			UnstableSquash: os.Getenv("GITBASE_UNSTABLE_SQUASH_ENABLE") != "",
+			SkipGitErrors:  os.Getenv("GITBASE_SKIP_GIT_ERRORS") != "",
+		})
+
+	parser.AddCommand("version", command.VersionDescription, command.VersionHelp,
+		&command.Version{
+			Name: name,
+		})
+
+	_, err := parser.Parse()
+	if err != nil {
+		if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrCommandRequired {
+			parser.WriteHelp(os.Stdout)
+		}
+
+		os.Exit(1)
+	}
+}