diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 8937f6d1e..d57aadc71 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -14,7 +14,7 @@ import (
 	"github.com/navidrome/navidrome/core/agents/lastfm"
 	"github.com/navidrome/navidrome/core/agents/listenbrainz"
 	"github.com/navidrome/navidrome/core/artwork"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/core/metrics"
 	"github.com/navidrome/navidrome/core/playback"
@@ -67,7 +67,7 @@ func CreateSubsonicAPIRouter(ctx context.Context) *subsonic.Router {
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
 	agentsAgents := agents.GetAgents(dataStore)
-	provider := extdata.NewProvider(dataStore, agentsAgents)
+	provider := external.NewProvider(dataStore, agentsAgents)
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
@@ -91,7 +91,7 @@ func CreatePublicRouter() *public.Router {
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
 	agentsAgents := agents.GetAgents(dataStore)
-	provider := extdata.NewProvider(dataStore, agentsAgents)
+	provider := external.NewProvider(dataStore, agentsAgents)
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
@@ -135,7 +135,7 @@ func CreateScanner(ctx context.Context) scanner.Scanner {
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
 	agentsAgents := agents.GetAgents(dataStore)
-	provider := extdata.NewProvider(dataStore, agentsAgents)
+	provider := external.NewProvider(dataStore, agentsAgents)
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
 	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
 	broker := events.GetBroker()
@@ -151,7 +151,7 @@ func CreateScanWatcher(ctx context.Context) scanner.Watcher {
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
 	agentsAgents := agents.GetAgents(dataStore)
-	provider := extdata.NewProvider(dataStore, agentsAgents)
+	provider := external.NewProvider(dataStore, agentsAgents)
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
 	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
 	broker := events.GetBroker()
diff --git a/core/artwork/artwork.go b/core/artwork/artwork.go
index 6a73ee11d..f1f571e0d 100644
--- a/core/artwork/artwork.go
+++ b/core/artwork/artwork.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
@@ -24,7 +24,7 @@ type Artwork interface {
 	GetOrPlaceholder(ctx context.Context, id string, size int, square bool) (io.ReadCloser, time.Time, error)
 }
 
-func NewArtwork(ds model.DataStore, cache cache.FileCache, ffmpeg ffmpeg.FFmpeg, provider extdata.Provider) Artwork {
+func NewArtwork(ds model.DataStore, cache cache.FileCache, ffmpeg ffmpeg.FFmpeg, provider external.Provider) Artwork {
 	return &artwork{ds: ds, cache: cache, ffmpeg: ffmpeg, provider: provider}
 }
 
@@ -32,7 +32,7 @@ type artwork struct {
 	ds       model.DataStore
 	cache    cache.FileCache
 	ffmpeg   ffmpeg.FFmpeg
-	provider extdata.Provider
+	provider external.Provider
 }
 
 type artworkReader interface {
diff --git a/core/artwork/reader_album.go b/core/artwork/reader_album.go
index 0d8d4ab19..a320533ed 100644
--- a/core/artwork/reader_album.go
+++ b/core/artwork/reader_album.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/model"
 )
@@ -20,14 +20,14 @@ import (
 type albumArtworkReader struct {
 	cacheKey
 	a          *artwork
-	provider   extdata.Provider
+	provider   external.Provider
 	album      model.Album
 	updatedAt  *time.Time
 	imgFiles   []string
 	rootFolder string
 }
 
-func newAlbumArtworkReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider extdata.Provider) (*albumArtworkReader, error) {
+func newAlbumArtworkReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider external.Provider) (*albumArtworkReader, error) {
 	al, err := artwork.ds.Album(ctx).Get(artID.ID)
 	if err != nil {
 		return nil, err
diff --git a/core/artwork/reader_artist.go b/core/artwork/reader_artist.go
index 26a43a42f..217044b7a 100644
--- a/core/artwork/reader_artist.go
+++ b/core/artwork/reader_artist.go
@@ -14,7 +14,7 @@ import (
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/utils/str"
@@ -23,13 +23,13 @@ import (
 type artistReader struct {
 	cacheKey
 	a            *artwork
-	provider     extdata.Provider
+	provider     external.Provider
 	artist       model.Artist
 	artistFolder string
 	imgFiles     []string
 }
 
-func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider extdata.Provider) (*artistReader, error) {
+func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider external.Provider) (*artistReader, error) {
 	ar, err := artwork.ds.Artist(ctx).Get(artID.ID)
 	if err != nil {
 		return nil, err
diff --git a/core/artwork/sources.go b/core/artwork/sources.go
index 0571d109e..121e6c38b 100644
--- a/core/artwork/sources.go
+++ b/core/artwork/sources.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/dhowden/tag"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
@@ -157,7 +157,7 @@ func fromAlbumPlaceholder() sourceFunc {
 		return r, consts.PlaceholderAlbumArt, nil
 	}
 }
-func fromArtistExternalSource(ctx context.Context, ar model.Artist, provider extdata.Provider) sourceFunc {
+func fromArtistExternalSource(ctx context.Context, ar model.Artist, provider external.Provider) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
 		imageUrl, err := provider.ArtistImage(ctx, ar.ID)
 		if err != nil {
@@ -168,7 +168,7 @@ func fromArtistExternalSource(ctx context.Context, ar model.Artist, provider ext
 	}
 }
 
-func fromAlbumExternalSource(ctx context.Context, al model.Album, provider extdata.Provider) sourceFunc {
+func fromAlbumExternalSource(ctx context.Context, al model.Album, provider external.Provider) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
 		imageUrl, err := provider.AlbumImage(ctx, al.ID)
 		if err != nil {
diff --git a/core/extdata/extdata_helper_test.go b/core/external/extdata_helper_test.go
similarity index 99%
rename from core/extdata/extdata_helper_test.go
rename to core/external/extdata_helper_test.go
index c2bda1ec5..367437815 100644
--- a/core/extdata/extdata_helper_test.go
+++ b/core/external/extdata_helper_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
diff --git a/core/extdata/extdata_suite_test.go b/core/external/extdata_suite_test.go
similarity index 73%
rename from core/extdata/extdata_suite_test.go
rename to core/external/extdata_suite_test.go
index 2cf408efc..f059e76b3 100644
--- a/core/extdata/extdata_suite_test.go
+++ b/core/external/extdata_suite_test.go
@@ -1,4 +1,4 @@
-package extdata
+package external
 
 import (
 	"testing"
@@ -9,9 +9,9 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func TestExternalData(t *testing.T) {
+func TestExternal(t *testing.T) {
 	tests.Init(t, false)
 	log.SetLevel(log.LevelFatal)
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "ExternalData Suite")
+	RunSpecs(t, "External Suite")
 }
diff --git a/core/extdata/provider.go b/core/external/provider.go
similarity index 99%
rename from core/extdata/provider.go
rename to core/external/provider.go
index 116ca73c2..f27ded11b 100644
--- a/core/extdata/provider.go
+++ b/core/external/provider.go
@@ -1,4 +1,4 @@
-package extdata
+package external
 
 import (
 	"context"
diff --git a/core/extdata/provider_albumimage_test.go b/core/external/provider_albumimage_test.go
similarity index 99%
rename from core/extdata/provider_albumimage_test.go
rename to core/external/provider_albumimage_test.go
index 6f0d9d388..e248813c1 100644
--- a/core/extdata/provider_albumimage_test.go
+++ b/core/external/provider_albumimage_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
 	"github.com/navidrome/navidrome/core/agents"
-	. "github.com/navidrome/navidrome/core/extdata"
+	. "github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_artistimage_test.go b/core/external/provider_artistimage_test.go
similarity index 99%
rename from core/extdata/provider_artistimage_test.go
rename to core/external/provider_artistimage_test.go
index 5d073f77c..96341836a 100644
--- a/core/extdata/provider_artistimage_test.go
+++ b/core/external/provider_artistimage_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
 	"github.com/navidrome/navidrome/core/agents"
-	. "github.com/navidrome/navidrome/core/extdata"
+	. "github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_similarsongs_test.go b/core/external/provider_similarsongs_test.go
similarity index 98%
rename from core/extdata/provider_similarsongs_test.go
rename to core/external/provider_similarsongs_test.go
index 9914a4130..fd622746a 100644
--- a/core/extdata/provider_similarsongs_test.go
+++ b/core/external/provider_similarsongs_test.go
@@ -1,11 +1,11 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
 	"errors"
 
 	"github.com/navidrome/navidrome/core/agents"
-	. "github.com/navidrome/navidrome/core/extdata"
+	. "github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_topsongs_test.go b/core/external/provider_topsongs_test.go
similarity index 99%
rename from core/extdata/provider_topsongs_test.go
rename to core/external/provider_topsongs_test.go
index c526ed68e..4ce7911de 100644
--- a/core/extdata/provider_topsongs_test.go
+++ b/core/external/provider_topsongs_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	_ "github.com/navidrome/navidrome/core/agents/lastfm"
 	_ "github.com/navidrome/navidrome/core/agents/listenbrainz"
 	_ "github.com/navidrome/navidrome/core/agents/spotify"
-	. "github.com/navidrome/navidrome/core/extdata"
+	. "github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_updatealbuminfo_test.go b/core/external/provider_updatealbuminfo_test.go
similarity index 97%
rename from core/extdata/provider_updatealbuminfo_test.go
rename to core/external/provider_updatealbuminfo_test.go
index c9b7cfc9e..0622849f0 100644
--- a/core/extdata/provider_updatealbuminfo_test.go
+++ b/core/external/provider_updatealbuminfo_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
@@ -24,7 +24,7 @@ func init() {
 var _ = Describe("Provider - UpdateAlbumInfo", func() {
 	var (
 		ctx           context.Context
-		p             extdata.Provider
+		p             external.Provider
 		ds            *tests.MockDataStore
 		ag            *mockAgents
 		mockAlbumRepo *tests.MockAlbumRepo
@@ -34,7 +34,7 @@ var _ = Describe("Provider - UpdateAlbumInfo", func() {
 		ctx = GinkgoT().Context()
 		ds = new(tests.MockDataStore)
 		ag = new(mockAgents)
-		p = extdata.NewProvider(ds, ag)
+		p = external.NewProvider(ds, ag)
 		mockAlbumRepo = ds.Album(ctx).(*tests.MockAlbumRepo)
 		conf.Server.DevAlbumInfoTimeToLive = 1 * time.Hour
 	})
diff --git a/core/extdata/provider_updateartistinfo_test.go b/core/external/provider_updateartistinfo_test.go
similarity index 98%
rename from core/extdata/provider_updateartistinfo_test.go
rename to core/external/provider_updateartistinfo_test.go
index 629adf597..9b1e8d866 100644
--- a/core/extdata/provider_updateartistinfo_test.go
+++ b/core/external/provider_updateartistinfo_test.go
@@ -1,4 +1,4 @@
-package extdata_test
+package external_test
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
 	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
@@ -25,7 +25,7 @@ func init() {
 var _ = Describe("Provider - UpdateArtistInfo", func() {
 	var (
 		ctx            context.Context
-		p              extdata.Provider
+		p              external.Provider
 		ds             *tests.MockDataStore
 		ag             *mockAgents
 		mockArtistRepo *tests.MockArtistRepo
@@ -37,7 +37,7 @@ var _ = Describe("Provider - UpdateArtistInfo", func() {
 		ctx = GinkgoT().Context()
 		ds = new(tests.MockDataStore)
 		ag = new(mockAgents)
-		p = extdata.NewProvider(ds, ag)
+		p = external.NewProvider(ds, ag)
 		mockArtistRepo = ds.Artist(ctx).(*tests.MockArtistRepo)
 	})
 
diff --git a/core/wire_providers.go b/core/wire_providers.go
index 45ed084cb..482cfbefe 100644
--- a/core/wire_providers.go
+++ b/core/wire_providers.go
@@ -3,7 +3,7 @@ package core
 import (
 	"github.com/google/wire"
 	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/core/metrics"
 	"github.com/navidrome/navidrome/core/playback"
@@ -18,8 +18,8 @@ var Set = wire.NewSet(
 	NewShare,
 	NewPlaylists,
 	agents.GetAgents,
-	extdata.NewProvider,
-	wire.Bind(new(extdata.Agents), new(*agents.Agents)),
+	external.NewProvider,
+	wire.Bind(new(external.Agents), new(*agents.Agents)),
 	ffmpeg.New,
 	scrobbler.GetPlayTracker,
 	playback.GetInstance,
diff --git a/server/subsonic/api.go b/server/subsonic/api.go
index 811f71eb6..fd8c3af28 100644
--- a/server/subsonic/api.go
+++ b/server/subsonic/api.go
@@ -12,7 +12,7 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/artwork"
-	"github.com/navidrome/navidrome/core/extdata"
+	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/playback"
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/log"
@@ -36,7 +36,7 @@ type Router struct {
 	streamer  core.MediaStreamer
 	archiver  core.Archiver
 	players   core.Players
-	provider  extdata.Provider
+	provider  external.Provider
 	playlists core.Playlists
 	scanner   scanner.Scanner
 	broker    events.Broker
@@ -46,7 +46,7 @@ type Router struct {
 }
 
 func New(ds model.DataStore, artwork artwork.Artwork, streamer core.MediaStreamer, archiver core.Archiver,
-	players core.Players, provider extdata.Provider, scanner scanner.Scanner, broker events.Broker,
+	players core.Players, provider external.Provider, scanner scanner.Scanner, broker events.Broker,
 	playlists core.Playlists, scrobbler scrobbler.PlayTracker, share core.Share, playback playback.PlaybackServer,
 ) *Router {
 	r := &Router{