diff --git a/src/libs/services/auth/impl/AuthServiceBase.cpp b/src/libs/services/auth/impl/AuthServiceBase.cpp
index 6e0d0589..6b3c9a95 100644
--- a/src/libs/services/auth/impl/AuthServiceBase.cpp
+++ b/src/libs/services/auth/impl/AuthServiceBase.cpp
@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "database/Db.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth
diff --git a/src/libs/services/auth/impl/AuthServiceBase.hpp b/src/libs/services/auth/impl/AuthServiceBase.hpp
index 81acba59..812e716f 100644
--- a/src/libs/services/auth/impl/AuthServiceBase.hpp
+++ b/src/libs/services/auth/impl/AuthServiceBase.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string_view>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/auth/impl/AuthTokenService.cpp b/src/libs/services/auth/impl/AuthTokenService.cpp
index f4104ca0..24b9cee4 100644
--- a/src/libs/services/auth/impl/AuthTokenService.cpp
+++ b/src/libs/services/auth/impl/AuthTokenService.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WRandom.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/services/auth/impl/PasswordServiceBase.cpp b/src/libs/services/auth/impl/PasswordServiceBase.cpp
index bd1901ee..79f57af1 100644
--- a/src/libs/services/auth/impl/PasswordServiceBase.cpp
+++ b/src/libs/services/auth/impl/PasswordServiceBase.cpp
@@ -28,8 +28,8 @@
 #endif // LMS_SUPPORT_PAM
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/services/auth/impl/internal/InternalPasswordService.cpp b/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
index fe162150..d63de7ed 100644
--- a/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
+++ b/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
@@ -22,8 +22,8 @@
 
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/services/auth/impl/internal/InternalPasswordService.hpp b/src/libs/services/auth/impl/internal/InternalPasswordService.hpp
index 6c241f31..7754953a 100644
--- a/src/libs/services/auth/impl/internal/InternalPasswordService.hpp
+++ b/src/libs/services/auth/impl/internal/InternalPasswordService.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Auth/HashFunction.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "PasswordServiceBase.hpp"
 #include "LoginThrottler.hpp"
 
diff --git a/src/libs/services/auth/impl/pam/PAMPasswordService.cpp b/src/libs/services/auth/impl/pam/PAMPasswordService.cpp
index e24de954..80c92644 100644
--- a/src/libs/services/auth/impl/pam/PAMPasswordService.cpp
+++ b/src/libs/services/auth/impl/pam/PAMPasswordService.cpp
@@ -27,7 +27,7 @@
 #include <security/pam_appl.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth
diff --git a/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp b/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
index 5d9dd51b..884dd7d1 100644
--- a/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
+++ b/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
@@ -27,7 +27,7 @@
 #include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/auth/include/services/auth/IEnvService.hpp b/src/libs/services/auth/include/services/auth/IEnvService.hpp
index ecb23349..291bfab6 100644
--- a/src/libs/services/auth/include/services/auth/IEnvService.hpp
+++ b/src/libs/services/auth/include/services/auth/IEnvService.hpp
@@ -22,7 +22,7 @@
 #include <optional>
 #include <string>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/auth/include/services/auth/IPasswordService.hpp b/src/libs/services/auth/include/services/auth/IPasswordService.hpp
index 6a9cb2bd..4958e746 100644
--- a/src/libs/services/auth/include/services/auth/IPasswordService.hpp
+++ b/src/libs/services/auth/include/services/auth/IPasswordService.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/ptr.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/auth/include/services/auth/Types.hpp b/src/libs/services/auth/include/services/auth/Types.hpp
index 8b97df6e..df470746 100644
--- a/src/libs/services/auth/include/services/auth/Types.hpp
+++ b/src/libs/services/auth/include/services/auth/Types.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace Auth
diff --git a/src/libs/services/cover/impl/CoverService.cpp b/src/libs/services/cover/impl/CoverService.cpp
index a968d5c4..58537ad1 100644
--- a/src/libs/services/cover/impl/CoverService.cpp
+++ b/src/libs/services/cover/impl/CoverService.cpp
@@ -21,10 +21,10 @@
 
 #include "av/IAudioFile.hpp"
 
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 
 #include "image/Exception.hpp"
 #include "image/IRawImage.hpp"
diff --git a/src/libs/services/cover/impl/CoverService.hpp b/src/libs/services/cover/impl/CoverService.hpp
index 866ed8da..bf6e9d6c 100644
--- a/src/libs/services/cover/impl/CoverService.hpp
+++ b/src/libs/services/cover/impl/CoverService.hpp
@@ -31,7 +31,7 @@
 
 #include "services/cover/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/cover/include/services/cover/ICoverService.hpp b/src/libs/services/cover/include/services/cover/ICoverService.hpp
index 039260ef..392f0dfc 100644
--- a/src/libs/services/cover/include/services/cover/ICoverService.hpp
+++ b/src/libs/services/cover/include/services/cover/ICoverService.hpp
@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace Database
diff --git a/src/libs/services/database/impl/Artist.cpp b/src/libs/services/database/impl/Artist.cpp
index 9ca631fa..9b139381 100644
--- a/src/libs/services/database/impl/Artist.cpp
+++ b/src/libs/services/database/impl/Artist.cpp
@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/services/database/impl/Cluster.cpp b/src/libs/services/database/impl/Cluster.cpp
index 184a03a1..cf4350cc 100644
--- a/src/libs/services/database/impl/Cluster.cpp
+++ b/src/libs/services/database/impl/Cluster.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
 
diff --git a/src/libs/services/database/impl/Db.cpp b/src/libs/services/database/impl/Db.cpp
index 5035466c..7eb7bf7a 100644
--- a/src/libs/services/database/impl/Db.cpp
+++ b/src/libs/services/database/impl/Db.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
 
 #include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {
