moved all remaining files under designated structure

Makefile

@@ -6,6 +6,7 @@ VERSION := 0.4.0-alpha
 all: concat bindata build
 
 deps:
+	go get github.com/jteeuwen/go-bindata/...
 	go get -t -v ./...
 
 test:
@@ -13,8 +14,7 @@ test:
 	go test -cover -short ./...
 
 build:
-	mkdir -p bin
+	go build -o bin/drone -ldflags "-X main.revision $(SHA) -X main.version $(VERSION).$(SHA)" github.com/drone/drone/cmd/drone-server
-	go build -o bin/drone -ldflags "-X main.revision $(SHA) -X main.version $(VERSION).$(SHA)"
 
 clean:
 	find . -name "*.out" -delete
@@ -22,20 +22,19 @@ clean:
 	rm -f bindata.go
 
 concat:
-	cat server/static/scripts/drone.js         \
+	cat cmd/drone-server/static/scripts/drone.js         \
-		server/static/scripts/services/*.js    \
+		cmd/drone-server/static/scripts/services/*.js    \
-		server/static/scripts/filters/*.js     \
+		cmd/drone-server/static/scripts/filters/*.js     \
-		server/static/scripts/controllers/*.js \
+		cmd/drone-server/static/scripts/controllers/*.js \
-		server/static/scripts/term.js          > server/static/scripts/drone.min.js
+		cmd/drone-server/static/scripts/term.js          > cmd/drone-server/static/scripts/drone.min.js
 
-bindata_deps:
+# embeds all the static files directly
-	go get github.com/jteeuwen/go-bindata/...
+# into the drone binary file
+bindata:
+	$$GOPATH/bin/go-bindata -o="cmd/drone-server/drone_bindata.go" cmd/drone-server/static/...
 
 bindata_debug:
-	$$GOPATH/bin/go-bindata --debug server/static/...
+	$$GOPATH/bin/go-bindata --debug -o="cmd/drone-server/drone_bindata.go" cmd/drone-server/static/...
-
-bindata:
-	$$GOPATH/bin/go-bindata server/static/...
 
 # creates a debian package for drone
 # to install `sudo dpkg -i drone.deb`

cmd/drone-server/drone.go

@@ -8,15 +8,15 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/drone/drone/pkg/remote/github"
-	"github.com/drone/drone/server"
+	"github.com/drone/drone/pkg/server"
-	"github.com/drone/drone/server/session"
+	"github.com/drone/drone/pkg/server/session"
-	"github.com/drone/drone/settings"
+	"github.com/drone/drone/pkg/settings"
 	"github.com/elazarl/go-bindata-assetfs"
 
 	eventbus "github.com/drone/drone/pkg/bus/builtin"
 	queue "github.com/drone/drone/pkg/queue/builtin"
+	runner "github.com/drone/drone/pkg/runner/builtin"
 	store "github.com/drone/drone/pkg/store/builtin"
-	runner "github.com/drone/drone/runner/builtin"
 
 	_ "net/http/pprof"
 )
@@ -175,14 +175,14 @@ func static() http.Handler {
 	return http.StripPrefix("/static/", http.FileServer(&assetfs.AssetFS{
 		Asset:    Asset,
 		AssetDir: AssetDir,
-		Prefix:   "server/static",
+		Prefix:   "cmd/drone-server/static",
 	}))
 }
 
 // index is a helper function that will setup a template
 // for rendering the main angular index.html file.
 func index() *template.Template {
-	file := MustAsset("server/static/index.html")
+	file := MustAsset("cmd/drone-server/static/index.html")
 	filestr := string(file)
 	return template.Must(template.New("index.html").Parse(filestr))
 }

docs/install-docker.md

@@ -0,0 +1 @@
+install-docker.md

docs/install-source.md

@@ -0,0 +1 @@
+install-source.md

docs/install-ubuntu.md

@@ -0,0 +1 @@
+install.md

docs/setup-bitbucket.md

@@ -0,0 +1 @@
+setup-bitbucket.md

docs/setup-database.md

@@ -0,0 +1 @@
+setup-database.md

docs/setup-github.md

@@ -0,0 +1 @@
+github.md

docs/setup-gitlab.md

@@ -0,0 +1 @@
+setup-gitlab.md

docs/setup.md

@@ -0,0 +1 @@
+setup.md

pkg/remote/client/client.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/rpc"
 
+	"github.com/drone/drone/pkg/settings"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/settings"
 )
 
 // Client communicates with a Remote plugin using the

pkg/remote/github/github.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/drone/drone/pkg/settings"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/settings"
 	"github.com/hashicorp/golang-lru"
 
 	"github.com/google/go-github/github"

pkg/remote/github/helper.go

@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/drone/drone/common/oauth2"
+	"github.com/drone/drone/pkg/oauth2"
 	"github.com/google/go-github/github"
 	"github.com/gorilla/securecookie"
 )

pkg/server/badge_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/drone/drone/pkg/ccmenu"
+	"github.com/drone/drone/pkg/server/recorder"
 	"github.com/drone/drone/pkg/store/mock"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/server/recorder"
 
 	. "github.com/franela/goblin"
 	"github.com/gin-gonic/gin"

pkg/server/login.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ungerik/go-gravatar"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/drone/drone/common/oauth2"
+	"github.com/drone/drone/pkg/oauth2"
 	common "github.com/drone/drone/pkg/types"
 	"github.com/drone/drone/pkg/utils/httputil"
 )

pkg/server/server.go

@@ -9,11 +9,11 @@ import (
 	"github.com/drone/drone/pkg/bus"
 	"github.com/drone/drone/pkg/queue"
 	"github.com/drone/drone/pkg/remote"
+	"github.com/drone/drone/pkg/runner"
+	"github.com/drone/drone/pkg/server/session"
+	"github.com/drone/drone/pkg/settings"
 	"github.com/drone/drone/pkg/store"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/runner"
-	"github.com/drone/drone/server/session"
-	"github.com/drone/drone/settings"
 )
 
 func SetQueue(q queue.Queue) gin.HandlerFunc {

pkg/server/session/session.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
+	"github.com/drone/drone/pkg/settings"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/settings"
 )
 
 type Session interface {

pkg/server/user_test.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/drone/drone/pkg/server/recorder"
 	"github.com/drone/drone/pkg/store/mock"
 	common "github.com/drone/drone/pkg/types"
-	"github.com/drone/drone/server/recorder"
 	. "github.com/franela/goblin"
 	"github.com/gin-gonic/gin"
 )