diff --git a/cmd/gonic/gonic.go b/cmd/gonic/gonic.go
index 60a8deca..0d030c64 100644
--- a/cmd/gonic/gonic.go
+++ b/cmd/gonic/gonic.go
@@ -18,7 +18,7 @@ import (
 
 	"go.senan.xyz/gonic"
 	"go.senan.xyz/gonic/server"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 const (
diff --git a/server/db/db.go b/db/db.go
similarity index 100%
rename from server/db/db.go
rename to db/db.go
diff --git a/server/db/db_test.go b/db/db_test.go
similarity index 100%
rename from server/db/db_test.go
rename to db/db_test.go
diff --git a/server/db/migrations.go b/db/migrations.go
similarity index 100%
rename from server/db/migrations.go
rename to db/migrations.go
diff --git a/server/db/model.go b/db/model.go
similarity index 99%
rename from server/db/model.go
rename to db/model.go
index 09ff975a..41446d97 100644
--- a/server/db/model.go
+++ b/db/model.go
@@ -15,7 +15,7 @@ import (
 	// TODO: remove this dep
 
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/mime"
+	"go.senan.xyz/gonic/mime"
 )
 
 func splitInt(in, sep string) []int {
diff --git a/server/jukebox/jukebox.go b/jukebox/jukebox.go
similarity index 99%
rename from server/jukebox/jukebox.go
rename to jukebox/jukebox.go
index 3552c042..f26625d8 100644
--- a/server/jukebox/jukebox.go
+++ b/jukebox/jukebox.go
@@ -14,7 +14,7 @@ import (
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 type Status struct {
diff --git a/server/mime/mime.go b/mime/mime.go
similarity index 73%
rename from server/mime/mime.go
rename to mime/mime.go
index 91b6277d..e7357358 100644
--- a/server/mime/mime.go
+++ b/mime/mime.go
@@ -1,8 +1,5 @@
 package mime
 
-// this package is at such a high level in the hierarchy because
-// it's used by both `server/db` and `server/scanner`
-
 func FromExtension(ext string) (string, bool) {
 	types := map[string]string{
 		"mp3":  "audio/mpeg",
diff --git a/server/mockfs/mockfs.go b/mockfs/mockfs.go
similarity index 98%
rename from server/mockfs/mockfs.go
rename to mockfs/mockfs.go
index b682851b..a3fdc3ec 100644
--- a/server/mockfs/mockfs.go
+++ b/mockfs/mockfs.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/mattn/go-sqlite3"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 var ErrPathNotFound = errors.New("path not found")
diff --git a/server/podcasts/podcasts.go b/podcasts/podcasts.go
similarity index 99%
rename from server/podcasts/podcasts.go
rename to podcasts/podcasts.go
index 8d4869cf..75158fcd 100644
--- a/server/podcasts/podcasts.go
+++ b/podcasts/podcasts.go
@@ -19,9 +19,9 @@ import (
 	"github.com/mmcdole/gofeed"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	gmime "go.senan.xyz/gonic/server/mime"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	gmime "go.senan.xyz/gonic/mime"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 const downloadAllWaitInterval = 3 * time.Second
diff --git a/server/podcasts/podcasts_test.go b/podcasts/podcasts_test.go
similarity index 100%
rename from server/podcasts/podcasts_test.go
rename to podcasts/podcasts_test.go
diff --git a/server/podcasts/testdata/rss.new b/podcasts/testdata/rss.new
similarity index 100%
rename from server/podcasts/testdata/rss.new
rename to podcasts/testdata/rss.new
diff --git a/server/scanner/scanner.go b/scanner/scanner.go
similarity index 99%
rename from server/scanner/scanner.go
rename to scanner/scanner.go
index f0c72635..7afefd88 100644
--- a/server/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -18,9 +18,9 @@ import (
 	"github.com/rainycape/unidecode"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/mime"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/mime"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 var (
diff --git a/server/scanner/scanner_benchmark_test.go b/scanner/scanner_benchmark_test.go
similarity index 93%
rename from server/scanner/scanner_benchmark_test.go
rename to scanner/scanner_benchmark_test.go
index 2b132bea..22149fe2 100644
--- a/server/scanner/scanner_benchmark_test.go
+++ b/scanner/scanner_benchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"go.senan.xyz/gonic/server/mockfs"
+	"go.senan.xyz/gonic/mockfs"
 )
 
 func BenchmarkScanIncremental(b *testing.B) {
diff --git a/server/scanner/scanner_fuzz_test.go b/scanner/scanner_fuzz_test.go
similarity index 98%
rename from server/scanner/scanner_fuzz_test.go
rename to scanner/scanner_fuzz_test.go
index 34f41dc7..bb904cc6 100644
--- a/server/scanner/scanner_fuzz_test.go
+++ b/scanner/scanner_fuzz_test.go
@@ -11,7 +11,7 @@ import (
 
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	"github.com/matryer/is"
-	"go.senan.xyz/gonic/server/mockfs"
+	"go.senan.xyz/gonic/mockfs"
 )
 
 func FuzzScanner(f *testing.F) {
diff --git a/server/scanner/scanner_test.go b/scanner/scanner_test.go
similarity index 99%
rename from server/scanner/scanner_test.go
rename to scanner/scanner_test.go
index ce56e757..7bc9bb86 100644
--- a/server/scanner/scanner_test.go
+++ b/scanner/scanner_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/matryer/is"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/mockfs"
-	"go.senan.xyz/gonic/server/scanner"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/mockfs"
+	"go.senan.xyz/gonic/scanner"
 )
 
 func TestMain(m *testing.M) {
diff --git a/server/scanner/tags/tags.go b/scanner/tags/tags.go
similarity index 100%
rename from server/scanner/tags/tags.go
rename to scanner/tags/tags.go
diff --git a/server/scanner/testdata/fuzz/FuzzScanner/22023bdee30f39396809ddfa903114a127d16fbf11dbd52256541a17c9f60b07 b/scanner/testdata/fuzz/FuzzScanner/22023bdee30f39396809ddfa903114a127d16fbf11dbd52256541a17c9f60b07
similarity index 100%
rename from server/scanner/testdata/fuzz/FuzzScanner/22023bdee30f39396809ddfa903114a127d16fbf11dbd52256541a17c9f60b07
rename to scanner/testdata/fuzz/FuzzScanner/22023bdee30f39396809ddfa903114a127d16fbf11dbd52256541a17c9f60b07
diff --git a/server/scanner/testdata/fuzz/FuzzScanner/50640a7a67794863f262b749f288aff8610f2cac65b7cf65b8708eb0ea104519 b/scanner/testdata/fuzz/FuzzScanner/50640a7a67794863f262b749f288aff8610f2cac65b7cf65b8708eb0ea104519
similarity index 100%
rename from server/scanner/testdata/fuzz/FuzzScanner/50640a7a67794863f262b749f288aff8610f2cac65b7cf65b8708eb0ea104519
rename to scanner/testdata/fuzz/FuzzScanner/50640a7a67794863f262b749f288aff8610f2cac65b7cf65b8708eb0ea104519
diff --git a/server/scanner/testdata/fuzz/FuzzScanner/b1f8e3fd8087149215418297f28d6e1e447100179409d69a827c6651370d96cc b/scanner/testdata/fuzz/FuzzScanner/b1f8e3fd8087149215418297f28d6e1e447100179409d69a827c6651370d96cc
similarity index 100%
rename from server/scanner/testdata/fuzz/FuzzScanner/b1f8e3fd8087149215418297f28d6e1e447100179409d69a827c6651370d96cc
rename to scanner/testdata/fuzz/FuzzScanner/b1f8e3fd8087149215418297f28d6e1e447100179409d69a827c6651370d96cc
diff --git a/server/scanner/testdata/fuzz/FuzzScanner/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9 b/scanner/testdata/fuzz/FuzzScanner/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9
similarity index 100%
rename from server/scanner/testdata/fuzz/FuzzScanner/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9
rename to scanner/testdata/fuzz/FuzzScanner/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9
diff --git a/server/scrobble/lastfm/lastfm.go b/scrobble/lastfm/lastfm.go
similarity index 99%
rename from server/scrobble/lastfm/lastfm.go
rename to scrobble/lastfm/lastfm.go
index e5cd0ade..61adbf66 100644
--- a/server/scrobble/lastfm/lastfm.go
+++ b/scrobble/lastfm/lastfm.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scrobble"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scrobble"
 )
 
 const (
diff --git a/server/scrobble/lastfm/lastfm_test.go b/scrobble/lastfm/lastfm_test.go
similarity index 100%
rename from server/scrobble/lastfm/lastfm_test.go
rename to scrobble/lastfm/lastfm_test.go
diff --git a/server/scrobble/listenbrainz/listenbrainz.go b/scrobble/listenbrainz/listenbrainz.go
similarity index 97%
rename from server/scrobble/listenbrainz/listenbrainz.go
rename to scrobble/listenbrainz/listenbrainz.go
index 4c07498d..c01a9b0d 100644
--- a/server/scrobble/listenbrainz/listenbrainz.go
+++ b/scrobble/listenbrainz/listenbrainz.go
@@ -10,8 +10,8 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scrobble"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scrobble"
 )
 
 const (
diff --git a/server/scrobble/scrobble.go b/scrobble/scrobble.go
similarity index 82%
rename from server/scrobble/scrobble.go
rename to scrobble/scrobble.go
index 6b47f2aa..45700c2b 100644
--- a/server/scrobble/scrobble.go
+++ b/scrobble/scrobble.go
@@ -3,7 +3,7 @@ package scrobble
 import (
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 type Scrobbler interface {
diff --git a/server/ctrladmin/ctrl.go b/server/ctrladmin/ctrl.go
index ca0e9a63..2298092b 100644
--- a/server/ctrladmin/ctrl.go
+++ b/server/ctrladmin/ctrl.go
@@ -23,8 +23,8 @@ import (
 	"go.senan.xyz/gonic"
 	"go.senan.xyz/gonic/server/assets"
 	"go.senan.xyz/gonic/server/ctrlbase"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/podcasts"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/podcasts"
 )
 
 type CtxKey int
diff --git a/server/ctrladmin/handlers.go b/server/ctrladmin/handlers.go
index 007cde4d..2be7c292 100644
--- a/server/ctrladmin/handlers.go
+++ b/server/ctrladmin/handlers.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/mmcdole/gofeed"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scrobble/lastfm"
-	"go.senan.xyz/gonic/server/scrobble/listenbrainz"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scrobble/lastfm"
+	"go.senan.xyz/gonic/scrobble/listenbrainz"
+	"go.senan.xyz/gonic/transcode"
 )
 
 func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
diff --git a/server/ctrladmin/handlers_playlist.go b/server/ctrladmin/handlers_playlist.go
index 3e060e3c..1476cc77 100644
--- a/server/ctrladmin/handlers_playlist.go
+++ b/server/ctrladmin/handlers_playlist.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/jinzhu/gorm"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 var (
diff --git a/server/ctrladmin/middleware.go b/server/ctrladmin/middleware.go
index eb59a661..db50f64f 100644
--- a/server/ctrladmin/middleware.go
+++ b/server/ctrladmin/middleware.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gorilla/sessions"
 
 	"go.senan.xyz/gonic"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func (c *Controller) WithSession(next http.Handler) http.Handler {
diff --git a/server/ctrlbase/ctrl.go b/server/ctrlbase/ctrl.go
index 59841cb9..209505a6 100644
--- a/server/ctrlbase/ctrl.go
+++ b/server/ctrlbase/ctrl.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"path"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
 )
 
 type statusWriter struct {
diff --git a/server/ctrlsubsonic/ctrl.go b/server/ctrlsubsonic/ctrl.go
index 24824eb3..ae549f57 100644
--- a/server/ctrlsubsonic/ctrl.go
+++ b/server/ctrlsubsonic/ctrl.go
@@ -12,10 +12,10 @@ import (
 	"go.senan.xyz/gonic/server/ctrlbase"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
-	"go.senan.xyz/gonic/server/jukebox"
-	"go.senan.xyz/gonic/server/podcasts"
-	"go.senan.xyz/gonic/server/scrobble"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/jukebox"
+	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/scrobble"
+	"go.senan.xyz/gonic/transcode"
 )
 
 type CtxKey int
diff --git a/server/ctrlsubsonic/ctrl_test.go b/server/ctrlsubsonic/ctrl_test.go
index afd17a36..29172eee 100644
--- a/server/ctrlsubsonic/ctrl_test.go
+++ b/server/ctrlsubsonic/ctrl_test.go
@@ -18,9 +18,9 @@ import (
 
 	"go.senan.xyz/gonic/server/ctrlbase"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/mockfs"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/mockfs"
+	"go.senan.xyz/gonic/transcode"
 )
 
 var testCamelExpr = regexp.MustCompile("([a-z0-9])([A-Z])")
diff --git a/server/ctrlsubsonic/handlers_bookmark.go b/server/ctrlsubsonic/handlers_bookmark.go
index 85af490f..8d5de413 100644
--- a/server/ctrlsubsonic/handlers_bookmark.go
+++ b/server/ctrlsubsonic/handlers_bookmark.go
@@ -9,7 +9,7 @@ import (
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func (c *Controller) ServeGetBookmarks(r *http.Request) *spec.Response {
diff --git a/server/ctrlsubsonic/handlers_by_folder.go b/server/ctrlsubsonic/handlers_by_folder.go
index d9e0d178..ba4e3bb1 100644
--- a/server/ctrlsubsonic/handlers_by_folder.go
+++ b/server/ctrlsubsonic/handlers_by_folder.go
@@ -9,7 +9,7 @@ import (
 
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 // the subsonic spec mentions "artist" a lot when talking about the
diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go
index f5f0bffb..63483dfc 100644
--- a/server/ctrlsubsonic/handlers_by_tags.go
+++ b/server/ctrlsubsonic/handlers_by_tags.go
@@ -13,8 +13,8 @@ import (
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scrobble/lastfm"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scrobble/lastfm"
 )
 
 func (c *Controller) ServeGetArtists(r *http.Request) *spec.Response {
diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go
index 59083e5c..8cf2d102 100644
--- a/server/ctrlsubsonic/handlers_common.go
+++ b/server/ctrlsubsonic/handlers_common.go
@@ -14,8 +14,8 @@ import (
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
 )
 
 func lowerUDecOrHash(in string) string {
diff --git a/server/ctrlsubsonic/handlers_playlist.go b/server/ctrlsubsonic/handlers_playlist.go
index ba5fefb9..b29793b7 100644
--- a/server/ctrlsubsonic/handlers_playlist.go
+++ b/server/ctrlsubsonic/handlers_playlist.go
@@ -10,7 +10,7 @@ import (
 
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func playlistRender(c *Controller, playlist *db.Playlist) *spec.Playlist {
diff --git a/server/ctrlsubsonic/handlers_podcast.go b/server/ctrlsubsonic/handlers_podcast.go
index c578b506..aaa9cb76 100644
--- a/server/ctrlsubsonic/handlers_podcast.go
+++ b/server/ctrlsubsonic/handlers_podcast.go
@@ -8,7 +8,7 @@ import (
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func (c *Controller) ServeGetPodcasts(r *http.Request) *spec.Response {
diff --git a/server/ctrlsubsonic/handlers_raw.go b/server/ctrlsubsonic/handlers_raw.go
index 1bcb0a8d..ad8788f7 100644
--- a/server/ctrlsubsonic/handlers_raw.go
+++ b/server/ctrlsubsonic/handlers_raw.go
@@ -17,8 +17,8 @@ import (
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/transcode"
 )
 
 // "raw" handlers are ones that don't always return a spec response.
diff --git a/server/ctrlsubsonic/handlers_raw_test.go b/server/ctrlsubsonic/handlers_raw_test.go
index f79e85ed..c0c44637 100644
--- a/server/ctrlsubsonic/handlers_raw_test.go
+++ b/server/ctrlsubsonic/handlers_raw_test.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/transcode"
 )
 
 func TestServeStreamRaw(t *testing.T) {
diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go
index 3762b0a4..42743021 100644
--- a/server/ctrlsubsonic/spec/construct_by_folder.go
+++ b/server/ctrlsubsonic/spec/construct_by_folder.go
@@ -3,7 +3,7 @@ package spec
 import (
 	"path"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func NewAlbumByFolder(f *db.Album) *Album {
diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go
index 434f0457..5551caec 100644
--- a/server/ctrlsubsonic/spec/construct_by_tags.go
+++ b/server/ctrlsubsonic/spec/construct_by_tags.go
@@ -4,7 +4,7 @@ import (
 	"path"
 	"strings"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album {
diff --git a/server/ctrlsubsonic/spec/construct_podcast.go b/server/ctrlsubsonic/spec/construct_podcast.go
index d3ebf76f..a214030a 100644
--- a/server/ctrlsubsonic/spec/construct_podcast.go
+++ b/server/ctrlsubsonic/spec/construct_podcast.go
@@ -1,6 +1,6 @@
 package spec
 
-import "go.senan.xyz/gonic/server/db"
+import "go.senan.xyz/gonic/db"
 
 func NewPodcastChannel(p *db.Podcast) *PodcastChannel {
 	ret := &PodcastChannel{
diff --git a/server/server.go b/server/server.go
index a4fd1de2..59f8d579 100644
--- a/server/server.go
+++ b/server/server.go
@@ -15,15 +15,15 @@ import (
 	"go.senan.xyz/gonic/server/ctrladmin"
 	"go.senan.xyz/gonic/server/ctrlbase"
 	"go.senan.xyz/gonic/server/ctrlsubsonic"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/jukebox"
-	"go.senan.xyz/gonic/server/podcasts"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scanner/tags"
-	"go.senan.xyz/gonic/server/scrobble"
-	"go.senan.xyz/gonic/server/scrobble/lastfm"
-	"go.senan.xyz/gonic/server/scrobble/listenbrainz"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/jukebox"
+	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scanner/tags"
+	"go.senan.xyz/gonic/scrobble"
+	"go.senan.xyz/gonic/scrobble/lastfm"
+	"go.senan.xyz/gonic/scrobble/listenbrainz"
+	"go.senan.xyz/gonic/transcode"
 )
 
 type Options struct {
diff --git a/server/transcode/testdata/10s.mp3 b/transcode/testdata/10s.mp3
similarity index 100%
rename from server/transcode/testdata/10s.mp3
rename to transcode/testdata/10s.mp3
diff --git a/server/transcode/testdata/5s.mp3 b/transcode/testdata/5s.mp3
similarity index 100%
rename from server/transcode/testdata/5s.mp3
rename to transcode/testdata/5s.mp3
diff --git a/server/transcode/testdata/fuzz/FuzzGuessExpectedSize/1e10ee326324ee7e1f371585414e7e41d5c802b4db45ebc79abe0397fb915a0c b/transcode/testdata/fuzz/FuzzGuessExpectedSize/1e10ee326324ee7e1f371585414e7e41d5c802b4db45ebc79abe0397fb915a0c
similarity index 100%
rename from server/transcode/testdata/fuzz/FuzzGuessExpectedSize/1e10ee326324ee7e1f371585414e7e41d5c802b4db45ebc79abe0397fb915a0c
rename to transcode/testdata/fuzz/FuzzGuessExpectedSize/1e10ee326324ee7e1f371585414e7e41d5c802b4db45ebc79abe0397fb915a0c
diff --git a/server/transcode/testdata/fuzz/FuzzGuessExpectedSize/3eaed9c9c8a57078033cea3337a79e1e6bfebf7e5eb7421878c911df2d78d1ac b/transcode/testdata/fuzz/FuzzGuessExpectedSize/3eaed9c9c8a57078033cea3337a79e1e6bfebf7e5eb7421878c911df2d78d1ac
similarity index 100%
rename from server/transcode/testdata/fuzz/FuzzGuessExpectedSize/3eaed9c9c8a57078033cea3337a79e1e6bfebf7e5eb7421878c911df2d78d1ac
rename to transcode/testdata/fuzz/FuzzGuessExpectedSize/3eaed9c9c8a57078033cea3337a79e1e6bfebf7e5eb7421878c911df2d78d1ac
diff --git a/server/transcode/testdata/fuzz/FuzzGuessExpectedSize/ce5db7c5c16dcb48567255c77772cacc3ca86d524cbb2d3a769248625bc3edc8 b/transcode/testdata/fuzz/FuzzGuessExpectedSize/ce5db7c5c16dcb48567255c77772cacc3ca86d524cbb2d3a769248625bc3edc8
similarity index 100%
rename from server/transcode/testdata/fuzz/FuzzGuessExpectedSize/ce5db7c5c16dcb48567255c77772cacc3ca86d524cbb2d3a769248625bc3edc8
rename to transcode/testdata/fuzz/FuzzGuessExpectedSize/ce5db7c5c16dcb48567255c77772cacc3ca86d524cbb2d3a769248625bc3edc8
diff --git a/server/transcode/transcode.go b/transcode/transcode.go
similarity index 100%
rename from server/transcode/transcode.go
rename to transcode/transcode.go
diff --git a/server/transcode/transcode_test.go b/transcode/transcode_test.go
similarity index 96%
rename from server/transcode/transcode_test.go
rename to transcode/transcode_test.go
index d53d156c..772c4235 100644
--- a/server/transcode/transcode_test.go
+++ b/transcode/transcode_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/transcode"
 )
 
 // FuzzGuessExpectedSize makes sure all of our profile's estimated transcode
diff --git a/server/transcode/transcoder_caching.go b/transcode/transcoder_caching.go
similarity index 100%
rename from server/transcode/transcoder_caching.go
rename to transcode/transcoder_caching.go
diff --git a/server/transcode/transcoder_ffmpeg.go b/transcode/transcoder_ffmpeg.go
similarity index 100%
rename from server/transcode/transcoder_ffmpeg.go
rename to transcode/transcoder_ffmpeg.go
diff --git a/server/transcode/transcoder_none.go b/transcode/transcoder_none.go
similarity index 100%
rename from server/transcode/transcoder_none.go
rename to transcode/transcoder_none.go