diff --git a/src/libs/services/database/impl/Release.cpp b/src/libs/services/database/impl/Release.cpp
index 310de51e..a25d23db 100644
--- a/src/libs/services/database/impl/Release.cpp
+++ b/src/libs/services/database/impl/Release.cpp
@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/services/database/impl/ScanSettings.cpp b/src/libs/services/database/impl/ScanSettings.cpp
index 9aafed53..0b509f32 100644
--- a/src/libs/services/database/impl/ScanSettings.cpp
+++ b/src/libs/services/database/impl/ScanSettings.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
@@ -25,8 +25,8 @@
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
-#include "database/Cluster.hpp"
-#include "database/Session.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Session.hpp"
 
 namespace {
 
diff --git a/src/libs/services/database/impl/Session.cpp b/src/libs/services/database/impl/Session.cpp
index 56ec77d1..7b219a08 100644
--- a/src/libs/services/database/impl/Session.cpp
+++ b/src/libs/services/database/impl/Session.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 
 #include <map>
 #include <mutex>
@@ -27,17 +27,17 @@
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackList.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/TrackFeatures.hpp"
+#include "services/database/User.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/database/impl/Track.cpp b/src/libs/services/database/impl/Track.cpp
index 82dc99cf..d1968146 100644
--- a/src/libs/services/database/impl/Track.cpp
+++ b/src/libs/services/database/impl/Track.cpp
@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackFeatures.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"
diff --git a/src/libs/services/database/impl/TrackArtistLink.cpp b/src/libs/services/database/impl/TrackArtistLink.cpp
index f8791dee..03bbbbee 100644
--- a/src/libs/services/database/impl/TrackArtistLink.cpp
+++ b/src/libs/services/database/impl/TrackArtistLink.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 
 #include "Traits.hpp"
 
diff --git a/src/libs/services/database/impl/TrackBookmark.cpp b/src/libs/services/database/impl/TrackBookmark.cpp
index 91f457bd..5a963c3c 100644
--- a/src/libs/services/database/impl/TrackBookmark.cpp
+++ b/src/libs/services/database/impl/TrackBookmark.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackBookmark.hpp"
+#include "services/database/TrackBookmark.hpp"
 
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "Traits.hpp"
 
 namespace Database {
diff --git a/src/libs/services/database/impl/TrackFeatures.cpp b/src/libs/services/database/impl/TrackFeatures.cpp
index 5770d0b1..65cc9b7a 100644
--- a/src/libs/services/database/impl/TrackFeatures.cpp
+++ b/src/libs/services/database/impl/TrackFeatures.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {
diff --git a/src/libs/services/database/impl/TrackList.cpp b/src/libs/services/database/impl/TrackList.cpp
index a9863d52..8e69434b 100644
--- a/src/libs/services/database/impl/TrackList.cpp
+++ b/src/libs/services/database/impl/TrackList.cpp
@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 
 #include <cassert>
 
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
+#include "services/database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/services/database/impl/Traits.hpp b/src/libs/services/database/impl/Traits.hpp
index bdfa0045..54b3e8d7 100644
--- a/src/libs/services/database/impl/Traits.hpp
+++ b/src/libs/services/database/impl/Traits.hpp
@@ -22,7 +22,7 @@
 #include <type_traits>
 #include <Wt/Dbo/StdSqlTraits.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Wt::Dbo
 {
diff --git a/src/libs/services/database/impl/User.cpp b/src/libs/services/database/impl/User.cpp
index 44f8c2b1..038c3a55 100644
--- a/src/libs/services/database/impl/User.cpp
+++ b/src/libs/services/database/impl/User.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
 #include "utils/Logger.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/services/database/include/database/Artist.hpp b/src/libs/services/database/include/services/database/Artist.hpp
similarity index 99%
rename from src/libs/services/database/include/database/Artist.hpp
rename to src/libs/services/database/include/services/database/Artist.hpp
index 23ef7812..0f5785bc 100644
--- a/src/libs/services/database/include/database/Artist.hpp
+++ b/src/libs/services/database/include/services/database/Artist.hpp
@@ -27,7 +27,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
diff --git a/src/libs/services/database/include/database/Cluster.hpp b/src/libs/services/database/include/services/database/Cluster.hpp
similarity index 98%
rename from src/libs/services/database/include/database/Cluster.hpp
rename to src/libs/services/database/include/services/database/Cluster.hpp
index 42a11e77..63032f75 100644
--- a/src/libs/services/database/include/database/Cluster.hpp
+++ b/src/libs/services/database/include/services/database/Cluster.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/Db.hpp b/src/libs/services/database/include/services/database/Db.hpp
similarity index 100%
rename from src/libs/services/database/include/database/Db.hpp
rename to src/libs/services/database/include/services/database/Db.hpp
diff --git a/src/libs/services/database/include/database/Release.hpp b/src/libs/services/database/include/services/database/Release.hpp
similarity index 99%
rename from src/libs/services/database/include/database/Release.hpp
rename to src/libs/services/database/include/services/database/Release.hpp
index ce45a1a8..6af4e700 100644
--- a/src/libs/services/database/include/database/Release.hpp
+++ b/src/libs/services/database/include/services/database/Release.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database
diff --git a/src/libs/services/database/include/database/ScanSettings.hpp b/src/libs/services/database/include/services/database/ScanSettings.hpp
similarity index 98%
rename from src/libs/services/database/include/database/ScanSettings.hpp
rename to src/libs/services/database/include/services/database/ScanSettings.hpp
index 9cb8cb5a..0a482956 100644
--- a/src/libs/services/database/include/database/ScanSettings.hpp
+++ b/src/libs/services/database/include/services/database/ScanSettings.hpp
@@ -25,7 +25,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/Session.hpp b/src/libs/services/database/include/services/database/Session.hpp
similarity index 100%
rename from src/libs/services/database/include/database/Session.hpp
rename to src/libs/services/database/include/services/database/Session.hpp
diff --git a/src/libs/services/database/include/database/Track.hpp b/src/libs/services/database/include/services/database/Track.hpp
similarity index 99%
rename from src/libs/services/database/include/database/Track.hpp
rename to src/libs/services/database/include/services/database/Track.hpp
index 3e2c2ced..ccc9bb4e 100644
--- a/src/libs/services/database/include/database/Track.hpp
+++ b/src/libs/services/database/include/services/database/Track.hpp
@@ -34,7 +34,7 @@
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/TrackArtistLink.hpp b/src/libs/services/database/include/services/database/TrackArtistLink.hpp
similarity index 97%
rename from src/libs/services/database/include/database/TrackArtistLink.hpp
rename to src/libs/services/database/include/services/database/TrackArtistLink.hpp
index 55d3b0c5..7708c69e 100644
--- a/src/libs/services/database/include/database/TrackArtistLink.hpp
+++ b/src/libs/services/database/include/services/database/TrackArtistLink.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database
diff --git a/src/libs/services/database/include/database/TrackBookmark.hpp b/src/libs/services/database/include/services/database/TrackBookmark.hpp
similarity index 98%
rename from src/libs/services/database/include/database/TrackBookmark.hpp
rename to src/libs/services/database/include/services/database/TrackBookmark.hpp
index 2c4af0db..34ddb542 100644
--- a/src/libs/services/database/include/database/TrackBookmark.hpp
+++ b/src/libs/services/database/include/services/database/TrackBookmark.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/TrackFeatures.hpp b/src/libs/services/database/include/services/database/TrackFeatures.hpp
similarity index 97%
rename from src/libs/services/database/include/database/TrackFeatures.hpp
rename to src/libs/services/database/include/services/database/TrackFeatures.hpp
index 99c36d6d..fd251647 100644
--- a/src/libs/services/database/include/database/TrackFeatures.hpp
+++ b/src/libs/services/database/include/services/database/TrackFeatures.hpp
@@ -26,7 +26,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/TrackList.hpp b/src/libs/services/database/include/services/database/TrackList.hpp
similarity index 99%
rename from src/libs/services/database/include/database/TrackList.hpp
rename to src/libs/services/database/include/services/database/TrackList.hpp
index 03aaca0f..48f56c23 100644
--- a/src/libs/services/database/include/database/TrackList.hpp
+++ b/src/libs/services/database/include/services/database/TrackList.hpp
@@ -27,7 +27,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/services/database/include/database/Types.hpp b/src/libs/services/database/include/services/database/Types.hpp
similarity index 100%
rename from src/libs/services/database/include/database/Types.hpp
rename to src/libs/services/database/include/services/database/Types.hpp
diff --git a/src/libs/services/database/include/database/User.hpp b/src/libs/services/database/include/services/database/User.hpp
similarity index 99%
rename from src/libs/services/database/include/database/User.hpp
rename to src/libs/services/database/include/services/database/User.hpp
index b94d41af..34748567 100644
--- a/src/libs/services/database/include/database/User.hpp
+++ b/src/libs/services/database/include/services/database/User.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database {
diff --git a/src/libs/services/database/test/Common.hpp b/src/libs/services/database/test/Common.hpp
index 8864e681..75aa654d 100644
--- a/src/libs/services/database/test/Common.hpp
+++ b/src/libs/services/database/test/Common.hpp
@@ -24,17 +24,17 @@
 
 #include <gtest/gtest.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
-#include "database/Types.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/Types.hpp"
+#include "services/database/User.hpp"
 
 template <typename T>
 class ScopedEntity
diff --git a/src/libs/services/recommendation/impl/IEngine.hpp b/src/libs/services/recommendation/impl/IEngine.hpp
index 8c16b407..b4b9da65 100644
--- a/src/libs/services/recommendation/impl/IEngine.hpp
+++ b/src/libs/services/recommendation/impl/IEngine.hpp
@@ -22,7 +22,7 @@
 #include <functional>
 #include <memory>
 #include <string_view>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "services/recommendation/Types.hpp"
 
diff --git a/src/libs/services/recommendation/impl/RecommendationService.cpp b/src/libs/services/recommendation/impl/RecommendationService.cpp
index b2b6f235..59a805ec 100644
--- a/src/libs/services/recommendation/impl/RecommendationService.cpp
+++ b/src/libs/services/recommendation/impl/RecommendationService.cpp
@@ -25,9 +25,9 @@
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
 
-#include "database/Db.hpp"
-#include "database/Session.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/ScanSettings.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
index f873443a..f2f3d458 100644
--- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
+++ b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
 
 namespace Recommendation {
 
diff --git a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
index 7610ee75..bb030bd6 100644
--- a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
+++ b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
@@ -21,14 +21,14 @@
 
 #include <numeric>
 
-#include "database/Artist.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackFeatures.hpp"
+#include "services/database/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"
diff --git a/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
index 08372345..348c66af 100644
--- a/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
+++ b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "som/Network.hpp"
 
 namespace Recommendation {
diff --git a/src/libs/services/recommendation/include/services/recommendation/Types.hpp b/src/libs/services/recommendation/include/services/recommendation/Types.hpp
index 08fa2f90..0b258c3f 100644
--- a/src/libs/services/recommendation/include/services/recommendation/Types.hpp
+++ b/src/libs/services/recommendation/include/services/recommendation/Types.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <functional>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Recommendation
 {
diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp
index 49f2e072..d96663be 100644
--- a/src/libs/services/scanner/impl/ScannerService.cpp
+++ b/src/libs/services/scanner/impl/ScannerService.cpp
@@ -24,13 +24,13 @@
 
 #include <Wt/WLocalDateTime.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackFeatures.hpp"
 #include "metadata/TagLibParser.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Exception.hpp"
diff --git a/src/libs/services/scanner/impl/ScannerService.hpp b/src/libs/services/scanner/impl/ScannerService.hpp
index 9cb9ce62..07adf5c6 100644
--- a/src/libs/services/scanner/impl/ScannerService.hpp
+++ b/src/libs/services/scanner/impl/ScannerService.hpp
@@ -30,9 +30,9 @@
 
 #include <boost/asio/system_timer.hpp>
 
-#include "database/Types.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Types.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.hpp"
 #include "metadata/IParser.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Path.hpp"
diff --git a/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp b/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp
index 5528ce8b..af60143e 100644
--- a/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp
+++ b/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp
@@ -24,7 +24,7 @@
 #include <filesystem>
 #include <vector>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Scanner {
 
diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
index 13ddb4d7..455ccc65 100644
--- a/src/libs/services/scrobbling/impl/ScrobblingService.cpp
+++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
@@ -19,13 +19,13 @@
 
 #include "ScrobblingService.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 
 #include "internal/InternalScrobbler.hpp"
 #include "listenbrainz/ListenBrainzScrobbler.hpp"
diff --git a/src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp b/src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp
index e5b23d51..b0dc6964 100644
--- a/src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp
+++ b/src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp
@@ -19,11 +19,11 @@
 
 #include "InternalScrobbler.hpp"
 
-#include "database/Db.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Scrobbling
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
index 08202d9e..20b68fc0 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
@@ -24,13 +24,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "database/Artist.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
index 62329030..c4216a33 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
@@ -25,13 +25,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "database/Artist.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "services/scrobbling/Exception.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
index 90942990..70efa377 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
@@ -26,7 +26,7 @@
 #include <boost/asio/steady_timer.hpp>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "services/scrobbling/Listen.hpp"
 
 namespace Database
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
index ab293954..a2d9c9e1 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
@@ -21,9 +21,9 @@
 
 #include <string_view>
 
-#include "database/Session.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 
 static constexpr std::string_view historyTracklistName {"__scrobbler_listenbrainz_history__"};
 
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
index 6b2d1271..aca140c7 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include "utils/UUID.hpp"
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
index b9ce833e..cf67d7fc 100644
--- a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
+++ b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
@@ -29,7 +29,7 @@
 #include <Wt/WDateTime.h>
 
 #include "services/scrobbling/Listen.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp b/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
index ae80dbac..50029c99 100644
--- a/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
+++ b/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Scrobbling
 {
diff --git a/src/libs/subsonic/impl/ParameterParsing.hpp b/src/libs/subsonic/impl/ParameterParsing.hpp
index bb8a91d3..2773a08e 100644
--- a/src/libs/subsonic/impl/ParameterParsing.hpp
+++ b/src/libs/subsonic/impl/ParameterParsing.hpp
@@ -20,7 +20,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/String.hpp"
 #include "SubsonicResponse.hpp"
 
diff --git a/src/libs/subsonic/impl/RequestContext.hpp b/src/libs/subsonic/impl/RequestContext.hpp
index 9d73bcb4..982963ea 100644
--- a/src/libs/subsonic/impl/RequestContext.hpp
+++ b/src/libs/subsonic/impl/RequestContext.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "ProtocolVersion.hpp"
 
diff --git a/src/libs/subsonic/impl/Stream.cpp b/src/libs/subsonic/impl/Stream.cpp
index d3d181ed..fe4218d0 100644
--- a/src/libs/subsonic/impl/Stream.cpp
+++ b/src/libs/subsonic/impl/Stream.cpp
@@ -22,9 +22,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "utils/IResourceHandler.hpp"
 #include "utils/Logger.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"
diff --git a/src/libs/subsonic/impl/SubsonicId.hpp b/src/libs/subsonic/impl/SubsonicId.hpp
index 0ac2a16a..dcc2e50b 100644
--- a/src/libs/subsonic/impl/SubsonicId.hpp
+++ b/src/libs/subsonic/impl/SubsonicId.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/String.hpp"
 
 namespace API::Subsonic
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index 6cbac9a5..6778f4b0 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -28,15 +28,15 @@
 
 #include "services/auth/IPasswordService.hpp"
 #include "services/auth/IEnvService.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "services/cover/ICoverService.hpp"
diff --git a/src/libs/subsonic/impl/SubsonicResource.hpp b/src/libs/subsonic/impl/SubsonicResource.hpp
index 2d549f41..24c0754b 100644
--- a/src/libs/subsonic/impl/SubsonicResource.hpp
+++ b/src/libs/subsonic/impl/SubsonicResource.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WResource.h>
 #include <Wt/Http/Response.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "RequestContext.hpp"
 
diff --git a/src/lms/main.cpp b/src/lms/main.cpp
index 67d221f0..e82bc6a3 100644
--- a/src/lms/main.cpp
+++ b/src/lms/main.cpp
@@ -29,12 +29,12 @@
 #include "services/auth/IPasswordService.hpp"
 #include "services/auth/IEnvService.hpp"
 #include "services/cover/ICoverService.hpp"
-#include "database/Db.hpp"
-#include "database/Session.hpp"
-#include "services/scanner/IScannerService.hpp"
-#include "subsonic/SubsonicResource.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
+#include "services/scanner/IScannerService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
+#include "subsonic/SubsonicResource.hpp"
 #include "ui/LmsApplication.hpp"
 #include "ui/LmsApplicationManager.hpp"
 #include "utils/http/IClient.hpp"
diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp
index b7585247..b505d8af 100644
--- a/src/lms/ui/Auth.cpp
+++ b/src/lms/ui/Auth.cpp
@@ -30,8 +30,8 @@
 
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
diff --git a/src/lms/ui/Auth.hpp b/src/lms/ui/Auth.hpp
index 5fda238b..87c00228 100644
--- a/src/lms/ui/Auth.hpp
+++ b/src/lms/ui/Auth.hpp
@@ -21,19 +21,20 @@
 
 #include <Wt/WTemplateFormView.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
-namespace UserInterface {
-
-std::optional<Database::UserId>
-processAuthToken(const Wt::WEnvironment& env);
-
-class Auth : public Wt::WTemplateFormView
+namespace UserInterface
 {
-	public:
-		Auth();
 
-		Wt::Signal<Database::UserId> userLoggedIn;
-};
+	std::optional<Database::UserId>
+	processAuthToken(const Wt::WEnvironment& env);
+
+	class Auth : public Wt::WTemplateFormView
+	{
+		public:
+			Auth();
+
+			Wt::Signal<Database::UserId> userLoggedIn;
+	};
 
 } // namespace UserInterface
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index b20489d8..a7132699 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -31,12 +31,12 @@
 #include "services/auth/IEnvService.hpp"
 #include "services/auth/IPasswordService.hpp"
 #include "services/cover/ICoverService.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/LmsApplicationException.hpp b/src/lms/ui/LmsApplicationException.hpp
index 0671a6c4..463bd899 100644
--- a/src/lms/ui/LmsApplicationException.hpp
+++ b/src/lms/ui/LmsApplicationException.hpp
@@ -19,41 +19,38 @@
 
 #pragma once
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/Exception.hpp"
 
-namespace UserInterface {
-
-
-class LmsApplicationException : public LmsException
+namespace UserInterface
 {
-	public:
-		LmsApplicationException(const Wt::WString& error) : LmsException {error.toUTF8()} {}
-};
+	class LmsApplicationException : public LmsException
+	{
+		public:
+			LmsApplicationException(const Wt::WString& error) : LmsException {error.toUTF8()} {}
+	};
 
-class ArtistNotFoundException : public LmsApplicationException
-{
-	public:
-		ArtistNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.artist-not-found")} {}
-};
+	class ArtistNotFoundException : public LmsApplicationException
+	{
+		public:
+			ArtistNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.artist-not-found")} {}
+	};
 
-class ReleaseNotFoundException : public LmsApplicationException
-{
-	public:
-		ReleaseNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.release-not-found")} {}
-};
+	class ReleaseNotFoundException : public LmsApplicationException
+	{
+		public:
+			ReleaseNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.release-not-found")} {}
+	};
 
-class UserNotFoundException : public LmsApplicationException
-{
-	public:
-		UserNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-found")} {}
-};
-
-class UserNotAllowedException : public LmsApplicationException
-{
-	public:
-		UserNotAllowedException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-allowed")} {}
-};
-
-}
+	class UserNotFoundException : public LmsApplicationException
+	{
+		public:
+			UserNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-found")} {}
+	};
 
+	class UserNotAllowedException : public LmsApplicationException
+	{
+		public:
+			UserNotAllowedException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-allowed")} {}
+	};
+} // ns UserInterface
diff --git a/src/lms/ui/LmsApplicationManager.hpp b/src/lms/ui/LmsApplicationManager.hpp
index 1d7761f7..f478ae8d 100644
--- a/src/lms/ui/LmsApplicationManager.hpp
+++ b/src/lms/ui/LmsApplicationManager.hpp
@@ -25,7 +25,7 @@
 
 #include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/LmsTheme.hpp b/src/lms/ui/LmsTheme.hpp
index 10ee14c2..dce55425 100644
--- a/src/lms/ui/LmsTheme.hpp
+++ b/src/lms/ui/LmsTheme.hpp
@@ -24,23 +24,21 @@
 #include <Wt/WBootstrapTheme.h>
 #include <Wt/WLinkedCssStyleSheet.h>
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
-namespace UserInterface {
-
-class LmsTheme : public Wt::WBootstrapTheme
+namespace UserInterface
 {
-	public:
-		LmsTheme(Database::User::UITheme theme);
+	class LmsTheme : public Wt::WBootstrapTheme
+	{
+		public:
+			LmsTheme(Database::User::UITheme theme);
 
-		void setTheme(Database::User::UITheme theme);
+			void setTheme(Database::User::UITheme theme);
 
-	private:
-
-		std::vector<Wt::WLinkedCssStyleSheet> styleSheets() const override;
-		static std::vector<Wt::WLink> getStyleSheets(Database::User::UITheme theme);
-
-		Database::User::UITheme _theme;
-};
+		private:
+			std::vector<Wt::WLinkedCssStyleSheet> styleSheets() const override;
+			static std::vector<Wt::WLink> getStyleSheets(Database::User::UITheme theme);
 
+			Database::User::UITheme _theme;
+	};
 }
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index 4ee65e06..eefd44fc 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -25,13 +25,13 @@
 
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/Types.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/Types.hpp"
+#include "services/database/User.hpp"
 
 #include "resource/CoverResource.hpp"
 #include "resource/AudioTranscodeResource.hpp"
diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp
index d4f1700b..542cc081 100644
--- a/src/lms/ui/MediaPlayer.hpp
+++ b/src/lms/ui/MediaPlayer.hpp
@@ -27,7 +27,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface {
 
diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp
index 550016ee..32ab87e7 100644
--- a/src/lms/ui/PlayQueue.cpp
+++ b/src/lms/ui/PlayQueue.cpp
@@ -22,12 +22,12 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"
diff --git a/src/lms/ui/PlayQueue.hpp b/src/lms/ui/PlayQueue.hpp
index 1bbb996a..89f15ff4 100644
--- a/src/lms/ui/PlayQueue.hpp
+++ b/src/lms/ui/PlayQueue.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Similarity
diff --git a/src/lms/ui/PlayQueueAction.hpp b/src/lms/ui/PlayQueueAction.hpp
index fffd8133..4fa8b426 100644
--- a/src/lms/ui/PlayQueueAction.hpp
+++ b/src/lms/ui/PlayQueueAction.hpp
@@ -22,11 +22,10 @@
 #include <vector>
 #include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {
-
 	enum class PlayQueueAction
 	{
 		Play,
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index c01c7d8e..1bc35013 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -35,7 +35,7 @@
 #include "common/ValueStringModel.hpp"
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/DatabaseSettingsView.cpp b/src/lms/ui/admin/DatabaseSettingsView.cpp
index d73a8241..53cec972 100644
--- a/src/lms/ui/admin/DatabaseSettingsView.cpp
+++ b/src/lms/ui/admin/DatabaseSettingsView.cpp
@@ -26,9 +26,9 @@
 #include <Wt/WString.h>
 #include <Wt/WTemplateFormView.h>
 
-#include "database/Cluster.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/InitWizardView.cpp b/src/lms/ui/admin/InitWizardView.cpp
index ce7ca58d..4e8186b8 100644
--- a/src/lms/ui/admin/InitWizardView.cpp
+++ b/src/lms/ui/admin/InitWizardView.cpp
@@ -25,8 +25,8 @@
 #include <Wt/WPushButton.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp
index 61199f23..12bf9392 100644
--- a/src/lms/ui/admin/ScannerController.cpp
+++ b/src/lms/ui/admin/ScannerController.cpp
@@ -28,8 +28,8 @@
 #include <Wt/WResource.h>
 #include <Wt/WSplitButton.h>
 
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Service.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp
index e974c967..fd456993 100644
--- a/src/lms/ui/admin/UserView.cpp
+++ b/src/lms/ui/admin/UserView.cpp
@@ -28,8 +28,8 @@
 #include <Wt/WFormModel.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/User.hpp"
-#include "database/Session.hpp"
+#include "services/database/User.hpp"
+#include "services/database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/lms/ui/admin/UsersView.cpp b/src/lms/ui/admin/UsersView.cpp
index 98160461..ae0279a9 100644
--- a/src/lms/ui/admin/UsersView.cpp
+++ b/src/lms/ui/admin/UsersView.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WTemplate.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/User.hpp"
-#include "database/Session.hpp"
+#include "services/database/User.hpp"
+#include "services/database/Session.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
@@ -34,7 +34,7 @@
 namespace UserInterface {
 
 UsersView::UsersView()
- : Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"))
+ : Wt::WTemplate {Wt::WString::tr("Lms.Admin.Users.template")}
 {
 	addFunction("tr", &Wt::WTemplate::Functions::tr);
 
@@ -45,7 +45,7 @@ UsersView::UsersView()
 		setCondition("if-can-create-user", true);
 
 		Wt::WPushButton* addBtn = bindNew<Wt::WPushButton>("add-btn", Wt::WString::tr("Lms.Admin.Users.add"));
-		addBtn->clicked().connect([]()
+		addBtn->clicked().connect([]
 		{
 			LmsApp->setInternalPath("/admin/user", true);
 		});
@@ -69,8 +69,7 @@ UsersView::refreshView()
 
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
-	auto users = Database::User::getAll(LmsApp->getDbSession());
-	for (const auto& user : users)
+	for (const auto& user : Database::User::getAll(LmsApp->getDbSession()))
 	{
 		const Database::UserId userId {user->getId()};
 
diff --git a/src/lms/ui/common/LoginNameValidator.cpp b/src/lms/ui/common/LoginNameValidator.cpp
index d1574d3f..5fc121cf 100644
--- a/src/lms/ui/common/LoginNameValidator.cpp
+++ b/src/lms/ui/common/LoginNameValidator.cpp
@@ -20,7 +20,7 @@
 #include "LoginNameValidator.hpp"
 
 #include <Wt/WLengthValidator.h>
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/common/PasswordValidator.hpp b/src/lms/ui/common/PasswordValidator.hpp
index 40a22679..e3b5a708 100644
--- a/src/lms/ui/common/PasswordValidator.hpp
+++ b/src/lms/ui/common/PasswordValidator.hpp
@@ -22,7 +22,7 @@
 #include <functional>
 #include <Wt/WValidator.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "services/auth/Types.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/ArtistCollector.cpp b/src/lms/ui/explore/ArtistCollector.cpp
index 2e2b3522..0d6d3619 100644
--- a/src/lms/ui/explore/ArtistCollector.cpp
+++ b/src/lms/ui/explore/ArtistCollector.cpp
@@ -19,9 +19,9 @@
 
 #include "ArtistCollector.hpp"
 
-#include "database/Artist.hpp"
-#include "database/User.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/User.hpp"
+#include "services/database/TrackList.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ArtistCollector.hpp b/src/lms/ui/explore/ArtistCollector.hpp
index 05734af0..f529b4cc 100644
--- a/src/lms/ui/explore/ArtistCollector.hpp
+++ b/src/lms/ui/explore/ArtistCollector.hpp
@@ -23,8 +23,7 @@
 #include <vector>
 
 #include "DatabaseCollectorBase.hpp"
-
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ArtistListHelpers.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp
index 85adb362..e16de3e2 100644
--- a/src/lms/ui/explore/ArtistListHelpers.cpp
+++ b/src/lms/ui/explore/ArtistListHelpers.cpp
@@ -20,7 +20,7 @@
 
 #include <Wt/WAnchor.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
 #include "LmsApplication.hpp"
 
 namespace UserInterface::ArtistListHelpers
diff --git a/src/lms/ui/explore/ArtistListHelpers.hpp b/src/lms/ui/explore/ArtistListHelpers.hpp
index 02659bf7..412ad51f 100644
--- a/src/lms/ui/explore/ArtistListHelpers.hpp
+++ b/src/lms/ui/explore/ArtistListHelpers.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index f44d7ee2..f66337ba 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -25,13 +25,13 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index 18b3894c..3d292760 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp
index 3d71b94c..b804f453 100644
--- a/src/lms/ui/explore/ArtistsView.cpp
+++ b/src/lms/ui/explore/ArtistsView.cpp
@@ -21,8 +21,8 @@
 
 #include <Wt/WMenu.h>
 
-#include "database/Session.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/TrackArtistLink.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/lms/ui/explore/ArtistsView.hpp b/src/lms/ui/explore/ArtistsView.hpp
index f7e61e22..350f683d 100644
--- a/src/lms/ui/explore/ArtistsView.hpp
+++ b/src/lms/ui/explore/ArtistsView.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WComboBox.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ArtistCollector.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/DatabaseCollectorBase.hpp b/src/lms/ui/explore/DatabaseCollectorBase.hpp
index 224f7657..db38fe5b 100644
--- a/src/lms/ui/explore/DatabaseCollectorBase.hpp
+++ b/src/lms/ui/explore/DatabaseCollectorBase.hpp
@@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp
index 8c821fdb..b0ab61a7 100644
--- a/src/lms/ui/explore/Explore.cpp
+++ b/src/lms/ui/explore/Explore.cpp
@@ -23,10 +23,10 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/explore/Explore.hpp b/src/lms/ui/explore/Explore.hpp
index 66815002..9e4c3bb0 100644
--- a/src/lms/ui/explore/Explore.hpp
+++ b/src/lms/ui/explore/Explore.hpp
@@ -21,32 +21,30 @@
 
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
-namespace UserInterface {
-
-class Filters;
-class SearchView;
-
-class Explore : public Wt::WTemplate
+namespace UserInterface
 {
-	public:
-		Explore(Filters* filters);
+	class Filters;
+	class SearchView;
 
-		void search(const Wt::WString& searchText);
+	class Explore : public Wt::WTemplate
+	{
+		public:
+			Explore(Filters* filters);
 
-		PlayQueueActionTrackSignal tracksAction;
+			void search(const Wt::WString& searchText);
 
-	private:
+			PlayQueueActionTrackSignal tracksAction;
 
-		void handleArtistsAction(PlayQueueAction action, const std::vector<Database::ArtistId>& artistsId);
-		void handleReleasesAction(PlayQueueAction action, const std::vector<Database::ReleaseId>& releasesId);
-		void handleTracksAction(PlayQueueAction action, const std::vector<Database::TrackId>& tracksId);
-
-		Filters* _filters {};
-		SearchView* _search {};
-};
+		private:
+			void handleArtistsAction(PlayQueueAction action, const std::vector<Database::ArtistId>& artistsId);
+			void handleReleasesAction(PlayQueueAction action, const std::vector<Database::ReleaseId>& releasesId);
+			void handleTracksAction(PlayQueueAction action, const std::vector<Database::TrackId>& tracksId);
 
+			Filters* _filters {};
+			SearchView* _search {};
+	};
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp
index f8ef1c74..728c16bf 100644
--- a/src/lms/ui/explore/Filters.cpp
+++ b/src/lms/ui/explore/Filters.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Cluster.hpp"
-#include "database/Session.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Session.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/explore/Filters.hpp b/src/lms/ui/explore/Filters.hpp
index 079d52c2..585d1472 100644
--- a/src/lms/ui/explore/Filters.hpp
+++ b/src/lms/ui/explore/Filters.hpp
@@ -24,31 +24,27 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 #include "Filters.hpp"
 
-namespace UserInterface {
-
-class Filters : public Wt::WTemplate
+namespace UserInterface
 {
-	public:
-		Filters();
+	class Filters : public Wt::WTemplate
+	{
+		public:
+			Filters();
 
-		void add(Database::ClusterId clusterId);
+			void add(Database::ClusterId clusterId);
+			const std::vector<Database::ClusterId>& getClusterIds() const { return _clusterIds; }
+			Wt::Signal<>& updated() { return _sigUpdated; }
 
-		const std::vector<Database::ClusterId>& getClusterIds() const { return _clusterIds; }
-
-		Wt::Signal<>& updated() { return _sigUpdated; }
-
-	private:
-
-		void showDialog();
-
-		Wt::WContainerWidget *_filters;
-		Wt::Signal<> _sigUpdated;
-		std::vector<Database::ClusterId> _clusterIds;
-};
+		private:
+			void showDialog();
 
+			Wt::WContainerWidget *_filters;
+			Wt::Signal<> _sigUpdated;
+			std::vector<Database::ClusterId> _clusterIds;
+	};
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ReleaseCollector.cpp b/src/lms/ui/explore/ReleaseCollector.cpp
index 0bfd0713..e0d0efb5 100644
--- a/src/lms/ui/explore/ReleaseCollector.cpp
+++ b/src/lms/ui/explore/ReleaseCollector.cpp
@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
+#include "services/database/TrackList.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp
index 71c5daa5..e2c40f65 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.cpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.cpp
@@ -23,8 +23,8 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
 #include "resource/CoverResource.hpp"
 
 #include "LmsApplication.hpp"
@@ -33,7 +33,6 @@ using namespace Database;
 
 namespace UserInterface::ReleaseListHelpers
 {
-
 	static
 	std::unique_ptr<Wt::WTemplate>
 	createEntryInternal(const Release::pointer& release, const std::string& templateKey, const Artist::pointer& artist, const bool showYear)
@@ -104,6 +103,5 @@ namespace UserInterface::ReleaseListHelpers
 	{
 		return createEntry(release, artist, true);
 	}
-
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ReleaseListHelpers.hpp b/src/lms/ui/explore/ReleaseListHelpers.hpp
index 3aad6698..fd3b051a 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.hpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <Wt/WTemplate.h>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ReleasePopup.cpp b/src/lms/ui/explore/ReleasePopup.cpp
index 7224683f..6d924c43 100644
--- a/src/lms/ui/explore/ReleasePopup.cpp
+++ b/src/lms/ui/explore/ReleasePopup.cpp
@@ -21,15 +21,14 @@
 
 #include <Wt/WPopupMenu.h>
 
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.hpp"
 #include "resource/DownloadResource.hpp"
 #include "LmsApplication.hpp"
 
 namespace UserInterface
 {
-
 	void
 	displayReleasePopupMenu(Wt::WInteractWidget& target,
 			Database::ReleaseId releaseId,
@@ -75,6 +74,4 @@ namespace UserInterface
 
 			popup->popup(&target);
 	}
-
 } // namespace UserInterface
-
diff --git a/src/lms/ui/explore/ReleasePopup.hpp b/src/lms/ui/explore/ReleasePopup.hpp
index 5ffb4f48..7bf35ad8 100644
--- a/src/lms/ui/explore/ReleasePopup.hpp
+++ b/src/lms/ui/explore/ReleasePopup.hpp
@@ -20,9 +20,8 @@
 #pragma once
 
 #include <Wt/WWidget.h>
-#include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index facbea1e..199810dc 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -25,11 +25,11 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp
index d3700eaa..855bc044 100644
--- a/src/lms/ui/explore/ReleaseView.hpp
+++ b/src/lms/ui/explore/ReleaseView.hpp
@@ -22,7 +22,7 @@
 #include <unordered_set>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
@@ -32,7 +32,6 @@ namespace Database
 
 namespace UserInterface
 {
-
 	class Filters;
 	class Release : public Wt::WTemplate
 	{
@@ -51,6 +50,5 @@ namespace UserInterface
 
 			Filters* _filters {};
 	};
-
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp
index 93c56428..8e47fe4e 100644
--- a/src/lms/ui/explore/ReleasesView.cpp
+++ b/src/lms/ui/explore/ReleasesView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "ReleaseListHelpers.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ReleasesView.hpp b/src/lms/ui/explore/ReleasesView.hpp
index f2a9b91b..9661678f 100644
--- a/src/lms/ui/explore/ReleasesView.hpp
+++ b/src/lms/ui/explore/ReleasesView.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WContainerWidget.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 #include "ReleaseCollector.hpp"
 
@@ -41,7 +41,6 @@ namespace UserInterface
 			PlayQueueActionReleaseSignal releasesAction;
 
 		private:
-
 			void refreshView();
 			void refreshView(ReleaseCollector::Mode mode);
 
diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp
index 90a950e8..b82ff3a0 100644
--- a/src/lms/ui/explore/SearchView.cpp
+++ b/src/lms/ui/explore/SearchView.cpp
@@ -25,10 +25,10 @@
 #include <Wt/WImage.h>
 #include <Wt/WStackedWidget.h>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 
 #include "common/InfiniteScrollingContainer.hpp"
 #include "common/LoadingIndicator.hpp"
@@ -40,7 +40,6 @@
 
 namespace UserInterface
 {
-
 	SearchView::SearchView(Filters* filters)
 	: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Search.template")}
 	, _filters {filters}
@@ -186,8 +185,5 @@ namespace UserInterface
 
 		getItemMenu(Mode::Track).setDisabled(results.getCount() == 0);
 	}
-
-
-
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/TrackCollector.cpp b/src/lms/ui/explore/TrackCollector.cpp
index d3e8b3db..13be14fc 100644
--- a/src/lms/ui/explore/TrackCollector.cpp
+++ b/src/lms/ui/explore/TrackCollector.cpp
@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/User.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index ba36cb9d..69055806 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -24,9 +24,9 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Track.hpp"
 #include "resource/DownloadResource.hpp"
 #include "resource/CoverResource.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/explore/TrackListHelpers.hpp b/src/lms/ui/explore/TrackListHelpers.hpp
index 2e3ea306..2ba93246 100644
--- a/src/lms/ui/explore/TrackListHelpers.hpp
+++ b/src/lms/ui/explore/TrackListHelpers.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <Wt/WTemplate.h>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
diff --git a/src/lms/ui/explore/TrackPopup.cpp b/src/lms/ui/explore/TrackPopup.cpp
index 8884347c..d1b1bdea 100644
--- a/src/lms/ui/explore/TrackPopup.cpp
+++ b/src/lms/ui/explore/TrackPopup.cpp
@@ -21,15 +21,14 @@
 
 #include <Wt/WPopupMenu.h>
 
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "resource/DownloadResource.hpp"
 #include "LmsApplication.hpp"
 
 namespace UserInterface
 {
-
 	void
 	displayTrackPopupMenu(Wt::WInteractWidget& target,
 			Database::TrackId trackId,
diff --git a/src/lms/ui/explore/TrackPopup.hpp b/src/lms/ui/explore/TrackPopup.hpp
index 1597d994..9ffe7474 100644
--- a/src/lms/ui/explore/TrackPopup.hpp
+++ b/src/lms/ui/explore/TrackPopup.hpp
@@ -22,7 +22,7 @@
 #include <Wt/WWidget.h>
 #include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp
index daec0fcd..639046de 100644
--- a/src/lms/ui/explore/TracksView.cpp
+++ b/src/lms/ui/explore/TracksView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/Logger.hpp"
 
 #include "common/InfiniteScrollingContainer.hpp"
diff --git a/src/lms/ui/explore/TracksView.hpp b/src/lms/ui/explore/TracksView.hpp
index ac011e01..37e7b4c5 100644
--- a/src/lms/ui/explore/TracksView.hpp
+++ b/src/lms/ui/explore/TracksView.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WContainerWidget.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 #include "TrackCollector.hpp"
 
diff --git a/src/lms/ui/resource/AudioFileResource.cpp b/src/lms/ui/resource/AudioFileResource.cpp
index def318df..42ff45b6 100644
--- a/src/lms/ui/resource/AudioFileResource.cpp
+++ b/src/lms/ui/resource/AudioFileResource.cpp
@@ -23,8 +23,8 @@
 #include <Wt/Http/Response.h>
 
 #include "av/IAudioFile.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/resource/AudioFileResource.hpp b/src/lms/ui/resource/AudioFileResource.hpp
index fda116eb..046f7c55 100644
--- a/src/lms/ui/resource/AudioFileResource.hpp
+++ b/src/lms/ui/resource/AudioFileResource.hpp
@@ -21,29 +21,21 @@
 
 #include <Wt/WResource.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
-
-namespace UserInterface {
-
-class AudioFileResource : public Wt::WResource
+namespace UserInterface
 {
-	public:
-		~AudioFileResource();
+	class AudioFileResource : public Wt::WResource
+	{
+		public:
+			~AudioFileResource();
 
-		std::string getUrl(Database::TrackId trackId) const;
+			std::string getUrl(Database::TrackId trackId) const;
 
-	private:
-
-		static constexpr std::size_t _chunkSize {262144};
-
-		void handleRequest(const Wt::Http::Request& request,
-				Wt::Http::Response& response) override;
-
-};
+		private:
+			static constexpr std::size_t _chunkSize {262144};
 
+			void handleRequest(const Wt::Http::Request& request,
+					Wt::Http::Response& response) override;
+	};
 } // namespace UserInterface
-
-
-
-
diff --git a/src/lms/ui/resource/AudioTranscodeResource.cpp b/src/lms/ui/resource/AudioTranscodeResource.cpp
index 66ecac06..acc04918 100644
--- a/src/lms/ui/resource/AudioTranscodeResource.cpp
+++ b/src/lms/ui/resource/AudioTranscodeResource.cpp
@@ -25,9 +25,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
@@ -41,7 +41,6 @@ namespace StringUtils
 	std::optional<Database::AudioFormat>
 	readAs(std::string_view str)
 	{
-
 		auto encodedFormat {readAs<int>(str)};
 		if (!encodedFormat)
 			return std::nullopt;
diff --git a/src/lms/ui/resource/AudioTranscodeResource.hpp b/src/lms/ui/resource/AudioTranscodeResource.hpp
index ef516e91..dbd1d31a 100644
--- a/src/lms/ui/resource/AudioTranscodeResource.hpp
+++ b/src/lms/ui/resource/AudioTranscodeResource.hpp
@@ -22,29 +22,28 @@
 #include <Wt/Dbo/ptr.h>
 #include <Wt/WResource.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {
 	class User;
 }
 
-namespace UserInterface {
-
-class AudioTranscodeResource : public Wt::WResource
+namespace UserInterface
 {
-	public:
-		~AudioTranscodeResource();
+	class AudioTranscodeResource : public Wt::WResource
+	{
+		public:
+			~AudioTranscodeResource();
 
-		// Url depends on the user since settings are used in parameters
-		std::string getUrl(Database::TrackId trackId) const;
+			// Url depends on the user since settings are used in parameters
+			std::string getUrl(Database::TrackId trackId) const;
 
-		void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response);
-
-	private:
-		static constexpr std::size_t	_chunkSize {262144};
-};
+			void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response);
 
+		private:
+			static constexpr std::size_t	_chunkSize {262144};
+	};
 } // namespace UserInterface
 
 
diff --git a/src/lms/ui/resource/CoverResource.cpp b/src/lms/ui/resource/CoverResource.cpp
index 69ef9b19..6b4c5a42 100644
--- a/src/lms/ui/resource/CoverResource.cpp
+++ b/src/lms/ui/resource/CoverResource.cpp
@@ -23,7 +23,7 @@
 #include <Wt/Http/Response.h>
 
 #include "services/cover/ICoverService.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/resource/CoverResource.hpp b/src/lms/ui/resource/CoverResource.hpp
index 1e8cb8ad..7ab2a1fe 100644
--- a/src/lms/ui/resource/CoverResource.hpp
+++ b/src/lms/ui/resource/CoverResource.hpp
@@ -20,11 +20,10 @@
 #pragma once
 
 #include <Wt/WResource.h>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {
-
 	class CoverResource : public Wt::WResource
 	{
 		public:
@@ -45,6 +44,5 @@ namespace UserInterface
 		private:
 			void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
 	};
-
 } // namespace UserInterface
 
diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp
index 998096a5..7dd75d79 100644
--- a/src/lms/ui/resource/DownloadResource.cpp
+++ b/src/lms/ui/resource/DownloadResource.cpp
@@ -26,10 +26,10 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WLocalDateTime.h>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Zipper.hpp"
diff --git a/src/lms/ui/resource/DownloadResource.hpp b/src/lms/ui/resource/DownloadResource.hpp
index 581a55ec..80d02994 100644
--- a/src/lms/ui/resource/DownloadResource.hpp
+++ b/src/lms/ui/resource/DownloadResource.hpp
@@ -22,53 +22,51 @@
 #include <memory>
 #include <Wt/WResource.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/Zipper.hpp"
 
-namespace UserInterface {
-
-class DownloadResource : public Wt::WResource
+namespace UserInterface
 {
-	public:
-		static constexpr std::size_t bufferSize {32768};
+	class DownloadResource : public Wt::WResource
+	{
+		public:
+			static constexpr std::size_t bufferSize {32768};
 
-		~DownloadResource();
+			~DownloadResource();
 
-	private:
+		private:
+			void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
+			virtual std::unique_ptr<Zip::Zipper> createZipper() = 0;
+	};
 
-		void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
-		virtual std::unique_ptr<Zip::Zipper> createZipper() = 0;
-};
+	class DownloadArtistResource : public DownloadResource
+	{
+		public:
+			DownloadArtistResource(Database::ArtistId artistId);
 
-class DownloadArtistResource : public DownloadResource
-{
-	public:
-		DownloadArtistResource(Database::ArtistId artistId);
+		private:
+			std::unique_ptr<Zip::Zipper> createZipper() override;
+			Database::ArtistId _artistId;
+	};
 
-	private:
-		std::unique_ptr<Zip::Zipper> createZipper() override;
-		Database::ArtistId _artistId;
-};
+	class DownloadReleaseResource : public DownloadResource
+	{
+		public:
+			DownloadReleaseResource(Database::ReleaseId releaseId);
 
-class DownloadReleaseResource : public DownloadResource
-{
-	public:
-		DownloadReleaseResource(Database::ReleaseId releaseId);
+		private:
+			std::unique_ptr<Zip::Zipper> createZipper() override;
+			Database::ReleaseId _releaseId;
+	};
 
-	private:
-		std::unique_ptr<Zip::Zipper> createZipper() override;
-		Database::ReleaseId _releaseId;
-};
-
-class DownloadTrackResource : public DownloadResource
-{
-	public:
-		DownloadTrackResource(Database::TrackId trackId);
-
-	private:
-		std::unique_ptr<Zip::Zipper> createZipper() override;
-		Database::TrackId _trackId;
-};
+	class DownloadTrackResource : public DownloadResource
+	{
+		public:
+			DownloadTrackResource(Database::TrackId trackId);
 
+		private:
+			std::unique_ptr<Zip::Zipper> createZipper() override;
+			Database::TrackId _trackId;
+	};
 } // namespace UserInterface
 
diff --git a/src/tools/cover/LmsCover.cpp b/src/tools/cover/LmsCover.cpp
index a533187f..7d72fd09 100644
--- a/src/tools/cover/LmsCover.cpp
+++ b/src/tools/cover/LmsCover.cpp
@@ -24,10 +24,10 @@
 
 #include <boost/program_options.hpp>
 
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "services/cover/ICoverService.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp
index 54118ffc..98666179 100644
--- a/src/tools/recommendation/LmsRecommendation.cpp
+++ b/src/tools/recommendation/LmsRecommendation.cpp
@@ -24,12 +24,12 @@
 
 #include <boost/program_options.hpp>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Service.hpp"