diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
index 6f98e19a..ca904a17 100644
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -1,15 +1,7 @@
-
-add_subdirectory(auth)
 add_subdirectory(av)
-add_subdirectory(database)
 add_subdirectory(image)
 add_subdirectory(metadata)
-add_subdirectory(recommendation)
-add_subdirectory(scanner)
-add_subdirectory(scrobbling)
 add_subdirectory(services)
 add_subdirectory(som)
 add_subdirectory(subsonic)
 add_subdirectory(utils)
-
-
diff --git a/src/libs/services/CMakeLists.txt b/src/libs/services/CMakeLists.txt
index 09e78dd4..fd4d3160 100644
--- a/src/libs/services/CMakeLists.txt
+++ b/src/libs/services/CMakeLists.txt
@@ -1 +1,6 @@
+add_subdirectory(auth)
 add_subdirectory(cover)
+add_subdirectory(database)
+add_subdirectory(recommendation)
+add_subdirectory(scanner)
+add_subdirectory(scrobbling)
diff --git a/src/libs/auth/CMakeLists.txt b/src/libs/services/auth/CMakeLists.txt
similarity index 100%
rename from src/libs/auth/CMakeLists.txt
rename to src/libs/services/auth/CMakeLists.txt
diff --git a/src/libs/auth/impl/AuthServiceBase.cpp b/src/libs/services/auth/impl/AuthServiceBase.cpp
similarity index 100%
rename from src/libs/auth/impl/AuthServiceBase.cpp
rename to src/libs/services/auth/impl/AuthServiceBase.cpp
diff --git a/src/libs/auth/impl/AuthServiceBase.hpp b/src/libs/services/auth/impl/AuthServiceBase.hpp
similarity index 100%
rename from src/libs/auth/impl/AuthServiceBase.hpp
rename to src/libs/services/auth/impl/AuthServiceBase.hpp
diff --git a/src/libs/auth/impl/AuthTokenService.cpp b/src/libs/services/auth/impl/AuthTokenService.cpp
similarity index 100%
rename from src/libs/auth/impl/AuthTokenService.cpp
rename to src/libs/services/auth/impl/AuthTokenService.cpp
diff --git a/src/libs/auth/impl/AuthTokenService.hpp b/src/libs/services/auth/impl/AuthTokenService.hpp
similarity index 100%
rename from src/libs/auth/impl/AuthTokenService.hpp
rename to src/libs/services/auth/impl/AuthTokenService.hpp
diff --git a/src/libs/auth/impl/EnvService.cpp b/src/libs/services/auth/impl/EnvService.cpp
similarity index 100%
rename from src/libs/auth/impl/EnvService.cpp
rename to src/libs/services/auth/impl/EnvService.cpp
diff --git a/src/libs/auth/impl/LoginThrottler.cpp b/src/libs/services/auth/impl/LoginThrottler.cpp
similarity index 100%
rename from src/libs/auth/impl/LoginThrottler.cpp
rename to src/libs/services/auth/impl/LoginThrottler.cpp
diff --git a/src/libs/auth/impl/LoginThrottler.hpp b/src/libs/services/auth/impl/LoginThrottler.hpp
similarity index 100%
rename from src/libs/auth/impl/LoginThrottler.hpp
rename to src/libs/services/auth/impl/LoginThrottler.hpp
diff --git a/src/libs/auth/impl/PasswordServiceBase.cpp b/src/libs/services/auth/impl/PasswordServiceBase.cpp
similarity index 100%
rename from src/libs/auth/impl/PasswordServiceBase.cpp
rename to src/libs/services/auth/impl/PasswordServiceBase.cpp
diff --git a/src/libs/auth/impl/PasswordServiceBase.hpp b/src/libs/services/auth/impl/PasswordServiceBase.hpp
similarity index 100%
rename from src/libs/auth/impl/PasswordServiceBase.hpp
rename to src/libs/services/auth/impl/PasswordServiceBase.hpp
diff --git a/src/libs/auth/impl/http-headers/HttpHeadersEnvService.cpp b/src/libs/services/auth/impl/http-headers/HttpHeadersEnvService.cpp
similarity index 100%
rename from src/libs/auth/impl/http-headers/HttpHeadersEnvService.cpp
rename to src/libs/services/auth/impl/http-headers/HttpHeadersEnvService.cpp
diff --git a/src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp b/src/libs/services/auth/impl/http-headers/HttpHeadersEnvService.hpp
similarity index 100%
rename from src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp
rename to src/libs/services/auth/impl/http-headers/HttpHeadersEnvService.hpp
diff --git a/src/libs/auth/impl/internal/InternalPasswordService.cpp b/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
similarity index 100%
rename from src/libs/auth/impl/internal/InternalPasswordService.cpp
rename to src/libs/services/auth/impl/internal/InternalPasswordService.cpp
diff --git a/src/libs/auth/impl/internal/InternalPasswordService.hpp b/src/libs/services/auth/impl/internal/InternalPasswordService.hpp
similarity index 100%
rename from src/libs/auth/impl/internal/InternalPasswordService.hpp
rename to src/libs/services/auth/impl/internal/InternalPasswordService.hpp
diff --git a/src/libs/auth/impl/pam/PAMPasswordService.cpp b/src/libs/services/auth/impl/pam/PAMPasswordService.cpp
similarity index 100%
rename from src/libs/auth/impl/pam/PAMPasswordService.cpp
rename to src/libs/services/auth/impl/pam/PAMPasswordService.cpp
diff --git a/src/libs/auth/impl/pam/PAMPasswordService.hpp b/src/libs/services/auth/impl/pam/PAMPasswordService.hpp
similarity index 100%
rename from src/libs/auth/impl/pam/PAMPasswordService.hpp
rename to src/libs/services/auth/impl/pam/PAMPasswordService.hpp
diff --git a/src/libs/auth/include/auth/IAuthTokenService.hpp b/src/libs/services/auth/include/auth/IAuthTokenService.hpp
similarity index 100%
rename from src/libs/auth/include/auth/IAuthTokenService.hpp
rename to src/libs/services/auth/include/auth/IAuthTokenService.hpp
diff --git a/src/libs/auth/include/auth/IEnvService.hpp b/src/libs/services/auth/include/auth/IEnvService.hpp
similarity index 100%
rename from src/libs/auth/include/auth/IEnvService.hpp
rename to src/libs/services/auth/include/auth/IEnvService.hpp
diff --git a/src/libs/auth/include/auth/IPasswordService.hpp b/src/libs/services/auth/include/auth/IPasswordService.hpp
similarity index 100%
rename from src/libs/auth/include/auth/IPasswordService.hpp
rename to src/libs/services/auth/include/auth/IPasswordService.hpp
diff --git a/src/libs/auth/include/auth/Types.hpp b/src/libs/services/auth/include/auth/Types.hpp
similarity index 100%
rename from src/libs/auth/include/auth/Types.hpp
rename to src/libs/services/auth/include/auth/Types.hpp
diff --git a/src/libs/database/CMakeLists.txt b/src/libs/services/database/CMakeLists.txt
similarity index 100%
rename from src/libs/database/CMakeLists.txt
rename to src/libs/services/database/CMakeLists.txt
diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/services/database/impl/Artist.cpp
similarity index 100%
rename from src/libs/database/impl/Artist.cpp
rename to src/libs/services/database/impl/Artist.cpp
diff --git a/src/libs/database/impl/Cluster.cpp b/src/libs/services/database/impl/Cluster.cpp
similarity index 100%
rename from src/libs/database/impl/Cluster.cpp
rename to src/libs/services/database/impl/Cluster.cpp
diff --git a/src/libs/database/impl/Db.cpp b/src/libs/services/database/impl/Db.cpp
similarity index 100%
rename from src/libs/database/impl/Db.cpp
rename to src/libs/services/database/impl/Db.cpp
diff --git a/src/libs/database/impl/Release.cpp b/src/libs/services/database/impl/Release.cpp
similarity index 100%
rename from src/libs/database/impl/Release.cpp
rename to src/libs/services/database/impl/Release.cpp
diff --git a/src/libs/database/impl/ScanSettings.cpp b/src/libs/services/database/impl/ScanSettings.cpp
similarity index 100%
rename from src/libs/database/impl/ScanSettings.cpp
rename to src/libs/services/database/impl/ScanSettings.cpp
diff --git a/src/libs/database/impl/Session.cpp b/src/libs/services/database/impl/Session.cpp
similarity index 100%
rename from src/libs/database/impl/Session.cpp
rename to src/libs/services/database/impl/Session.cpp
diff --git a/src/libs/database/impl/SqlQuery.cpp b/src/libs/services/database/impl/SqlQuery.cpp
similarity index 100%
rename from src/libs/database/impl/SqlQuery.cpp
rename to src/libs/services/database/impl/SqlQuery.cpp
diff --git a/src/libs/database/impl/SqlQuery.hpp b/src/libs/services/database/impl/SqlQuery.hpp
similarity index 100%
rename from src/libs/database/impl/SqlQuery.hpp
rename to src/libs/services/database/impl/SqlQuery.hpp
diff --git a/src/libs/database/impl/StringViewTraits.hpp b/src/libs/services/database/impl/StringViewTraits.hpp
similarity index 100%
rename from src/libs/database/impl/StringViewTraits.hpp
rename to src/libs/services/database/impl/StringViewTraits.hpp
diff --git a/src/libs/database/impl/Track.cpp b/src/libs/services/database/impl/Track.cpp
similarity index 100%
rename from src/libs/database/impl/Track.cpp
rename to src/libs/services/database/impl/Track.cpp
diff --git a/src/libs/database/impl/TrackArtistLink.cpp b/src/libs/services/database/impl/TrackArtistLink.cpp
similarity index 100%
rename from src/libs/database/impl/TrackArtistLink.cpp
rename to src/libs/services/database/impl/TrackArtistLink.cpp
diff --git a/src/libs/database/impl/TrackBookmark.cpp b/src/libs/services/database/impl/TrackBookmark.cpp
similarity index 100%
rename from src/libs/database/impl/TrackBookmark.cpp
rename to src/libs/services/database/impl/TrackBookmark.cpp
diff --git a/src/libs/database/impl/TrackFeatures.cpp b/src/libs/services/database/impl/TrackFeatures.cpp
similarity index 100%
rename from src/libs/database/impl/TrackFeatures.cpp
rename to src/libs/services/database/impl/TrackFeatures.cpp
diff --git a/src/libs/database/impl/TrackList.cpp b/src/libs/services/database/impl/TrackList.cpp
similarity index 100%
rename from src/libs/database/impl/TrackList.cpp
rename to src/libs/services/database/impl/TrackList.cpp
diff --git a/src/libs/database/impl/Traits.hpp b/src/libs/services/database/impl/Traits.hpp
similarity index 100%
rename from src/libs/database/impl/Traits.hpp
rename to src/libs/services/database/impl/Traits.hpp
diff --git a/src/libs/database/impl/User.cpp b/src/libs/services/database/impl/User.cpp
similarity index 100%
rename from src/libs/database/impl/User.cpp
rename to src/libs/services/database/impl/User.cpp
diff --git a/src/libs/database/impl/Utils.cpp b/src/libs/services/database/impl/Utils.cpp
similarity index 100%
rename from src/libs/database/impl/Utils.cpp
rename to src/libs/services/database/impl/Utils.cpp
diff --git a/src/libs/database/impl/Utils.hpp b/src/libs/services/database/impl/Utils.hpp
similarity index 100%
rename from src/libs/database/impl/Utils.hpp
rename to src/libs/services/database/impl/Utils.hpp
diff --git a/src/libs/database/include/database/Artist.hpp b/src/libs/services/database/include/database/Artist.hpp
similarity index 100%
rename from src/libs/database/include/database/Artist.hpp
rename to src/libs/services/database/include/database/Artist.hpp
diff --git a/src/libs/database/include/database/Cluster.hpp b/src/libs/services/database/include/database/Cluster.hpp
similarity index 100%
rename from src/libs/database/include/database/Cluster.hpp
rename to src/libs/services/database/include/database/Cluster.hpp
diff --git a/src/libs/database/include/database/Db.hpp b/src/libs/services/database/include/database/Db.hpp
similarity index 100%
rename from src/libs/database/include/database/Db.hpp
rename to src/libs/services/database/include/database/Db.hpp
diff --git a/src/libs/database/include/database/Release.hpp b/src/libs/services/database/include/database/Release.hpp
similarity index 100%
rename from src/libs/database/include/database/Release.hpp
rename to src/libs/services/database/include/database/Release.hpp
diff --git a/src/libs/database/include/database/ScanSettings.hpp b/src/libs/services/database/include/database/ScanSettings.hpp
similarity index 100%
rename from src/libs/database/include/database/ScanSettings.hpp
rename to src/libs/services/database/include/database/ScanSettings.hpp
diff --git a/src/libs/database/include/database/Session.hpp b/src/libs/services/database/include/database/Session.hpp
similarity index 100%
rename from src/libs/database/include/database/Session.hpp
rename to src/libs/services/database/include/database/Session.hpp
diff --git a/src/libs/database/include/database/Track.hpp b/src/libs/services/database/include/database/Track.hpp
similarity index 100%
rename from src/libs/database/include/database/Track.hpp
rename to src/libs/services/database/include/database/Track.hpp
diff --git a/src/libs/database/include/database/TrackArtistLink.hpp b/src/libs/services/database/include/database/TrackArtistLink.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackArtistLink.hpp
rename to src/libs/services/database/include/database/TrackArtistLink.hpp
diff --git a/src/libs/database/include/database/TrackBookmark.hpp b/src/libs/services/database/include/database/TrackBookmark.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackBookmark.hpp
rename to src/libs/services/database/include/database/TrackBookmark.hpp
diff --git a/src/libs/database/include/database/TrackFeatures.hpp b/src/libs/services/database/include/database/TrackFeatures.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackFeatures.hpp
rename to src/libs/services/database/include/database/TrackFeatures.hpp
diff --git a/src/libs/database/include/database/TrackList.hpp b/src/libs/services/database/include/database/TrackList.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackList.hpp
rename to src/libs/services/database/include/database/TrackList.hpp
diff --git a/src/libs/database/include/database/Types.hpp b/src/libs/services/database/include/database/Types.hpp
similarity index 100%
rename from src/libs/database/include/database/Types.hpp
rename to src/libs/services/database/include/database/Types.hpp
diff --git a/src/libs/database/include/database/User.hpp b/src/libs/services/database/include/database/User.hpp
similarity index 100%
rename from src/libs/database/include/database/User.hpp
rename to src/libs/services/database/include/database/User.hpp
diff --git a/src/libs/database/test/Artist.cpp b/src/libs/services/database/test/Artist.cpp
similarity index 100%
rename from src/libs/database/test/Artist.cpp
rename to src/libs/services/database/test/Artist.cpp
diff --git a/src/libs/database/test/CMakeLists.txt b/src/libs/services/database/test/CMakeLists.txt
similarity index 100%
rename from src/libs/database/test/CMakeLists.txt
rename to src/libs/services/database/test/CMakeLists.txt
diff --git a/src/libs/database/test/Cluster.cpp b/src/libs/services/database/test/Cluster.cpp
similarity index 100%
rename from src/libs/database/test/Cluster.cpp
rename to src/libs/services/database/test/Cluster.cpp
diff --git a/src/libs/database/test/Common.hpp b/src/libs/services/database/test/Common.hpp
similarity index 100%
rename from src/libs/database/test/Common.hpp
rename to src/libs/services/database/test/Common.hpp
diff --git a/src/libs/database/test/DatabaseTest.cpp b/src/libs/services/database/test/DatabaseTest.cpp
similarity index 100%
rename from src/libs/database/test/DatabaseTest.cpp
rename to src/libs/services/database/test/DatabaseTest.cpp
diff --git a/src/libs/database/test/Release.cpp b/src/libs/services/database/test/Release.cpp
similarity index 100%
rename from src/libs/database/test/Release.cpp
rename to src/libs/services/database/test/Release.cpp
diff --git a/src/libs/database/test/Track.cpp b/src/libs/services/database/test/Track.cpp
similarity index 100%
rename from src/libs/database/test/Track.cpp
rename to src/libs/services/database/test/Track.cpp
diff --git a/src/libs/recommendation/CMakeLists.txt b/src/libs/services/recommendation/CMakeLists.txt
similarity index 100%
rename from src/libs/recommendation/CMakeLists.txt
rename to src/libs/services/recommendation/CMakeLists.txt
diff --git a/src/libs/recommendation/impl/ClustersEngineCreator.hpp b/src/libs/services/recommendation/impl/ClustersEngineCreator.hpp
similarity index 100%
rename from src/libs/recommendation/impl/ClustersEngineCreator.hpp
rename to src/libs/services/recommendation/impl/ClustersEngineCreator.hpp
diff --git a/src/libs/recommendation/impl/Engine.cpp b/src/libs/services/recommendation/impl/Engine.cpp
similarity index 100%
rename from src/libs/recommendation/impl/Engine.cpp
rename to src/libs/services/recommendation/impl/Engine.cpp
diff --git a/src/libs/recommendation/impl/Engine.hpp b/src/libs/services/recommendation/impl/Engine.hpp
similarity index 100%
rename from src/libs/recommendation/impl/Engine.hpp
rename to src/libs/services/recommendation/impl/Engine.hpp
diff --git a/src/libs/recommendation/impl/FeaturesEngineCreator.hpp b/src/libs/services/recommendation/impl/FeaturesEngineCreator.hpp
similarity index 100%
rename from src/libs/recommendation/impl/FeaturesEngineCreator.hpp
rename to src/libs/services/recommendation/impl/FeaturesEngineCreator.hpp
diff --git a/src/libs/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
similarity index 100%
rename from src/libs/recommendation/impl/clusters/ClustersEngine.cpp
rename to src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
diff --git a/src/libs/recommendation/impl/clusters/ClustersEngine.hpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp
similarity index 100%
rename from src/libs/recommendation/impl/clusters/ClustersEngine.hpp
rename to src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp
diff --git a/src/libs/recommendation/impl/features/FeaturesDefs.cpp b/src/libs/services/recommendation/impl/features/FeaturesDefs.cpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesDefs.cpp
rename to src/libs/services/recommendation/impl/features/FeaturesDefs.cpp
diff --git a/src/libs/recommendation/impl/features/FeaturesDefs.hpp b/src/libs/services/recommendation/impl/features/FeaturesDefs.hpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesDefs.hpp
rename to src/libs/services/recommendation/impl/features/FeaturesDefs.hpp
diff --git a/src/libs/recommendation/impl/features/FeaturesEngine.cpp b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesEngine.cpp
rename to src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
diff --git a/src/libs/recommendation/impl/features/FeaturesEngine.hpp b/src/libs/services/recommendation/impl/features/FeaturesEngine.hpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesEngine.hpp
rename to src/libs/services/recommendation/impl/features/FeaturesEngine.hpp
diff --git a/src/libs/recommendation/impl/features/FeaturesEngineCache.cpp b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.cpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesEngineCache.cpp
rename to src/libs/services/recommendation/impl/features/FeaturesEngineCache.cpp
diff --git a/src/libs/recommendation/impl/features/FeaturesEngineCache.hpp b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
similarity index 100%
rename from src/libs/recommendation/impl/features/FeaturesEngineCache.hpp
rename to src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
diff --git a/src/libs/recommendation/include/recommendation/IEngine.hpp b/src/libs/services/recommendation/include/recommendation/IEngine.hpp
similarity index 100%
rename from src/libs/recommendation/include/recommendation/IEngine.hpp
rename to src/libs/services/recommendation/include/recommendation/IEngine.hpp
diff --git a/src/libs/scanner/CMakeLists.txt b/src/libs/services/scanner/CMakeLists.txt
similarity index 100%
rename from src/libs/scanner/CMakeLists.txt
rename to src/libs/services/scanner/CMakeLists.txt
diff --git a/src/libs/scanner/impl/AcousticBrainzUtils.cpp b/src/libs/services/scanner/impl/AcousticBrainzUtils.cpp
similarity index 100%
rename from src/libs/scanner/impl/AcousticBrainzUtils.cpp
rename to src/libs/services/scanner/impl/AcousticBrainzUtils.cpp
diff --git a/src/libs/scanner/impl/AcousticBrainzUtils.hpp b/src/libs/services/scanner/impl/AcousticBrainzUtils.hpp
similarity index 100%
rename from src/libs/scanner/impl/AcousticBrainzUtils.hpp
rename to src/libs/services/scanner/impl/AcousticBrainzUtils.hpp
diff --git a/src/libs/scanner/impl/Scanner.cpp b/src/libs/services/scanner/impl/Scanner.cpp
similarity index 100%
rename from src/libs/scanner/impl/Scanner.cpp
rename to src/libs/services/scanner/impl/Scanner.cpp
diff --git a/src/libs/scanner/impl/Scanner.hpp b/src/libs/services/scanner/impl/Scanner.hpp
similarity index 100%
rename from src/libs/scanner/impl/Scanner.hpp
rename to src/libs/services/scanner/impl/Scanner.hpp
diff --git a/src/libs/scanner/impl/ScannerStats.cpp b/src/libs/services/scanner/impl/ScannerStats.cpp
similarity index 100%
rename from src/libs/scanner/impl/ScannerStats.cpp
rename to src/libs/services/scanner/impl/ScannerStats.cpp
diff --git a/src/libs/scanner/include/scanner/IScanner.hpp b/src/libs/services/scanner/include/scanner/IScanner.hpp
similarity index 100%
rename from src/libs/scanner/include/scanner/IScanner.hpp
rename to src/libs/services/scanner/include/scanner/IScanner.hpp
diff --git a/src/libs/scanner/include/scanner/ScannerEvents.hpp b/src/libs/services/scanner/include/scanner/ScannerEvents.hpp
similarity index 100%
rename from src/libs/scanner/include/scanner/ScannerEvents.hpp
rename to src/libs/services/scanner/include/scanner/ScannerEvents.hpp
diff --git a/src/libs/scanner/include/scanner/ScannerStats.hpp b/src/libs/services/scanner/include/scanner/ScannerStats.hpp
similarity index 100%
rename from src/libs/scanner/include/scanner/ScannerStats.hpp
rename to src/libs/services/scanner/include/scanner/ScannerStats.hpp
diff --git a/src/libs/scrobbling/CMakeLists.txt b/src/libs/services/scrobbling/CMakeLists.txt
similarity index 94%
rename from src/libs/scrobbling/CMakeLists.txt
rename to src/libs/services/scrobbling/CMakeLists.txt
index d69a6f5a..2ce1bb21 100644
--- a/src/libs/scrobbling/CMakeLists.txt
+++ b/src/libs/services/scrobbling/CMakeLists.txt
@@ -4,7 +4,7 @@ add_library(lmsscrobbling SHARED
 	impl/listenbrainz/ListenBrainzScrobbler.cpp
 	impl/listenbrainz/ListensSynchronizer.cpp
 	impl/listenbrainz/Utils.cpp
-	impl/Scrobbling.cpp
+	impl/ScrobblingService.cpp
 	)
 
 target_include_directories(lmsscrobbling INTERFACE
diff --git a/src/libs/scrobbling/impl/IScrobbler.hpp b/src/libs/services/scrobbling/impl/IScrobbler.hpp
similarity index 97%
rename from src/libs/scrobbling/impl/IScrobbler.hpp
rename to src/libs/services/scrobbling/impl/IScrobbler.hpp
index f442e773..cc0a98ca 100644
--- a/src/libs/scrobbling/impl/IScrobbler.hpp
+++ b/src/libs/services/scrobbling/impl/IScrobbler.hpp
@@ -25,7 +25,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "scrobbling/Listen.hpp"
+#include "services/scrobbling/Listen.hpp"
 
 namespace Database
 {
diff --git a/src/libs/scrobbling/impl/Scrobbling.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
similarity index 82%
rename from src/libs/scrobbling/impl/Scrobbling.cpp
rename to src/libs/services/scrobbling/impl/ScrobblingService.cpp
index b1a91936..13ddb4d7 100644
--- a/src/libs/scrobbling/impl/Scrobbling.cpp
+++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Scrobbling.hpp"
+#include "ScrobblingService.hpp"
 
 #include "database/Artist.hpp"
 #include "database/Db.hpp"
@@ -34,13 +34,13 @@ namespace Scrobbling
 {
 	using namespace Database;
 
-	std::unique_ptr<IScrobbling>
-	createScrobbling(boost::asio::io_context& ioContext, Db& db)
+	std::unique_ptr<IScrobblingService>
+	createScrobblingService(boost::asio::io_context& ioContext, Db& db)
 	{
-		return std::make_unique<Scrobbling>(ioContext, db);
+		return std::make_unique<ScrobblingService>(ioContext, db);
 	}
 
-	Scrobbling::Scrobbling(boost::asio::io_context& ioContext, Db& db)
+	ScrobblingService::ScrobblingService(boost::asio::io_context& ioContext, Db& db)
 		: _db {db}
 	{
 		_scrobblers.emplace(Database::Scrobbler::Internal, std::make_unique<InternalScrobbler>(_db));
@@ -48,28 +48,28 @@ namespace Scrobbling
 	}
 
 	void
-	Scrobbling::listenStarted(const Listen& listen)
+	ScrobblingService::listenStarted(const Listen& listen)
 	{
 		if (std::optional<Database::Scrobbler> scrobbler {getUserScrobbler(listen.userId)})
 			_scrobblers[*scrobbler]->listenStarted(listen);
 	}
 
 	void
-	Scrobbling::listenFinished(const Listen& listen, std::optional<std::chrono::seconds> duration)
+	ScrobblingService::listenFinished(const Listen& listen, std::optional<std::chrono::seconds> duration)
 	{
 		if (std::optional<Database::Scrobbler> scrobbler {getUserScrobbler(listen.userId)})
 			_scrobblers[*scrobbler]->listenFinished(listen, duration);
 	}
 
 	void
-	Scrobbling::addTimedListen(const TimedListen& listen)
+	ScrobblingService::addTimedListen(const TimedListen& listen)
 	{
 		if (std::optional<Database::Scrobbler> scrobbler {getUserScrobbler(listen.userId)})
 			_scrobblers[*scrobbler]->addTimedListen(listen);
 	}
 
 	std::optional<Database::Scrobbler>
-	Scrobbling::getUserScrobbler(Database::UserId userId)
+	ScrobblingService::getUserScrobbler(Database::UserId userId)
 	{
 		std::optional<Database::Scrobbler> scrobbler;
 
@@ -81,8 +81,8 @@ namespace Scrobbling
 		return scrobbler;
 	}
 
-	Scrobbling::ArtistContainer
-	Scrobbling::getRecentArtists(UserId userId,
+	ScrobblingService::ArtistContainer
+	ScrobblingService::getRecentArtists(UserId userId,
 									const std::vector<ClusterId>& clusterIds,
 									std::optional<TrackArtistLinkType> linkType,
 									std::optional<Range> range,
@@ -107,8 +107,8 @@ namespace Scrobbling
 		return res;
 	}
 
-	Scrobbling::ReleaseContainer
-	Scrobbling::getRecentReleases(Database::UserId userId,
+	ScrobblingService::ReleaseContainer
+	ScrobblingService::getRecentReleases(Database::UserId userId,
 									const std::vector<Database::ClusterId>& clusterIds,
 									std::optional<Database::Range> range,
 									bool& moreResults)
@@ -132,8 +132,8 @@ namespace Scrobbling
 		return res;
 	}
 
-	Scrobbling::TrackContainer
-	Scrobbling::getRecentTracks(Database::UserId userId,
+	ScrobblingService::TrackContainer
+	ScrobblingService::getRecentTracks(Database::UserId userId,
 										const std::vector<Database::ClusterId>& clusterIds,
 										std::optional<Database::Range> range,
 										bool& moreResults)
@@ -159,8 +159,8 @@ namespace Scrobbling
 
 
 	// Top
-	Scrobbling::ArtistContainer
-	Scrobbling::getTopArtists(UserId userId,
+	ScrobblingService::ArtistContainer
+	ScrobblingService::getTopArtists(UserId userId,
 								const std::vector<Database::ClusterId>& clusterIds,
 								std::optional<Database::TrackArtistLinkType> linkType,
 								std::optional<Database::Range> range,
@@ -185,8 +185,8 @@ namespace Scrobbling
 		return res;
 	}
 
-	Scrobbling::ReleaseContainer
-	Scrobbling::getTopReleases(Database::UserId userId,
+	ScrobblingService::ReleaseContainer
+	ScrobblingService::getTopReleases(Database::UserId userId,
 								const std::vector<Database::ClusterId>& clusterIds,
 								std::optional<Database::Range> range,
 								bool& moreResults)
@@ -210,8 +210,8 @@ namespace Scrobbling
 		return res;
 	}
 
-	Scrobbling::TrackContainer
-	Scrobbling::getTopTracks(Database::UserId userId,
+	ScrobblingService::TrackContainer
+	ScrobblingService::getTopTracks(Database::UserId userId,
 								const std::vector<Database::ClusterId>& clusterIds,
 								std::optional<Database::Range> range,
 								bool& moreResults)
@@ -235,7 +235,7 @@ namespace Scrobbling
 	}
 
 	Database::ObjectPtr<Database::TrackList>
-	Scrobbling::getListensTrackList(Session& session, Database::ObjectPtr<Database::User> user)
+	ScrobblingService::getListensTrackList(Session& session, Database::ObjectPtr<Database::User> user)
 	{
 		return _scrobblers[user->getScrobbler()]->getListensTrackList(session, user);
 	}
diff --git a/src/libs/scrobbling/impl/Scrobbling.hpp b/src/libs/services/scrobbling/impl/ScrobblingService.hpp
similarity index 93%
rename from src/libs/scrobbling/impl/Scrobbling.hpp
rename to src/libs/services/scrobbling/impl/ScrobblingService.hpp
index dd338dd3..6b1b9959 100644
--- a/src/libs/scrobbling/impl/Scrobbling.hpp
+++ b/src/libs/services/scrobbling/impl/ScrobblingService.hpp
@@ -23,15 +23,15 @@
 #include <optional>
 #include <unordered_map>
 
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "IScrobbler.hpp"
 
 namespace Scrobbling
 {
-	class Scrobbling : public IScrobbling
+	class ScrobblingService : public IScrobblingService
 	{
 		public:
-			Scrobbling(boost::asio::io_context& ioContext, Database::Db& db);
+			ScrobblingService(boost::asio::io_context& ioContext, Database::Db& db);
 
 		private:
 			void listenStarted(const Listen& listen) override;
diff --git a/src/libs/scrobbling/impl/internal/InternalScrobbler.cpp b/src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp
similarity index 100%
rename from src/libs/scrobbling/impl/internal/InternalScrobbler.cpp
rename to src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp
diff --git a/src/libs/scrobbling/impl/internal/InternalScrobbler.hpp b/src/libs/services/scrobbling/impl/internal/InternalScrobbler.hpp
similarity index 100%
rename from src/libs/scrobbling/impl/internal/InternalScrobbler.hpp
rename to src/libs/services/scrobbling/impl/internal/InternalScrobbler.hpp
diff --git a/src/libs/scrobbling/impl/listenbrainz/FeedbackSynchronizer.hpp b/src/libs/services/scrobbling/impl/listenbrainz/FeedbackSynchronizer.hpp
similarity index 100%
rename from src/libs/scrobbling/impl/listenbrainz/FeedbackSynchronizer.hpp
rename to src/libs/services/scrobbling/impl/listenbrainz/FeedbackSynchronizer.hpp
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
similarity index 100%
rename from src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
rename to src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
similarity index 100%
rename from src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
rename to src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
similarity index 99%
rename from src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
rename to src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
index 8196da8b..62329030 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
@@ -32,7 +32,7 @@
 #include "database/Track.hpp"
 #include "database/TrackList.hpp"
 #include "database/User.hpp"
-#include "scrobbling/Exception.hpp"
+#include "services/scrobbling/Exception.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
similarity index 98%
rename from src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
rename to src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
index e71a8ae4..90942990 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
@@ -27,7 +27,7 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "database/Types.hpp"
-#include "scrobbling/Listen.hpp"
+#include "services/scrobbling/Listen.hpp"
 
 namespace Database
 {
diff --git a/src/libs/scrobbling/impl/listenbrainz/Utils.cpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
similarity index 100%
rename from src/libs/scrobbling/impl/listenbrainz/Utils.cpp
rename to src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
diff --git a/src/libs/scrobbling/impl/listenbrainz/Utils.hpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
similarity index 100%
rename from src/libs/scrobbling/impl/listenbrainz/Utils.hpp
rename to src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
diff --git a/src/libs/scrobbling/include/scrobbling/Exception.hpp b/src/libs/services/scrobbling/include/services/scrobbling/Exception.hpp
similarity index 100%
rename from src/libs/scrobbling/include/scrobbling/Exception.hpp
rename to src/libs/services/scrobbling/include/services/scrobbling/Exception.hpp
diff --git a/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
similarity index 93%
rename from src/libs/scrobbling/include/scrobbling/IScrobbling.hpp
rename to src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
index cda27ca1..b9ce833e 100644
--- a/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp
+++ b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
@@ -28,7 +28,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "scrobbling/Listen.hpp"
+#include "services/scrobbling/Listen.hpp"
 #include "database/Types.hpp"
 
 namespace Database
@@ -44,10 +44,10 @@ namespace Database
 namespace Scrobbling
 {
 
-	class IScrobbling
+	class IScrobblingService
 	{
 		public:
-			virtual ~IScrobbling() = default;
+			virtual ~IScrobblingService() = default;
 
 			// Scrobbling
 			virtual void listenStarted(const Listen& listen) = 0;
@@ -97,7 +97,7 @@ namespace Scrobbling
 														bool& moreResults) = 0;
 	};
 
-	std::unique_ptr<IScrobbling> createScrobbling(boost::asio::io_service& ioService, Database::Db& db);
+	std::unique_ptr<IScrobblingService> createScrobblingService(boost::asio::io_service& ioService, Database::Db& db);
 
 } // ns Scrobbling
 
diff --git a/src/libs/scrobbling/include/scrobbling/Listen.hpp b/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
similarity index 100%
rename from src/libs/scrobbling/include/scrobbling/Listen.hpp
rename to src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index 38f811b0..43bbdcca 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -38,7 +38,7 @@
 #include "database/TrackList.hpp"
 #include "database/User.hpp"
 #include "recommendation/IEngine.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "services/cover/ICoverService.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
@@ -724,7 +724,7 @@ handleGetAlbumListRequestCommon(const RequestContext& context, bool id3)
 	const Range range {offset, size};
 
 	std::vector<Release::pointer> releases;
-	Scrobbling::IScrobbling& scrobbling {*Service<Scrobbling::IScrobbling>::get()};
+	Scrobbling::IScrobblingService& scrobbling {*Service<Scrobbling::IScrobblingService>::get()};
 
 	auto transaction {context.dbSession.createSharedTransaction()};
 
@@ -1574,13 +1574,13 @@ handleScrobble(RequestContext& context)
 
 	if (!submission)
 	{
-		Service<Scrobbling::IScrobbling>::get()->listenStarted({context.userId, ids.front()});
+		Service<Scrobbling::IScrobblingService>::get()->listenStarted({context.userId, ids.front()});
 	}
 	else
 	{
 		if (times.empty())
 		{
-			Service<Scrobbling::IScrobbling>::get()->listenFinished({context.userId, ids.front()});
+			Service<Scrobbling::IScrobblingService>::get()->listenFinished({context.userId, ids.front()});
 		}
 		else
 		{
@@ -1588,7 +1588,7 @@ handleScrobble(RequestContext& context)
 			{
 				const TrackId trackId {ids[i]};
 				const unsigned long time {times[i]};
-				Service<Scrobbling::IScrobbling>::get()->addTimedListen({{context.userId, trackId}, Wt::WDateTime::fromTime_t(static_cast<std::time_t>(time / 1000))});
+				Service<Scrobbling::IScrobblingService>::get()->addTimedListen({{context.userId, trackId}, Wt::WDateTime::fromTime_t(static_cast<std::time_t>(time / 1000))});
 			}
 		}
 	}
diff --git a/src/lms/main.cpp b/src/lms/main.cpp
index c30dd110..467446dc 100644
--- a/src/lms/main.cpp
+++ b/src/lms/main.cpp
@@ -34,7 +34,7 @@
 #include "scanner/IScanner.hpp"
 #include "recommendation/IEngine.hpp"
 #include "subsonic/SubsonicResource.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "ui/LmsApplication.hpp"
 #include "ui/LmsApplicationManager.hpp"
 #include "utils/http/IClient.hpp"
@@ -268,7 +268,7 @@ int main(int argc, char* argv[])
 			coverService->flushCache();
 		});
 
-		Service<Scrobbling::IScrobbling> scrobblingService {Scrobbling::createScrobbling(ioContext, database)};
+		Service<Scrobbling::IScrobblingService> scrobblingService {Scrobbling::createScrobblingService(ioContext, database)};
 
 		std::unique_ptr<Wt::WResource> subsonicResource;
 
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index e14207ca..0c9123f7 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -37,7 +37,7 @@
 #include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 #include "utils/String.hpp"
@@ -548,14 +548,14 @@ LmsApplication::createHome()
 	{
 		LMS_LOG(UI, DEBUG) << "Received ScrobbleListenNow from player for trackId = " << trackId.toString();
 		const Scrobbling::Listen listen {getUserId(), trackId};
-		Service<Scrobbling::IScrobbling>::get()->listenStarted(listen);
+		Service<Scrobbling::IScrobblingService>::get()->listenStarted(listen);
 	});
 	_mediaPlayer->scrobbleListenFinished.connect([this](Database::TrackId trackId, unsigned durationMs)
 	{
 		LMS_LOG(UI, DEBUG) << "Received ScrobbleListenFinished from player for trackId = " << trackId.toString() << ", duration = " << (durationMs / 1000) << "s";
 		const std::chrono::milliseconds duration {durationMs};
 		const Scrobbling::Listen listen {getUserId(), trackId};
-		Service<Scrobbling::IScrobbling>::get()->listenFinished(listen, std::chrono::duration_cast<std::chrono::seconds>(duration));
+		Service<Scrobbling::IScrobblingService>::get()->listenFinished(listen, std::chrono::duration_cast<std::chrono::seconds>(duration));
 	});
 
 	_mediaPlayer->playbackEnded.connect([this]
diff --git a/src/lms/ui/explore/ArtistCollector.cpp b/src/lms/ui/explore/ArtistCollector.cpp
index 0c73aa3e..2e2b3522 100644
--- a/src/lms/ui/explore/ArtistCollector.cpp
+++ b/src/lms/ui/explore/ArtistCollector.cpp
@@ -22,7 +22,7 @@
 #include "database/Artist.hpp"
 #include "database/User.hpp"
 #include "database/TrackList.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
@@ -34,7 +34,7 @@ namespace UserInterface
 	std::vector<Database::ObjectPtr<Database::Artist>>
 	ArtistCollector::get(std::optional<Database::Range> range, bool& moreResults)
 	{
-		Scrobbling::IScrobbling& scrobbling {*Service<Scrobbling::IScrobbling>::get()};
+		Scrobbling::IScrobblingService& scrobbling {*Service<Scrobbling::IScrobblingService>::get()};
 
 		range = getActualRange(range);
 
diff --git a/src/lms/ui/explore/ReleaseCollector.cpp b/src/lms/ui/explore/ReleaseCollector.cpp
index c5671f54..0bfd0713 100644
--- a/src/lms/ui/explore/ReleaseCollector.cpp
+++ b/src/lms/ui/explore/ReleaseCollector.cpp
@@ -25,7 +25,7 @@
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "database/TrackList.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
@@ -37,7 +37,7 @@ namespace UserInterface
 	std::vector<Release::pointer>
 	ReleaseCollector::get(std::optional<Database::Range> range, bool& moreResults)
 	{
-		Scrobbling::IScrobbling& scrobbling {*Service<Scrobbling::IScrobbling>::get()};
+		Scrobbling::IScrobblingService& scrobbling {*Service<Scrobbling::IScrobblingService>::get()};
 
 		range = getActualRange(range);
 
diff --git a/src/lms/ui/explore/TrackCollector.cpp b/src/lms/ui/explore/TrackCollector.cpp
index 77106931..d3e8b3db 100644
--- a/src/lms/ui/explore/TrackCollector.cpp
+++ b/src/lms/ui/explore/TrackCollector.cpp
@@ -25,7 +25,7 @@
 #include "database/Track.hpp"
 #include "database/TrackList.hpp"
 #include "database/User.hpp"
-#include "scrobbling/IScrobbling.hpp"
+#include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
@@ -37,7 +37,7 @@ namespace UserInterface
 	std::vector<Track::pointer>
 	TrackCollector::get(std::optional<Database::Range> range, bool& moreResults)
 	{
-		Scrobbling::IScrobbling& scrobbling {*Service<Scrobbling::IScrobbling>::get()};
+		Scrobbling::IScrobblingService& scrobbling {*Service<Scrobbling::IScrobblingService>::get()};
 		range = getActualRange(range);
 
 		std::vector<Track::pointer> tracks;