diff --git a/.goreleaser.yaml b/.goreleaser.yaml
new file mode 100644
index 0000000..d195971
--- /dev/null
+++ b/.goreleaser.yaml
@@ -0,0 +1,26 @@
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    main: ./cmd/gpm
+    ldflags:
+      - "-s -w -X go.jolheiser.com/gpm/cmd.Version={{.Version}}"
+archives:
+  - replacements:
+      386: i386
+      amd64: x86_64
+    format_overrides:
+      - goos: windows
+        format: zip
+checksum:
+  name_template: 'checksums.txt'
+release:
+  gitea:
+    owner: jolheiser
+    name: gpm
+gitea_urls:
+  api: https://git.jojodev.com/api/v1/
+  download: https://git.jojodev.com
diff --git a/.woodpecker.yml b/.woodpecker.yml
deleted file mode 100644
index 90155bb..0000000
--- a/.woodpecker.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git:next
-
-pipeline:
-  compliance:
-    image: golang:1.17
-    commands:
-      - go test -race ./...
-      - go vet ./...
-      - go run github.com/rs/zerolog/cmd/lint go.jolheiser.com/gpm
-      - go build
-    when:
-      event: pull_request
-
-  build:
-    image: golang:1.17
-    commands:
-      - GOOS="windows" go build
-      - GOOS="linux" go build
-    when:
-      event: [ push, tag ]
-      branch: main
-
-  release-main:
-    image: jolheiser/drone-gitea-main:latest
-    secrets:
-      - source: gitea_token
-        target: plugin_token
-    base: https://git.jojodev.com
-    files:
-      - "gpm"
-      - "gpm.exe"
-    when:
-      event: push
-      branch: main
-
-  release-tag:
-    image: plugins/gitea-release:1
-    secrets:
-      - source: gitea_token
-        target: plugin_api_key
-    base_url: https://git.jojodev.com
-    files:
-      - "gpm"
-      - "gpm.exe"
-    when:
-      event: tag
-      tag: v*
-
-  prune:
-    image: jolheiser/drone-gitea-prune
-    secrets:
-      - source: gitea_token
-        target: plugin_token
-    base: https://git.jojodev.com
-    when:
-      event: tag
-      tag: v*
diff --git a/.woodpecker/goreleaser.yml b/.woodpecker/goreleaser.yml
new file mode 100644
index 0000000..261ee53
--- /dev/null
+++ b/.woodpecker/goreleaser.yml
@@ -0,0 +1,39 @@
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      tags: true
+
+pipeline:
+  compliance:
+    image: golang:1.18
+    commands:
+      - go test -race ./...
+      - go vet ./...
+      - go run github.com/rs/zerolog/cmd/lint@latest go.jolheiser.com/gpm/cmd/gpm
+    when:
+      event: pull_request
+
+  build:
+    image: goreleaser/goreleaser
+    commands:
+      - goreleaser build --snapshot
+    when:
+      event: pull_request
+
+  release:
+    image: goreleaser/goreleaser
+    commands:
+      - goreleaser release
+    secrets: [ gitea_token ]
+    when:
+      event: tag
+
+  prune:
+    image: jolheiser/drone-gitea-prune
+    settings:
+      base: https://git.jojodev.com
+      token:
+        from_secret: gitea_token
+    when:
+      event: tag
diff --git a/DOCS.md b/DOCS.md
index d29b8d2..4fc41a7 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -20,7 +20,7 @@ gpm [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]
 
 # GLOBAL OPTIONS
 
