diff --git a/cmd/gonic/gonic.go b/cmd/gonic/gonic.go
index 344c57d..e4ec4a8 100644
--- a/cmd/gonic/gonic.go
+++ b/cmd/gonic/gonic.go
@@ -39,8 +39,8 @@ import (
 	"go.senan.xyz/gonic/playlist"
 	"go.senan.xyz/gonic/podcast"
 	"go.senan.xyz/gonic/scanner"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
-	"go.senan.xyz/gonic/scanner/tags/taglib"
+	"go.senan.xyz/gonic/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/taglib"
 	"go.senan.xyz/gonic/scrobble"
 	"go.senan.xyz/gonic/server/ctrladmin"
 	"go.senan.xyz/gonic/server/ctrlsubsonic"
diff --git a/mockfs/mockfs.go b/mockfs/mockfs.go
index c433989..8de8238 100644
--- a/mockfs/mockfs.go
+++ b/mockfs/mockfs.go
@@ -15,7 +15,7 @@ import (
 	"github.com/mattn/go-sqlite3"
 	"go.senan.xyz/gonic/db"
 	"go.senan.xyz/gonic/scanner"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/tagcommon"
 )
 
 var ErrPathNotFound = errors.New("path not found")
diff --git a/podcast/podcast.go b/podcast/podcast.go
index 6cf078f..00851e2 100644
--- a/podcast/podcast.go
+++ b/podcast/podcast.go
@@ -20,7 +20,7 @@ import (
 
 	"go.senan.xyz/gonic/db"
 	"go.senan.xyz/gonic/fileutil"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/tagcommon"
 )
 
 var ErrNoAudioInFeedItem = errors.New("no audio in feed item")
diff --git a/scanner/scanner.go b/scanner/scanner.go
index 455d18e..65fa1cf 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -19,7 +19,7 @@ import (
 	"github.com/rainycape/unidecode"
 
 	"go.senan.xyz/gonic/db"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/tagcommon"
 )
 
 var (
diff --git a/scanner/tags/tagcommon/tagcommmon.go b/tags/tagcommon/tagcommmon.go
similarity index 100%
rename from scanner/tags/tagcommon/tagcommmon.go
rename to tags/tagcommon/tagcommmon.go
diff --git a/scanner/tags/taglib/taglib.go b/tags/taglib/taglib.go
similarity index 98%
rename from scanner/tags/taglib/taglib.go
rename to tags/taglib/taglib.go
index ffdfa35..87a4c3f 100644
--- a/scanner/tags/taglib/taglib.go
+++ b/tags/taglib/taglib.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/sentriz/audiotags"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/tagcommon"
 )
 
 type TagLib struct{}