diff --git a/.gitignore b/.gitignore
index 544efd3209..2b77de6c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ drone.sublime-workspace
 *.out
 *.rice-box.go
 
-cmd/cmd
+cli/cli
 client/client
 server/server
 debian/drone/usr
diff --git a/Makefile b/Makefile
index c6be682694..ccdf238c54 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ test:
 	go test -cover -short ./...
 
 build:
-	go build -o debian/drone/usr/local/bin/drone  -ldflags "-X main.revision $(SHA)" github.com/drone/drone/cmd
+	go build -o debian/drone/usr/local/bin/drone  -ldflags "-X main.revision $(SHA)" github.com/drone/drone/cli
 	go build -o debian/drone/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server
 
 install:
@@ -29,7 +29,7 @@ clean:
 	rm -f debian/drone/usr/local/bin/droned
 	rm -f debian/drone.deb
 	rm -f server/server
-	rm -f cmd/cmd
+	rm -f cli/cli
 
 lessc:
 	lessc --clean-css server/app/styles/drone.less server/app/styles/drone.css
diff --git a/cmd/build.go b/cli/build.go
similarity index 100%
rename from cmd/build.go
rename to cli/build.go
diff --git a/cmd/disable.go b/cli/disable.go
similarity index 100%
rename from cmd/disable.go
rename to cli/disable.go
diff --git a/cmd/enable.go b/cli/enable.go
similarity index 100%
rename from cmd/enable.go
rename to cli/enable.go
diff --git a/cmd/handle.go b/cli/handle.go
similarity index 100%
rename from cmd/handle.go
rename to cli/handle.go
diff --git a/cmd/main.go b/cli/main.go
similarity index 100%
rename from cmd/main.go
rename to cli/main.go
diff --git a/cmd/repos.go b/cli/repos.go
similarity index 100%
rename from cmd/repos.go
rename to cli/repos.go
diff --git a/cmd/restart.go b/cli/restart.go
similarity index 100%
rename from cmd/restart.go
rename to cli/restart.go
diff --git a/cmd/status.go b/cli/status.go
similarity index 100%
rename from cmd/status.go
rename to cli/status.go
diff --git a/cmd/util.go b/cli/util.go
similarity index 100%
rename from cmd/util.go
rename to cli/util.go
diff --git a/cmd/whoami.go b/cli/whoami.go
similarity index 100%
rename from cmd/whoami.go
rename to cli/whoami.go