diff --git a/core/agents/lastfm.go b/core/agents/lastfm.go
index 68f9b8889..ea111650e 100644
--- a/core/agents/lastfm.go
+++ b/core/agents/lastfm.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/lastfm"
 	"github.com/navidrome/navidrome/log"
+	"github.com/navidrome/navidrome/utils/lastfm"
 )
 
 const lastFMAgentName = "lastfm"
diff --git a/core/agents/spotify.go b/core/agents/spotify.go
index 3f85a7fa6..3aae0dc77 100644
--- a/core/agents/spotify.go
+++ b/core/agents/spotify.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/spotify"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/utils/spotify"
 	"github.com/xrash/smetrics"
 )
 
diff --git a/core/artwork.go b/core/artwork.go
index e303a91a4..f35ecc74a 100644
--- a/core/artwork.go
+++ b/core/artwork.go
@@ -20,11 +20,11 @@ import (
 	"github.com/disintegration/imaging"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/cache"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/resources"
 	"github.com/navidrome/navidrome/utils"
+	"github.com/navidrome/navidrome/utils/cache"
 	_ "golang.org/x/image/webp"
 )
 
diff --git a/core/cache_warmer.go b/core/cache_warmer.go
index 6d63479b0..d4b655a2c 100644
--- a/core/cache_warmer.go
+++ b/core/cache_warmer.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/core/pool"
 	"github.com/navidrome/navidrome/log"
+	"github.com/navidrome/navidrome/utils/pool"
 )
 
 type CacheWarmer interface {
diff --git a/core/media_streamer.go b/core/media_streamer.go
index e39be251f..7c38d6dd8 100644
--- a/core/media_streamer.go
+++ b/core/media_streamer.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/cache"
 	"github.com/navidrome/navidrome/core/transcoder"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
+	"github.com/navidrome/navidrome/utils/cache"
 )
 
 type MediaStreamer interface {
diff --git a/server/app/auth.go b/server/app/auth.go
index 789b8abaf..b9c5aa926 100644
--- a/server/app/auth.go
+++ b/server/app/auth.go
@@ -15,10 +15,10 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core/auth"
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
+	"github.com/navidrome/navidrome/utils/gravatar"
 )
 
 var (
diff --git a/server/subsonic/media_retrieval.go b/server/subsonic/media_retrieval.go
index a2c90e759..8eba5562c 100644
--- a/server/subsonic/media_retrieval.go
+++ b/server/subsonic/media_retrieval.go
@@ -7,12 +7,12 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/resources"
 	"github.com/navidrome/navidrome/server/subsonic/responses"
 	"github.com/navidrome/navidrome/utils"
+	"github.com/navidrome/navidrome/utils/gravatar"
 )
 
 type MediaRetrievalController struct {
diff --git a/core/cache/cache_suite_test.go b/utils/cache/cache_suite_test.go
similarity index 100%
rename from core/cache/cache_suite_test.go
rename to utils/cache/cache_suite_test.go
diff --git a/core/cache/file_caches.go b/utils/cache/file_caches.go
similarity index 100%
rename from core/cache/file_caches.go
rename to utils/cache/file_caches.go
diff --git a/core/cache/file_caches_test.go b/utils/cache/file_caches_test.go
similarity index 100%
rename from core/cache/file_caches_test.go
rename to utils/cache/file_caches_test.go
diff --git a/core/cache/spread_fs.go b/utils/cache/spread_fs.go
similarity index 100%
rename from core/cache/spread_fs.go
rename to utils/cache/spread_fs.go
diff --git a/core/gravatar/gravatar.go b/utils/gravatar/gravatar.go
similarity index 100%
rename from core/gravatar/gravatar.go
rename to utils/gravatar/gravatar.go
diff --git a/core/gravatar/gravatar_test.go b/utils/gravatar/gravatar_test.go
similarity index 95%
rename from core/gravatar/gravatar_test.go
rename to utils/gravatar/gravatar_test.go
index 2462f55a5..373ce25cc 100644
--- a/core/gravatar/gravatar_test.go
+++ b/utils/gravatar/gravatar_test.go
@@ -3,9 +3,9 @@ package gravatar_test
 import (
 	"testing"
 
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
+	"github.com/navidrome/navidrome/utils/gravatar"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/core/lastfm/client.go b/utils/lastfm/client.go
similarity index 100%
rename from core/lastfm/client.go
rename to utils/lastfm/client.go
diff --git a/core/lastfm/client_test.go b/utils/lastfm/client_test.go
similarity index 100%
rename from core/lastfm/client_test.go
rename to utils/lastfm/client_test.go
diff --git a/core/lastfm/lastfm_suite_test.go b/utils/lastfm/lastfm_suite_test.go
similarity index 100%
rename from core/lastfm/lastfm_suite_test.go
rename to utils/lastfm/lastfm_suite_test.go
diff --git a/core/lastfm/responses.go b/utils/lastfm/responses.go
similarity index 100%
rename from core/lastfm/responses.go
rename to utils/lastfm/responses.go
diff --git a/core/lastfm/responses_test.go b/utils/lastfm/responses_test.go
similarity index 100%
rename from core/lastfm/responses_test.go
rename to utils/lastfm/responses_test.go
diff --git a/core/pool/pool.go b/utils/pool/pool.go
similarity index 100%
rename from core/pool/pool.go
rename to utils/pool/pool.go
diff --git a/core/pool/pool_test.go b/utils/pool/pool_test.go
similarity index 100%
rename from core/pool/pool_test.go
rename to utils/pool/pool_test.go
diff --git a/core/spotify/client.go b/utils/spotify/client.go
similarity index 100%
rename from core/spotify/client.go
rename to utils/spotify/client.go
diff --git a/core/spotify/client_test.go b/utils/spotify/client_test.go
similarity index 100%
rename from core/spotify/client_test.go
rename to utils/spotify/client_test.go
diff --git a/core/spotify/responses.go b/utils/spotify/responses.go
similarity index 100%
rename from core/spotify/responses.go
rename to utils/spotify/responses.go
diff --git a/core/spotify/responses_test.go b/utils/spotify/responses_test.go
similarity index 100%
rename from core/spotify/responses_test.go
rename to utils/spotify/responses_test.go
diff --git a/core/spotify/spotify_suite_test.go b/utils/spotify/spotify_suite_test.go
similarity index 100%
rename from core/spotify/spotify_suite_test.go
rename to utils/spotify/spotify_suite_test.go