-**--database, -d**="": path to gpm database for server (default: `${USERCONFIG}/gpm.db` or `${BINPATH}/gpm.db`)
+**--database, -d**="": path to gpm database for server (default: /home/jolheiser/.config/gpm.db)
 
 **--server, -s**="": gpm server to use (default: https://gpm.jolheiser.com)
 
diff --git a/go-gpm/client.go b/client.go
similarity index 100%
rename from go-gpm/client.go
rename to client.go
diff --git a/cmd/flags/flags.go b/cmd/flags/flags.go
deleted file mode 100644
index e4a4f67..0000000
--- a/cmd/flags/flags.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package flags
-
-var (
-	Server   string
-	Token    string
-	Database string
-
-	Local bool
-	Force bool
-	Port  int
-)
diff --git a/main.go b/cmd/gpm/main.go
similarity index 62%
rename from main.go
rename to cmd/gpm/main.go
index 9d23860..bfbe2de 100644
--- a/main.go
+++ b/cmd/gpm/main.go
@@ -1,17 +1,20 @@
 package main
 
 import (
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"os"
 
-	"go.jolheiser.com/gpm/cmd"
+	"go.jolheiser.com/gpm/internal/cli"
+
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 )
 
+var Version = "develop"
+
 func main() {
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 
-	if err := cmd.New().Run(os.Args); err != nil {
+	if err := cli.New(Version).Run(os.Args); err != nil {
 		log.Err(err).Msg("")
 	}
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5431a7b..3492098 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.16-alpine as builder
 RUN apk --no-cache add build-base git
 COPY . /app
 WORKDIR /app
-RUN make build
+RUN go build ./cmd/gpm
 
 FROM alpine:latest
 LABEL maintainer="john.olheiser@gmail.com"
diff --git a/docs.go b/docs.go
index c7cbd42..96d9e78 100644
--- a/docs.go
+++ b/docs.go
@@ -4,24 +4,19 @@
 package main
 
 import (
+	"go.jolheiser.com/gpm/internal/cli"
 	"os"
-	"strings"
-
-	"go.jolheiser.com/gpm/cmd"
 )
 
 //go:generate go run docs.go
 func main() {
-	app := cmd.New()
+	app := cli.New("docs")
 
 	md, err := app.ToMarkdown()
 	if err != nil {
 		panic(err)
 	}
 
-	// FIXME Why is this not fixed yet??
-	md = md[strings.Index(md, "#"):]
-
 	fi, err := os.Create("DOCS.md")
 	if err != nil {
 		panic(err)
diff --git a/go-gpm/gpm_test.go b/go-gpm/gpm_test.go
deleted file mode 100644
index 925a0bc..0000000
--- a/go-gpm/gpm_test.go
+++ /dev/null
@@ -1,207 +0,0 @@
-package gpm
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"strings"
-	"testing"
-)
-
-var (
-	server  *httptest.Server
-	token   = "TestingLibrary"
-	version = "GPMTest"
-
-	packages = []Package{
-		{
-			Name:   "test1",
-			Import: "gitea.com/test/testing",
-		},
-	}
-)
-
-func TestMain(m *testing.M) {
-	server = httptest.NewServer(http.HandlerFunc(testServer))
-	os.Exit(m.Run())
-}
-
-func TestClient(t *testing.T) {
-	ctx := context.Background()
-	client := New("", WithServer(server.URL))
-
-	// Info
-	checkInfo(t, client, 1)
-
-	pkg1 := Package{
-		Name:   "test1",
-		Import: "gitea.com/test/testing",
-	}
-	pkg2 := Package{
-		Name:   "test2",
-		Import: "gitea.com/testing/test",
-	}
-
-	// Add (without token)
-	if err := client.Add(ctx, pkg1); err == nil {
-		t.Log("adding without token should fail")
-		t.Fail()
-	}
-
-	// Add (with token)
-	client = New(token, WithServer(server.URL))
-	checkAdd(t, client, pkg1, pkg2)
-
-	// Info (after second package)
-	checkInfo(t, client, 2)
-
-	// Check package
-	checkGet(t, client, pkg2)
-
-	// Update package
-	checkUpdate(t, client, pkg1)
-
-	// Remove
-	checkRemove(t, client, pkg1)
-
-	// Info (final)
-	checkInfo(t, client, 1)
-}
-
-func checkInfo(t *testing.T, client *Client, numPackages int) {
-	info, err := client.Info(context.Background())
-	if err != nil {
-		t.Logf("info should not return error: %v\n", err)
-		t.Fail()
-	}
-	if info.Version != version || info.NumPackages != numPackages {
-		t.Log("info did not match expected")
-		t.Fail()
-	}
-}
-
-func checkGet(t *testing.T, client *Client, pkg Package) {
-	ctx := context.Background()
-	_, err := client.Get(ctx, "test3")
-	if err == nil {
-		t.Log("should not be able to get invalid package")
-		t.Fail()
-	}
-
-	// Check valid package
-	p, err := client.Get(ctx, "test2")
-	if err != nil {
-		t.Logf("should not be able to get invalid package: %v\n", err)
-		t.Fail()
-	}
-	if p != pkg {
-		t.Log("valid package should match pkg")
-		t.Fail()
-	}
-}
-
-func checkAdd(t *testing.T, client *Client, pkg1, pkg2 Package) {
-	ctx := context.Background()
-	if err := client.Add(ctx, pkg2); err != nil {
-		t.Logf("pkg2 should be added: %v\n", err)
-		t.Fail()
-	}
-	// Duplicate package
-	if err := client.Add(ctx, pkg1); err == nil {
-		t.Log("pkg1 should already exist")
-		t.Fail()
-	}
-}
-
-func checkUpdate(t *testing.T, client *Client, pkg Package) {
-	ctx := context.Background()
-	// Update invalid package
-	if err := client.Update(ctx, Package{Name: "test4", Import: "gitea.com/invalid"}); err == nil {
-		t.Log("should not be able to update invalid package")
-		t.Fail()
-	}
-
-	// Update valid package
-	pkg.Import = "gitea.com/tester/testing"
-	if err := client.Update(ctx, pkg); err != nil {
-		t.Logf("should be able to update valid package: %v\n", err)
-		t.Fail()
-	}
-}
-
-func checkRemove(t *testing.T, client *Client, pkg Package) {
-	ctx := context.Background()
-	if err := client.Remove(ctx, pkg); err != nil {
-		t.Logf("should be able to remove package: %v\n", err)
-		t.Fail()
-	}
-
-	// Remove (idempotent)
-	if err := client.Remove(ctx, pkg); err != nil {
-		t.Logf("should be able to remove package idempotently: %v\n", err)
-		t.Fail()
-	}
-}
-
-func testServer(w http.ResponseWriter, r *http.Request) {
-	switch r.URL.Path {
-	case "/":
-		switch r.Method {
-		case http.MethodGet:
-			resp := Info{
-				Version:     version,
-				NumPackages: len(packages),
-				Packages:    packages,
-			}
-			_ = json.NewEncoder(w).Encode(resp)
-		case http.MethodPost, http.MethodPatch, http.MethodDelete:
-			if r.Header.Get(TokenHeader) != token {
-				w.WriteHeader(http.StatusUnauthorized)
-				return
-			}
-			var pkg Package
-			if err := json.NewDecoder(r.Body).Decode(&pkg); err != nil {
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			switch r.Method {
-			case http.MethodPost:
-				for _, p := range packages {
-					if p.Name == pkg.Name {
-						w.WriteHeader(http.StatusConflict)
-						return
-					}
-				}
-				packages = append(packages, pkg)
-				w.WriteHeader(http.StatusCreated)
-			case http.MethodPatch:
-				for idx, p := range packages {
-					if p.Name == pkg.Name {
-						packages[idx] = pkg
-						return
-					}
-				}
-				w.WriteHeader(http.StatusNotFound)
-			case http.MethodDelete:
-				for idx, p := range packages {
-					if p.Name == pkg.Name {
-						packages = append(packages[:idx], packages[idx+1:]...)
-					}
-				}
-			}
-			return
-		}
-		return
-	default:
-		name := strings.TrimPrefix(r.URL.Path, "/")
-		for _, pkg := range packages {
-			if pkg.Name == name {
-				_ = json.NewEncoder(w).Encode(pkg)
-				return
-			}
-		}
-	}
-	w.WriteHeader(http.StatusNotImplemented)
-}
diff --git a/go.mod b/go.mod
index 5ba33f3..f9d4b94 100644
--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,19 @@ module go.jolheiser.com/gpm
 go 1.15
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.2.7
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/go-chi/chi v1.5.2
+	github.com/AlecAivazis/survey/v2 v2.3.5
+	github.com/go-chi/chi/v5 v5.0.7
 	github.com/go-chi/render v1.0.1
-	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/kr/pty v1.1.4 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/rs/zerolog v1.26.0
+	github.com/rs/zerolog v1.27.0
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/urfave/cli/v2 v2.3.0
-	go.etcd.io/bbolt v1.3.5
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/urfave/cli/v2 v2.11.1
+	go.etcd.io/bbolt v1.3.6
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	golang.org/x/tools v0.1.7 // indirect
+	gopkg.in/yaml.v2 v2.2.3 // indirect
 )
diff --git a/go.sum b/go.sum
index f06889a..f176327 100644
--- a/go.sum
+++ b/go.sum
@@ -1,21 +1,31 @@
 github.com/AlecAivazis/survey/v2 v2.2.7 h1:5NbxkF4RSKmpywYdcRgUmos1o+roJY8duCLZXbVjoig=
 github.com/AlecAivazis/survey/v2 v2.2.7/go.mod h1:9DYvHgXtiXm6nCn+jXnOXLKbH+Yo9u8fAS/SduGdoPk=
+github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ=
+github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
+github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-chi/chi v1.5.2 h1:YcLIBANL4OTaAOcTdp//sskGa0yGACQMCtbnr7YEn0Q=
-github.com/go-chi/chi v1.5.2/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k=
+github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
+github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
 github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
+github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ=
@@ -23,9 +33,13 @@ github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -35,26 +49,38 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE=
 github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo=
+github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
+github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/cli/v2 v2.11.1 h1:UKK6SP7fV3eKOefbS87iT9YHefv7iB/53ih6e+GNAsE=
+github.com/urfave/cli/v2 v2.11.1/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -64,21 +90,34 @@ golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/cmd/add.go b/internal/cli/add.go
similarity index 84%
rename from cmd/add.go
rename to internal/cli/add.go
index 1739655..168d622 100644
--- a/cmd/add.go
+++ b/internal/cli/add.go
@@ -1,16 +1,15 @@
-package cmd
+package cli
 
 import (
 	"context"
-	"github.com/rs/zerolog/log"
 	"regexp"
 	"strings"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,13 +22,13 @@ var Add = cli.Command{
 			Name:        "force",
 			Aliases:     []string{"f"},
 			Usage:       "Overwrite existing package without prompt",
-			Destination: &flags.Force,
+			Destination: &forceFlag,
 		},
 		&cli.BoolFlag{
 			Name:        "local",
 			Aliases:     []string{"l"},
 			Usage:       "local mode",
-			Destination: &flags.Local,
+			Destination: &localFlag,
 		},
 	},
 	Before: localOrToken,
@@ -70,8 +69,8 @@ func doAdd(_ *cli.Context) error {
 		Import: goGetAnswer,
 	}
 
-	if flags.Local {
-		db, err := database.Load(flags.Database)
+	if localFlag {
+		db, err := database.Load(databaseFlag)
 		if err != nil {
 			return err
 		}
@@ -79,7 +78,7 @@ func doAdd(_ *cli.Context) error {
 			return err
 		}
 	} else {
-		client := gpm.New(flags.Token, gpm.WithServer(flags.Server))
+		client := gpm.New(tokenFlag, gpm.WithServer(serverFlag))
 		if err := client.Add(context.Background(), pkg); err != nil {
 			return err
 		}
diff --git a/cmd/cmd.go b/internal/cli/cmd.go
similarity index 78%
rename from cmd/cmd.go
rename to internal/cli/cmd.go
index 4b498cf..9073675 100644
--- a/cmd/cmd.go
+++ b/internal/cli/cmd.go
@@ -1,4 +1,4 @@
-package cmd
+package cli
 
 import (
 	"context"
@@ -6,19 +6,17 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
-	"go.jolheiser.com/gpm/router"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
 
 	"github.com/urfave/cli/v2"
 )
 
-func New() *cli.App {
+func New(version string) *cli.App {
 	app := cli.NewApp()
 	app.Name = "gpm"
 	app.Usage = "Go Package Manager"
-	app.Version = router.Version
+	app.Version = version
 	app.Commands = []*cli.Command{
 		&Add,
 		&Get,
@@ -35,7 +33,7 @@ func New() *cli.App {
 			Usage:       "gpm server to use",
 			Value:       gpm.DefaultServer,
 			EnvVars:     []string{"GPM_SERVER"},
-			Destination: &flags.Server,
+			Destination: &serverFlag,
 		},
 		&cli.StringFlag{
 			Name:        "token",
@@ -43,7 +41,7 @@ func New() *cli.App {
 			Usage:       "gpm auth token to use",
 			DefaultText: "${GPM_TOKEN}",
 			EnvVars:     []string{"GPM_TOKEN"},
-			Destination: &flags.Token,
+			Destination: &tokenFlag,
 		},
 		&cli.StringFlag{
 			Name:        "database",
@@ -52,7 +50,7 @@ func New() *cli.App {
 			Value:       dbPath(),
 			DefaultText: "`${USERCONFIG}/gpm.db` or `${BINPATH}/gpm.db`",
 			EnvVars:     []string{"GPM_DATABASE"},
-			Destination: &flags.Database,
+			Destination: &databaseFlag,
 		},
 	}
 	return app
@@ -72,7 +70,7 @@ func dbPath() string {
 }
 
 func localOrToken(_ *cli.Context) error {
-	if flags.Local && flags.Token == "" {
+	if localFlag && tokenFlag == "" {
 		return errors.New("server interaaction requires --token")
 	}
 	return nil
@@ -80,8 +78,8 @@ func localOrToken(_ *cli.Context) error {
 
 func listPackages() ([]gpm.Package, error) {
 	var pkgs []gpm.Package
-	if flags.Local {
-		db, err := database.Load(flags.Database)
+	if localFlag {
+		db, err := database.Load(databaseFlag)
 		if err != nil {
 			return pkgs, err
 		}
@@ -90,7 +88,7 @@ func listPackages() ([]gpm.Package, error) {
 			return pkgs, err
 		}
 	} else {
-		client := gpm.New(flags.Token, gpm.WithServer(flags.Server))
+		client := gpm.New(tokenFlag, gpm.WithServer(serverFlag))
 		info, err := client.Info(context.Background())
 		if err != nil {
 			return pkgs, err
diff --git a/internal/cli/flags.go b/internal/cli/flags.go
new file mode 100644
index 0000000..ea0c67a
--- /dev/null
+++ b/internal/cli/flags.go
@@ -0,0 +1,11 @@
+package cli
+
+var (
+	serverFlag   string
+	tokenFlag    string
+	databaseFlag string
+
+	localFlag bool
+	forceFlag bool
+	portFlag  int
+)
diff --git a/cmd/get.go b/internal/cli/get.go
similarity index 87%
rename from cmd/get.go
rename to internal/cli/get.go
index ca4cb6b..421bec6 100644
--- a/cmd/get.go
+++ b/internal/cli/get.go
@@ -1,16 +1,15 @@
-package cmd
+package cli
 
 import (
 	"context"
-	"github.com/rs/zerolog/log"
 	"os"
 	"os/exec"
 	"strings"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
@@ -36,7 +35,7 @@ func doGet(ctx *cli.Context) error {
 		pkgs = strings.Split(pkgsAnswer, "\n")
 	}
 
-	client := gpm.New(flags.Token, gpm.WithServer(flags.Server))
+	client := gpm.New(tokenFlag, gpm.WithServer(serverFlag))
 	for _, p := range pkgs {
 		pkg, err := client.Get(context.Background(), p)
 		if err != nil {
diff --git a/cmd/list.go b/internal/cli/list.go
similarity index 97%
rename from cmd/list.go
rename to internal/cli/list.go
index 9d53d85..8302ca4 100644
--- a/cmd/list.go
+++ b/internal/cli/list.go
@@ -1,4 +1,4 @@
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/cmd/remove.go b/internal/cli/remove.go
similarity index 82%
rename from cmd/remove.go
rename to internal/cli/remove.go
index b066dac..874c990 100644
--- a/cmd/remove.go
+++ b/internal/cli/remove.go
@@ -1,14 +1,13 @@
-package cmd
+package cli
 
 import (
 	"context"
-	"github.com/rs/zerolog/log"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
@@ -48,8 +47,8 @@ func doRemove(_ *cli.Context) error {
 		Import: pkgMap[pkgName].Import,
 	}
 
-	if flags.Local {
-		db, err := database.Load(flags.Database)
+	if localFlag {
+		db, err := database.Load(databaseFlag)
 		if err != nil {
 			return err
 		}
@@ -57,7 +56,7 @@ func doRemove(_ *cli.Context) error {
 			return err
 		}
 	} else {
-		client := gpm.New(flags.Token, gpm.WithServer(flags.Server))
+		client := gpm.New(tokenFlag, gpm.WithServer(serverFlag))
 		if err := client.Remove(context.Background(), pkg); err != nil {
 			return err
 		}
diff --git a/cmd/search.go b/internal/cli/search.go
similarity index 95%
rename from cmd/search.go
rename to internal/cli/search.go
index f3d9ff4..cb72767 100644
--- a/cmd/search.go
+++ b/internal/cli/search.go
@@ -1,10 +1,10 @@
-package cmd
+package cli
 
 import (
-	"github.com/rs/zerolog/log"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/cmd/server.go b/internal/cli/server.go
similarity index 52%
rename from cmd/server.go
rename to internal/cli/server.go
index 3b25448..21ac91d 100644
--- a/cmd/server.go
+++ b/internal/cli/server.go
@@ -1,15 +1,14 @@
-package cmd
+package cli
 
 import (
 	"errors"
 	"fmt"
-	"github.com/rs/zerolog/log"
 	"net/http"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/router"
+	"go.jolheiser.com/gpm/internal/database"
+	"go.jolheiser.com/gpm/internal/router"
 
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
@@ -24,24 +23,24 @@ var Server = cli.Command{
 			Usage:       "Port to run the gpm server on",
 			Value:       3333,
 			EnvVars:     []string{"GPM_PORT"},
-			Destination: &flags.Port,
+			Destination: &portFlag,
 		},
 	},
 	Action: doServer,
 }
 
-func doServer(_ *cli.Context) error {
-	if flags.Token == "" {
+func doServer(ctx *cli.Context) error {
+	if tokenFlag == "" {
 		return errors.New("gpm server requires --token")
 	}
 
-	db, err := database.Load(flags.Database)
+	db, err := database.Load(databaseFlag)
 	if err != nil {
-		log.Fatal().Msgf("could not load database at %q: %v", flags.Database, err)
+		log.Fatal().Msgf("could not load database at %q: %v", databaseFlag, err)
 	}
 
-	log.Info().Msgf("Running gpm server at http://localhost:%d", flags.Port)
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", flags.Port), router.New(flags.Token, db)); err != nil {
+	log.Info().Msgf("Running gpm server at http://localhost:%d", portFlag)
+	if err := http.ListenAndServe(fmt.Sprintf(":%d", portFlag), router.New(tokenFlag, ctx.App.Version, db)); err != nil {
 		return err
 	}
 	return nil
diff --git a/cmd/update.go b/internal/cli/update.go
similarity index 84%
rename from cmd/update.go
rename to internal/cli/update.go
index 3639bce..e92949c 100644
--- a/cmd/update.go
+++ b/internal/cli/update.go
@@ -1,14 +1,13 @@
-package cmd
+package cli
 
 import (
 	"context"
-	"github.com/rs/zerolog/log"
 
-	"go.jolheiser.com/gpm/cmd/flags"
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
 
@@ -21,7 +20,7 @@ var Update = cli.Command{
 			Name:        "local",
 			Aliases:     []string{"l"},
 			Usage:       "local mode",
-			Destination: &flags.Local,
+			Destination: &localFlag,
 		},
 	},
 	Before: localOrToken,
@@ -66,8 +65,8 @@ func doUpdate(_ *cli.Context) error {
 		Import: importPath,
 	}
 
-	if flags.Local {
-		db, err := database.Load(flags.Database)
+	if localFlag {
+		db, err := database.Load(databaseFlag)
 		if err != nil {
 			return err
 		}
@@ -75,7 +74,7 @@ func doUpdate(_ *cli.Context) error {
 			return err
 		}
 	} else {
-		client := gpm.New(flags.Token, gpm.WithServer(flags.Server))
+		client := gpm.New(tokenFlag, gpm.WithServer(serverFlag))
 		if err := client.Update(context.Background(), pkg); err != nil {
 			return err
 		}
diff --git a/database/database.go b/internal/database/database.go
similarity index 98%
rename from database/database.go
rename to internal/database/database.go
index d7827d0..10c138b 100644
--- a/database/database.go
+++ b/internal/database/database.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
 
 	"go.etcd.io/bbolt"
 )
diff --git a/database/database_test.go b/internal/database/database_test.go
similarity index 97%
rename from database/database_test.go
rename to internal/database/database_test.go
index b6e1f92..950ba65 100644
--- a/database/database_test.go
+++ b/internal/database/database_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
 )
 
 var db *Database
@@ -33,7 +33,6 @@ func TestMain(m *testing.M) {
 }
 
 func TestPackage(t *testing.T) {
-
 	// Does not exist
 	_, err := db.Package("test")
 	if err == nil {
diff --git a/router/router.go b/internal/router/router.go
similarity index 87%
rename from router/router.go
rename to internal/router/router.go
index 69424b7..85c20fb 100644
--- a/router/router.go
+++ b/internal/router/router.go
@@ -1,27 +1,25 @@
 package router
 
 import (
-	"github.com/go-chi/render"
-	"github.com/rs/zerolog/log"
 	"net/http"
 	"time"
 
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
 
-	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/render"
+	"github.com/rs/zerolog/log"
 )
 
-var Version = "develop"
-
-func New(token string, db *database.Database) *chi.Mux {
+func New(token, version string, db *database.Database) *chi.Mux {
 	r := chi.NewRouter()
 	r.Use(middleware.RedirectSlashes)
 	r.Use(middleware.Recoverer)
 	r.Use(middleware.Timeout(30 * time.Second))
 
-	r.Get("/", handleHome(db))
+	r.Get("/", handleHome(version, db))
 	r.Post("/", addUpdatePackage(db, token))
 	r.Patch("/", addUpdatePackage(db, token))
 	r.Delete("/", removePackage(db, token))
@@ -30,7 +28,7 @@ func New(token string, db *database.Database) *chi.Mux {
 	return r
 }
 
-func handleHome(db *database.Database) func(http.ResponseWriter, *http.Request) {
+func handleHome(version string, db *database.Database) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		pkgs, err := db.Packages()
 		if err != nil {
@@ -39,7 +37,7 @@ func handleHome(db *database.Database) func(http.ResponseWriter, *http.Request)
 		}
 
 		render.JSON(w, r, gpm.Info{
-			Version:     Version,
+			Version:     version,
 			NumPackages: len(pkgs),
 			Packages:    pkgs,
 		})
@@ -50,7 +48,6 @@ func getPackage(db *database.Database) func(http.ResponseWriter, *http.Request)
 	return func(w http.ResponseWriter, r *http.Request) {
 		name := chi.URLParam(r, "name")
 
-
 		pkg, err := db.Package(name)
 		if err != nil {
 			w.WriteHeader(http.StatusNotFound)
diff --git a/router/router_test.go b/internal/router/router_test.go
similarity index 95%
rename from router/router_test.go
rename to internal/router/router_test.go
index 7ac3348..a4018c6 100644
--- a/router/router_test.go
+++ b/internal/router/router_test.go
@@ -2,14 +2,15 @@ package router
 
 import (
 	"context"
-	"github.com/rs/zerolog/log"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"go.jolheiser.com/gpm/database"
-	"go.jolheiser.com/gpm/go-gpm"
+	"go.jolheiser.com/gpm"
+	"go.jolheiser.com/gpm/internal/database"
+
+	"github.com/rs/zerolog/log"
 )
 
 var (
@@ -31,7 +32,7 @@ func TestMain(m *testing.M) {
 		log.Fatal().Msgf("could not load database at %q: %v", dbPath, err)
 	}
 
-	server = httptest.NewServer(New(token, db))
+	server = httptest.NewServer(New(token, "test", db))
 
 	code := m.Run()
 
@@ -91,7 +92,7 @@ func checkInfo(t *testing.T, client *gpm.Client, numPackages int) {
 		t.Logf("info should not return error: %v\n", err)
 		t.Fail()
 	}
-	if info.Version != Version || info.NumPackages != numPackages {
+	if info.Version != "test" || info.NumPackages != numPackages {
 		t.Log("info did not match expected")
 		t.Fail()
 	}
diff --git a/go-gpm/package.go b/package.go
similarity index 100%
rename from go-gpm/package.go
rename to package.go
diff --git a/tools.go b/tools.go
deleted file mode 100644
index 048b2fa..0000000
--- a/tools.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build tools
-// +build tools
-
-package main
-
-import (
-	_ "github.com/rs/zerolog/cmd/lint"
-)