From 90e0c742951ff02ad2d2f7d0eef5aa0a611ddbe1 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Fri, 27 Oct 2023 14:23:05 -0400
Subject: [PATCH] refactor: rename pkgs

---
 cmd/cmd.go                                    |  71 +++
 cmd/soft/{ => admin}/admin.go                 |  34 +-
 cmd/soft/{ => browse}/browse.go               |  14 +-
 cmd/soft/{ => hook}/hook.go                   |  72 +--
 cmd/soft/{root.go => main.go}                 |  82 ++--
 cmd/soft/man.go                               |  27 --
 cmd/soft/migrate_config.go                    | 434 ------------------
 cmd/soft/{ => serve}/serve.go                 |  87 ++--
 {server => cmd/soft/serve}/server.go          |  20 +-
 {server => pkg}/access/access.go              |   0
 {server => pkg}/access/access_test.go         |   0
 {server => pkg}/access/context.go             |   0
 {server => pkg}/backend/access_token.go       |   4 +-
 {server => pkg}/backend/auth.go               |   0
 {server => pkg}/backend/auth_test.go          |   0
 {server => pkg}/backend/backend.go            |   8 +-
 {server => pkg}/backend/cache.go              |   0
 {server => pkg}/backend/collab.go             |  12 +-
 {server => pkg}/backend/context.go            |   0
 {server => pkg}/backend/hooks.go              |   8 +-
 {server => pkg}/backend/lfs.go                |  12 +-
 {server => pkg}/backend/repo.go               |  18 +-
 {server => pkg}/backend/settings.go           |   4 +-
 {server => pkg}/backend/user.go               |  12 +-
 {server => pkg}/backend/utils.go              |   2 +-
 {server => pkg}/backend/webhooks.go           |  10 +-
 {server => pkg}/config/config.go              |   2 +-
 {server => pkg}/config/config_test.go         |   0
 {server => pkg}/config/context.go             |   0
 {server => pkg}/config/file.go                |   0
 {server => pkg}/config/ssh.go                 |   0
 {server => pkg}/config/testdata/k1.pub        |   0
 {server => pkg}/cron/cron.go                  |   0
 {server => pkg}/daemon/conn.go                |   0
 {server => pkg}/daemon/daemon.go              |  10 +-
 {server => pkg}/daemon/daemon_test.go         |  16 +-
 {server => pkg}/db/context.go                 |   0
 {server => pkg}/db/db.go                      |   2 +-
 {server => pkg}/db/errors.go                  |   0
 {server => pkg}/db/handler.go                 |   0
 {server => pkg}/db/logger.go                  |   0
 .../db/migrate/0001_create_tables.go          |   8 +-
 .../0001_create_tables_postgres.down.sql      |   0
 .../0001_create_tables_postgres.up.sql        |   0
 .../0001_create_tables_sqlite.down.sql        |   0
 .../migrate/0001_create_tables_sqlite.up.sql  |   0
 {server => pkg}/db/migrate/0002_webhooks.go   |   2 +-
 .../migrate/0002_webhooks_postgres.down.sql   |   0
 .../db/migrate/0002_webhooks_postgres.up.sql  |   0
 .../db/migrate/0002_webhooks_sqlite.down.sql  |   0
 .../db/migrate/0002_webhooks_sqlite.up.sql    |   0
 {server => pkg}/db/migrate/migrate.go         |   2 +-
 {server => pkg}/db/migrate/migrations.go      |   2 +-
 {server => pkg}/db/models/access_token.go     |   0
 {server => pkg}/db/models/collab.go           |   2 +-
 {server => pkg}/db/models/lfs.go              |   0
 {server => pkg}/db/models/public_key.go       |   0
 {server => pkg}/db/models/repo.go             |   0
 {server => pkg}/db/models/settings.go         |   0
 {server => pkg}/db/models/user.go             |   0
 {server => pkg}/db/models/webhook.go          |   0
 {server => pkg}/git/errors.go                 |   0
 {server => pkg}/git/git.go                    |   0
 {server => pkg}/git/git_test.go               |   0
 {server => pkg}/git/lfs.go                    |  14 +-
 {server => pkg}/git/lfs_auth.go               |   8 +-
 {server => pkg}/git/service.go                |   0
 {server => pkg}/hooks/gen.go                  |   4 +-
 {server => pkg}/hooks/hooks.go                |   0
 {server => pkg}/jobs/jobs.go                  |   0
 {server => pkg}/jobs/mirror.go                |  12 +-
 {server => pkg}/jwk/jwk.go                    |   2 +-
 {server => pkg}/lfs/basic_transfer.go         |   0
 {server => pkg}/lfs/client.go                 |   0
 {server => pkg}/lfs/common.go                 |   0
 {server => pkg}/lfs/endpoint.go               |   0
 {server => pkg}/lfs/http_client.go            |   0
 {server => pkg}/lfs/pointer.go                |   0
 {server => pkg}/lfs/pointer_test.go           |   0
 {server => pkg}/lfs/scanner.go                |   0
 {server => pkg}/lfs/ssh_client.go             |   0
 {server => pkg}/lfs/transfer.go               |   0
 {server => pkg}/log/log.go                    |   2 +-
 {server => pkg}/proto/access_token.go         |   0
 {server => pkg}/proto/context.go              |   0
 {server => pkg}/proto/errors.go               |   0
 {server => pkg}/proto/repo.go                 |   0
 {server => pkg}/proto/user.go                 |   0
 {server => pkg}/ssh/cmd/blob.go               |   6 +-
 {server => pkg}/ssh/cmd/branch.go             |   6 +-
 {server => pkg}/ssh/cmd/cmd.go                |  12 +-
 {server => pkg}/ssh/cmd/collab.go             |   4 +-
 {server => pkg}/ssh/cmd/commit.go             |   6 +-
 {server => pkg}/ssh/cmd/create.go             |   6 +-
 {server => pkg}/ssh/cmd/delete.go             |   2 +-
 {server => pkg}/ssh/cmd/description.go        |   2 +-
 {server => pkg}/ssh/cmd/git.go                |  16 +-
 {server => pkg}/ssh/cmd/hidden.go             |   2 +-
 {server => pkg}/ssh/cmd/import.go             |   6 +-
 {server => pkg}/ssh/cmd/info.go               |   4 +-
 {server => pkg}/ssh/cmd/jwt.go                |   6 +-
 {server => pkg}/ssh/cmd/list.go               |   6 +-
 {server => pkg}/ssh/cmd/mirror.go             |   2 +-
 {server => pkg}/ssh/cmd/private.go            |   2 +-
 {server => pkg}/ssh/cmd/project_name.go       |   2 +-
 {server => pkg}/ssh/cmd/pubkey.go             |   4 +-
 {server => pkg}/ssh/cmd/rename.go             |   2 +-
 {server => pkg}/ssh/cmd/repo.go               |   4 +-
 {server => pkg}/ssh/cmd/set_username.go       |   4 +-
 {server => pkg}/ssh/cmd/settings.go           |   4 +-
 {server => pkg}/ssh/cmd/tag.go                |   6 +-
 {server => pkg}/ssh/cmd/token.go              |   4 +-
 {server => pkg}/ssh/cmd/tree.go               |   4 +-
 {server => pkg}/ssh/cmd/user.go               |   6 +-
 {server => pkg}/ssh/cmd/webhooks.go           |   4 +-
 {server => pkg}/ssh/middleware.go             |  14 +-
 {server => pkg}/ssh/session.go                |  10 +-
 {server => pkg}/ssh/session_test.go           |  14 +-
 {server => pkg}/ssh/ssh.go                    |  10 +-
 {server => pkg}/ssh/ui.go                     |  14 +-
 {server => pkg}/sshutils/utils.go             |   0
 {server => pkg}/sshutils/utils_test.go        |   0
 {server => pkg}/stats/stats.go                |   2 +-
 {server => pkg}/storage/local.go              |   0
 {server => pkg}/storage/storage.go            |   0
 {server => pkg}/store/access_token.go         |   4 +-
 {server => pkg}/store/collab.go               |   6 +-
 {server => pkg}/store/context.go              |   0
 .../store/database/access_token.go            |   6 +-
 {server => pkg}/store/database/collab.go      |  10 +-
 {server => pkg}/store/database/database.go    |   6 +-
 {server => pkg}/store/database/lfs.go         |   6 +-
 {server => pkg}/store/database/repo.go        |   8 +-
 {server => pkg}/store/database/settings.go    |   6 +-
 {server => pkg}/store/database/user.go        |  10 +-
 {server => pkg}/store/database/webhooks.go    |   6 +-
 {server => pkg}/store/lfs.go                  |   4 +-
 {server => pkg}/store/repo.go                 |   4 +-
 {server => pkg}/store/settings.go             |   4 +-
 {server => pkg}/store/store.go                |   0
 {server => pkg}/store/user.go                 |   4 +-
 {server => pkg}/store/webhooks.go             |   4 +-
 {server => pkg}/sync/workqueue.go             |   0
 {server => pkg}/sync/workqueue_test.go        |   0
 {server => pkg}/task/manager.go               |   0
 {server => pkg}/test/test.go                  |   0
 {server => pkg}/ui/common/common.go           |   8 +-
 {server => pkg}/ui/common/component.go        |   0
 {server => pkg}/ui/common/error.go            |   0
 {server => pkg}/ui/common/format.go           |   2 +-
 {server => pkg}/ui/common/style.go            |   0
 {server => pkg}/ui/common/utils.go            |   2 +-
 {server => pkg}/ui/components/code/code.go    |   4 +-
 .../ui/components/footer/footer.go            |   2 +-
 .../ui/components/header/header.go            |   2 +-
 .../ui/components/selector/selector.go        |   2 +-
 .../ui/components/statusbar/statusbar.go      |   2 +-
 {server => pkg}/ui/components/tabs/tabs.go    |   2 +-
 .../ui/components/viewport/viewport.go        |   2 +-
 {server => pkg}/ui/keymap/keymap.go           |   0
 {server => pkg}/ui/pages/repo/empty.go        |   4 +-
 {server => pkg}/ui/pages/repo/files.go        |   8 +-
 {server => pkg}/ui/pages/repo/filesitem.go    |   2 +-
 {server => pkg}/ui/pages/repo/log.go          |  12 +-
 {server => pkg}/ui/pages/repo/logitem.go      |   2 +-
 {server => pkg}/ui/pages/repo/readme.go       |   8 +-
 {server => pkg}/ui/pages/repo/refs.go         |   6 +-
 {server => pkg}/ui/pages/repo/refsitem.go     |   2 +-
 {server => pkg}/ui/pages/repo/repo.go         |  12 +-
 {server => pkg}/ui/pages/repo/stash.go        |   8 +-
 {server => pkg}/ui/pages/repo/stashitem.go    |   2 +-
 {server => pkg}/ui/pages/selection/item.go    |   6 +-
 .../ui/pages/selection/selection.go           |  12 +-
 {server => pkg}/ui/styles/styles.go           |   0
 {server => pkg}/utils/utils.go                |   0
 {server => pkg}/utils/utils_test.go           |   0
 {server => pkg}/version/version.go            |   0
 {server => pkg}/web/auth.go                   |   6 +-
 {server => pkg}/web/context.go                |   8 +-
 {server => pkg}/web/git.go                    |  14 +-
 {server => pkg}/web/git_lfs.go                |  18 +-
 {server => pkg}/web/goget.go                  |   6 +-
 {server => pkg}/web/http.go                   |   2 +-
 {server => pkg}/web/logging.go                |   0
 {server => pkg}/web/server.go                 |   0
 {server => pkg}/web/util.go                   |   0
 {server => pkg}/webhook/branch_tag.go         |   8 +-
 {server => pkg}/webhook/collaborator.go       |   8 +-
 {server => pkg}/webhook/common.go             |   0
 {server => pkg}/webhook/content_type.go       |   0
 {server => pkg}/webhook/event.go              |   0
 {server => pkg}/webhook/push.go               |   8 +-
 {server => pkg}/webhook/repository.go         |   8 +-
 {server => pkg}/webhook/webhook.go            |  10 +-
 testscript/script_test.go                     |  20 +-
 195 files changed, 556 insertions(+), 975 deletions(-)
 create mode 100644 cmd/cmd.go
 rename cmd/soft/{ => admin}/admin.go (61%)
 rename cmd/soft/{ => browse}/browse.go (95%)
 rename cmd/soft/{ => hook}/hook.go (68%)
 rename cmd/soft/{root.go => main.go} (62%)
 delete mode 100644 cmd/soft/man.go
 delete mode 100644 cmd/soft/migrate_config.go
 rename cmd/soft/{ => serve}/serve.go (55%)
 rename {server => cmd/soft/serve}/server.go (88%)
 rename {server => pkg}/access/access.go (100%)
 rename {server => pkg}/access/access_test.go (100%)
 rename {server => pkg}/access/context.go (100%)
 rename {server => pkg}/backend/access_token.go (94%)
 rename {server => pkg}/backend/auth.go (100%)
 rename {server => pkg}/backend/auth_test.go (100%)
 rename {server => pkg}/backend/backend.go (79%)
 rename {server => pkg}/backend/cache.go (100%)
 rename {server => pkg}/backend/collab.go (90%)
 rename {server => pkg}/backend/context.go (100%)
 rename {server => pkg}/backend/hooks.go (94%)
 rename {server => pkg}/backend/lfs.go (86%)
 rename {server => pkg}/backend/repo.go (97%)
 rename {server => pkg}/backend/settings.go (93%)
 rename {server => pkg}/backend/user.go (97%)
 rename {server => pkg}/backend/utils.go (92%)
 rename {server => pkg}/backend/webhooks.go (96%)
 rename {server => pkg}/config/config.go (99%)
 rename {server => pkg}/config/config_test.go (100%)
 rename {server => pkg}/config/context.go (100%)
 rename {server => pkg}/config/file.go (100%)
 rename {server => pkg}/config/ssh.go (100%)
 rename {server => pkg}/config/testdata/k1.pub (100%)
 rename {server => pkg}/cron/cron.go (100%)
 rename {server => pkg}/daemon/conn.go (100%)
 rename {server => pkg}/daemon/daemon.go (96%)
 rename {server => pkg}/daemon/daemon_test.go (85%)
 rename {server => pkg}/db/context.go (100%)
 rename {server => pkg}/db/db.go (97%)
 rename {server => pkg}/db/errors.go (100%)
 rename {server => pkg}/db/handler.go (100%)
 rename {server => pkg}/db/logger.go (100%)
 rename {server => pkg}/db/migrate/0001_create_tables.go (95%)
 rename {server => pkg}/db/migrate/0001_create_tables_postgres.down.sql (100%)
 rename {server => pkg}/db/migrate/0001_create_tables_postgres.up.sql (100%)
 rename {server => pkg}/db/migrate/0001_create_tables_sqlite.down.sql (100%)
 rename {server => pkg}/db/migrate/0001_create_tables_sqlite.up.sql (100%)
 rename {server => pkg}/db/migrate/0002_webhooks.go (89%)
 rename {server => pkg}/db/migrate/0002_webhooks_postgres.down.sql (100%)
 rename {server => pkg}/db/migrate/0002_webhooks_postgres.up.sql (100%)
 rename {server => pkg}/db/migrate/0002_webhooks_sqlite.down.sql (100%)
 rename {server => pkg}/db/migrate/0002_webhooks_sqlite.up.sql (100%)
 rename {server => pkg}/db/migrate/migrate.go (98%)
 rename {server => pkg}/db/migrate/migrations.go (96%)
 rename {server => pkg}/db/models/access_token.go (100%)
 rename {server => pkg}/db/models/collab.go (88%)
 rename {server => pkg}/db/models/lfs.go (100%)
 rename {server => pkg}/db/models/public_key.go (100%)
 rename {server => pkg}/db/models/repo.go (100%)
 rename {server => pkg}/db/models/settings.go (100%)
 rename {server => pkg}/db/models/user.go (100%)
 rename {server => pkg}/db/models/webhook.go (100%)
 rename {server => pkg}/git/errors.go (100%)
 rename {server => pkg}/git/git.go (100%)
 rename {server => pkg}/git/git_test.go (100%)
 rename {server => pkg}/git/lfs.go (97%)
 rename {server => pkg}/git/lfs_auth.go (91%)
 rename {server => pkg}/git/service.go (100%)
 rename {server => pkg}/hooks/gen.go (97%)
 rename {server => pkg}/hooks/hooks.go (100%)
 rename {server => pkg}/jobs/jobs.go (100%)
 rename {server => pkg}/jobs/mirror.go (90%)
 rename {server => pkg}/jwk/jwk.go (94%)
 rename {server => pkg}/lfs/basic_transfer.go (100%)
 rename {server => pkg}/lfs/client.go (100%)
 rename {server => pkg}/lfs/common.go (100%)
 rename {server => pkg}/lfs/endpoint.go (100%)
 rename {server => pkg}/lfs/http_client.go (100%)
 rename {server => pkg}/lfs/pointer.go (100%)
 rename {server => pkg}/lfs/pointer_test.go (100%)
 rename {server => pkg}/lfs/scanner.go (100%)
 rename {server => pkg}/lfs/ssh_client.go (100%)
 rename {server => pkg}/lfs/transfer.go (100%)
 rename {server => pkg}/log/log.go (94%)
 rename {server => pkg}/proto/access_token.go (100%)
 rename {server => pkg}/proto/context.go (100%)
 rename {server => pkg}/proto/errors.go (100%)
 rename {server => pkg}/proto/repo.go (100%)
 rename {server => pkg}/proto/user.go (100%)
 rename {server => pkg}/ssh/cmd/blob.go (92%)
 rename {server => pkg}/ssh/cmd/branch.go (96%)
 rename {server => pkg}/ssh/cmd/cmd.go (93%)
 rename {server => pkg}/ssh/cmd/collab.go (95%)
 rename {server => pkg}/ssh/cmd/commit.go (95%)
 rename {server => pkg}/ssh/cmd/create.go (89%)
 rename {server => pkg}/ssh/cmd/delete.go (90%)
 rename {server => pkg}/ssh/cmd/description.go (94%)
 rename {server => pkg}/ssh/cmd/git.go (95%)
 rename {server => pkg}/ssh/cmd/hidden.go (94%)
 rename {server => pkg}/ssh/cmd/import.go (91%)
 rename {server => pkg}/ssh/cmd/info.go (87%)
 rename {server => pkg}/ssh/cmd/jwt.go (88%)
 rename {server => pkg}/ssh/cmd/list.go (83%)
 rename {server => pkg}/ssh/cmd/mirror.go (91%)
 rename {server => pkg}/ssh/cmd/private.go (94%)
 rename {server => pkg}/ssh/cmd/project_name.go (94%)
 rename {server => pkg}/ssh/cmd/pubkey.go (94%)
 rename {server => pkg}/ssh/cmd/rename.go (91%)
 rename {server => pkg}/ssh/cmd/repo.go (95%)
 rename {server => pkg}/ssh/cmd/set_username.go (84%)
 rename {server => pkg}/ssh/cmd/settings.go (94%)
 rename {server => pkg}/ssh/cmd/tag.go (93%)
 rename {server => pkg}/ssh/cmd/token.go (96%)
 rename {server => pkg}/ssh/cmd/tree.go (94%)
 rename {server => pkg}/ssh/cmd/user.go (96%)
 rename {server => pkg}/ssh/cmd/webhooks.go (98%)
 rename {server => pkg}/ssh/middleware.go (92%)
 rename {server => pkg}/ssh/session.go (89%)
 rename {server => pkg}/ssh/session_test.go (85%)
 rename {server => pkg}/ssh/ssh.go (95%)
 rename {server => pkg}/ssh/ui.go (94%)
 rename {server => pkg}/sshutils/utils.go (100%)
 rename {server => pkg}/sshutils/utils_test.go (100%)
 rename {server => pkg}/stats/stats.go (95%)
 rename {server => pkg}/storage/local.go (100%)
 rename {server => pkg}/storage/storage.go (100%)
 rename {server => pkg}/store/access_token.go (87%)
 rename {server => pkg}/store/collab.go (80%)
 rename {server => pkg}/store/context.go (100%)
 rename {server => pkg}/store/database/access_token.go (94%)
 rename {server => pkg}/store/database/collab.go (91%)
 rename {server => pkg}/store/database/database.go (83%)
 rename {server => pkg}/store/database/lfs.go (97%)
 rename {server => pkg}/store/database/repo.go (96%)
 rename {server => pkg}/store/database/settings.go (91%)
 rename {server => pkg}/store/database/user.go (96%)
 rename {server => pkg}/store/database/webhooks.go (97%)
 rename {server => pkg}/store/lfs.go (94%)
 rename {server => pkg}/store/repo.go (93%)
 rename {server => pkg}/store/settings.go (80%)
 rename {server => pkg}/store/store.go (100%)
 rename {server => pkg}/store/user.go (93%)
 rename {server => pkg}/store/webhooks.go (96%)
 rename {server => pkg}/sync/workqueue.go (100%)
 rename {server => pkg}/sync/workqueue_test.go (100%)
 rename {server => pkg}/task/manager.go (100%)
 rename {server => pkg}/test/test.go (100%)
 rename {server => pkg}/ui/common/common.go (90%)
 rename {server => pkg}/ui/common/component.go (100%)
 rename {server => pkg}/ui/common/error.go (100%)
 rename {server => pkg}/ui/common/format.go (96%)
 rename {server => pkg}/ui/common/style.go (100%)
 rename {server => pkg}/ui/common/utils.go (94%)
 rename {server => pkg}/ui/components/code/code.go (97%)
 rename {server => pkg}/ui/components/footer/footer.go (97%)
 rename {server => pkg}/ui/components/header/header.go (93%)
 rename {server => pkg}/ui/components/selector/selector.go (99%)
 rename {server => pkg}/ui/components/statusbar/statusbar.go (97%)
 rename {server => pkg}/ui/components/tabs/tabs.go (97%)
 rename {server => pkg}/ui/components/viewport/viewport.go (97%)
 rename {server => pkg}/ui/keymap/keymap.go (100%)
 rename {server => pkg}/ui/pages/repo/empty.go (86%)
 rename {server => pkg}/ui/pages/repo/files.go (98%)
 rename {server => pkg}/ui/pages/repo/filesitem.go (98%)
 rename {server => pkg}/ui/pages/repo/log.go (97%)
 rename {server => pkg}/ui/pages/repo/logitem.go (98%)
 rename {server => pkg}/ui/pages/repo/readme.go (93%)
 rename {server => pkg}/ui/pages/repo/refs.go (97%)
 rename {server => pkg}/ui/pages/repo/refsitem.go (98%)
 rename {server => pkg}/ui/pages/repo/repo.go (96%)
 rename {server => pkg}/ui/pages/repo/stash.go (96%)
 rename {server => pkg}/ui/pages/repo/stashitem.go (97%)
 rename {server => pkg}/ui/pages/selection/item.go (97%)
 rename {server => pkg}/ui/pages/selection/selection.go (95%)
 rename {server => pkg}/ui/styles/styles.go (100%)
 rename {server => pkg}/utils/utils.go (100%)
 rename {server => pkg}/utils/utils_test.go (100%)
 rename {server => pkg}/version/version.go (100%)
 rename {server => pkg}/web/auth.go (96%)
 rename {server => pkg}/web/context.go (80%)
 rename {server => pkg}/web/git.go (97%)
 rename {server => pkg}/web/git_lfs.go (98%)
 rename {server => pkg}/web/goget.go (94%)
 rename {server => pkg}/web/http.go (96%)
 rename {server => pkg}/web/logging.go (100%)
 rename {server => pkg}/web/server.go (100%)
 rename {server => pkg}/web/util.go (100%)
 rename {server => pkg}/webhook/branch_tag.go (91%)
 rename {server => pkg}/webhook/collaborator.go (91%)
 rename {server => pkg}/webhook/common.go (100%)
 rename {server => pkg}/webhook/content_type.go (100%)
 rename {server => pkg}/webhook/event.go (100%)
 rename {server => pkg}/webhook/push.go (92%)
 rename {server => pkg}/webhook/repository.go (92%)
 rename {server => pkg}/webhook/webhook.go (92%)

diff --git a/cmd/cmd.go b/cmd/cmd.go
new file mode 100644
index 000000000..9aead6369
--- /dev/null
+++ b/cmd/cmd.go
@@ -0,0 +1,71 @@
+package cmd
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io/fs"
+	"os"
+
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/hooks"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/store/database"
+	"github.com/spf13/cobra"
+)
+
+// InitBackendContext initializes the backend context.
+func InitBackendContext(cmd *cobra.Command, _ []string) error {
+	ctx := cmd.Context()
+	cfg := config.FromContext(ctx)
+	if _, err := os.Stat(cfg.DataPath); errors.Is(err, fs.ErrNotExist) {
+		if err := os.MkdirAll(cfg.DataPath, os.ModePerm); err != nil {
+			return fmt.Errorf("create data directory: %w", err)
+		}
+	}
+	dbx, err := db.Open(ctx, cfg.DB.Driver, cfg.DB.DataSource)
+	if err != nil {
+		return fmt.Errorf("open database: %w", err)
+	}
+
+	ctx = db.WithContext(ctx, dbx)
+	dbstore := database.New(ctx, dbx)
+	ctx = store.WithContext(ctx, dbstore)
+	be := backend.New(ctx, cfg, dbx)
+	ctx = backend.WithContext(ctx, be)
+
+	cmd.SetContext(ctx)
+
+	return nil
+}
+
+// CloseDBContext closes the database context.
+func CloseDBContext(cmd *cobra.Command, _ []string) error {
+	ctx := cmd.Context()
+	dbx := db.FromContext(ctx)
+	if dbx != nil {
+		if err := dbx.Close(); err != nil {
+			return fmt.Errorf("close database: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// InitializeHooks initializes the hooks.
+func InitializeHooks(ctx context.Context, cfg *config.Config, be *backend.Backend) error {
+	repos, err := be.Repositories(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, repo := range repos {
+		if err := hooks.GenerateHooks(ctx, cfg, repo.Name()); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/cmd/soft/admin.go b/cmd/soft/admin/admin.go
similarity index 61%
rename from cmd/soft/admin.go
rename to cmd/soft/admin/admin.go
index 16d31f278..7138f5754 100644
--- a/cmd/soft/admin.go
+++ b/cmd/soft/admin/admin.go
@@ -1,17 +1,19 @@
-package main
+package admin
 
 import (
 	"fmt"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/migrate"
+	"github.com/charmbracelet/soft-serve/cmd"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/migrate"
 	"github.com/spf13/cobra"
 )
 
 var (
-	adminCmd = &cobra.Command{
+	// Command is the admin command.
+	Command = &cobra.Command{
 		Use:   "admin",
 		Short: "Administrate the server",
 	}
@@ -19,8 +21,8 @@ var (
 	migrateCmd = &cobra.Command{
 		Use:                "migrate",
 		Short:              "Migrate the database to the latest version",
-		PersistentPreRunE:  initBackendContext,
-		PersistentPostRunE: closeDBContext,
+		PersistentPreRunE:  cmd.InitBackendContext,
+		PersistentPostRunE: cmd.CloseDBContext,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 			db := db.FromContext(ctx)
@@ -35,8 +37,8 @@ var (
 	rollbackCmd = &cobra.Command{
 		Use:                "rollback",
 		Short:              "Rollback the database to the previous version",
-		PersistentPreRunE:  initBackendContext,
-		PersistentPostRunE: closeDBContext,
+		PersistentPreRunE:  cmd.InitBackendContext,
+		PersistentPostRunE: cmd.CloseDBContext,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 			db := db.FromContext(ctx)
@@ -51,13 +53,13 @@ var (
 	syncHooksCmd = &cobra.Command{
 		Use:                "sync-hooks",
 		Short:              "Update repository hooks",
-		PersistentPreRunE:  initBackendContext,
-		PersistentPostRunE: closeDBContext,
-		RunE: func(cmd *cobra.Command, _ []string) error {
-			ctx := cmd.Context()
+		PersistentPreRunE:  cmd.InitBackendContext,
+		PersistentPostRunE: cmd.CloseDBContext,
+		RunE: func(c *cobra.Command, _ []string) error {
+			ctx := c.Context()
 			cfg := config.FromContext(ctx)
 			be := backend.FromContext(ctx)
-			if err := initializeHooks(ctx, cfg, be); err != nil {
+			if err := cmd.InitializeHooks(ctx, cfg, be); err != nil {
 				return fmt.Errorf("initialize hooks: %w", err)
 			}
 
@@ -67,7 +69,7 @@ var (
 )
 
 func init() {
-	adminCmd.AddCommand(
+	Command.AddCommand(
 		syncHooksCmd,
 		migrateCmd,
 		rollbackCmd,
diff --git a/cmd/soft/browse.go b/cmd/soft/browse/browse.go
similarity index 95%
rename from cmd/soft/browse.go
rename to cmd/soft/browse/browse.go
index 8cb760198..43fa3e612 100644
--- a/cmd/soft/browse.go
+++ b/cmd/soft/browse/browse.go
@@ -1,4 +1,4 @@
-package main
+package browse
 
 import (
 	"fmt"
@@ -9,15 +9,16 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/server/ui/pages/repo"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/pkg/ui/pages/repo"
 	"github.com/muesli/termenv"
 	"github.com/spf13/cobra"
 )
 
-var browseCmd = &cobra.Command{
+// Command is the browse command.
+var Command = &cobra.Command{
 	Use:   "browse PATH",
 	Short: "Browse a repository",
 	Args:  cobra.MaximumNArgs(1),
@@ -72,7 +73,6 @@ func init() {
 	// HACK: This is a hack to hide the clone url
 	// TODO: Make this configurable
 	common.CloneCmd = func(publicURL, name string) string { return "" }
-	rootCmd.AddCommand(browseCmd)
 }
 
 type state int
diff --git a/cmd/soft/hook.go b/cmd/soft/hook/hook.go
similarity index 68%
rename from cmd/soft/hook.go
rename to cmd/soft/hook/hook.go
index 1bb32b4ea..43718ed22 100644
--- a/cmd/soft/hook.go
+++ b/cmd/soft/hook/hook.go
@@ -1,4 +1,4 @@
-package main
+package hook
 
 import (
 	"bufio"
@@ -13,9 +13,10 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/hooks"
+	"github.com/charmbracelet/soft-serve/cmd"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/hooks"
 	"github.com/spf13/cobra"
 )
 
@@ -26,23 +27,24 @@ var (
 	// Deprecated: this flag is ignored.
 	configPath string
 
-	hookCmd = &cobra.Command{
+	// Command is the hook command.
+	Command = &cobra.Command{
 		Use:    "hook",
 		Short:  "Run git server hooks",
 		Long:   "Handles Soft Serve git server hooks.",
 		Hidden: true,
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			logger := log.FromContext(cmd.Context())
-			if err := initBackendContext(cmd, args); err != nil {
+		PersistentPreRunE: func(c *cobra.Command, args []string) error {
+			logger := log.FromContext(c.Context())
+			if err := cmd.InitBackendContext(c, args); err != nil {
 				logger.Error("failed to initialize backend context", "err", err)
 				return ErrInternalServerError
 			}
 
 			return nil
 		},
-		PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
-			logger := log.FromContext(cmd.Context())
-			if err := closeDBContext(cmd, args); err != nil {
+		PersistentPostRunE: func(c *cobra.Command, args []string) error {
+			logger := log.FromContext(c.Context())
+			if err := cmd.CloseDBContext(c, args); err != nil {
 				logger.Error("failed to close backend", "err", err)
 				return ErrInternalServerError
 			}
@@ -147,8 +149,8 @@ var (
 )
 
 func init() {
-	hookCmd.PersistentFlags().StringVar(&configPath, "config", "", "path to config file (deprecated)")
-	hookCmd.AddCommand(
+	Command.PersistentFlags().StringVar(&configPath, "config", "", "path to config file (deprecated)")
+	Command.AddCommand(
 		preReceiveCmd,
 		updateCmd,
 		postReceiveCmd,
@@ -163,47 +165,3 @@ func runCommand(ctx context.Context, in io.Reader, out io.Writer, err io.Writer,
 	cmd.Stderr = err
 	return cmd.Run()
 }
-
-const updateHookExample = `#!/bin/sh
-#
-# An example hook script to echo information about the push
-# and send it to the client.
-#
-# To enable this hook, rename this file to "update" and make it executable.
-
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# Safety check
-if [ -z "$GIT_DIR" ]; then
-        echo "Don't run this script from the command line." >&2
-        echo " (if you want, you could supply GIT_DIR then run" >&2
-        echo "  $0 <ref> <oldrev> <newrev>)" >&2
-        exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-        echo "usage: $0 <ref> <oldrev> <newrev>" >&2
-        exit 1
-fi
-
-# Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
-if [ "$newrev" = "$zero" ]; then
-        newrev_type=delete
-else
-        newrev_type=$(git cat-file -t $newrev)
-fi
-
-echo "Hi from Soft Serve update hook!"
-echo
-echo "Repository: $SOFT_SERVE_REPO_NAME"
-echo "RefName: $refname"
-echo "Change Type: $newrev_type"
-echo "Old SHA1: $oldrev"
-echo "New SHA1: $newrev"
-
-exit 0
-`
diff --git a/cmd/soft/root.go b/cmd/soft/main.go
similarity index 62%
rename from cmd/soft/root.go
rename to cmd/soft/main.go
index c47a81f7e..8264abee8 100644
--- a/cmd/soft/root.go
+++ b/cmd/soft/main.go
@@ -2,20 +2,20 @@ package main
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"io/fs"
 	"os"
 	"runtime/debug"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	logr "github.com/charmbracelet/soft-serve/server/log"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/store/database"
-	"github.com/charmbracelet/soft-serve/server/version"
+	"github.com/charmbracelet/soft-serve/cmd/soft/admin"
+	"github.com/charmbracelet/soft-serve/cmd/soft/browse"
+	"github.com/charmbracelet/soft-serve/cmd/soft/hook"
+	"github.com/charmbracelet/soft-serve/cmd/soft/serve"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	logr "github.com/charmbracelet/soft-serve/pkg/log"
+	"github.com/charmbracelet/soft-serve/pkg/version"
+	mcobra "github.com/muesli/mango-cobra"
+	"github.com/muesli/roff"
 	"github.com/spf13/cobra"
 	"go.uber.org/automaxprocs/maxprocs"
 )
@@ -39,18 +39,36 @@ var (
 		Long:         "Soft Serve is a self-hostable Git server for the command line.",
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return browseCmd.RunE(cmd, args)
+			return browse.Command.RunE(cmd, args)
+		},
+	}
+
+	manCmd = &cobra.Command{
+		Use:    "man",
+		Short:  "Generate man pages",
+		Args:   cobra.NoArgs,
+		Hidden: true,
+		RunE: func(_ *cobra.Command, _ []string) error {
+			manPage, err := mcobra.NewManPage(1, rootCmd) //.
+			if err != nil {
+				return err
+			}
+
+			manPage = manPage.WithSection("Copyright", "(C) 2021-2023 Charmbracelet, Inc.\n"+
+				"Released under MIT license.")
+			fmt.Println(manPage.Build(roff.NewDocument()))
+			return nil
 		},
 	}
 )
 
 func init() {
 	rootCmd.AddCommand(
-		serveCmd,
 		manCmd,
-		hookCmd,
-		migrateConfig,
-		adminCmd,
+		serve.Command,
+		hook.Command,
+		admin.Command,
+		browse.Command,
 	)
 	rootCmd.CompletionOptions.HiddenDefaultCmd = true
 
@@ -114,39 +132,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-
-func initBackendContext(cmd *cobra.Command, _ []string) error {
-	ctx := cmd.Context()
-	cfg := config.FromContext(ctx)
-	if _, err := os.Stat(cfg.DataPath); errors.Is(err, fs.ErrNotExist) {
-		if err := os.MkdirAll(cfg.DataPath, os.ModePerm); err != nil {
-			return fmt.Errorf("create data directory: %w", err)
-		}
-	}
-	dbx, err := db.Open(ctx, cfg.DB.Driver, cfg.DB.DataSource)
-	if err != nil {
-		return fmt.Errorf("open database: %w", err)
-	}
-
-	ctx = db.WithContext(ctx, dbx)
-	dbstore := database.New(ctx, dbx)
-	ctx = store.WithContext(ctx, dbstore)
-	be := backend.New(ctx, cfg, dbx)
-	ctx = backend.WithContext(ctx, be)
-
-	cmd.SetContext(ctx)
-
-	return nil
-}
-
-func closeDBContext(cmd *cobra.Command, _ []string) error {
-	ctx := cmd.Context()
-	dbx := db.FromContext(ctx)
-	if dbx != nil {
-		if err := dbx.Close(); err != nil {
-			return fmt.Errorf("close database: %w", err)
-		}
-	}
-
-	return nil
-}
diff --git a/cmd/soft/man.go b/cmd/soft/man.go
deleted file mode 100644
index 966fe27d3..000000000
--- a/cmd/soft/man.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	mcobra "github.com/muesli/mango-cobra"
-	"github.com/muesli/roff"
-	"github.com/spf13/cobra"
-)
-
-var manCmd = &cobra.Command{
-	Use:    "man",
-	Short:  "Generate man pages",
-	Args:   cobra.NoArgs,
-	Hidden: true,
-	RunE: func(_ *cobra.Command, _ []string) error {
-		manPage, err := mcobra.NewManPage(1, rootCmd) //.
-		if err != nil {
-			return err
-		}
-
-		manPage = manPage.WithSection("Copyright", "(C) 2021-2023 Charmbracelet, Inc.\n"+
-			"Released under MIT license.")
-		fmt.Println(manPage.Build(roff.NewDocument()))
-		return nil
-	},
-}
diff --git a/cmd/soft/migrate_config.go b/cmd/soft/migrate_config.go
deleted file mode 100644
index 5138e93c0..000000000
--- a/cmd/soft/migrate_config.go
+++ /dev/null
@@ -1,434 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/utils"
-	gitm "github.com/gogs/git-module"
-	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh"
-	"gopkg.in/yaml.v3"
-)
-
-// Deprecated: will be removed in a future release.
-var migrateConfig = &cobra.Command{
-	Use:    "migrate-config",
-	Short:  "Migrate config to new format",
-	Hidden: true,
-	RunE: func(cmd *cobra.Command, _ []string) error {
-		ctx := cmd.Context()
-
-		logger := log.FromContext(ctx)
-		// Disable logging timestamp
-		logger.SetReportTimestamp(false)
-
-		keyPath := os.Getenv("SOFT_SERVE_KEY_PATH")
-		reposPath := os.Getenv("SOFT_SERVE_REPO_PATH")
-		bindAddr := os.Getenv("SOFT_SERVE_BIND_ADDRESS")
-		cfg := config.DefaultConfig()
-		if err := cfg.ParseEnv(); err != nil {
-			return fmt.Errorf("parse env: %w", err)
-		}
-
-		ctx = config.WithContext(ctx, cfg)
-		db, err := db.Open(ctx, cfg.DB.Driver, cfg.DB.DataSource)
-		if err != nil {
-			return fmt.Errorf("open database: %w", err)
-		}
-
-		defer db.Close() // nolint: errcheck
-		sb := backend.New(ctx, cfg, db)
-
-		// FIXME: Admin user gets created when the database is created.
-		sb.DeleteUser(ctx, "admin") // nolint: errcheck
-
-		// Set SSH listen address
-		logger.Info("Setting SSH listen address...")
-		if bindAddr != "" {
-			cfg.SSH.ListenAddr = bindAddr
-		}
-
-		// Copy SSH host key
-		logger.Info("Copying SSH host key...")
-		if keyPath != "" {
-			if err := os.MkdirAll(filepath.Join(cfg.DataPath, "ssh"), os.ModePerm); err != nil {
-				return fmt.Errorf("failed to create ssh directory: %w", err)
-			}
-
-			if err := copyFile(keyPath, filepath.Join(cfg.DataPath, "ssh", filepath.Base(keyPath))); err != nil {
-				return fmt.Errorf("failed to copy ssh key: %w", err)
-			}
-
-			if err := copyFile(keyPath+".pub", filepath.Join(cfg.DataPath, "ssh", filepath.Base(keyPath))+".pub"); err != nil {
-				logger.Errorf("failed to copy ssh key: %s", err)
-			}
-
-			cfg.SSH.KeyPath = filepath.Join(cfg.DataPath, "ssh", filepath.Base(keyPath))
-		}
-
-		// Read config
-		logger.Info("Reading config repository...")
-		r, err := git.Open(filepath.Join(reposPath, "config"))
-		if err != nil {
-			return fmt.Errorf("failed to open config repo: %w", err)
-		}
-
-		head, err := r.HEAD()
-		if err != nil {
-			return fmt.Errorf("failed to get head: %w", err)
-		}
-
-		tree, err := r.TreePath(head, "")
-		if err != nil {
-			return fmt.Errorf("failed to get tree: %w", err)
-		}
-
-		isJson := false // nolint: revive
-		te, err := tree.TreeEntry("config.yaml")
-		if err != nil {
-			te, err = tree.TreeEntry("config.json")
-			if err != nil {
-				return fmt.Errorf("failed to get config file: %w", err)
-			}
-			isJson = true
-		}
-
-		cc, err := te.Contents()
-		if err != nil {
-			return fmt.Errorf("failed to get config contents: %w", err)
-		}
-
-		var ocfg Config
-		if isJson {
-			if err := json.Unmarshal(cc, &ocfg); err != nil {
-				return fmt.Errorf("failed to unmarshal config: %w", err)
-			}
-		} else {
-			if err := yaml.Unmarshal(cc, &ocfg); err != nil {
-				return fmt.Errorf("failed to unmarshal config: %w", err)
-			}
-		}
-
-		readme, readmePath, err := git.LatestFile(r, nil, "README*")
-		hasReadme := err == nil
-
-		// Set server name
-		cfg.Name = ocfg.Name
-
-		// Set server public url
-		cfg.SSH.PublicURL = fmt.Sprintf("ssh://%s:%d", ocfg.Host, ocfg.Port)
-
-		// Set server settings
-		logger.Info("Setting server settings...")
-		if sb.SetAllowKeyless(ctx, ocfg.AllowKeyless) != nil {
-			fmt.Fprintf(os.Stderr, "failed to set allow keyless\n")
-		}
-		anon := access.ParseAccessLevel(ocfg.AnonAccess)
-		if anon >= 0 {
-			if err := sb.SetAnonAccess(ctx, anon); err != nil {
-				fmt.Fprintf(os.Stderr, "failed to set anon access: %s\n", err)
-			}
-		}
-
-		// Copy repos
-		if reposPath != "" {
-			logger.Info("Copying repos...")
-			if err := os.MkdirAll(filepath.Join(cfg.DataPath, "repos"), os.ModePerm); err != nil {
-				return fmt.Errorf("failed to create repos directory: %w", err)
-			}
-
-			dirs, err := os.ReadDir(reposPath)
-			if err != nil {
-				return fmt.Errorf("failed to read repos directory: %w", err)
-			}
-
-			for _, dir := range dirs {
-				if !dir.IsDir() || dir.Name() == "config" {
-					continue
-				}
-
-				if !isGitDir(filepath.Join(reposPath, dir.Name())) {
-					continue
-				}
-
-				logger.Infof("  Copying repo %s", dir.Name())
-				src := filepath.Join(reposPath, utils.SanitizeRepo(dir.Name()))
-				dst := filepath.Join(cfg.DataPath, "repos", utils.SanitizeRepo(dir.Name())) + ".git"
-				if err := os.MkdirAll(dst, os.ModePerm); err != nil {
-					return fmt.Errorf("failed to create repo directory: %w", err)
-				}
-
-				if err := copyDir(src, dst); err != nil {
-					return fmt.Errorf("failed to copy repo: %w", err)
-				}
-
-				if _, err := sb.CreateRepository(ctx, dir.Name(), nil, proto.RepositoryOptions{}); err != nil {
-					fmt.Fprintf(os.Stderr, "failed to create repository: %s\n", err)
-				}
-			}
-
-			if hasReadme {
-				logger.Infof("  Copying readme from \"config\" to \".soft-serve\"")
-
-				// Switch to main branch
-				bcmd := git.NewCommand("branch", "-M", "main")
-
-				rp := filepath.Join(cfg.DataPath, "repos", ".soft-serve.git")
-				nr, err := git.Init(rp, true)
-				if err != nil {
-					return fmt.Errorf("failed to init repo: %w", err)
-				}
-
-				if _, err := nr.SymbolicRef("HEAD", gitm.RefsHeads+"main"); err != nil {
-					return fmt.Errorf("failed to set HEAD: %w", err)
-				}
-
-				tmpDir, err := os.MkdirTemp("", "soft-serve")
-				if err != nil {
-					return fmt.Errorf("failed to create temp dir: %w", err)
-				}
-
-				r, err := git.Init(tmpDir, false)
-				if err != nil {
-					return fmt.Errorf("failed to clone repo: %w", err)
-				}
-
-				if _, err := bcmd.RunInDir(tmpDir); err != nil {
-					return fmt.Errorf("failed to create main branch: %w", err)
-				}
-
-				if err := os.WriteFile(filepath.Join(tmpDir, readmePath), []byte(readme), 0o644); err != nil { // nolint: gosec
-					return fmt.Errorf("failed to write readme: %w", err)
-				}
-
-				if err := r.Add(gitm.AddOptions{
-					All: true,
-				}); err != nil {
-					return fmt.Errorf("failed to add readme: %w", err)
-				}
-
-				if err := r.Commit(&gitm.Signature{
-					Name:  "Soft Serve",
-					Email: "vt100@charm.sh",
-					When:  time.Now(),
-				}, "Add readme"); err != nil {
-					return fmt.Errorf("failed to commit readme: %w", err)
-				}
-
-				if err := r.RemoteAdd("origin", "file://"+rp); err != nil {
-					return fmt.Errorf("failed to add remote: %w", err)
-				}
-
-				if err := r.Push("origin", "main"); err != nil {
-					return fmt.Errorf("failed to push readme: %w", err)
-				}
-
-				// Create `.soft-serve` repository and add readme
-				if _, err := sb.CreateRepository(ctx, ".soft-serve", nil, proto.RepositoryOptions{
-					ProjectName: "Home",
-					Description: "Soft Serve home repository",
-					Hidden:      true,
-					Private:     false,
-				}); err != nil {
-					fmt.Fprintf(os.Stderr, "failed to create repository: %s\n", err)
-				}
-			}
-		}
-
-		// Set repos metadata & collabs
-		logger.Info("Setting repos metadata & collabs...")
-		for _, r := range ocfg.Repos {
-			repo, name := r.Repo, r.Name
-			// Special case for config repo
-			if repo == "config" {
-				repo = ".soft-serve"
-				r.Private = false
-			}
-
-			if err := sb.SetProjectName(ctx, repo, name); err != nil {
-				logger.Errorf("failed to set repo name to %s: %s", repo, err)
-			}
-
-			if err := sb.SetDescription(ctx, repo, r.Note); err != nil {
-				logger.Errorf("failed to set repo description to %s: %s", repo, err)
-			}
-
-			if err := sb.SetPrivate(ctx, repo, r.Private); err != nil {
-				logger.Errorf("failed to set repo private to %s: %s", repo, err)
-			}
-
-			for _, collab := range r.Collabs {
-				if err := sb.AddCollaborator(ctx, repo, collab, access.ReadWriteAccess); err != nil {
-					logger.Errorf("failed to add repo collab to %s: %s", repo, err)
-				}
-			}
-		}
-
-		// Create users & collabs
-		logger.Info("Creating users & collabs...")
-		for _, user := range ocfg.Users {
-			keys := make(map[string]ssh.PublicKey)
-			for _, key := range user.PublicKeys {
-				pk, _, err := sshutils.ParseAuthorizedKey(key)
-				if err != nil {
-					continue
-				}
-				ak := sshutils.MarshalAuthorizedKey(pk)
-				keys[ak] = pk
-			}
-
-			pubkeys := make([]ssh.PublicKey, 0)
-			for _, pk := range keys {
-				pubkeys = append(pubkeys, pk)
-			}
-
-			username := strings.ToLower(user.Name)
-			username = strings.ReplaceAll(username, " ", "-")
-			logger.Infof("Creating user %q", username)
-			if _, err := sb.CreateUser(ctx, username, proto.UserOptions{
-				Admin:      user.Admin,
-				PublicKeys: pubkeys,
-			}); err != nil {
-				logger.Errorf("failed to create user: %s", err)
-			}
-
-			for _, repo := range user.CollabRepos {
-				if err := sb.AddCollaborator(ctx, repo, username, access.ReadWriteAccess); err != nil {
-					logger.Errorf("failed to add user collab to %s: %s\n", repo, err)
-				}
-			}
-		}
-
-		logger.Info("Writing config...")
-		defer logger.Info("Done!")
-		return cfg.WriteConfig()
-	},
-}
-
-// Returns true if path is a directory containing an `objects` directory and a
-// `HEAD` file.
-func isGitDir(path string) bool {
-	stat, err := os.Stat(filepath.Join(path, "objects"))
-	if err != nil {
-		return false
-	}
-	if !stat.IsDir() {
-		return false
-	}
-
-	stat, err = os.Stat(filepath.Join(path, "HEAD"))
-	if err != nil {
-		return false
-	}
-	if stat.IsDir() {
-		return false
-	}
-
-	return true
-}
-
-// copyFile copies a single file from src to dst.
-func copyFile(src, dst string) error {
-	var err error
-	var srcfd *os.File
-	var dstfd *os.File
-	var srcinfo os.FileInfo
-
-	if srcfd, err = os.Open(src); err != nil {
-		return err
-	}
-	defer srcfd.Close() // nolint: errcheck
-
-	if dstfd, err = os.Create(dst); err != nil {
-		return err
-	}
-	defer dstfd.Close() // nolint: errcheck
-
-	if _, err = io.Copy(dstfd, srcfd); err != nil {
-		return err
-	}
-	if srcinfo, err = os.Stat(src); err != nil {
-		return err
-	}
-	return os.Chmod(dst, srcinfo.Mode())
-}
-
-// copyDir copies a whole directory recursively.
-func copyDir(src string, dst string) error {
-	var err error
-	var fds []os.DirEntry
-	var srcinfo os.FileInfo
-
-	if srcinfo, err = os.Stat(src); err != nil {
-		return err
-	}
-
-	if err = os.MkdirAll(dst, srcinfo.Mode()); err != nil {
-		return err
-	}
-
-	if fds, err = os.ReadDir(src); err != nil {
-		return err
-	}
-
-	for _, fd := range fds {
-		srcfp := filepath.Join(src, fd.Name())
-		dstfp := filepath.Join(dst, fd.Name())
-
-		if fd.IsDir() {
-			if err = copyDir(srcfp, dstfp); err != nil {
-				err = errors.Join(err, err)
-			}
-		} else {
-			if err = copyFile(srcfp, dstfp); err != nil {
-				err = errors.Join(err, err)
-			}
-		}
-	}
-
-	return err
-}
-
-// Config is the configuration for the server.
-type Config struct {
-	Name         string       `yaml:"name" json:"name"`
-	Host         string       `yaml:"host" json:"host"`
-	Port         int          `yaml:"port" json:"port"`
-	AnonAccess   string       `yaml:"anon-access" json:"anon-access"`
-	AllowKeyless bool         `yaml:"allow-keyless" json:"allow-keyless"`
-	Users        []User       `yaml:"users" json:"users"`
-	Repos        []RepoConfig `yaml:"repos" json:"repos"`
-}
-
-// User contains user-level configuration for a repository.
-type User struct {
-	Name        string   `yaml:"name" json:"name"`
-	Admin       bool     `yaml:"admin" json:"admin"`
-	PublicKeys  []string `yaml:"public-keys" json:"public-keys"`
-	CollabRepos []string `yaml:"collab-repos" json:"collab-repos"`
-}
-
-// RepoConfig is a repository configuration.
-type RepoConfig struct {
-	Name    string   `yaml:"name" json:"name"`
-	Repo    string   `yaml:"repo" json:"repo"`
-	Note    string   `yaml:"note" json:"note"`
-	Private bool     `yaml:"private" json:"private"`
-	Readme  string   `yaml:"readme" json:"readme"`
-	Collabs []string `yaml:"collabs" json:"collabs"`
-}
diff --git a/cmd/soft/serve.go b/cmd/soft/serve/serve.go
similarity index 55%
rename from cmd/soft/serve.go
rename to cmd/soft/serve/serve.go
index 0111f311a..7f81dcf0f 100644
--- a/cmd/soft/serve.go
+++ b/cmd/soft/serve/serve.go
@@ -1,4 +1,4 @@
-package main
+package serve
 
 import (
 	"context"
@@ -9,26 +9,26 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/migrate"
-	"github.com/charmbracelet/soft-serve/server/hooks"
+	"github.com/charmbracelet/soft-serve/cmd"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/migrate"
 	"github.com/spf13/cobra"
 )
 
 var (
 	syncHooks bool
 
-	serveCmd = &cobra.Command{
+	// Command is the serve command.
+	Command = &cobra.Command{
 		Use:                "serve",
 		Short:              "Start the server",
 		Args:               cobra.NoArgs,
-		PersistentPreRunE:  initBackendContext,
-		PersistentPostRunE: closeDBContext,
-		RunE: func(cmd *cobra.Command, _ []string) error {
-			ctx := cmd.Context()
+		PersistentPreRunE:  cmd.InitBackendContext,
+		PersistentPostRunE: cmd.CloseDBContext,
+		RunE: func(c *cobra.Command, _ []string) error {
+			ctx := c.Context()
 			cfg := config.DefaultConfig()
 			if cfg.Exist() {
 				if err := cfg.ParseFile(); err != nil {
@@ -67,14 +67,14 @@ var (
 				return fmt.Errorf("migration error: %w", err)
 			}
 
-			s, err := server.NewServer(ctx)
+			s, err := NewServer(ctx)
 			if err != nil {
 				return fmt.Errorf("start server: %w", err)
 			}
 
 			if syncHooks {
 				be := backend.FromContext(ctx)
-				if err := initializeHooks(ctx, cfg, be); err != nil {
+				if err := cmd.InitializeHooks(ctx, cfg, be); err != nil {
 					return fmt.Errorf("initialize hooks: %w", err)
 				}
 			}
@@ -103,20 +103,49 @@ var (
 )
 
 func init() {
-	serveCmd.Flags().BoolVarP(&syncHooks, "sync-hooks", "", false, "synchronize hooks for all repositories before running the server")
+	Command.Flags().BoolVarP(&syncHooks, "sync-hooks", "", false, "synchronize hooks for all repositories before running the server")
 }
 
-func initializeHooks(ctx context.Context, cfg *config.Config, be *backend.Backend) error {
-	repos, err := be.Repositories(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, repo := range repos {
-		if err := hooks.GenerateHooks(ctx, cfg, repo.Name()); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
+const updateHookExample = `#!/bin/sh
+#
+# An example hook script to echo information about the push
+# and send it to the client.
+#
+# To enable this hook, rename this file to "update" and make it executable.
+
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# Safety check
+if [ -z "$GIT_DIR" ]; then
+        echo "Don't run this script from the command line." >&2
+        echo " (if you want, you could supply GIT_DIR then run" >&2
+        echo "  $0 <ref> <oldrev> <newrev>)" >&2
+        exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+        echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+        exit 1
+fi
+
+# Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+        newrev_type=delete
+else
+        newrev_type=$(git cat-file -t $newrev)
+fi
+
+echo "Hi from Soft Serve update hook!"
+echo
+echo "Repository: $SOFT_SERVE_REPO_NAME"
+echo "RefName: $refname"
+echo "Change Type: $newrev_type"
+echo "Old SHA1: $oldrev"
+echo "New SHA1: $newrev"
+
+exit 0
+`
diff --git a/server/server.go b/cmd/soft/serve/server.go
similarity index 88%
rename from server/server.go
rename to cmd/soft/serve/server.go
index 71f796522..223e55a69 100644
--- a/server/server.go
+++ b/cmd/soft/serve/server.go
@@ -1,4 +1,4 @@
-package server
+package serve
 
 import (
 	"context"
@@ -8,15 +8,15 @@ import (
 
 	"github.com/charmbracelet/log"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/cron"
-	"github.com/charmbracelet/soft-serve/server/daemon"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/jobs"
-	sshsrv "github.com/charmbracelet/soft-serve/server/ssh"
-	"github.com/charmbracelet/soft-serve/server/stats"
-	"github.com/charmbracelet/soft-serve/server/web"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/cron"
+	"github.com/charmbracelet/soft-serve/pkg/daemon"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/jobs"
+	sshsrv "github.com/charmbracelet/soft-serve/pkg/ssh"
+	"github.com/charmbracelet/soft-serve/pkg/stats"
+	"github.com/charmbracelet/soft-serve/pkg/web"
 	"github.com/charmbracelet/ssh"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/server/access/access.go b/pkg/access/access.go
similarity index 100%
rename from server/access/access.go
rename to pkg/access/access.go
diff --git a/server/access/access_test.go b/pkg/access/access_test.go
similarity index 100%
rename from server/access/access_test.go
rename to pkg/access/access_test.go
diff --git a/server/access/context.go b/pkg/access/context.go
similarity index 100%
rename from server/access/context.go
rename to pkg/access/context.go
diff --git a/server/backend/access_token.go b/pkg/backend/access_token.go
similarity index 94%
rename from server/backend/access_token.go
rename to pkg/backend/access_token.go
index bff3b25ba..281ad8f17 100644
--- a/server/backend/access_token.go
+++ b/pkg/backend/access_token.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 )
 
 // CreateAccessToken creates an access token for user.
diff --git a/server/backend/auth.go b/pkg/backend/auth.go
similarity index 100%
rename from server/backend/auth.go
rename to pkg/backend/auth.go
diff --git a/server/backend/auth_test.go b/pkg/backend/auth_test.go
similarity index 100%
rename from server/backend/auth_test.go
rename to pkg/backend/auth_test.go
diff --git a/server/backend/backend.go b/pkg/backend/backend.go
similarity index 79%
rename from server/backend/backend.go
rename to pkg/backend/backend.go
index ba9ad61d3..2d9eb2a05 100644
--- a/server/backend/backend.go
+++ b/pkg/backend/backend.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/task"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/task"
 )
 
 // Backend is the Soft Serve backend that handles users, repositories, and
diff --git a/server/backend/cache.go b/pkg/backend/cache.go
similarity index 100%
rename from server/backend/cache.go
rename to pkg/backend/cache.go
diff --git a/server/backend/collab.go b/pkg/backend/collab.go
similarity index 90%
rename from server/backend/collab.go
rename to pkg/backend/collab.go
index 6b03c5d0e..c9635ae37 100644
--- a/server/backend/collab.go
+++ b/pkg/backend/collab.go
@@ -5,12 +5,12 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/utils"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 )
 
 // AddCollaborator adds a collaborator to a repository.
diff --git a/server/backend/context.go b/pkg/backend/context.go
similarity index 100%
rename from server/backend/context.go
rename to pkg/backend/context.go
diff --git a/server/backend/hooks.go b/pkg/backend/hooks.go
similarity index 94%
rename from server/backend/hooks.go
rename to pkg/backend/hooks.go
index 3e5297eb9..f6c644671 100644
--- a/server/backend/hooks.go
+++ b/pkg/backend/hooks.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/hooks"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/hooks"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 )
 
 var _ hooks.Hooks = (*Backend)(nil)
diff --git a/server/backend/lfs.go b/pkg/backend/lfs.go
similarity index 86%
rename from server/backend/lfs.go
rename to pkg/backend/lfs.go
index 5b0d5a406..b940940bd 100644
--- a/server/backend/lfs.go
+++ b/pkg/backend/lfs.go
@@ -8,12 +8,12 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/storage"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/storage"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 // StoreRepoMissingLFSObjects stores missing LFS objects for a repository.
diff --git a/server/backend/repo.go b/pkg/backend/repo.go
similarity index 97%
rename from server/backend/repo.go
rename to pkg/backend/repo.go
index 2a8a8d1be..231d94e6f 100644
--- a/server/backend/repo.go
+++ b/pkg/backend/repo.go
@@ -13,15 +13,15 @@ import (
 	"time"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/hooks"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/storage"
-	"github.com/charmbracelet/soft-serve/server/task"
-	"github.com/charmbracelet/soft-serve/server/utils"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/hooks"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/storage"
+	"github.com/charmbracelet/soft-serve/pkg/task"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 )
 
 func (d *Backend) reposPath() string {
diff --git a/server/backend/settings.go b/pkg/backend/settings.go
similarity index 93%
rename from server/backend/settings.go
rename to pkg/backend/settings.go
index 0879aa38d..3b7ddbf18 100644
--- a/server/backend/settings.go
+++ b/pkg/backend/settings.go
@@ -3,8 +3,8 @@ package backend
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
 )
 
 // AllowKeyless returns whether or not keyless access is allowed.
diff --git a/server/backend/user.go b/pkg/backend/user.go
similarity index 97%
rename from server/backend/user.go
rename to pkg/backend/user.go
index d5cf38ca3..75423048d 100644
--- a/server/backend/user.go
+++ b/pkg/backend/user.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/server/backend/utils.go b/pkg/backend/utils.go
similarity index 92%
rename from server/backend/utils.go
rename to pkg/backend/utils.go
index 5e90873e5..be1b0b4a7 100644
--- a/server/backend/utils.go
+++ b/pkg/backend/utils.go
@@ -2,7 +2,7 @@ package backend
 
 import (
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 )
 
 // LatestFile returns the contents of the latest file at the specified path in
diff --git a/server/backend/webhooks.go b/pkg/backend/webhooks.go
similarity index 96%
rename from server/backend/webhooks.go
rename to pkg/backend/webhooks.go
index 6d676d356..78126b2ee 100644
--- a/server/backend/webhooks.go
+++ b/pkg/backend/webhooks.go
@@ -5,11 +5,11 @@ import (
 	"encoding/json"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 	"github.com/google/uuid"
 )
 
diff --git a/server/config/config.go b/pkg/config/config.go
similarity index 99%
rename from server/config/config.go
rename to pkg/config/config.go
index 4707cc452..e1124204f 100644
--- a/server/config/config.go
+++ b/pkg/config/config.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/caarlos0/env/v8"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"golang.org/x/crypto/ssh"
 	"gopkg.in/yaml.v3"
 )
diff --git a/server/config/config_test.go b/pkg/config/config_test.go
similarity index 100%
rename from server/config/config_test.go
rename to pkg/config/config_test.go
diff --git a/server/config/context.go b/pkg/config/context.go
similarity index 100%
rename from server/config/context.go
rename to pkg/config/context.go
diff --git a/server/config/file.go b/pkg/config/file.go
similarity index 100%
rename from server/config/file.go
rename to pkg/config/file.go
diff --git a/server/config/ssh.go b/pkg/config/ssh.go
similarity index 100%
rename from server/config/ssh.go
rename to pkg/config/ssh.go
diff --git a/server/config/testdata/k1.pub b/pkg/config/testdata/k1.pub
similarity index 100%
rename from server/config/testdata/k1.pub
rename to pkg/config/testdata/k1.pub
diff --git a/server/cron/cron.go b/pkg/cron/cron.go
similarity index 100%
rename from server/cron/cron.go
rename to pkg/cron/cron.go
diff --git a/server/daemon/conn.go b/pkg/daemon/conn.go
similarity index 100%
rename from server/daemon/conn.go
rename to pkg/daemon/conn.go
diff --git a/server/daemon/daemon.go b/pkg/daemon/daemon.go
similarity index 96%
rename from server/daemon/daemon.go
rename to pkg/daemon/daemon.go
index 1a6070abc..eee10ec52 100644
--- a/server/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/git"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/go-git/go-git/v5/plumbing/format/pktline"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
diff --git a/server/daemon/daemon_test.go b/pkg/daemon/daemon_test.go
similarity index 85%
rename from server/daemon/daemon_test.go
rename to pkg/daemon/daemon_test.go
index 0592db2de..a8710513e 100644
--- a/server/daemon/daemon_test.go
+++ b/pkg/daemon/daemon_test.go
@@ -12,14 +12,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/migrate"
-	"github.com/charmbracelet/soft-serve/server/git"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/store/database"
-	"github.com/charmbracelet/soft-serve/server/test"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/migrate"
+	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/store/database"
+	"github.com/charmbracelet/soft-serve/pkg/test"
 	"github.com/go-git/go-git/v5/plumbing/format/pktline"
 	_ "modernc.org/sqlite" // sqlite driver
 )
diff --git a/server/db/context.go b/pkg/db/context.go
similarity index 100%
rename from server/db/context.go
rename to pkg/db/context.go
diff --git a/server/db/db.go b/pkg/db/db.go
similarity index 97%
rename from server/db/db.go
rename to pkg/db/db.go
index ae0bfcaae..968d0425a 100644
--- a/server/db/db.go
+++ b/pkg/db/db.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
+	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"  // postgres driver
 	_ "modernc.org/sqlite" // sqlite driver
diff --git a/server/db/errors.go b/pkg/db/errors.go
similarity index 100%
rename from server/db/errors.go
rename to pkg/db/errors.go
diff --git a/server/db/handler.go b/pkg/db/handler.go
similarity index 100%
rename from server/db/handler.go
rename to pkg/db/handler.go
diff --git a/server/db/logger.go b/pkg/db/logger.go
similarity index 100%
rename from server/db/logger.go
rename to pkg/db/logger.go
diff --git a/server/db/migrate/0001_create_tables.go b/pkg/db/migrate/0001_create_tables.go
similarity index 95%
rename from server/db/migrate/0001_create_tables.go
rename to pkg/db/migrate/0001_create_tables.go
index d1cadd4d4..8491328c0 100644
--- a/server/db/migrate/0001_create_tables.go
+++ b/pkg/db/migrate/0001_create_tables.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 )
 
 const (
diff --git a/server/db/migrate/0001_create_tables_postgres.down.sql b/pkg/db/migrate/0001_create_tables_postgres.down.sql
similarity index 100%
rename from server/db/migrate/0001_create_tables_postgres.down.sql
rename to pkg/db/migrate/0001_create_tables_postgres.down.sql
diff --git a/server/db/migrate/0001_create_tables_postgres.up.sql b/pkg/db/migrate/0001_create_tables_postgres.up.sql
similarity index 100%
rename from server/db/migrate/0001_create_tables_postgres.up.sql
rename to pkg/db/migrate/0001_create_tables_postgres.up.sql
diff --git a/server/db/migrate/0001_create_tables_sqlite.down.sql b/pkg/db/migrate/0001_create_tables_sqlite.down.sql
similarity index 100%
rename from server/db/migrate/0001_create_tables_sqlite.down.sql
rename to pkg/db/migrate/0001_create_tables_sqlite.down.sql
diff --git a/server/db/migrate/0001_create_tables_sqlite.up.sql b/pkg/db/migrate/0001_create_tables_sqlite.up.sql
similarity index 100%
rename from server/db/migrate/0001_create_tables_sqlite.up.sql
rename to pkg/db/migrate/0001_create_tables_sqlite.up.sql
diff --git a/server/db/migrate/0002_webhooks.go b/pkg/db/migrate/0002_webhooks.go
similarity index 89%
rename from server/db/migrate/0002_webhooks.go
rename to pkg/db/migrate/0002_webhooks.go
index 7ad37be61..a525f6edc 100644
--- a/server/db/migrate/0002_webhooks.go
+++ b/pkg/db/migrate/0002_webhooks.go
@@ -3,7 +3,7 @@ package migrate
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
+	"github.com/charmbracelet/soft-serve/pkg/db"
 )
 
 const (
diff --git a/server/db/migrate/0002_webhooks_postgres.down.sql b/pkg/db/migrate/0002_webhooks_postgres.down.sql
similarity index 100%
rename from server/db/migrate/0002_webhooks_postgres.down.sql
rename to pkg/db/migrate/0002_webhooks_postgres.down.sql
diff --git a/server/db/migrate/0002_webhooks_postgres.up.sql b/pkg/db/migrate/0002_webhooks_postgres.up.sql
similarity index 100%
rename from server/db/migrate/0002_webhooks_postgres.up.sql
rename to pkg/db/migrate/0002_webhooks_postgres.up.sql
diff --git a/server/db/migrate/0002_webhooks_sqlite.down.sql b/pkg/db/migrate/0002_webhooks_sqlite.down.sql
similarity index 100%
rename from server/db/migrate/0002_webhooks_sqlite.down.sql
rename to pkg/db/migrate/0002_webhooks_sqlite.down.sql
diff --git a/server/db/migrate/0002_webhooks_sqlite.up.sql b/pkg/db/migrate/0002_webhooks_sqlite.up.sql
similarity index 100%
rename from server/db/migrate/0002_webhooks_sqlite.up.sql
rename to pkg/db/migrate/0002_webhooks_sqlite.up.sql
diff --git a/server/db/migrate/migrate.go b/pkg/db/migrate/migrate.go
similarity index 98%
rename from server/db/migrate/migrate.go
rename to pkg/db/migrate/migrate.go
index 23242a302..18bc1780d 100644
--- a/server/db/migrate/migrate.go
+++ b/pkg/db/migrate/migrate.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/db"
+	"github.com/charmbracelet/soft-serve/pkg/db"
 )
 
 // MigrateFunc is a function that executes a migration.
diff --git a/server/db/migrate/migrations.go b/pkg/db/migrate/migrations.go
similarity index 96%
rename from server/db/migrate/migrations.go
rename to pkg/db/migrate/migrations.go
index 890454ab1..8a7c375c0 100644
--- a/server/db/migrate/migrations.go
+++ b/pkg/db/migrate/migrations.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/db"
+	"github.com/charmbracelet/soft-serve/pkg/db"
 )
 
 //go:embed *.sql
diff --git a/server/db/models/access_token.go b/pkg/db/models/access_token.go
similarity index 100%
rename from server/db/models/access_token.go
rename to pkg/db/models/access_token.go
diff --git a/server/db/models/collab.go b/pkg/db/models/collab.go
similarity index 88%
rename from server/db/models/collab.go
rename to pkg/db/models/collab.go
index 7efc44b9d..5141e5986 100644
--- a/server/db/models/collab.go
+++ b/pkg/db/models/collab.go
@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/access"
+	"github.com/charmbracelet/soft-serve/pkg/access"
 )
 
 // Collab represents a repository collaborator.
diff --git a/server/db/models/lfs.go b/pkg/db/models/lfs.go
similarity index 100%
rename from server/db/models/lfs.go
rename to pkg/db/models/lfs.go
diff --git a/server/db/models/public_key.go b/pkg/db/models/public_key.go
similarity index 100%
rename from server/db/models/public_key.go
rename to pkg/db/models/public_key.go
diff --git a/server/db/models/repo.go b/pkg/db/models/repo.go
similarity index 100%
rename from server/db/models/repo.go
rename to pkg/db/models/repo.go
diff --git a/server/db/models/settings.go b/pkg/db/models/settings.go
similarity index 100%
rename from server/db/models/settings.go
rename to pkg/db/models/settings.go
diff --git a/server/db/models/user.go b/pkg/db/models/user.go
similarity index 100%
rename from server/db/models/user.go
rename to pkg/db/models/user.go
diff --git a/server/db/models/webhook.go b/pkg/db/models/webhook.go
similarity index 100%
rename from server/db/models/webhook.go
rename to pkg/db/models/webhook.go
diff --git a/server/git/errors.go b/pkg/git/errors.go
similarity index 100%
rename from server/git/errors.go
rename to pkg/git/errors.go
diff --git a/server/git/git.go b/pkg/git/git.go
similarity index 100%
rename from server/git/git.go
rename to pkg/git/git.go
diff --git a/server/git/git_test.go b/pkg/git/git_test.go
similarity index 100%
rename from server/git/git_test.go
rename to pkg/git/git_test.go
diff --git a/server/git/lfs.go b/pkg/git/lfs.go
similarity index 97%
rename from server/git/lfs.go
rename to pkg/git/lfs.go
index 9e6851f19..b767c30c5 100644
--- a/server/git/lfs.go
+++ b/pkg/git/lfs.go
@@ -15,13 +15,13 @@ import (
 
 	"github.com/charmbracelet/git-lfs-transfer/transfer"
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/storage"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/storage"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/rubyist/tracerx"
 )
 
diff --git a/server/git/lfs_auth.go b/pkg/git/lfs_auth.go
similarity index 91%
rename from server/git/lfs_auth.go
rename to pkg/git/lfs_auth.go
index 0568d2907..edf0785d4 100644
--- a/server/git/lfs_auth.go
+++ b/pkg/git/lfs_auth.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/jwk"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/jwk"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/golang-jwt/jwt/v5"
 )
 
diff --git a/server/git/service.go b/pkg/git/service.go
similarity index 100%
rename from server/git/service.go
rename to pkg/git/service.go
diff --git a/server/hooks/gen.go b/pkg/hooks/gen.go
similarity index 97%
rename from server/hooks/gen.go
rename to pkg/hooks/gen.go
index ac23515da..5eb16ebc2 100644
--- a/server/hooks/gen.go
+++ b/pkg/hooks/gen.go
@@ -9,8 +9,8 @@ import (
 	"text/template"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 )
 
 // The names of git server-side hooks.
diff --git a/server/hooks/hooks.go b/pkg/hooks/hooks.go
similarity index 100%
rename from server/hooks/hooks.go
rename to pkg/hooks/hooks.go
diff --git a/server/jobs/jobs.go b/pkg/jobs/jobs.go
similarity index 100%
rename from server/jobs/jobs.go
rename to pkg/jobs/jobs.go
diff --git a/server/jobs/mirror.go b/pkg/jobs/mirror.go
similarity index 90%
rename from server/jobs/mirror.go
rename to pkg/jobs/mirror.go
index 4a8f08053..6d5d91685 100644
--- a/server/jobs/mirror.go
+++ b/pkg/jobs/mirror.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/sync"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/sync"
 )
 
 func init() {
diff --git a/server/jwk/jwk.go b/pkg/jwk/jwk.go
similarity index 94%
rename from server/jwk/jwk.go
rename to pkg/jwk/jwk.go
index 51ea86be8..b758f88aa 100644
--- a/server/jwk/jwk.go
+++ b/pkg/jwk/jwk.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	"github.com/charmbracelet/soft-serve/server/config"
+	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/go-jose/go-jose/v3"
 	"github.com/golang-jwt/jwt/v5"
 )
diff --git a/server/lfs/basic_transfer.go b/pkg/lfs/basic_transfer.go
similarity index 100%
rename from server/lfs/basic_transfer.go
rename to pkg/lfs/basic_transfer.go
diff --git a/server/lfs/client.go b/pkg/lfs/client.go
similarity index 100%
rename from server/lfs/client.go
rename to pkg/lfs/client.go
diff --git a/server/lfs/common.go b/pkg/lfs/common.go
similarity index 100%
rename from server/lfs/common.go
rename to pkg/lfs/common.go
diff --git a/server/lfs/endpoint.go b/pkg/lfs/endpoint.go
similarity index 100%
rename from server/lfs/endpoint.go
rename to pkg/lfs/endpoint.go
diff --git a/server/lfs/http_client.go b/pkg/lfs/http_client.go
similarity index 100%
rename from server/lfs/http_client.go
rename to pkg/lfs/http_client.go
diff --git a/server/lfs/pointer.go b/pkg/lfs/pointer.go
similarity index 100%
rename from server/lfs/pointer.go
rename to pkg/lfs/pointer.go
diff --git a/server/lfs/pointer_test.go b/pkg/lfs/pointer_test.go
similarity index 100%
rename from server/lfs/pointer_test.go
rename to pkg/lfs/pointer_test.go
diff --git a/server/lfs/scanner.go b/pkg/lfs/scanner.go
similarity index 100%
rename from server/lfs/scanner.go
rename to pkg/lfs/scanner.go
diff --git a/server/lfs/ssh_client.go b/pkg/lfs/ssh_client.go
similarity index 100%
rename from server/lfs/ssh_client.go
rename to pkg/lfs/ssh_client.go
diff --git a/server/lfs/transfer.go b/pkg/lfs/transfer.go
similarity index 100%
rename from server/lfs/transfer.go
rename to pkg/lfs/transfer.go
diff --git a/server/log/log.go b/pkg/log/log.go
similarity index 94%
rename from server/log/log.go
rename to pkg/log/log.go
index 3162d8768..aa9a6b418 100644
--- a/server/log/log.go
+++ b/pkg/log/log.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
+	"github.com/charmbracelet/soft-serve/pkg/config"
 )
 
 // NewLogger returns a new logger with default settings.
diff --git a/server/proto/access_token.go b/pkg/proto/access_token.go
similarity index 100%
rename from server/proto/access_token.go
rename to pkg/proto/access_token.go
diff --git a/server/proto/context.go b/pkg/proto/context.go
similarity index 100%
rename from server/proto/context.go
rename to pkg/proto/context.go
diff --git a/server/proto/errors.go b/pkg/proto/errors.go
similarity index 100%
rename from server/proto/errors.go
rename to pkg/proto/errors.go
diff --git a/server/proto/repo.go b/pkg/proto/repo.go
similarity index 100%
rename from server/proto/repo.go
rename to pkg/proto/repo.go
diff --git a/server/proto/user.go b/pkg/proto/user.go
similarity index 100%
rename from server/proto/user.go
rename to pkg/proto/user.go
diff --git a/server/ssh/cmd/blob.go b/pkg/ssh/cmd/blob.go
similarity index 92%
rename from server/ssh/cmd/blob.go
rename to pkg/ssh/cmd/blob.go
index 06034d94a..45e0affb2 100644
--- a/server/ssh/cmd/blob.go
+++ b/pkg/ssh/cmd/blob.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/styles"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/styles"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/branch.go b/pkg/ssh/cmd/branch.go
similarity index 96%
rename from server/ssh/cmd/branch.go
rename to pkg/ssh/cmd/branch.go
index 051bc9c16..1bc008923 100644
--- a/server/ssh/cmd/branch.go
+++ b/pkg/ssh/cmd/branch.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 	gitm "github.com/gogs/git-module"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/cmd.go b/pkg/ssh/cmd/cmd.go
similarity index 93%
rename from server/ssh/cmd/cmd.go
rename to pkg/ssh/cmd/cmd.go
index d543c3ad1..2d0b00c25 100644
--- a/server/ssh/cmd/cmd.go
+++ b/pkg/ssh/cmd/cmd.go
@@ -7,12 +7,12 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/charmbracelet/ssh"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/collab.go b/pkg/ssh/cmd/collab.go
similarity index 95%
rename from server/ssh/cmd/collab.go
rename to pkg/ssh/cmd/collab.go
index 7f45939a9..bc4e22d81 100644
--- a/server/ssh/cmd/collab.go
+++ b/pkg/ssh/cmd/collab.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/commit.go b/pkg/ssh/cmd/commit.go
similarity index 95%
rename from server/ssh/cmd/commit.go
rename to pkg/ssh/cmd/commit.go
index 75f02efbd..058029dfe 100644
--- a/server/ssh/cmd/commit.go
+++ b/pkg/ssh/cmd/commit.go
@@ -7,9 +7,9 @@ import (
 
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/styles"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/styles"
 	"github.com/muesli/termenv"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/create.go b/pkg/ssh/cmd/create.go
similarity index 89%
rename from server/ssh/cmd/create.go
rename to pkg/ssh/cmd/create.go
index 545470ff5..fa8ea3001 100644
--- a/server/ssh/cmd/create.go
+++ b/pkg/ssh/cmd/create.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/delete.go b/pkg/ssh/cmd/delete.go
similarity index 90%
rename from server/ssh/cmd/delete.go
rename to pkg/ssh/cmd/delete.go
index 7dad3d3f1..a1c25cb29 100644
--- a/server/ssh/cmd/delete.go
+++ b/pkg/ssh/cmd/delete.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/description.go b/pkg/ssh/cmd/description.go
similarity index 94%
rename from server/ssh/cmd/description.go
rename to pkg/ssh/cmd/description.go
index e80f3ff56..9ca799891 100644
--- a/server/ssh/cmd/description.go
+++ b/pkg/ssh/cmd/description.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/git.go b/pkg/ssh/cmd/git.go
similarity index 95%
rename from server/ssh/cmd/git.go
rename to pkg/ssh/cmd/git.go
index 56831f272..355d235d4 100644
--- a/server/ssh/cmd/git.go
+++ b/pkg/ssh/cmd/git.go
@@ -6,14 +6,14 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/git"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/spf13/cobra"
diff --git a/server/ssh/cmd/hidden.go b/pkg/ssh/cmd/hidden.go
similarity index 94%
rename from server/ssh/cmd/hidden.go
rename to pkg/ssh/cmd/hidden.go
index 2e2f4f486..79441b4a7 100644
--- a/server/ssh/cmd/hidden.go
+++ b/pkg/ssh/cmd/hidden.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/import.go b/pkg/ssh/cmd/import.go
similarity index 91%
rename from server/ssh/cmd/import.go
rename to pkg/ssh/cmd/import.go
index 85cb2fb8f..cb71f3c67 100644
--- a/server/ssh/cmd/import.go
+++ b/pkg/ssh/cmd/import.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"errors"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/task"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/task"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/info.go b/pkg/ssh/cmd/info.go
similarity index 87%
rename from server/ssh/cmd/info.go
rename to pkg/ssh/cmd/info.go
index 43f0c15ec..bb932390a 100644
--- a/server/ssh/cmd/info.go
+++ b/pkg/ssh/cmd/info.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/jwt.go b/pkg/ssh/cmd/jwt.go
similarity index 88%
rename from server/ssh/cmd/jwt.go
rename to pkg/ssh/cmd/jwt.go
index f5dec4cbf..e2d792cfa 100644
--- a/server/ssh/cmd/jwt.go
+++ b/pkg/ssh/cmd/jwt.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/jwk"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/jwk"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/list.go b/pkg/ssh/cmd/list.go
similarity index 83%
rename from server/ssh/cmd/list.go
rename to pkg/ssh/cmd/list.go
index 539a4dfbc..bcdfa99cd 100644
--- a/server/ssh/cmd/list.go
+++ b/pkg/ssh/cmd/list.go
@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/mirror.go b/pkg/ssh/cmd/mirror.go
similarity index 91%
rename from server/ssh/cmd/mirror.go
rename to pkg/ssh/cmd/mirror.go
index d2e641c23..4ef05a904 100644
--- a/server/ssh/cmd/mirror.go
+++ b/pkg/ssh/cmd/mirror.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/private.go b/pkg/ssh/cmd/private.go
similarity index 94%
rename from server/ssh/cmd/private.go
rename to pkg/ssh/cmd/private.go
index f835c804a..11340a6f0 100644
--- a/server/ssh/cmd/private.go
+++ b/pkg/ssh/cmd/private.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/project_name.go b/pkg/ssh/cmd/project_name.go
similarity index 94%
rename from server/ssh/cmd/project_name.go
rename to pkg/ssh/cmd/project_name.go
index 8eb9b05ad..469a2e16d 100644
--- a/server/ssh/cmd/project_name.go
+++ b/pkg/ssh/cmd/project_name.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/pubkey.go b/pkg/ssh/cmd/pubkey.go
similarity index 94%
rename from server/ssh/cmd/pubkey.go
rename to pkg/ssh/cmd/pubkey.go
index 11edd386d..697ab51c8 100644
--- a/server/ssh/cmd/pubkey.go
+++ b/pkg/ssh/cmd/pubkey.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/rename.go b/pkg/ssh/cmd/rename.go
similarity index 91%
rename from server/ssh/cmd/rename.go
rename to pkg/ssh/cmd/rename.go
index 2e92907b0..77cdc74e7 100644
--- a/server/ssh/cmd/rename.go
+++ b/pkg/ssh/cmd/rename.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/repo.go b/pkg/ssh/cmd/repo.go
similarity index 95%
rename from server/ssh/cmd/repo.go
rename to pkg/ssh/cmd/repo.go
index 0579a12ac..fa3e72ff9 100644
--- a/server/ssh/cmd/repo.go
+++ b/pkg/ssh/cmd/repo.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/set_username.go b/pkg/ssh/cmd/set_username.go
similarity index 84%
rename from server/ssh/cmd/set_username.go
rename to pkg/ssh/cmd/set_username.go
index c3841f82e..1fe93616b 100644
--- a/server/ssh/cmd/set_username.go
+++ b/pkg/ssh/cmd/set_username.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/settings.go b/pkg/ssh/cmd/settings.go
similarity index 94%
rename from server/ssh/cmd/settings.go
rename to pkg/ssh/cmd/settings.go
index 4131fb2b1..cf0ffe9e0 100644
--- a/server/ssh/cmd/settings.go
+++ b/pkg/ssh/cmd/settings.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/tag.go b/pkg/ssh/cmd/tag.go
similarity index 93%
rename from server/ssh/cmd/tag.go
rename to pkg/ssh/cmd/tag.go
index c15ce09f6..811de2316 100644
--- a/server/ssh/cmd/tag.go
+++ b/pkg/ssh/cmd/tag.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/ssh/cmd/token.go b/pkg/ssh/cmd/token.go
similarity index 96%
rename from server/ssh/cmd/token.go
rename to pkg/ssh/cmd/token.go
index 3fefaa8cd..ddb4d19e2 100644
--- a/server/ssh/cmd/token.go
+++ b/pkg/ssh/cmd/token.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/caarlos0/duration"
 	"github.com/caarlos0/tablewriter"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/tree.go b/pkg/ssh/cmd/tree.go
similarity index 94%
rename from server/ssh/cmd/tree.go
rename to pkg/ssh/cmd/tree.go
index e380a348e..6399c3e3f 100644
--- a/server/ssh/cmd/tree.go
+++ b/pkg/ssh/cmd/tree.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 )
diff --git a/server/ssh/cmd/user.go b/pkg/ssh/cmd/user.go
similarity index 96%
rename from server/ssh/cmd/user.go
rename to pkg/ssh/cmd/user.go
index f8b0a986d..21981f9cb 100644
--- a/server/ssh/cmd/user.go
+++ b/pkg/ssh/cmd/user.go
@@ -4,9 +4,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/server/ssh/cmd/webhooks.go b/pkg/ssh/cmd/webhooks.go
similarity index 98%
rename from server/ssh/cmd/webhooks.go
rename to pkg/ssh/cmd/webhooks.go
index 53ee877f8..e33ca9b0e 100644
--- a/server/ssh/cmd/webhooks.go
+++ b/pkg/ssh/cmd/webhooks.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/caarlos0/tablewriter"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/webhook"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/webhook"
 	"github.com/dustin/go-humanize"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
diff --git a/server/ssh/middleware.go b/pkg/ssh/middleware.go
similarity index 92%
rename from server/ssh/middleware.go
rename to pkg/ssh/middleware.go
index 23bf5ea97..285a980a7 100644
--- a/server/ssh/middleware.go
+++ b/pkg/ssh/middleware.go
@@ -5,13 +5,13 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ssh/cmd"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ssh/cmd"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/charmbracelet/ssh"
 	"github.com/charmbracelet/wish"
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/server/ssh/session.go b/pkg/ssh/session.go
similarity index 89%
rename from server/ssh/session.go
rename to pkg/ssh/session.go
index 53496e3af..5ccd9062b 100644
--- a/server/ssh/session.go
+++ b/pkg/ssh/session.go
@@ -5,11 +5,11 @@ import (
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/charmbracelet/ssh"
 	"github.com/charmbracelet/wish"
 	"github.com/muesli/termenv"
diff --git a/server/ssh/session_test.go b/pkg/ssh/session_test.go
similarity index 85%
rename from server/ssh/session_test.go
rename to pkg/ssh/session_test.go
index 17cbc5c08..845e17865 100644
--- a/server/ssh/session_test.go
+++ b/pkg/ssh/session_test.go
@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/migrate"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/store/database"
-	"github.com/charmbracelet/soft-serve/server/test"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/migrate"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/store/database"
+	"github.com/charmbracelet/soft-serve/pkg/test"
 	"github.com/charmbracelet/ssh"
 	bm "github.com/charmbracelet/wish/bubbletea"
 	"github.com/charmbracelet/wish/testsession"
diff --git a/server/ssh/ssh.go b/pkg/ssh/ssh.go
similarity index 95%
rename from server/ssh/ssh.go
rename to pkg/ssh/ssh.go
index 4d57dc90b..f56ccbf6e 100644
--- a/server/ssh/ssh.go
+++ b/pkg/ssh/ssh.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/charmbracelet/keygen"
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/charmbracelet/ssh"
 	"github.com/charmbracelet/wish"
 	bm "github.com/charmbracelet/wish/bubbletea"
diff --git a/server/ssh/ui.go b/pkg/ssh/ui.go
similarity index 94%
rename from server/ssh/ui.go
rename to pkg/ssh/ui.go
index 87c73ad71..3ac6b08ed 100644
--- a/server/ssh/ui.go
+++ b/pkg/ssh/ui.go
@@ -8,13 +8,13 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/server/ui/components/header"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/server/ui/pages/repo"
-	"github.com/charmbracelet/soft-serve/server/ui/pages/selection"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/header"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/ui/pages/repo"
+	"github.com/charmbracelet/soft-serve/pkg/ui/pages/selection"
 )
 
 type page int
diff --git a/server/sshutils/utils.go b/pkg/sshutils/utils.go
similarity index 100%
rename from server/sshutils/utils.go
rename to pkg/sshutils/utils.go
diff --git a/server/sshutils/utils_test.go b/pkg/sshutils/utils_test.go
similarity index 100%
rename from server/sshutils/utils_test.go
rename to pkg/sshutils/utils_test.go
diff --git a/server/stats/stats.go b/pkg/stats/stats.go
similarity index 95%
rename from server/stats/stats.go
rename to pkg/stats/stats.go
index 109e5207c..0ee72963e 100644
--- a/server/stats/stats.go
+++ b/pkg/stats/stats.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/config"
+	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
diff --git a/server/storage/local.go b/pkg/storage/local.go
similarity index 100%
rename from server/storage/local.go
rename to pkg/storage/local.go
diff --git a/server/storage/storage.go b/pkg/storage/storage.go
similarity index 100%
rename from server/storage/storage.go
rename to pkg/storage/storage.go
diff --git a/server/store/access_token.go b/pkg/store/access_token.go
similarity index 87%
rename from server/store/access_token.go
rename to pkg/store/access_token.go
index c502ea6b1..e244f1af3 100644
--- a/server/store/access_token.go
+++ b/pkg/store/access_token.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 )
 
 // AccessTokenStore is an interface for managing access tokens.
diff --git a/server/store/collab.go b/pkg/store/collab.go
similarity index 80%
rename from server/store/collab.go
rename to pkg/store/collab.go
index f8907e1ca..ac3f4cc0a 100644
--- a/server/store/collab.go
+++ b/pkg/store/collab.go
@@ -3,9 +3,9 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 )
 
 // CollaboratorStore is an interface for managing collaborators.
diff --git a/server/store/context.go b/pkg/store/context.go
similarity index 100%
rename from server/store/context.go
rename to pkg/store/context.go
diff --git a/server/store/database/access_token.go b/pkg/store/database/access_token.go
similarity index 94%
rename from server/store/database/access_token.go
rename to pkg/store/database/access_token.go
index 16f72b6aa..af3e2b89e 100644
--- a/server/store/database/access_token.go
+++ b/pkg/store/database/access_token.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 type accessTokenStore struct{}
diff --git a/server/store/database/collab.go b/pkg/store/database/collab.go
similarity index 91%
rename from server/store/database/collab.go
rename to pkg/store/database/collab.go
index ea4e24a2f..9068edef2 100644
--- a/server/store/database/collab.go
+++ b/pkg/store/database/collab.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 )
 
 type collabStore struct{}
diff --git a/server/store/database/database.go b/pkg/store/database/database.go
similarity index 83%
rename from server/store/database/database.go
rename to pkg/store/database/database.go
index ab6155e8e..02c4bd19c 100644
--- a/server/store/database/database.go
+++ b/pkg/store/database/database.go
@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 type datastore struct {
diff --git a/server/store/database/lfs.go b/pkg/store/database/lfs.go
similarity index 97%
rename from server/store/database/lfs.go
rename to pkg/store/database/lfs.go
index 64fef3716..8179d1803 100644
--- a/server/store/database/lfs.go
+++ b/pkg/store/database/lfs.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 type lfsStore struct{}
diff --git a/server/store/database/repo.go b/pkg/store/database/repo.go
similarity index 96%
rename from server/store/database/repo.go
rename to pkg/store/database/repo.go
index 03c080444..32b91291e 100644
--- a/server/store/database/repo.go
+++ b/pkg/store/database/repo.go
@@ -3,10 +3,10 @@ package database
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 )
 
 type repoStore struct{}
diff --git a/server/store/database/settings.go b/pkg/store/database/settings.go
similarity index 91%
rename from server/store/database/settings.go
rename to pkg/store/database/settings.go
index ace96f717..8fd8294f8 100644
--- a/server/store/database/settings.go
+++ b/pkg/store/database/settings.go
@@ -3,9 +3,9 @@ package database
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 type settingsStore struct{}
diff --git a/server/store/database/user.go b/pkg/store/database/user.go
similarity index 96%
rename from server/store/database/user.go
rename to pkg/store/database/user.go
index 95572010d..86b161f47 100644
--- a/server/store/database/user.go
+++ b/pkg/store/database/user.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"strings"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/sshutils"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/server/store/database/webhooks.go b/pkg/store/database/webhooks.go
similarity index 97%
rename from server/store/database/webhooks.go
rename to pkg/store/database/webhooks.go
index abaa25851..1bc1f206c 100644
--- a/server/store/database/webhooks.go
+++ b/pkg/store/database/webhooks.go
@@ -3,9 +3,9 @@ package database
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
 )
diff --git a/server/store/lfs.go b/pkg/store/lfs.go
similarity index 94%
rename from server/store/lfs.go
rename to pkg/store/lfs.go
index 067285eac..31611e9b5 100644
--- a/server/store/lfs.go
+++ b/pkg/store/lfs.go
@@ -3,8 +3,8 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 )
 
 // LFSStore is the interface for the LFS store.
diff --git a/server/store/repo.go b/pkg/store/repo.go
similarity index 93%
rename from server/store/repo.go
rename to pkg/store/repo.go
index 01feece79..768679251 100644
--- a/server/store/repo.go
+++ b/pkg/store/repo.go
@@ -3,8 +3,8 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 )
 
 // RepositoryStore is an interface for managing repositories.
diff --git a/server/store/settings.go b/pkg/store/settings.go
similarity index 80%
rename from server/store/settings.go
rename to pkg/store/settings.go
index 75dd9d7af..f4833d02a 100644
--- a/server/store/settings.go
+++ b/pkg/store/settings.go
@@ -3,8 +3,8 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
 )
 
 // SettingStore is an interface for managing settings.
diff --git a/server/store/store.go b/pkg/store/store.go
similarity index 100%
rename from server/store/store.go
rename to pkg/store/store.go
diff --git a/server/store/user.go b/pkg/store/user.go
similarity index 93%
rename from server/store/user.go
rename to pkg/store/user.go
index 43c523736..260a7279c 100644
--- a/server/store/user.go
+++ b/pkg/store/user.go
@@ -3,8 +3,8 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/server/store/webhooks.go b/pkg/store/webhooks.go
similarity index 96%
rename from server/store/webhooks.go
rename to pkg/store/webhooks.go
index 139753484..1c0567b86 100644
--- a/server/store/webhooks.go
+++ b/pkg/store/webhooks.go
@@ -3,8 +3,8 @@ package store
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
 	"github.com/google/uuid"
 )
 
diff --git a/server/sync/workqueue.go b/pkg/sync/workqueue.go
similarity index 100%
rename from server/sync/workqueue.go
rename to pkg/sync/workqueue.go
diff --git a/server/sync/workqueue_test.go b/pkg/sync/workqueue_test.go
similarity index 100%
rename from server/sync/workqueue_test.go
rename to pkg/sync/workqueue_test.go
diff --git a/server/task/manager.go b/pkg/task/manager.go
similarity index 100%
rename from server/task/manager.go
rename to pkg/task/manager.go
diff --git a/server/test/test.go b/pkg/test/test.go
similarity index 100%
rename from server/test/test.go
rename to pkg/test/test.go
diff --git a/server/ui/common/common.go b/pkg/ui/common/common.go
similarity index 90%
rename from server/ui/common/common.go
rename to pkg/ui/common/common.go
index 884b7d200..3a2362150 100644
--- a/server/ui/common/common.go
+++ b/pkg/ui/common/common.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/ui/keymap"
-	"github.com/charmbracelet/soft-serve/server/ui/styles"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/ui/keymap"
+	"github.com/charmbracelet/soft-serve/pkg/ui/styles"
 	"github.com/charmbracelet/ssh"
 	zone "github.com/lrstanley/bubblezone"
 	"github.com/muesli/termenv"
diff --git a/server/ui/common/component.go b/pkg/ui/common/component.go
similarity index 100%
rename from server/ui/common/component.go
rename to pkg/ui/common/component.go
diff --git a/server/ui/common/error.go b/pkg/ui/common/error.go
similarity index 100%
rename from server/ui/common/error.go
rename to pkg/ui/common/error.go
diff --git a/server/ui/common/format.go b/pkg/ui/common/format.go
similarity index 96%
rename from server/ui/common/format.go
rename to pkg/ui/common/format.go
index 90d00dc54..9649eb03a 100644
--- a/server/ui/common/format.go
+++ b/pkg/ui/common/format.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/alecthomas/chroma/lexers"
 	gansi "github.com/charmbracelet/glamour/ansi"
-	"github.com/charmbracelet/soft-serve/server/ui/styles"
+	"github.com/charmbracelet/soft-serve/pkg/ui/styles"
 	"github.com/muesli/termenv"
 )
 
diff --git a/server/ui/common/style.go b/pkg/ui/common/style.go
similarity index 100%
rename from server/ui/common/style.go
rename to pkg/ui/common/style.go
diff --git a/server/ui/common/utils.go b/pkg/ui/common/utils.go
similarity index 94%
rename from server/ui/common/utils.go
rename to pkg/ui/common/utils.go
index 49eaf00ce..08f07ada1 100644
--- a/server/ui/common/utils.go
+++ b/pkg/ui/common/utils.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/muesli/reflow/truncate"
 )
 
diff --git a/server/ui/components/code/code.go b/pkg/ui/components/code/code.go
similarity index 97%
rename from server/ui/components/code/code.go
rename to pkg/ui/components/code/code.go
index 5d6d4a91e..56c580345 100644
--- a/server/ui/components/code/code.go
+++ b/pkg/ui/components/code/code.go
@@ -10,8 +10,8 @@ import (
 	"github.com/charmbracelet/glamour"
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	vp "github.com/charmbracelet/soft-serve/server/ui/components/viewport"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	vp "github.com/charmbracelet/soft-serve/pkg/ui/components/viewport"
 	"github.com/muesli/termenv"
 )
 
diff --git a/server/ui/components/footer/footer.go b/pkg/ui/components/footer/footer.go
similarity index 97%
rename from server/ui/components/footer/footer.go
rename to pkg/ui/components/footer/footer.go
index 0022d0fe2..b65de0e2b 100644
--- a/server/ui/components/footer/footer.go
+++ b/pkg/ui/components/footer/footer.go
@@ -5,7 +5,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 // ToggleFooterMsg is a message sent to show/hide the footer.
diff --git a/server/ui/components/header/header.go b/pkg/ui/components/header/header.go
similarity index 93%
rename from server/ui/components/header/header.go
rename to pkg/ui/components/header/header.go
index 66870968a..7de511426 100644
--- a/server/ui/components/header/header.go
+++ b/pkg/ui/components/header/header.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 // Header represents a header component.
diff --git a/server/ui/components/selector/selector.go b/pkg/ui/components/selector/selector.go
similarity index 99%
rename from server/ui/components/selector/selector.go
rename to pkg/ui/components/selector/selector.go
index 22dcfefaf..7454cc3e7 100644
--- a/server/ui/components/selector/selector.go
+++ b/pkg/ui/components/selector/selector.go
@@ -6,7 +6,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 // Selector is a list of items that can be selected.
diff --git a/server/ui/components/statusbar/statusbar.go b/pkg/ui/components/statusbar/statusbar.go
similarity index 97%
rename from server/ui/components/statusbar/statusbar.go
rename to pkg/ui/components/statusbar/statusbar.go
index f60e07795..2ac1fa47e 100644
--- a/server/ui/components/statusbar/statusbar.go
+++ b/pkg/ui/components/statusbar/statusbar.go
@@ -3,7 +3,7 @@ package statusbar
 import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/muesli/reflow/truncate"
 )
 
diff --git a/server/ui/components/tabs/tabs.go b/pkg/ui/components/tabs/tabs.go
similarity index 97%
rename from server/ui/components/tabs/tabs.go
rename to pkg/ui/components/tabs/tabs.go
index 4adff6d9d..d5132e7f8 100644
--- a/server/ui/components/tabs/tabs.go
+++ b/pkg/ui/components/tabs/tabs.go
@@ -5,7 +5,7 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 // SelectTabMsg is a message that contains the index of the tab to select.
diff --git a/server/ui/components/viewport/viewport.go b/pkg/ui/components/viewport/viewport.go
similarity index 97%
rename from server/ui/components/viewport/viewport.go
rename to pkg/ui/components/viewport/viewport.go
index 35fe8f24d..cd7b6c909 100644
--- a/server/ui/components/viewport/viewport.go
+++ b/pkg/ui/components/viewport/viewport.go
@@ -4,7 +4,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 // Viewport represents a viewport component.
diff --git a/server/ui/keymap/keymap.go b/pkg/ui/keymap/keymap.go
similarity index 100%
rename from server/ui/keymap/keymap.go
rename to pkg/ui/keymap/keymap.go
diff --git a/server/ui/pages/repo/empty.go b/pkg/ui/pages/repo/empty.go
similarity index 86%
rename from server/ui/pages/repo/empty.go
rename to pkg/ui/pages/repo/empty.go
index 78ce98726..ddf9c73d4 100644
--- a/server/ui/pages/repo/empty.go
+++ b/pkg/ui/pages/repo/empty.go
@@ -3,8 +3,8 @@ package repo
 import (
 	"fmt"
 
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 )
 
 func defaultEmptyRepoMsg(cfg *config.Config, repo string) string {
diff --git a/server/ui/pages/repo/files.go b/pkg/ui/pages/repo/files.go
similarity index 98%
rename from server/ui/pages/repo/files.go
rename to pkg/ui/pages/repo/files.go
index 38521a7be..259adf5f1 100644
--- a/server/ui/pages/repo/files.go
+++ b/pkg/ui/pages/repo/files.go
@@ -11,10 +11,10 @@ import (
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/code"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/code"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
 	gitm "github.com/gogs/git-module"
 )
 
diff --git a/server/ui/pages/repo/filesitem.go b/pkg/ui/pages/repo/filesitem.go
similarity index 98%
rename from server/ui/pages/repo/filesitem.go
rename to pkg/ui/pages/repo/filesitem.go
index c4f358b50..04b6715e3 100644
--- a/server/ui/pages/repo/filesitem.go
+++ b/pkg/ui/pages/repo/filesitem.go
@@ -11,7 +11,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/dustin/go-humanize"
 )
 
diff --git a/server/ui/pages/repo/log.go b/pkg/ui/pages/repo/log.go
similarity index 97%
rename from server/ui/pages/repo/log.go
rename to pkg/ui/pages/repo/log.go
index 5ea585431..ef4e5589e 100644
--- a/server/ui/pages/repo/log.go
+++ b/pkg/ui/pages/repo/log.go
@@ -11,12 +11,12 @@ import (
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/server/ui/components/viewport"
-	"github.com/charmbracelet/soft-serve/server/ui/styles"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/viewport"
+	"github.com/charmbracelet/soft-serve/pkg/ui/styles"
 	"github.com/muesli/reflow/wrap"
 	"github.com/muesli/termenv"
 )
diff --git a/server/ui/pages/repo/logitem.go b/pkg/ui/pages/repo/logitem.go
similarity index 98%
rename from server/ui/pages/repo/logitem.go
rename to pkg/ui/pages/repo/logitem.go
index bd29ec8d0..61fb58f8a 100644
--- a/server/ui/pages/repo/logitem.go
+++ b/pkg/ui/pages/repo/logitem.go
@@ -11,7 +11,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/muesli/reflow/truncate"
 )
 
diff --git a/server/ui/pages/repo/readme.go b/pkg/ui/pages/repo/readme.go
similarity index 93%
rename from server/ui/pages/repo/readme.go
rename to pkg/ui/pages/repo/readme.go
index fe7207326..6ecbe9aa9 100644
--- a/server/ui/pages/repo/readme.go
+++ b/pkg/ui/pages/repo/readme.go
@@ -7,10 +7,10 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/code"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/code"
 )
 
 // ReadmeMsg is a message sent when the readme is loaded.
diff --git a/server/ui/pages/repo/refs.go b/pkg/ui/pages/repo/refs.go
similarity index 97%
rename from server/ui/pages/repo/refs.go
rename to pkg/ui/pages/repo/refs.go
index e89eee409..e34b30f85 100644
--- a/server/ui/pages/repo/refs.go
+++ b/pkg/ui/pages/repo/refs.go
@@ -9,9 +9,9 @@ import (
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
 )
 
 // RefMsg is a message that contains a git.Reference.
diff --git a/server/ui/pages/repo/refsitem.go b/pkg/ui/pages/repo/refsitem.go
similarity index 98%
rename from server/ui/pages/repo/refsitem.go
rename to pkg/ui/pages/repo/refsitem.go
index 4ebec8669..5e071edf4 100644
--- a/server/ui/pages/repo/refsitem.go
+++ b/pkg/ui/pages/repo/refsitem.go
@@ -11,7 +11,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/dustin/go-humanize"
 	"github.com/muesli/reflow/truncate"
 )
diff --git a/server/ui/pages/repo/repo.go b/pkg/ui/pages/repo/repo.go
similarity index 96%
rename from server/ui/pages/repo/repo.go
rename to pkg/ui/pages/repo/repo.go
index dde1f2fee..cc4ba58d8 100644
--- a/server/ui/pages/repo/repo.go
+++ b/pkg/ui/pages/repo/repo.go
@@ -10,12 +10,12 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/server/ui/components/statusbar"
-	"github.com/charmbracelet/soft-serve/server/ui/components/tabs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/statusbar"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/tabs"
 )
 
 type state int
diff --git a/server/ui/pages/repo/stash.go b/pkg/ui/pages/repo/stash.go
similarity index 96%
rename from server/ui/pages/repo/stash.go
rename to pkg/ui/pages/repo/stash.go
index 0693743f3..b1d524565 100644
--- a/server/ui/pages/repo/stash.go
+++ b/pkg/ui/pages/repo/stash.go
@@ -8,10 +8,10 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/code"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/code"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
 	gitm "github.com/gogs/git-module"
 )
 
diff --git a/server/ui/pages/repo/stashitem.go b/pkg/ui/pages/repo/stashitem.go
similarity index 97%
rename from server/ui/pages/repo/stashitem.go
rename to pkg/ui/pages/repo/stashitem.go
index 482a40ad3..7c095a019 100644
--- a/server/ui/pages/repo/stashitem.go
+++ b/pkg/ui/pages/repo/stashitem.go
@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	gitm "github.com/gogs/git-module"
 )
 
diff --git a/server/ui/pages/selection/item.go b/pkg/ui/pages/selection/item.go
similarity index 97%
rename from server/ui/pages/selection/item.go
rename to pkg/ui/pages/selection/item.go
index 20a381ff0..f90f58d8c 100644
--- a/server/ui/pages/selection/item.go
+++ b/pkg/ui/pages/selection/item.go
@@ -11,9 +11,9 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/dustin/go-humanize"
 )
 
diff --git a/server/ui/pages/selection/selection.go b/pkg/ui/pages/selection/selection.go
similarity index 95%
rename from server/ui/pages/selection/selection.go
rename to pkg/ui/pages/selection/selection.go
index b84b0a33d..60865480c 100644
--- a/server/ui/pages/selection/selection.go
+++ b/pkg/ui/pages/selection/selection.go
@@ -8,12 +8,12 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/ui/common"
-	"github.com/charmbracelet/soft-serve/server/ui/components/code"
-	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/server/ui/components/tabs"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/code"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/pkg/ui/components/tabs"
 )
 
 const (
diff --git a/server/ui/styles/styles.go b/pkg/ui/styles/styles.go
similarity index 100%
rename from server/ui/styles/styles.go
rename to pkg/ui/styles/styles.go
diff --git a/server/utils/utils.go b/pkg/utils/utils.go
similarity index 100%
rename from server/utils/utils.go
rename to pkg/utils/utils.go
diff --git a/server/utils/utils_test.go b/pkg/utils/utils_test.go
similarity index 100%
rename from server/utils/utils_test.go
rename to pkg/utils/utils_test.go
diff --git a/server/version/version.go b/pkg/version/version.go
similarity index 100%
rename from server/version/version.go
rename to pkg/version/version.go
diff --git a/server/web/auth.go b/pkg/web/auth.go
similarity index 96%
rename from server/web/auth.go
rename to pkg/web/auth.go
index bbbe88b3f..631660bd3 100644
--- a/server/web/auth.go
+++ b/pkg/web/auth.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/proto"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/golang-jwt/jwt/v5"
 )
 
diff --git a/server/web/context.go b/pkg/web/context.go
similarity index 80%
rename from server/web/context.go
rename to pkg/web/context.go
index 8e7eb8ea9..6cb6c5428 100644
--- a/server/web/context.go
+++ b/pkg/web/context.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 // NewContextHandler returns a new context middleware.
diff --git a/server/web/git.go b/pkg/web/git.go
similarity index 97%
rename from server/web/git.go
rename to pkg/web/git.go
index 4d4dde8b2..e166b92af 100644
--- a/server/web/git.go
+++ b/pkg/web/git.go
@@ -15,13 +15,13 @@ import (
 
 	"github.com/charmbracelet/log"
 	gitb "github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/git"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
diff --git a/server/web/git_lfs.go b/pkg/web/git_lfs.go
similarity index 98%
rename from server/web/git_lfs.go
rename to pkg/web/git_lfs.go
index 4d25f76e9..dccd87f95 100644
--- a/server/web/git_lfs.go
+++ b/pkg/web/git_lfs.go
@@ -14,15 +14,15 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/lfs"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/storage"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/lfs"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/storage"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/gorilla/mux"
 )
 
diff --git a/server/web/goget.go b/pkg/web/goget.go
similarity index 94%
rename from server/web/goget.go
rename to pkg/web/goget.go
index ac0e54c69..d8e65a400 100644
--- a/server/web/goget.go
+++ b/pkg/web/goget.go
@@ -7,9 +7,9 @@ import (
 	"text/template"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/utils"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
diff --git a/server/web/http.go b/pkg/web/http.go
similarity index 96%
rename from server/web/http.go
rename to pkg/web/http.go
index e4588c45d..a9a61a140 100644
--- a/server/web/http.go
+++ b/pkg/web/http.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server/config"
+	"github.com/charmbracelet/soft-serve/pkg/config"
 )
 
 // HTTPServer is an http server.
diff --git a/server/web/logging.go b/pkg/web/logging.go
similarity index 100%
rename from server/web/logging.go
rename to pkg/web/logging.go
diff --git a/server/web/server.go b/pkg/web/server.go
similarity index 100%
rename from server/web/server.go
rename to pkg/web/server.go
diff --git a/server/web/util.go b/pkg/web/util.go
similarity index 100%
rename from server/web/util.go
rename to pkg/web/util.go
diff --git a/server/webhook/branch_tag.go b/pkg/webhook/branch_tag.go
similarity index 91%
rename from server/webhook/branch_tag.go
rename to pkg/webhook/branch_tag.go
index 88f42bdde..89771e9fe 100644
--- a/server/webhook/branch_tag.go
+++ b/pkg/webhook/branch_tag.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 // BranchTagEvent is a branch or tag event.
diff --git a/server/webhook/collaborator.go b/pkg/webhook/collaborator.go
similarity index 91%
rename from server/webhook/collaborator.go
rename to pkg/webhook/collaborator.go
index 86f3e86a1..e7b737b16 100644
--- a/server/webhook/collaborator.go
+++ b/pkg/webhook/collaborator.go
@@ -3,10 +3,10 @@ package webhook
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/access"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 // CollaboratorEvent is a collaborator event.
diff --git a/server/webhook/common.go b/pkg/webhook/common.go
similarity index 100%
rename from server/webhook/common.go
rename to pkg/webhook/common.go
diff --git a/server/webhook/content_type.go b/pkg/webhook/content_type.go
similarity index 100%
rename from server/webhook/content_type.go
rename to pkg/webhook/content_type.go
diff --git a/server/webhook/event.go b/pkg/webhook/event.go
similarity index 100%
rename from server/webhook/event.go
rename to pkg/webhook/event.go
diff --git a/server/webhook/push.go b/pkg/webhook/push.go
similarity index 92%
rename from server/webhook/push.go
rename to pkg/webhook/push.go
index 4642aeb81..ce27a1f7c 100644
--- a/server/webhook/push.go
+++ b/pkg/webhook/push.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 	gitm "github.com/gogs/git-module"
 )
 
diff --git a/server/webhook/repository.go b/pkg/webhook/repository.go
similarity index 92%
rename from server/webhook/repository.go
rename to pkg/webhook/repository.go
index 19cb72304..3cad5c39f 100644
--- a/server/webhook/repository.go
+++ b/pkg/webhook/repository.go
@@ -3,10 +3,10 @@ package webhook
 import (
 	"context"
 
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/proto"
-	"github.com/charmbracelet/soft-serve/server/store"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/store"
 )
 
 // RepositoryEvent is a repository payload.
diff --git a/server/webhook/webhook.go b/pkg/webhook/webhook.go
similarity index 92%
rename from server/webhook/webhook.go
rename to pkg/webhook/webhook.go
index 0429056c2..e5c4d2bb2 100644
--- a/server/webhook/webhook.go
+++ b/pkg/webhook/webhook.go
@@ -11,11 +11,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/models"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/utils"
-	"github.com/charmbracelet/soft-serve/server/version"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/utils"
+	"github.com/charmbracelet/soft-serve/pkg/version"
 	"github.com/google/go-querystring/query"
 	"github.com/google/uuid"
 )
diff --git a/testscript/script_test.go b/testscript/script_test.go
index 1372c8258..94c6408bc 100644
--- a/testscript/script_test.go
+++ b/testscript/script_test.go
@@ -19,15 +19,15 @@ import (
 
 	"github.com/charmbracelet/keygen"
 	"github.com/charmbracelet/log"
-	"github.com/charmbracelet/soft-serve/server"
-	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/server/db"
-	"github.com/charmbracelet/soft-serve/server/db/migrate"
-	logr "github.com/charmbracelet/soft-serve/server/log"
-	"github.com/charmbracelet/soft-serve/server/store"
-	"github.com/charmbracelet/soft-serve/server/store/database"
-	"github.com/charmbracelet/soft-serve/server/test"
+	"github.com/charmbracelet/soft-serve/cmd/soft/serve"
+	"github.com/charmbracelet/soft-serve/pkg/backend"
+	"github.com/charmbracelet/soft-serve/pkg/config"
+	"github.com/charmbracelet/soft-serve/pkg/db"
+	"github.com/charmbracelet/soft-serve/pkg/db/migrate"
+	logr "github.com/charmbracelet/soft-serve/pkg/log"
+	"github.com/charmbracelet/soft-serve/pkg/store"
+	"github.com/charmbracelet/soft-serve/pkg/store/database"
+	"github.com/charmbracelet/soft-serve/pkg/test"
 	"github.com/rogpeppe/go-internal/testscript"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
@@ -153,7 +153,7 @@ func TestScript(t *testing.T) {
 			ctx = backend.WithContext(ctx, be)
 
 			lock.Lock()
-			srv, err := server.NewServer(ctx)
+			srv, err := serve.NewServer(ctx)
 			if err != nil {
 				lock.Unlock()
 				return err