diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt
index e282a328..8efc57ca 100644
--- a/src/libs/database/CMakeLists.txt
+++ b/src/libs/database/CMakeLists.txt
@@ -1,41 +1,41 @@
 add_library(lmsdatabase STATIC
-	impl/Artist.cpp
-	impl/ArtistInfo.cpp
-	impl/Artwork.cpp
-	impl/AuthToken.cpp
-	impl/Cluster.cpp
+	impl/objects/Artist.cpp
+	impl/objects/ArtistInfo.cpp
+	impl/objects/Artwork.cpp
+	impl/objects/AuthToken.cpp
+	impl/objects/Cluster.cpp
+	impl/objects/Directory.cpp
+	impl/objects/Image.cpp
+	impl/objects/Listen.cpp
+	impl/objects/MediaLibrary.cpp
+	impl/objects/PlayListFile.cpp
+	impl/objects/PlayQueue.cpp
+	impl/objects/TrackArtistLink.cpp
+	impl/objects/TrackFeatures.cpp
+	impl/objects/TrackList.cpp
+	impl/objects/RatedArtist.cpp
+	impl/objects/RatedRelease.cpp
+	impl/objects/RatedTrack.cpp
+	impl/objects/Release.cpp
+	impl/objects/ScanSettings.cpp
+	impl/objects/StarredArtist.cpp
+	impl/objects/StarredRelease.cpp
+	impl/objects/StarredTrack.cpp
+	impl/objects/Track.cpp
+	impl/objects/TrackBookmark.cpp
+	impl/objects/TrackEmbeddedImage.cpp
+	impl/objects/TrackEmbeddedImageLink.cpp
+	impl/objects/TrackLyrics.cpp
+	impl/objects/UIState.cpp
+	impl/objects/User.cpp
 	impl/Db.cpp
-	impl/Directory.cpp
 	impl/IdType.cpp
-	impl/Image.cpp
-	impl/Listen.cpp
-	impl/MediaLibrary.cpp
 	impl/Migration.cpp
 	impl/Object.cpp
-	impl/PlayListFile.cpp
-	impl/PlayQueue.cpp
-	impl/TrackArtistLink.cpp
-	impl/TrackFeatures.cpp
-	impl/TrackList.cpp
-	impl/RatedArtist.cpp
-	impl/RatedRelease.cpp
-	impl/RatedTrack.cpp
-	impl/Release.cpp
-	impl/ScanSettings.cpp
 	impl/Session.cpp
-	impl/StarredArtist.cpp
-	impl/StarredRelease.cpp
-	impl/StarredTrack.cpp
 	impl/SqlQuery.cpp
-	impl/Track.cpp
-	impl/TrackBookmark.cpp
-	impl/TrackEmbeddedImage.cpp
-	impl/TrackEmbeddedImageLink.cpp
-	impl/TrackLyrics.cpp
 	impl/Transaction.cpp
 	impl/Types.cpp
-	impl/UIState.cpp
-	impl/User.cpp
 	impl/Utils.cpp
 	)
 
@@ -48,6 +48,7 @@ target_include_directories(lmsdatabase INTERFACE
 	)
 
 target_include_directories(lmsdatabase PRIVATE
+	impl
 	include
 	)
 
diff --git a/src/libs/database/impl/Db.cpp b/src/libs/database/impl/Db.cpp
index 91787a7e..df00596e 100644
--- a/src/libs/database/impl/Db.cpp
+++ b/src/libs/database/impl/Db.cpp
@@ -27,7 +27,7 @@
 #include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 
diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp
index 194d1500..62922926 100644
--- a/src/libs/database/impl/Migration.cpp
+++ b/src/libs/database/impl/Migration.cpp
@@ -24,9 +24,9 @@
 #include "core/Exception.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp
index 64f4e19f..d480c8da 100644
--- a/src/libs/database/impl/Session.cpp
+++ b/src/libs/database/impl/Session.cpp
@@ -21,35 +21,35 @@
 
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Artwork.hpp"
-#include "database/AuthToken.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
-#include "database/Listen.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/PlayQueue.hpp"
-#include "database/RatedArtist.hpp"
-#include "database/RatedRelease.hpp"
-#include "database/RatedTrack.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/UIState.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/AuthToken.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/PlayQueue.hpp"
+#include "database/objects/RatedArtist.hpp"
+#include "database/objects/RatedRelease.hpp"
+#include "database/objects/RatedTrack.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/UIState.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Migration.hpp"
diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp
similarity index 98%
rename from src/libs/database/impl/Artist.cpp
rename to src/libs/database/impl/objects/Artist.cpp
index 04e44676..0ecda221 100644
--- a/src/libs/database/impl/Artist.cpp
+++ b/src/libs/database/impl/objects/Artist.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/Artist.hpp"
+#include "database/objects/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/ArtistInfo.cpp b/src/libs/database/impl/objects/ArtistInfo.cpp
similarity index 97%
rename from src/libs/database/impl/ArtistInfo.cpp
rename to src/libs/database/impl/objects/ArtistInfo.cpp
index a534d307..2edd646f 100644
--- a/src/libs/database/impl/ArtistInfo.cpp
+++ b/src/libs/database/impl/objects/ArtistInfo.cpp
@@ -17,14 +17,14 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ArtistInfo.hpp"
+#include "database/objects/ArtistInfo.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/ArtistInfoId.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfoId.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Artwork.cpp b/src/libs/database/impl/objects/Artwork.cpp
similarity index 97%
rename from src/libs/database/impl/Artwork.cpp
rename to src/libs/database/impl/objects/Artwork.cpp
index 4dd62d4d..444b8070 100644
--- a/src/libs/database/impl/Artwork.cpp
+++ b/src/libs/database/impl/objects/Artwork.cpp
@@ -17,13 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Artwork.hpp"
-
+#include "database/objects/Artwork.hpp"
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Image.hpp"
 #include "database/Session.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/AuthToken.cpp b/src/libs/database/impl/objects/AuthToken.cpp
similarity index 97%
rename from src/libs/database/impl/AuthToken.cpp
rename to src/libs/database/impl/objects/AuthToken.cpp
index 8622975f..63ad027d 100644
--- a/src/libs/database/impl/AuthToken.cpp
+++ b/src/libs/database/impl/objects/AuthToken.cpp
@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/AuthToken.hpp"
+#include "database/objects/AuthToken.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Cluster.cpp b/src/libs/database/impl/objects/Cluster.cpp
similarity index 96%
rename from src/libs/database/impl/Cluster.cpp
rename to src/libs/database/impl/objects/Cluster.cpp
index 589b2f15..7816cb68 100644
--- a/src/libs/database/impl/Cluster.cpp
+++ b/src/libs/database/impl/objects/Cluster.cpp
@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/Directory.cpp b/src/libs/database/impl/objects/Directory.cpp
similarity index 99%
rename from src/libs/database/impl/Directory.cpp
rename to src/libs/database/impl/objects/Directory.cpp
index da595498..9d180fd9 100644
--- a/src/libs/database/impl/Directory.cpp
+++ b/src/libs/database/impl/objects/Directory.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
 #include "database/Types.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Image.cpp b/src/libs/database/impl/objects/Image.cpp
similarity index 97%
rename from src/libs/database/impl/Image.cpp
rename to src/libs/database/impl/objects/Image.cpp
index 4b5bbd5a..2010547d 100644
--- a/src/libs/database/impl/Image.cpp
+++ b/src/libs/database/impl/objects/Image.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Image.hpp"
+#include "database/objects/Image.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp
similarity index 99%
rename from src/libs/database/impl/Listen.cpp
rename to src/libs/database/impl/objects/Listen.cpp
index 73e58490..ffd4294b 100644
--- a/src/libs/database/impl/Listen.cpp
+++ b/src/libs/database/impl/objects/Listen.cpp
@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Listen.hpp"
+#include "database/objects/Listen.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/MediaLibrary.cpp b/src/libs/database/impl/objects/MediaLibrary.cpp
similarity index 96%
rename from src/libs/database/impl/MediaLibrary.cpp
rename to src/libs/database/impl/objects/MediaLibrary.cpp
index cbbadaae..1b6ea7cb 100644
--- a/src/libs/database/impl/MediaLibrary.cpp
+++ b/src/libs/database/impl/objects/MediaLibrary.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/MediaLibrary.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/PlayListFile.cpp b/src/libs/database/impl/objects/PlayListFile.cpp
similarity index 96%
rename from src/libs/database/impl/PlayListFile.cpp
rename to src/libs/database/impl/objects/PlayListFile.cpp
index 1f408f4c..61f388f3 100644
--- a/src/libs/database/impl/PlayListFile.cpp
+++ b/src/libs/database/impl/objects/PlayListFile.cpp
@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/PlayListFile.hpp"
+#include "database/objects/PlayListFile.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/PlayQueue.cpp b/src/libs/database/impl/objects/PlayQueue.cpp
similarity index 90%
rename from src/libs/database/impl/PlayQueue.cpp
rename to src/libs/database/impl/objects/PlayQueue.cpp
index d5941f20..22fa1fd0 100644
--- a/src/libs/database/impl/PlayQueue.cpp
+++ b/src/libs/database/impl/objects/PlayQueue.cpp
@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/PlayQueue.hpp"
+#include "database/objects/PlayQueue.hpp"
 
 #include <Wt/Dbo/SqlTraits.h>
 
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/RatedArtist.cpp b/src/libs/database/impl/objects/RatedArtist.cpp
similarity index 95%
rename from src/libs/database/impl/RatedArtist.cpp
rename to src/libs/database/impl/objects/RatedArtist.cpp
index 3e480f1f..7952b530 100644
--- a/src/libs/database/impl/RatedArtist.cpp
+++ b/src/libs/database/impl/objects/RatedArtist.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedArtist.hpp"
+#include "database/objects/RatedArtist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/RatedRelease.cpp b/src/libs/database/impl/objects/RatedRelease.cpp
similarity index 95%
rename from src/libs/database/impl/RatedRelease.cpp
rename to src/libs/database/impl/objects/RatedRelease.cpp
index b7de0d78..f5562327 100644
--- a/src/libs/database/impl/RatedRelease.cpp
+++ b/src/libs/database/impl/objects/RatedRelease.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedRelease.hpp"
+#include "database/objects/RatedRelease.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/RatedTrack.cpp b/src/libs/database/impl/objects/RatedTrack.cpp
similarity index 95%
rename from src/libs/database/impl/RatedTrack.cpp
rename to src/libs/database/impl/objects/RatedTrack.cpp
index 0c0ec110..146b1d88 100644
--- a/src/libs/database/impl/RatedTrack.cpp
+++ b/src/libs/database/impl/objects/RatedTrack.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedTrack.hpp"
+#include "database/objects/RatedTrack.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Release.cpp b/src/libs/database/impl/objects/Release.cpp
similarity index 99%
rename from src/libs/database/impl/Release.cpp
rename to src/libs/database/impl/objects/Release.cpp
index 9b740d21..bb5d82b8 100644
--- a/src/libs/database/impl/Release.cpp
+++ b/src/libs/database/impl/objects/Release.cpp
@@ -17,19 +17,19 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/PartialDateTime.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/ScanSettings.cpp b/src/libs/database/impl/objects/ScanSettings.cpp
similarity index 98%
rename from src/libs/database/impl/ScanSettings.cpp
rename to src/libs/database/impl/objects/ScanSettings.cpp
index f38ee204..961661b8 100644
--- a/src/libs/database/impl/ScanSettings.cpp
+++ b/src/libs/database/impl/objects/ScanSettings.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ScanSettings.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/String.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/StarredArtist.cpp b/src/libs/database/impl/objects/StarredArtist.cpp
similarity index 95%
rename from src/libs/database/impl/StarredArtist.cpp
rename to src/libs/database/impl/objects/StarredArtist.cpp
index e19071c1..ec68c229 100644
--- a/src/libs/database/impl/StarredArtist.cpp
+++ b/src/libs/database/impl/objects/StarredArtist.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredArtist.hpp"
+#include "database/objects/StarredArtist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/StarredRelease.cpp b/src/libs/database/impl/objects/StarredRelease.cpp
similarity index 95%
rename from src/libs/database/impl/StarredRelease.cpp
rename to src/libs/database/impl/objects/StarredRelease.cpp
index 1b5fded8..8ace864e 100644
--- a/src/libs/database/impl/StarredRelease.cpp
+++ b/src/libs/database/impl/objects/StarredRelease.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredRelease.hpp"
+#include "database/objects/StarredRelease.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/StarredTrack.cpp b/src/libs/database/impl/objects/StarredTrack.cpp
similarity index 96%
rename from src/libs/database/impl/StarredTrack.cpp
rename to src/libs/database/impl/objects/StarredTrack.cpp
index 842b276d..4fc4829e 100644
--- a/src/libs/database/impl/StarredTrack.cpp
+++ b/src/libs/database/impl/objects/StarredTrack.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredTrack.hpp"
+#include "database/objects/StarredTrack.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/Track.cpp b/src/libs/database/impl/objects/Track.cpp
similarity index 97%
rename from src/libs/database/impl/Track.cpp
rename to src/libs/database/impl/objects/Track.cpp
index 394689fe..7dd20df1 100644
--- a/src/libs/database/impl/Track.cpp
+++ b/src/libs/database/impl/objects/Track.cpp
@@ -17,24 +17,24 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/TrackArtistLink.cpp b/src/libs/database/impl/objects/TrackArtistLink.cpp
similarity index 98%
rename from src/libs/database/impl/TrackArtistLink.cpp
rename to src/libs/database/impl/objects/TrackArtistLink.cpp
index ea92ef36..e2d15cac 100644
--- a/src/libs/database/impl/TrackArtistLink.cpp
+++ b/src/libs/database/impl/objects/TrackArtistLink.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/TrackBookmark.cpp b/src/libs/database/impl/objects/TrackBookmark.cpp
similarity index 95%
rename from src/libs/database/impl/TrackBookmark.cpp
rename to src/libs/database/impl/objects/TrackBookmark.cpp
index f0d0bc22..f24b3755 100644
--- a/src/libs/database/impl/TrackBookmark.cpp
+++ b/src/libs/database/impl/objects/TrackBookmark.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackBookmark.hpp"
+#include "database/objects/TrackBookmark.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/TrackEmbeddedImage.cpp b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp
similarity index 98%
rename from src/libs/database/impl/TrackEmbeddedImage.cpp
rename to src/libs/database/impl/objects/TrackEmbeddedImage.cpp
index 55509420..c3d2bb05 100644
--- a/src/libs/database/impl/TrackEmbeddedImage.cpp
+++ b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp
@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/TrackEmbeddedImageLink.cpp b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
similarity index 94%
rename from src/libs/database/impl/TrackEmbeddedImageLink.cpp
rename to src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
index 300d2ed3..9b074777 100644
--- a/src/libs/database/impl/TrackEmbeddedImageLink.cpp
+++ b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/TrackFeatures.cpp b/src/libs/database/impl/objects/TrackFeatures.cpp
similarity index 96%
rename from src/libs/database/impl/TrackFeatures.cpp
rename to src/libs/database/impl/objects/TrackFeatures.cpp
index cfb088ea..c2557560 100644
--- a/src/libs/database/impl/TrackFeatures.cpp
+++ b/src/libs/database/impl/objects/TrackFeatures.cpp
@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackFeatures.hpp"
+#include "database/objects/TrackFeatures.hpp"
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/TrackList.cpp b/src/libs/database/impl/objects/TrackList.cpp
similarity index 98%
rename from src/libs/database/impl/TrackList.cpp
rename to src/libs/database/impl/objects/TrackList.cpp
index 1b32030f..0ef495dc 100644
--- a/src/libs/database/impl/TrackList.cpp
+++ b/src/libs/database/impl/objects/TrackList.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/TrackList.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include <cassert>
 
-#include "database/Cluster.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/TrackLyrics.cpp b/src/libs/database/impl/objects/TrackLyrics.cpp
similarity index 97%
rename from src/libs/database/impl/TrackLyrics.cpp
rename to src/libs/database/impl/objects/TrackLyrics.cpp
index 2f71e8fd..3285e676 100644
--- a/src/libs/database/impl/TrackLyrics.cpp
+++ b/src/libs/database/impl/objects/TrackLyrics.cpp
@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackLyrics.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include <Wt/Dbo/SqlTraits.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/UIState.cpp b/src/libs/database/impl/objects/UIState.cpp
similarity index 96%
rename from src/libs/database/impl/UIState.cpp
rename to src/libs/database/impl/objects/UIState.cpp
index 22a11d75..4d495534 100644
--- a/src/libs/database/impl/UIState.cpp
+++ b/src/libs/database/impl/objects/UIState.cpp
@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/UIState.hpp"
+#include "database/objects/UIState.hpp"
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
diff --git a/src/libs/database/impl/User.cpp b/src/libs/database/impl/objects/User.cpp
similarity index 94%
rename from src/libs/database/impl/User.cpp
rename to src/libs/database/impl/objects/User.cpp
index fcbb6e71..bd1932ec 100644
--- a/src/libs/database/impl/User.cpp
+++ b/src/libs/database/impl/objects/User.cpp
@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include <cassert>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/UIState.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/UIState.hpp"
 
 #include "Utils.hpp"
 #include "traits/EnumSetTraits.hpp"
diff --git a/src/libs/database/include/database/Artist.hpp b/src/libs/database/include/database/objects/Artist.hpp
similarity index 95%
rename from src/libs/database/include/database/Artist.hpp
rename to src/libs/database/include/database/objects/Artist.hpp
index 051b7025..762e6f4a 100644
--- a/src/libs/database/include/database/Artist.hpp
+++ b/src/libs/database/include/database/objects/Artist.hpp
@@ -30,17 +30,17 @@
 
 #include "core/EnumSet.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/ClusterId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ArtistId.hpp b/src/libs/database/include/database/objects/ArtistId.hpp
similarity index 100%
rename from src/libs/database/include/database/ArtistId.hpp
rename to src/libs/database/include/database/objects/ArtistId.hpp
diff --git a/src/libs/database/include/database/ArtistInfo.hpp b/src/libs/database/include/database/objects/ArtistInfo.hpp
similarity index 97%
rename from src/libs/database/include/database/ArtistInfo.hpp
rename to src/libs/database/include/database/objects/ArtistInfo.hpp
index 7f6b95a6..bf371220 100644
--- a/src/libs/database/include/database/ArtistInfo.hpp
+++ b/src/libs/database/include/database/objects/ArtistInfo.hpp
@@ -27,11 +27,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
-#include "database/ArtistInfoId.hpp"
-#include "database/DirectoryId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtistInfoId.hpp"
+#include "database/objects/DirectoryId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ArtistInfoId.hpp b/src/libs/database/include/database/objects/ArtistInfoId.hpp
similarity index 100%
rename from src/libs/database/include/database/ArtistInfoId.hpp
rename to src/libs/database/include/database/objects/ArtistInfoId.hpp
diff --git a/src/libs/database/include/database/Artwork.hpp b/src/libs/database/include/database/objects/Artwork.hpp
similarity index 94%
rename from src/libs/database/include/database/Artwork.hpp
rename to src/libs/database/include/database/objects/Artwork.hpp
index 4873e45b..44e08075 100644
--- a/src/libs/database/include/database/Artwork.hpp
+++ b/src/libs/database/include/database/objects/Artwork.hpp
@@ -24,10 +24,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtworkId.hpp"
-#include "database/ImageId.hpp"
 #include "database/Object.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ImageId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ArtworkId.hpp b/src/libs/database/include/database/objects/ArtworkId.hpp
similarity index 100%
rename from src/libs/database/include/database/ArtworkId.hpp
rename to src/libs/database/include/database/objects/ArtworkId.hpp
diff --git a/src/libs/database/include/database/AuthToken.hpp b/src/libs/database/include/database/objects/AuthToken.hpp
similarity index 97%
rename from src/libs/database/include/database/AuthToken.hpp
rename to src/libs/database/include/database/objects/AuthToken.hpp
index 720716aa..08a067ec 100644
--- a/src/libs/database/include/database/AuthToken.hpp
+++ b/src/libs/database/include/database/objects/AuthToken.hpp
@@ -25,10 +25,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/AuthTokenId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/AuthTokenId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/AuthTokenId.hpp b/src/libs/database/include/database/objects/AuthTokenId.hpp
similarity index 100%
rename from src/libs/database/include/database/AuthTokenId.hpp
rename to src/libs/database/include/database/objects/AuthTokenId.hpp
diff --git a/src/libs/database/include/database/Cluster.hpp b/src/libs/database/include/database/objects/Cluster.hpp
similarity index 98%
rename from src/libs/database/include/database/Cluster.hpp
rename to src/libs/database/include/database/objects/Cluster.hpp
index 471e1c8e..7c7c37cd 100644
--- a/src/libs/database/include/database/Cluster.hpp
+++ b/src/libs/database/include/database/objects/Cluster.hpp
@@ -28,11 +28,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ClusterId.hpp"
 #include "database/Object.hpp"
-#include "database/Release.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ClusterId.hpp b/src/libs/database/include/database/objects/ClusterId.hpp
similarity index 100%
rename from src/libs/database/include/database/ClusterId.hpp
rename to src/libs/database/include/database/objects/ClusterId.hpp
diff --git a/src/libs/database/include/database/CountryId.hpp b/src/libs/database/include/database/objects/CountryId.hpp
similarity index 100%
rename from src/libs/database/include/database/CountryId.hpp
rename to src/libs/database/include/database/objects/CountryId.hpp
diff --git a/src/libs/database/include/database/Directory.hpp b/src/libs/database/include/database/objects/Directory.hpp
similarity index 97%
rename from src/libs/database/include/database/Directory.hpp
rename to src/libs/database/include/database/objects/Directory.hpp
index 45f17743..7a1eda7b 100644
--- a/src/libs/database/include/database/Directory.hpp
+++ b/src/libs/database/include/database/objects/Directory.hpp
@@ -28,12 +28,12 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/DirectoryId.hpp b/src/libs/database/include/database/objects/DirectoryId.hpp
similarity index 100%
rename from src/libs/database/include/database/DirectoryId.hpp
rename to src/libs/database/include/database/objects/DirectoryId.hpp
diff --git a/src/libs/database/include/database/Filters.hpp b/src/libs/database/include/database/objects/Filters.hpp
similarity index 90%
rename from src/libs/database/include/database/Filters.hpp
rename to src/libs/database/include/database/objects/Filters.hpp
index d287021c..1d95a09f 100644
--- a/src/libs/database/include/database/Filters.hpp
+++ b/src/libs/database/include/database/objects/Filters.hpp
@@ -22,10 +22,10 @@
 #include <span>
 #include <vector>
 
-#include "database/ClusterId.hpp"
-#include "database/LabelId.hpp"
-#include "database/MediaLibraryId.hpp"
-#include "database/ReleaseTypeId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/LabelId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseTypeId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/Image.hpp b/src/libs/database/include/database/objects/Image.hpp
similarity index 98%
rename from src/libs/database/include/database/Image.hpp
rename to src/libs/database/include/database/objects/Image.hpp
index a8eeb195..79985fee 100644
--- a/src/libs/database/include/database/Image.hpp
+++ b/src/libs/database/include/database/objects/Image.hpp
@@ -25,10 +25,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/DirectoryId.hpp"
-#include "database/ImageId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/ImageId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ImageId.hpp b/src/libs/database/include/database/objects/ImageId.hpp
similarity index 100%
rename from src/libs/database/include/database/ImageId.hpp
rename to src/libs/database/include/database/objects/ImageId.hpp
diff --git a/src/libs/database/include/database/LabelId.hpp b/src/libs/database/include/database/objects/LabelId.hpp
similarity index 100%
rename from src/libs/database/include/database/LabelId.hpp
rename to src/libs/database/include/database/objects/LabelId.hpp
diff --git a/src/libs/database/include/database/Listen.hpp b/src/libs/database/include/database/objects/Listen.hpp
similarity index 96%
rename from src/libs/database/include/database/Listen.hpp
rename to src/libs/database/include/database/objects/Listen.hpp
index dcbb32c7..a028da5e 100644
--- a/src/libs/database/include/database/Listen.hpp
+++ b/src/libs/database/include/database/objects/Listen.hpp
@@ -24,14 +24,14 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
-#include "database/Filters.hpp"
-#include "database/ListenId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/ListenId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ListenId.hpp b/src/libs/database/include/database/objects/ListenId.hpp
similarity index 100%
rename from src/libs/database/include/database/ListenId.hpp
rename to src/libs/database/include/database/objects/ListenId.hpp
diff --git a/src/libs/database/include/database/MediaLibrary.hpp b/src/libs/database/include/database/objects/MediaLibrary.hpp
similarity index 98%
rename from src/libs/database/include/database/MediaLibrary.hpp
rename to src/libs/database/include/database/objects/MediaLibrary.hpp
index d26b0336..c52881ef 100644
--- a/src/libs/database/include/database/MediaLibrary.hpp
+++ b/src/libs/database/include/database/objects/MediaLibrary.hpp
@@ -26,8 +26,8 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/MediaLibraryId.hpp b/src/libs/database/include/database/objects/MediaLibraryId.hpp
similarity index 100%
rename from src/libs/database/include/database/MediaLibraryId.hpp
rename to src/libs/database/include/database/objects/MediaLibraryId.hpp
diff --git a/src/libs/database/include/database/PlayListFile.hpp b/src/libs/database/include/database/objects/PlayListFile.hpp
similarity index 99%
rename from src/libs/database/include/database/PlayListFile.hpp
rename to src/libs/database/include/database/objects/PlayListFile.hpp
index bc53f7ce..bfcc6811 100644
--- a/src/libs/database/include/database/PlayListFile.hpp
+++ b/src/libs/database/include/database/objects/PlayListFile.hpp
@@ -27,9 +27,9 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/DirectoryId.hpp"
 #include "database/IdRange.hpp"
 #include "database/Object.hpp"
+#include "database/objects/DirectoryId.hpp"
 
 LMS_DECLARE_IDTYPE(PlayListFileId)
 
diff --git a/src/libs/database/include/database/PlayQueue.hpp b/src/libs/database/include/database/objects/PlayQueue.hpp
similarity index 97%
rename from src/libs/database/include/database/PlayQueue.hpp
rename to src/libs/database/include/database/objects/PlayQueue.hpp
index a3dcbaee..68e39d4e 100644
--- a/src/libs/database/include/database/PlayQueue.hpp
+++ b/src/libs/database/include/database/objects/PlayQueue.hpp
@@ -28,9 +28,9 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 LMS_DECLARE_IDTYPE(PlayQueueId)
 
diff --git a/src/libs/database/include/database/RatedArtist.hpp b/src/libs/database/include/database/objects/RatedArtist.hpp
similarity index 95%
rename from src/libs/database/include/database/RatedArtist.hpp
rename to src/libs/database/include/database/objects/RatedArtist.hpp
index 7e846b67..ac21bc6a 100644
--- a/src/libs/database/include/database/RatedArtist.hpp
+++ b/src/libs/database/include/database/objects/RatedArtist.hpp
@@ -22,11 +22,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/RatedArtistId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/RatedArtistId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/RatedArtistId.hpp b/src/libs/database/include/database/objects/RatedArtistId.hpp
similarity index 100%
rename from src/libs/database/include/database/RatedArtistId.hpp
rename to src/libs/database/include/database/objects/RatedArtistId.hpp
diff --git a/src/libs/database/include/database/RatedRelease.hpp b/src/libs/database/include/database/objects/RatedRelease.hpp
similarity index 95%
rename from src/libs/database/include/database/RatedRelease.hpp
rename to src/libs/database/include/database/objects/RatedRelease.hpp
index 54a12e1c..374de014 100644
--- a/src/libs/database/include/database/RatedRelease.hpp
+++ b/src/libs/database/include/database/objects/RatedRelease.hpp
@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/RatedReleaseId.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/RatedReleaseId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/RatedReleaseId.hpp b/src/libs/database/include/database/objects/RatedReleaseId.hpp
similarity index 100%
rename from src/libs/database/include/database/RatedReleaseId.hpp
rename to src/libs/database/include/database/objects/RatedReleaseId.hpp
diff --git a/src/libs/database/include/database/RatedTrack.hpp b/src/libs/database/include/database/objects/RatedTrack.hpp
similarity index 95%
rename from src/libs/database/include/database/RatedTrack.hpp
rename to src/libs/database/include/database/objects/RatedTrack.hpp
index bdc2a6c6..32d49b87 100644
--- a/src/libs/database/include/database/RatedTrack.hpp
+++ b/src/libs/database/include/database/objects/RatedTrack.hpp
@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/RatedTrackId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/RatedTrackId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/RatedTrackId.hpp b/src/libs/database/include/database/objects/RatedTrackId.hpp
similarity index 100%
rename from src/libs/database/include/database/RatedTrackId.hpp
rename to src/libs/database/include/database/objects/RatedTrackId.hpp
diff --git a/src/libs/database/include/database/Release.hpp b/src/libs/database/include/database/objects/Release.hpp
similarity index 97%
rename from src/libs/database/include/database/Release.hpp
rename to src/libs/database/include/database/objects/Release.hpp
index 44a10eae..9895b8c2 100644
--- a/src/libs/database/include/database/Release.hpp
+++ b/src/libs/database/include/database/objects/Release.hpp
@@ -30,19 +30,19 @@
 #include "core/EnumSet.hpp"
 #include "core/PartialDateTime.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/CountryId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/LabelId.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/ReleaseTypeId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/CountryId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/LabelId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/ReleaseTypeId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/ReleaseId.hpp b/src/libs/database/include/database/objects/ReleaseId.hpp
similarity index 100%
rename from src/libs/database/include/database/ReleaseId.hpp
rename to src/libs/database/include/database/objects/ReleaseId.hpp
diff --git a/src/libs/database/include/database/ReleaseTypeId.hpp b/src/libs/database/include/database/objects/ReleaseTypeId.hpp
similarity index 100%
rename from src/libs/database/include/database/ReleaseTypeId.hpp
rename to src/libs/database/include/database/objects/ReleaseTypeId.hpp
diff --git a/src/libs/database/include/database/ScanSettings.hpp b/src/libs/database/include/database/objects/ScanSettings.hpp
similarity index 100%
rename from src/libs/database/include/database/ScanSettings.hpp
rename to src/libs/database/include/database/objects/ScanSettings.hpp
diff --git a/src/libs/database/include/database/StarredArtist.hpp b/src/libs/database/include/database/objects/StarredArtist.hpp
similarity index 95%
rename from src/libs/database/include/database/StarredArtist.hpp
rename to src/libs/database/include/database/objects/StarredArtist.hpp
index 0e05137e..bcc69e79 100644
--- a/src/libs/database/include/database/StarredArtist.hpp
+++ b/src/libs/database/include/database/objects/StarredArtist.hpp
@@ -22,11 +22,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/StarredArtistId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/StarredArtistId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/StarredArtistId.hpp b/src/libs/database/include/database/objects/StarredArtistId.hpp
similarity index 100%
rename from src/libs/database/include/database/StarredArtistId.hpp
rename to src/libs/database/include/database/objects/StarredArtistId.hpp
diff --git a/src/libs/database/include/database/StarredRelease.hpp b/src/libs/database/include/database/objects/StarredRelease.hpp
similarity index 95%
rename from src/libs/database/include/database/StarredRelease.hpp
rename to src/libs/database/include/database/objects/StarredRelease.hpp
index 7894f990..4fc66cdf 100644
--- a/src/libs/database/include/database/StarredRelease.hpp
+++ b/src/libs/database/include/database/objects/StarredRelease.hpp
@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/StarredReleaseId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/StarredReleaseId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/StarredReleaseId.hpp b/src/libs/database/include/database/objects/StarredReleaseId.hpp
similarity index 100%
rename from src/libs/database/include/database/StarredReleaseId.hpp
rename to src/libs/database/include/database/objects/StarredReleaseId.hpp
diff --git a/src/libs/database/include/database/StarredTrack.hpp b/src/libs/database/include/database/objects/StarredTrack.hpp
similarity index 96%
rename from src/libs/database/include/database/StarredTrack.hpp
rename to src/libs/database/include/database/objects/StarredTrack.hpp
index 05d3490d..bcd127ee 100644
--- a/src/libs/database/include/database/StarredTrack.hpp
+++ b/src/libs/database/include/database/objects/StarredTrack.hpp
@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/StarredTrackId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/StarredTrackId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/StarredTrackId.hpp b/src/libs/database/include/database/objects/StarredTrackId.hpp
similarity index 100%
rename from src/libs/database/include/database/StarredTrackId.hpp
rename to src/libs/database/include/database/objects/StarredTrackId.hpp
diff --git a/src/libs/database/include/database/Track.hpp b/src/libs/database/include/database/objects/Track.hpp
similarity index 97%
rename from src/libs/database/include/database/Track.hpp
rename to src/libs/database/include/database/objects/Track.hpp
index c6b62524..1d9e1013 100644
--- a/src/libs/database/include/database/Track.hpp
+++ b/src/libs/database/include/database/objects/Track.hpp
@@ -34,20 +34,20 @@
 #include "core/EnumSet.hpp"
 #include "core/PartialDateTime.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/ClusterId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/TrackArtistLink.hpp b/src/libs/database/include/database/objects/TrackArtistLink.hpp
similarity index 97%
rename from src/libs/database/include/database/TrackArtistLink.hpp
rename to src/libs/database/include/database/objects/TrackArtistLink.hpp
index 47547f3b..6ad1801e 100644
--- a/src/libs/database/include/database/TrackArtistLink.hpp
+++ b/src/libs/database/include/database/objects/TrackArtistLink.hpp
@@ -26,12 +26,12 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackArtistLinkId)
 
diff --git a/src/libs/database/include/database/TrackBookmark.hpp b/src/libs/database/include/database/objects/TrackBookmark.hpp
similarity index 97%
rename from src/libs/database/include/database/TrackBookmark.hpp
rename to src/libs/database/include/database/objects/TrackBookmark.hpp
index 61a606a2..016f69be 100644
--- a/src/libs/database/include/database/TrackBookmark.hpp
+++ b/src/libs/database/include/database/objects/TrackBookmark.hpp
@@ -26,9 +26,9 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackBookmarkId)
 
diff --git a/src/libs/database/include/database/TrackEmbeddedImage.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
similarity index 95%
rename from src/libs/database/include/database/TrackEmbeddedImage.hpp
rename to src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
index 83261073..c4187ddc 100644
--- a/src/libs/database/include/database/TrackEmbeddedImage.hpp
+++ b/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
@@ -26,13 +26,13 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/TrackEmbeddedImageId.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImageId.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackEmbeddedImageId.hpp
rename to src/libs/database/include/database/objects/TrackEmbeddedImageId.hpp
diff --git a/src/libs/database/include/database/TrackEmbeddedImageLink.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
similarity index 96%
rename from src/libs/database/include/database/TrackEmbeddedImageLink.hpp
rename to src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
index 69335195..fe94213a 100644
--- a/src/libs/database/include/database/TrackEmbeddedImageLink.hpp
+++ b/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
@@ -25,9 +25,9 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "database/Object.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackEmbeddedImageLinkId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackEmbeddedImageLinkId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/TrackEmbeddedImageLinkId.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImageLinkId.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackEmbeddedImageLinkId.hpp
rename to src/libs/database/include/database/objects/TrackEmbeddedImageLinkId.hpp
diff --git a/src/libs/database/include/database/TrackFeatures.hpp b/src/libs/database/include/database/objects/TrackFeatures.hpp
similarity index 98%
rename from src/libs/database/include/database/TrackFeatures.hpp
rename to src/libs/database/include/database/objects/TrackFeatures.hpp
index 4ff8e1e9..6530a214 100644
--- a/src/libs/database/include/database/TrackFeatures.hpp
+++ b/src/libs/database/include/database/objects/TrackFeatures.hpp
@@ -29,8 +29,8 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackFeaturesId)
 
diff --git a/src/libs/database/include/database/TrackId.hpp b/src/libs/database/include/database/objects/TrackId.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackId.hpp
rename to src/libs/database/include/database/objects/TrackId.hpp
diff --git a/src/libs/database/include/database/TrackList.hpp b/src/libs/database/include/database/objects/TrackList.hpp
similarity index 98%
rename from src/libs/database/include/database/TrackList.hpp
rename to src/libs/database/include/database/objects/TrackList.hpp
index 57c10b7c..27fe17fe 100644
--- a/src/libs/database/include/database/TrackList.hpp
+++ b/src/libs/database/include/database/objects/TrackList.hpp
@@ -27,12 +27,12 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Filters.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/TrackListId.hpp b/src/libs/database/include/database/objects/TrackListId.hpp
similarity index 100%
rename from src/libs/database/include/database/TrackListId.hpp
rename to src/libs/database/include/database/objects/TrackListId.hpp
diff --git a/src/libs/database/include/database/TrackLyrics.hpp b/src/libs/database/include/database/objects/TrackLyrics.hpp
similarity index 99%
rename from src/libs/database/include/database/TrackLyrics.hpp
rename to src/libs/database/include/database/objects/TrackLyrics.hpp
index d89c46d8..e8d7bbee 100644
--- a/src/libs/database/include/database/TrackLyrics.hpp
+++ b/src/libs/database/include/database/objects/TrackLyrics.hpp
@@ -29,8 +29,8 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackLyricsId)
 
diff --git a/src/libs/database/include/database/UIState.hpp b/src/libs/database/include/database/objects/UIState.hpp
similarity index 95%
rename from src/libs/database/include/database/UIState.hpp
rename to src/libs/database/include/database/objects/UIState.hpp
index 06455269..fcd4320f 100644
--- a/src/libs/database/include/database/UIState.hpp
+++ b/src/libs/database/include/database/objects/UIState.hpp
@@ -24,8 +24,8 @@
 #include "core/String.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UIStateId.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UIStateId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/UIStateId.hpp b/src/libs/database/include/database/objects/UIStateId.hpp
similarity index 100%
rename from src/libs/database/include/database/UIStateId.hpp
rename to src/libs/database/include/database/objects/UIStateId.hpp
diff --git a/src/libs/database/include/database/User.hpp b/src/libs/database/include/database/objects/User.hpp
similarity index 99%
rename from src/libs/database/include/database/User.hpp
rename to src/libs/database/include/database/objects/User.hpp
index 4bf2c4fc..78ae5a75 100644
--- a/src/libs/database/include/database/User.hpp
+++ b/src/libs/database/include/database/objects/User.hpp
@@ -29,7 +29,7 @@
 #include "core/UUID.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/database/include/database/UserId.hpp b/src/libs/database/include/database/objects/UserId.hpp
similarity index 100%
rename from src/libs/database/include/database/UserId.hpp
rename to src/libs/database/include/database/objects/UserId.hpp
diff --git a/src/libs/database/test/Artist.cpp b/src/libs/database/test/Artist.cpp
index 5b52344a..69abbfd0 100644
--- a/src/libs/database/test/Artist.cpp
+++ b/src/libs/database/test/Artist.cpp
@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/ArtistInfo.cpp b/src/libs/database/test/ArtistInfo.cpp
index 3146e05f..706195ba 100644
--- a/src/libs/database/test/ArtistInfo.cpp
+++ b/src/libs/database/test/ArtistInfo.cpp
@@ -19,9 +19,9 @@
 
 #include "Common.hpp"
 
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Directory.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Directory.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Artwork.cpp b/src/libs/database/test/Artwork.cpp
index e0a2745e..88c020cd 100644
--- a/src/libs/database/test/Artwork.cpp
+++ b/src/libs/database/test/Artwork.cpp
@@ -17,10 +17,10 @@
 
 #include "Common.hpp"
 
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/AuthToken.cpp b/src/libs/database/test/AuthToken.cpp
index 3cf6fc91..071fd358 100644
--- a/src/libs/database/test/AuthToken.cpp
+++ b/src/libs/database/test/AuthToken.cpp
@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/AuthToken.hpp"
+#include "database/objects/AuthToken.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Common.cpp b/src/libs/database/test/Common.cpp
index 7817b3dc..b9377ff4 100644
--- a/src/libs/database/test/Common.cpp
+++ b/src/libs/database/test/Common.cpp
@@ -19,9 +19,9 @@
 
 #include "Common.hpp"
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Release.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Common.hpp b/src/libs/database/test/Common.hpp
index 1c7d92fc..7a025976 100644
--- a/src/libs/database/test/Common.hpp
+++ b/src/libs/database/test/Common.hpp
@@ -24,21 +24,21 @@
 
 #include <gtest/gtest.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Listen.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Directory.cpp b/src/libs/database/test/Directory.cpp
index 546a0de0..5f365d81 100644
--- a/src/libs/database/test/Directory.cpp
+++ b/src/libs/database/test/Directory.cpp
@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Image.cpp b/src/libs/database/test/Image.cpp
index 1bed6697..a26340ad 100644
--- a/src/libs/database/test/Image.cpp
+++ b/src/libs/database/test/Image.cpp
@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/Listen.cpp b/src/libs/database/test/Listen.cpp
index 1e6d8adc..4a79b015 100644
--- a/src/libs/database/test/Listen.cpp
+++ b/src/libs/database/test/Listen.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Listen.hpp"
+#include "database/objects/Listen.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/Migration.cpp b/src/libs/database/test/Migration.cpp
index 84c78238..828889ab 100644
--- a/src/libs/database/test/Migration.cpp
+++ b/src/libs/database/test/Migration.cpp
@@ -20,26 +20,26 @@
 #include "Common.hpp"
 
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/AuthToken.hpp"
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/PlayQueue.hpp"
-#include "database/RatedArtist.hpp"
-#include "database/RatedRelease.hpp"
-#include "database/RatedTrack.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/UIState.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/AuthToken.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/PlayQueue.hpp"
+#include "database/objects/RatedArtist.hpp"
+#include "database/objects/RatedRelease.hpp"
+#include "database/objects/RatedTrack.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/UIState.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/PlayListFile.cpp b/src/libs/database/test/PlayListFile.cpp
index c508c79d..304c0523 100644
--- a/src/libs/database/test/PlayListFile.cpp
+++ b/src/libs/database/test/PlayListFile.cpp
@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/PlayListFile.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/TrackList.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/RatedArtist.cpp b/src/libs/database/test/RatedArtist.cpp
index 3cb44501..38ddacdc 100644
--- a/src/libs/database/test/RatedArtist.cpp
+++ b/src/libs/database/test/RatedArtist.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedArtist.hpp"
+#include "database/objects/RatedArtist.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/RatedRelease.cpp b/src/libs/database/test/RatedRelease.cpp
index 7a309e92..ee4c66e0 100644
--- a/src/libs/database/test/RatedRelease.cpp
+++ b/src/libs/database/test/RatedRelease.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedRelease.hpp"
+#include "database/objects/RatedRelease.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/RatedTrack.cpp b/src/libs/database/test/RatedTrack.cpp
index d939a6af..13ed38b5 100644
--- a/src/libs/database/test/RatedTrack.cpp
+++ b/src/libs/database/test/RatedTrack.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedTrack.hpp"
+#include "database/objects/RatedTrack.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/Release.cpp b/src/libs/database/test/Release.cpp
index 4d134964..f232c6e7 100644
--- a/src/libs/database/test/Release.cpp
+++ b/src/libs/database/test/Release.cpp
@@ -20,8 +20,8 @@
 #include "Common.hpp"
 
 #include "core/PartialDateTime.hpp"
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/ScanSettings.cpp b/src/libs/database/test/ScanSettings.cpp
index a6b28010..c619e4e6 100644
--- a/src/libs/database/test/ScanSettings.cpp
+++ b/src/libs/database/test/ScanSettings.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ScanSettings.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include <initializer_list>
 
diff --git a/src/libs/database/test/StarredArtist.cpp b/src/libs/database/test/StarredArtist.cpp
index dac89056..f85af565 100644
--- a/src/libs/database/test/StarredArtist.cpp
+++ b/src/libs/database/test/StarredArtist.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredArtist.hpp"
+#include "database/objects/StarredArtist.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/StarredRelease.cpp b/src/libs/database/test/StarredRelease.cpp
index 6fc161a4..d8e66a35 100644
--- a/src/libs/database/test/StarredRelease.cpp
+++ b/src/libs/database/test/StarredRelease.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredRelease.hpp"
+#include "database/objects/StarredRelease.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/StarredTrack.cpp b/src/libs/database/test/StarredTrack.cpp
index 03e560c3..0c0b4632 100644
--- a/src/libs/database/test/StarredTrack.cpp
+++ b/src/libs/database/test/StarredTrack.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredTrack.hpp"
+#include "database/objects/StarredTrack.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/Track.cpp b/src/libs/database/test/Track.cpp
index 5fb48041..9b83cf63 100644
--- a/src/libs/database/test/Track.cpp
+++ b/src/libs/database/test/Track.cpp
@@ -21,8 +21,8 @@
 
 #include <algorithm>
 
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/TrackArtistLink.cpp b/src/libs/database/test/TrackArtistLink.cpp
index 51bcfba3..d8e512a2 100644
--- a/src/libs/database/test/TrackArtistLink.cpp
+++ b/src/libs/database/test/TrackArtistLink.cpp
@@ -20,7 +20,7 @@
 #include "Common.hpp"
 #include "database/Types.hpp"
 
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/TrackBookmark.cpp b/src/libs/database/test/TrackBookmark.cpp
index 2b30eb07..5e4d8208 100644
--- a/src/libs/database/test/TrackBookmark.cpp
+++ b/src/libs/database/test/TrackBookmark.cpp
@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/TrackBookmark.hpp"
+#include "database/objects/TrackBookmark.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/TrackEmbeddedImage.cpp b/src/libs/database/test/TrackEmbeddedImage.cpp
index 0e1855c3..5b8123e9 100644
--- a/src/libs/database/test/TrackEmbeddedImage.cpp
+++ b/src/libs/database/test/TrackEmbeddedImage.cpp
@@ -19,10 +19,10 @@
 
 #include <limits>
 
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackList.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "Common.hpp"
 
diff --git a/src/libs/database/test/TrackFeatures.cpp b/src/libs/database/test/TrackFeatures.cpp
index cb799684..edf56025 100644
--- a/src/libs/database/test/TrackFeatures.cpp
+++ b/src/libs/database/test/TrackFeatures.cpp
@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/TrackFeatures.hpp"
+#include "database/objects/TrackFeatures.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/database/test/TrackLyrics.cpp b/src/libs/database/test/TrackLyrics.cpp
index 79e91824..3ab59f3d 100644
--- a/src/libs/database/test/TrackLyrics.cpp
+++ b/src/libs/database/test/TrackLyrics.cpp
@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/Track.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 namespace lms::db::tests
 {
diff --git a/src/libs/services/artwork/impl/ArtworkService.cpp b/src/libs/services/artwork/impl/ArtworkService.cpp
index 23b697db..0480b756 100644
--- a/src/libs/services/artwork/impl/ArtworkService.cpp
+++ b/src/libs/services/artwork/impl/ArtworkService.cpp
@@ -22,17 +22,17 @@
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
 #include "core/Utils.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/ImageId.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/ImageId.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackList.hpp"
 #include "image/Exception.hpp"
 #include "image/IEncodedImage.hpp"
 #include "image/Image.hpp"
diff --git a/src/libs/services/artwork/impl/ArtworkService.hpp b/src/libs/services/artwork/impl/ArtworkService.hpp
index f08b8a6d..6eb0a691 100644
--- a/src/libs/services/artwork/impl/ArtworkService.hpp
+++ b/src/libs/services/artwork/impl/ArtworkService.hpp
@@ -22,8 +22,8 @@
 #include <filesystem>
 #include <vector>
 
-#include "database/ImageId.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
+#include "database/objects/ImageId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
 #include "services/artwork/IArtworkService.hpp"
 
 #include "ImageCache.hpp"
diff --git a/src/libs/services/artwork/impl/ImageCache.hpp b/src/libs/services/artwork/impl/ImageCache.hpp
index 995e67f7..e4921362 100644
--- a/src/libs/services/artwork/impl/ImageCache.hpp
+++ b/src/libs/services/artwork/impl/ImageCache.hpp
@@ -26,7 +26,7 @@
 #include <shared_mutex>
 #include <unordered_map>
 
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace lms::artwork
diff --git a/src/libs/services/artwork/include/services/artwork/IArtworkService.hpp b/src/libs/services/artwork/include/services/artwork/IArtworkService.hpp
index 7577f640..d8fcc71f 100644
--- a/src/libs/services/artwork/include/services/artwork/IArtworkService.hpp
+++ b/src/libs/services/artwork/include/services/artwork/IArtworkService.hpp
@@ -23,8 +23,8 @@
 #include <memory>
 #include <optional>
 
-#include "database/ArtworkId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/auth/impl/AuthServiceBase.cpp b/src/libs/services/auth/impl/AuthServiceBase.cpp
index 9164716a..cb3b9e5b 100644
--- a/src/libs/services/auth/impl/AuthServiceBase.cpp
+++ b/src/libs/services/auth/impl/AuthServiceBase.cpp
@@ -22,7 +22,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::auth
 {
diff --git a/src/libs/services/auth/impl/AuthServiceBase.hpp b/src/libs/services/auth/impl/AuthServiceBase.hpp
index 4b9956b1..c25aa28d 100644
--- a/src/libs/services/auth/impl/AuthServiceBase.hpp
+++ b/src/libs/services/auth/impl/AuthServiceBase.hpp
@@ -21,7 +21,7 @@
 
 #include <string_view>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/services/auth/impl/AuthTokenService.cpp b/src/libs/services/auth/impl/AuthTokenService.cpp
index 2e1fca8f..5fef93db 100644
--- a/src/libs/services/auth/impl/AuthTokenService.cpp
+++ b/src/libs/services/auth/impl/AuthTokenService.cpp
@@ -23,9 +23,9 @@
 #include <Wt/WRandom.h>
 
 #include "core/ILogger.hpp"
-#include "database/AuthToken.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/AuthToken.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/Types.hpp"
 
 namespace lms::auth
diff --git a/src/libs/services/auth/impl/internal/InternalPasswordService.cpp b/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
index 2b3e5bc0..8764b875 100644
--- a/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
+++ b/src/libs/services/auth/impl/internal/InternalPasswordService.cpp
@@ -24,7 +24,7 @@
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/Types.hpp"
 
 namespace lms::auth
diff --git a/src/libs/services/auth/impl/internal/InternalPasswordService.hpp b/src/libs/services/auth/impl/internal/InternalPasswordService.hpp
index 1c05e3d8..92fbfc53 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 "database/objects/User.hpp"
 
 #include "PasswordServiceBase.hpp"
 #include "services/auth/IPasswordService.hpp"
diff --git a/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp b/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
index 22739642..300d4b32 100644
--- a/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
+++ b/src/libs/services/auth/include/services/auth/IAuthTokenService.hpp
@@ -28,7 +28,7 @@
 #include <boost/asio/ip/address.hpp>
 
 #include "core/LiteralString.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/services/auth/include/services/auth/IEnvService.hpp b/src/libs/services/auth/include/services/auth/IEnvService.hpp
index 502d9f19..4a743bf4 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 <memory>
 #include <string_view>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/services/auth/include/services/auth/IPasswordService.hpp b/src/libs/services/auth/include/services/auth/IPasswordService.hpp
index 1986883b..83260ca5 100644
--- a/src/libs/services/auth/include/services/auth/IPasswordService.hpp
+++ b/src/libs/services/auth/include/services/auth/IPasswordService.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WDateTime.h>
 #include <boost/asio/ip/address.hpp>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 #include "services/auth/Types.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/feedback/impl/FeedbackService.cpp b/src/libs/services/feedback/impl/FeedbackService.cpp
index 69e80df9..c7e53313 100644
--- a/src/libs/services/feedback/impl/FeedbackService.cpp
+++ b/src/libs/services/feedback/impl/FeedbackService.cpp
@@ -21,18 +21,18 @@
 #include "FeedbackService.impl.hpp"
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
 #include "database/IDb.hpp"
-#include "database/RatedArtist.hpp"
-#include "database/RatedRelease.hpp"
-#include "database/RatedTrack.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/RatedArtist.hpp"
+#include "database/objects/RatedRelease.hpp"
+#include "database/objects/RatedTrack.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "internal/InternalBackend.hpp"
 #include "listenbrainz/ListenBrainzBackend.hpp"
diff --git a/src/libs/services/feedback/impl/FeedbackService.impl.hpp b/src/libs/services/feedback/impl/FeedbackService.impl.hpp
index 2db429ce..6f549648 100644
--- a/src/libs/services/feedback/impl/FeedbackService.impl.hpp
+++ b/src/libs/services/feedback/impl/FeedbackService.impl.hpp
@@ -21,7 +21,7 @@
 
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::feedback
 {
diff --git a/src/libs/services/feedback/impl/IFeedbackBackend.hpp b/src/libs/services/feedback/impl/IFeedbackBackend.hpp
index cb377f1a..dea1b433 100644
--- a/src/libs/services/feedback/impl/IFeedbackBackend.hpp
+++ b/src/libs/services/feedback/impl/IFeedbackBackend.hpp
@@ -21,9 +21,9 @@
 
 #include <memory>
 
-#include "database/StarredArtistId.hpp"
-#include "database/StarredReleaseId.hpp"
-#include "database/StarredTrackId.hpp"
+#include "database/objects/StarredArtistId.hpp"
+#include "database/objects/StarredReleaseId.hpp"
+#include "database/objects/StarredTrackId.hpp"
 
 namespace lms::feedback
 {
diff --git a/src/libs/services/feedback/impl/internal/InternalBackend.cpp b/src/libs/services/feedback/impl/internal/InternalBackend.cpp
index 847e24ac..0c90b540 100644
--- a/src/libs/services/feedback/impl/internal/InternalBackend.cpp
+++ b/src/libs/services/feedback/impl/internal/InternalBackend.cpp
@@ -21,9 +21,9 @@
 
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
 
 namespace lms::feedback
 {
diff --git a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
index 40123058..7b69456d 100644
--- a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
+++ b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
@@ -31,9 +31,9 @@
 #include "core/http/IClient.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Exception.hpp"
 #include "FeedbacksParser.hpp"
diff --git a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.hpp b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.hpp
index ae9153ea..a1a39078 100644
--- a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.hpp
+++ b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.hpp
@@ -26,8 +26,8 @@
 #include <boost/asio/io_context_strand.hpp>
 #include <boost/asio/steady_timer.hpp>
 
-#include "database/StarredTrackId.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/StarredTrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 #include "FeedbackTypes.hpp"
 
diff --git a/src/libs/services/feedback/impl/listenbrainz/ListenBrainzBackend.cpp b/src/libs/services/feedback/impl/listenbrainz/ListenBrainzBackend.cpp
index f3a45527..59a7fc71 100644
--- a/src/libs/services/feedback/impl/listenbrainz/ListenBrainzBackend.cpp
+++ b/src/libs/services/feedback/impl/listenbrainz/ListenBrainzBackend.cpp
@@ -24,9 +24,9 @@
 #include "core/http/IClient.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/Track.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 
diff --git a/src/libs/services/feedback/impl/listenbrainz/Utils.cpp b/src/libs/services/feedback/impl/listenbrainz/Utils.cpp
index e240c8c6..6f9932d4 100644
--- a/src/libs/services/feedback/impl/listenbrainz/Utils.cpp
+++ b/src/libs/services/feedback/impl/listenbrainz/Utils.cpp
@@ -23,7 +23,7 @@
 #include <Wt/Json/Parser.h>
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::feedback::listenBrainz::utils
 {
diff --git a/src/libs/services/feedback/impl/listenbrainz/Utils.hpp b/src/libs/services/feedback/impl/listenbrainz/Utils.hpp
index a55641ee..d2790cef 100644
--- a/src/libs/services/feedback/impl/listenbrainz/Utils.hpp
+++ b/src/libs/services/feedback/impl/listenbrainz/Utils.hpp
@@ -21,7 +21,7 @@
 
 #include "core/ILogger.hpp"
 #include "core/UUID.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 #define LOG(sev, message) LMS_LOG(FEEDBACK, sev, "[listenbrainz] " << message)
 
diff --git a/src/libs/services/feedback/include/services/feedback/IFeedbackService.hpp b/src/libs/services/feedback/include/services/feedback/IFeedbackService.hpp
index 10fa960b..e1353b4a 100644
--- a/src/libs/services/feedback/include/services/feedback/IFeedbackService.hpp
+++ b/src/libs/services/feedback/include/services/feedback/IFeedbackService.hpp
@@ -25,12 +25,12 @@
 #include <Wt/WDateTime.h>
 #include <boost/asio/io_context.hpp>
 
-#include "database/ArtistId.hpp"
-#include "database/Filters.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/services/recommendation/impl/IEngine.hpp b/src/libs/services/recommendation/impl/IEngine.hpp
index d4229a8f..a072fba4 100644
--- a/src/libs/services/recommendation/impl/IEngine.hpp
+++ b/src/libs/services/recommendation/impl/IEngine.hpp
@@ -22,8 +22,8 @@
 #include <memory>
 
 #include "core/EnumSet.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/recommendation/impl/PlaylistGeneratorService.cpp b/src/libs/services/recommendation/impl/PlaylistGeneratorService.cpp
index 1315bbd6..05a0f892 100644
--- a/src/libs/services/recommendation/impl/PlaylistGeneratorService.cpp
+++ b/src/libs/services/recommendation/impl/PlaylistGeneratorService.cpp
@@ -24,7 +24,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 
 #include "playlist-constraints/ConsecutiveArtists.hpp"
diff --git a/src/libs/services/recommendation/impl/RecommendationService.cpp b/src/libs/services/recommendation/impl/RecommendationService.cpp
index b5498f9f..e51ba11b 100644
--- a/src/libs/services/recommendation/impl/RecommendationService.cpp
+++ b/src/libs/services/recommendation/impl/RecommendationService.cpp
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "database/IDb.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp
index 2a001500..e1100d0f 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/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 
 namespace lms::recommendation
 {
diff --git a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
index 181f6c3f..cb3bf190 100644
--- a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
+++ b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp
@@ -23,14 +23,14 @@
 
 #include "core/ILogger.hpp"
 #include "core/Random.hpp"
-#include "database/Artist.hpp"
 #include "database/IDb.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 "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 
 namespace lms::recommendation
diff --git a/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
index 84ca8697..1b4794ae 100644
--- a/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
+++ b/src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp
@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 #include "som/Network.hpp"
 
 namespace lms::recommendation
diff --git a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.cpp b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.cpp
index 9aaaae0c..f5a27025 100644
--- a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.cpp
+++ b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.cpp
@@ -22,9 +22,9 @@
 #include <algorithm>
 
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::recommendation::PlaylistGeneratorConstraint
 {
diff --git a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.cpp b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.cpp
index 9d8a4760..9b0f2802 100644
--- a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.cpp
+++ b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.cpp
@@ -20,9 +20,9 @@
 #include "ConsecutiveReleases.hpp"
 
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::recommendation::PlaylistGeneratorConstraint
 {
diff --git a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.hpp b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.hpp
index 6055e21d..819d4ac1 100644
--- a/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.hpp
+++ b/src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.hpp
@@ -21,7 +21,7 @@
 
 #include "IConstraint.hpp"
 
-#include "database/ReleaseId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 namespace lms::db
 {
diff --git a/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp b/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp
index 3fd5168b..b36dd023 100644
--- a/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp
+++ b/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include "database/TrackListId.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/recommendation/include/services/recommendation/IRecommendationService.hpp b/src/libs/services/recommendation/include/services/recommendation/IRecommendationService.hpp
index 92849eec..fabb9a0d 100644
--- a/src/libs/services/recommendation/include/services/recommendation/IRecommendationService.hpp
+++ b/src/libs/services/recommendation/include/services/recommendation/IRecommendationService.hpp
@@ -23,10 +23,10 @@
 #include <vector>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/recommendation/include/services/recommendation/Types.hpp b/src/libs/services/recommendation/include/services/recommendation/Types.hpp
index 53a7c9b8..5389640e 100644
--- a/src/libs/services/recommendation/include/services/recommendation/Types.hpp
+++ b/src/libs/services/recommendation/include/services/recommendation/Types.hpp
@@ -2,9 +2,9 @@
 
 #include <functional>
 
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::recommendation
 {
diff --git a/src/libs/services/scanner/impl/MediaLibraryInfo.hpp b/src/libs/services/scanner/impl/MediaLibraryInfo.hpp
index 5b62eb83..116aa748 100644
--- a/src/libs/services/scanner/impl/MediaLibraryInfo.hpp
+++ b/src/libs/services/scanner/impl/MediaLibraryInfo.hpp
@@ -21,7 +21,7 @@
 
 #include <filesystem>
 
-#include "database/MediaLibraryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::scanner
 {
diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp
index cc770bd2..41137b52 100644
--- a/src/libs/services/scanner/impl/ScannerService.cpp
+++ b/src/libs/services/scanner/impl/ScannerService.cpp
@@ -27,9 +27,9 @@
 #include "core/IJobScheduler.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "scanners/ArtistInfoFileScanner.hpp"
 #include "scanners/AudioFileScanner.hpp"
diff --git a/src/libs/services/scanner/impl/ScannerSettings.hpp b/src/libs/services/scanner/impl/ScannerSettings.hpp
index d915404b..0a450b3b 100644
--- a/src/libs/services/scanner/impl/ScannerSettings.hpp
+++ b/src/libs/services/scanner/impl/ScannerSettings.hpp
@@ -25,7 +25,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "database/ScanSettings.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "MediaLibraryInfo.hpp"
 
diff --git a/src/libs/services/scanner/impl/helpers/ArtistHelpers.hpp b/src/libs/services/scanner/impl/helpers/ArtistHelpers.hpp
index 83af1527..1c81320a 100644
--- a/src/libs/services/scanner/impl/helpers/ArtistHelpers.hpp
+++ b/src/libs/services/scanner/impl/helpers/ArtistHelpers.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "core/TaggedType.hpp"
-#include "database/Artist.hpp"
+#include "database/objects/Artist.hpp"
 
 namespace lms::metadata
 {
diff --git a/src/libs/services/scanner/impl/scanners/ArtistInfoFileScanner.cpp b/src/libs/services/scanner/impl/scanners/ArtistInfoFileScanner.cpp
index 7fade649..c6a984be 100644
--- a/src/libs/services/scanner/impl/scanners/ArtistInfoFileScanner.cpp
+++ b/src/libs/services/scanner/impl/scanners/ArtistInfoFileScanner.cpp
@@ -24,11 +24,11 @@
 
 #include "core/ILogger.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "metadata/ArtistInfo.hpp"
 #include "metadata/Types.hpp"
 #include "services/scanner/ScanErrors.hpp"
diff --git a/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp b/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
index 6c3d1221..e67cbc4b 100644
--- a/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
+++ b/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
@@ -24,21 +24,21 @@
 #include "core/PartialDateTime.hpp"
 #include "core/Path.hpp"
 #include "core/XxHash3.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackLyrics.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "image/Exception.hpp"
 #include "image/Image.hpp"
 #include "metadata/Exception.hpp"
diff --git a/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp b/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp
index 5bd20f8a..5b8d7a0c 100644
--- a/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp
+++ b/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp
@@ -22,9 +22,9 @@
 #include "core/IConfig.hpp"
 #include "core/Service.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Track.hpp"
 #include "metadata/IAudioFileParser.hpp"
 
 #include "AudioFileScanOperation.hpp"
diff --git a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp
index 8910f07d..b84e4672 100644
--- a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp
+++ b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp
@@ -22,11 +22,12 @@
 #include <optional>
 
 #include "core/ILogger.hpp"
-#include "database/Artwork.hpp"
+
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "image/Exception.hpp"
 #include "image/Image.hpp"
 #include "services/scanner/ScanErrors.hpp"
diff --git a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp
index d077802b..de85094a 100644
--- a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp
+++ b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp
@@ -26,9 +26,9 @@
 #include "ScannerSettings.hpp"
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "metadata/Lyrics.hpp"
 #include "services/scanner/ScanErrors.hpp"
 
diff --git a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp
index 0be759d6..809ed1fa 100644
--- a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp
+++ b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp
@@ -24,9 +24,9 @@
 
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/PlayListFile.hpp"
 #include "metadata/Exception.hpp"
 #include "metadata/PlayList.hpp"
 
diff --git a/src/libs/services/scanner/impl/scanners/Utils.cpp b/src/libs/services/scanner/impl/scanners/Utils.cpp
index 4469a3a1..fc187ce8 100644
--- a/src/libs/services/scanner/impl/scanners/Utils.cpp
+++ b/src/libs/services/scanner/impl/scanners/Utils.cpp
@@ -22,9 +22,9 @@
 #include <system_error>
 
 #include "core/Path.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 namespace lms::scanner::utils
 {
diff --git a/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp b/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp
index 4513ea96..77d2bbdd 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp
@@ -23,13 +23,13 @@
 #include <ostream>
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackList.hpp"
 #include "metadata/Types.hpp"
 
 #include "ScanContext.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp
index 9e3490d5..08b36aed 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp
@@ -30,16 +30,16 @@
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Artwork.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp
index 03dc6cbe..9fb01f3a 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp
@@ -22,11 +22,11 @@
 #include <deque>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "ScanContext.hpp"
 
diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp
index f8f740b6..098f6bba 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp
@@ -25,13 +25,13 @@
 
 #include "core/IJob.hpp"
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 #include "services/scanner/ScanErrors.hpp"
 
 #include "JobQueue.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp
index 3e15d1ad..17572122 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp
@@ -28,14 +28,14 @@
 #include "core/IJob.hpp"
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
index dd361328..6d4175f0 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
@@ -27,15 +27,15 @@
 #include "core/IJobScheduler.hpp"
 #include "core/ILogger.hpp"
 #include "core/LiteralString.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
 #include "database/IdRange.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp
index b78918f9..3b236cd7 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp
@@ -22,7 +22,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "ScanContext.hpp"
 
diff --git a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
index c91c8b2c..d30dae79 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
@@ -23,13 +23,13 @@
 
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "ScanContext.hpp"
 #include "ScannerSettings.hpp"
diff --git a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp b/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp
index 60cb53b1..7d1dd110 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp
@@ -19,9 +19,9 @@
 
 #include "ScanStepComputeClusterStats.hpp"
 #include "core/ILogger.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Cluster.hpp"
 
 #include "ScanContext.hpp"
 
diff --git a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp
index dba7c06c..abaac7a8 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp
@@ -20,14 +20,14 @@
 #include "ScanStepRemoveOrphanedDbEntries.hpp"
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "ScanContext.hpp"
 
diff --git a/src/libs/services/scanner/impl/steps/ScanStepUpdateLibraryFields.cpp b/src/libs/services/scanner/impl/steps/ScanStepUpdateLibraryFields.cpp
index 14958504..22500381 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepUpdateLibraryFields.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepUpdateLibraryFields.cpp
@@ -19,10 +19,10 @@
 
 #include "ScanStepUpdateLibraryFields.hpp"
 
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "MediaLibraryInfo.hpp"
 #include "ScanContext.hpp"
diff --git a/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp b/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp
index 7d1633df..3ed335a0 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 <memory>
 #include <vector>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 #include "ScanErrors.hpp"
 
diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
index 162cf523..5e97a9a7 100644
--- a/src/libs/services/scrobbling/impl/ScrobblingService.cpp
+++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp
@@ -20,13 +20,13 @@
 #include "ScrobblingService.hpp"
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
 #include "database/IDb.hpp"
-#include "database/Listen.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "internal/InternalBackend.hpp"
 #include "listenbrainz/ListenBrainzBackend.hpp"
diff --git a/src/libs/services/scrobbling/impl/internal/InternalBackend.cpp b/src/libs/services/scrobbling/impl/internal/InternalBackend.cpp
index 70ae072d..2fef72d0 100644
--- a/src/libs/services/scrobbling/impl/internal/InternalBackend.cpp
+++ b/src/libs/services/scrobbling/impl/internal/InternalBackend.cpp
@@ -20,10 +20,10 @@
 #include "InternalBackend.hpp"
 
 #include "database/IDb.hpp"
-#include "database/Listen.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::scrobbling
 {
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp
index 19adf19e..f241f01e 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp
@@ -25,7 +25,7 @@
 #include "core/http/IClient.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
index 2e9a81e3..9d78f95c 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
@@ -30,13 +30,13 @@
 #include "core/IConfig.hpp"
 #include "core/Service.hpp"
 #include "core/http/IClient.hpp"
-#include "database/Artist.hpp"
 #include "database/IDb.hpp"
-#include "database/Listen.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/scrobbling/Exception.hpp"
 
 #include "Utils.hpp"
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
index 2751272f..25523e3b 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
@@ -27,7 +27,7 @@
 #include <boost/asio/steady_timer.hpp>
 
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 #include "services/scrobbling/Listen.hpp"
 
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
index 3c0d47bf..230f9df1 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp
@@ -23,7 +23,7 @@
 #include <Wt/Json/Parser.h>
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::scrobbling::listenBrainz::utils
 {
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
index 0e3801c8..6bd75648 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp
@@ -21,7 +21,7 @@
 
 #include "core/ILogger.hpp"
 #include "core/UUID.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 #define LOG(sev, message) LMS_LOG(SCROBBLING, sev, "[listenbrainz] " << message)
 
diff --git a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
index 35f3e8bc..3d0b2e09 100644
--- a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
+++ b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
@@ -26,11 +26,11 @@
 #include <Wt/WDateTime.h>
 #include <boost/asio/io_context.hpp>
 
-#include "database/ArtistId.hpp"
-#include "database/Filters.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 #include "services/scrobbling/Listen.hpp"
 
 namespace lms::db
diff --git a/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp b/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
index 7491bd04..f586f0f9 100644
--- a/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
+++ b/src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp
@@ -21,8 +21,8 @@
 
 #include <Wt/WDateTime.h>
 
-#include "database/TrackId.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::scrobbling
 {
diff --git a/src/libs/services/transcoding/impl/TranscodingService.cpp b/src/libs/services/transcoding/impl/TranscodingService.cpp
index 56fa18dc..5a14820c 100644
--- a/src/libs/services/transcoding/impl/TranscodingService.cpp
+++ b/src/libs/services/transcoding/impl/TranscodingService.cpp
@@ -23,7 +23,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "TranscodingResourceHandler.hpp"
 
diff --git a/src/libs/services/transcoding/include/services/transcoding/ITranscodingService.hpp b/src/libs/services/transcoding/include/services/transcoding/ITranscodingService.hpp
index e1b478d3..593a47e6 100644
--- a/src/libs/services/transcoding/include/services/transcoding/ITranscodingService.hpp
+++ b/src/libs/services/transcoding/include/services/transcoding/ITranscodingService.hpp
@@ -23,7 +23,7 @@
 #include <memory>
 #include <optional>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms
 {
diff --git a/src/libs/subsonic/impl/CoverArtId.cpp b/src/libs/subsonic/impl/CoverArtId.cpp
index fc91c008..9f184a21 100644
--- a/src/libs/subsonic/impl/CoverArtId.cpp
+++ b/src/libs/subsonic/impl/CoverArtId.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 
 #include "core/String.hpp"
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/CoverArtId.hpp b/src/libs/subsonic/impl/CoverArtId.hpp
index 11a763e6..ec0c3ccb 100644
--- a/src/libs/subsonic/impl/CoverArtId.hpp
+++ b/src/libs/subsonic/impl/CoverArtId.hpp
@@ -22,7 +22,7 @@
 #include <ctime>
 
 #include "core/String.hpp"
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/SubsonicId.hpp b/src/libs/subsonic/impl/SubsonicId.hpp
index f0db1e48..7dac636c 100644
--- a/src/libs/subsonic/impl/SubsonicId.hpp
+++ b/src/libs/subsonic/impl/SubsonicId.hpp
@@ -20,12 +20,12 @@
 #pragma once
 
 #include "core/String.hpp"
-#include "database/ArtistId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/MediaLibraryId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index 67718981..91871541 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -31,7 +31,7 @@
 #include "core/String.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
 
diff --git a/src/libs/subsonic/impl/SubsonicResource.hpp b/src/libs/subsonic/impl/SubsonicResource.hpp
index 4433d1ab..b0d89217 100644
--- a/src/libs/subsonic/impl/SubsonicResource.hpp
+++ b/src/libs/subsonic/impl/SubsonicResource.hpp
@@ -25,7 +25,7 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WResource.h>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 #include "RequestContext.hpp"
 
diff --git a/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp b/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
index 179269b1..2c9871d7 100644
--- a/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
+++ b/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
@@ -22,13 +22,13 @@
 #include <algorithm>
 
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/libs/subsonic/impl/endpoints/Bookmarks.cpp b/src/libs/subsonic/impl/endpoints/Bookmarks.cpp
index fe75e9b1..7587bed7 100644
--- a/src/libs/subsonic/impl/endpoints/Bookmarks.cpp
+++ b/src/libs/subsonic/impl/endpoints/Bookmarks.cpp
@@ -19,11 +19,11 @@
 
 #include "Bookmarks.hpp"
 
-#include "database/PlayQueue.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/User.hpp"
+#include "database/objects/PlayQueue.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"
diff --git a/src/libs/subsonic/impl/endpoints/Browsing.cpp b/src/libs/subsonic/impl/endpoints/Browsing.cpp
index d36a7053..9f783714 100644
--- a/src/libs/subsonic/impl/endpoints/Browsing.cpp
+++ b/src/libs/subsonic/impl/endpoints/Browsing.cpp
@@ -22,15 +22,15 @@
 #include "core/ILogger.hpp"
 #include "core/Random.hpp"
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
diff --git a/src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp b/src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp
index 55749da6..3bd79e77 100644
--- a/src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp
+++ b/src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp
@@ -23,12 +23,12 @@
 #include <vector>
 
 #include "core/Service.hpp"
-#include "database/ArtistId.hpp"
-#include "database/Release.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Session.hpp"
-#include "database/TrackId.hpp"
-#include "database/User.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
index 805a0468..e589fa2a 100644
--- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
+++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
@@ -27,10 +27,10 @@
 #include "core/String.hpp"
 #include "core/Utils.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/User.hpp"
 #include "services/artwork/IArtworkService.hpp"
 #include "services/transcoding/ITranscodingService.hpp"
 
diff --git a/src/libs/subsonic/impl/endpoints/Playlists.cpp b/src/libs/subsonic/impl/endpoints/Playlists.cpp
index a3d2e4bb..cfa46fff 100644
--- a/src/libs/subsonic/impl/endpoints/Playlists.cpp
+++ b/src/libs/subsonic/impl/endpoints/Playlists.cpp
@@ -20,9 +20,9 @@
 #include "Playlists.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"
diff --git a/src/libs/subsonic/impl/endpoints/Searching.cpp b/src/libs/subsonic/impl/endpoints/Searching.cpp
index 9cc979cb..f38f1519 100644
--- a/src/libs/subsonic/impl/endpoints/Searching.cpp
+++ b/src/libs/subsonic/impl/endpoints/Searching.cpp
@@ -24,12 +24,12 @@
 #include <mutex>
 
 #include "core/Random.hpp"
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"
diff --git a/src/libs/subsonic/impl/endpoints/UserManagement.cpp b/src/libs/subsonic/impl/endpoints/UserManagement.cpp
index 9f47adaf..541b2a46 100644
--- a/src/libs/subsonic/impl/endpoints/UserManagement.cpp
+++ b/src/libs/subsonic/impl/endpoints/UserManagement.cpp
@@ -2,7 +2,7 @@
 
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IPasswordService.hpp"
 
 #include "ParameterParsing.hpp"
diff --git a/src/libs/subsonic/impl/responses/Album.cpp b/src/libs/subsonic/impl/responses/Album.cpp
index 767e5fa3..07f71b96 100644
--- a/src/libs/subsonic/impl/responses/Album.cpp
+++ b/src/libs/subsonic/impl/responses/Album.cpp
@@ -22,14 +22,14 @@
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/libs/subsonic/impl/responses/AlbumInfo.cpp b/src/libs/subsonic/impl/responses/AlbumInfo.cpp
index 4d3a4e5a..0463609a 100644
--- a/src/libs/subsonic/impl/responses/AlbumInfo.cpp
+++ b/src/libs/subsonic/impl/responses/AlbumInfo.cpp
@@ -19,7 +19,7 @@
 
 #include "AlbumInfo.hpp"
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 #include "RequestContext.hpp"
 
diff --git a/src/libs/subsonic/impl/responses/Artist.cpp b/src/libs/subsonic/impl/responses/Artist.cpp
index f47a76bf..53dbf7d3 100644
--- a/src/libs/subsonic/impl/responses/Artist.cpp
+++ b/src/libs/subsonic/impl/responses/Artist.cpp
@@ -22,11 +22,11 @@
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Release.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 
 #include "CoverArtId.hpp"
diff --git a/src/libs/subsonic/impl/responses/Bookmark.cpp b/src/libs/subsonic/impl/responses/Bookmark.cpp
index 063f330c..07069412 100644
--- a/src/libs/subsonic/impl/responses/Bookmark.cpp
+++ b/src/libs/subsonic/impl/responses/Bookmark.cpp
@@ -19,8 +19,8 @@
 
 #include "responses/Bookmark.hpp"
 
-#include "database/TrackBookmark.hpp"
-#include "database/User.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/responses/Contributor.cpp b/src/libs/subsonic/impl/responses/Contributor.cpp
index 952fc662..430f5d5a 100644
--- a/src/libs/subsonic/impl/responses/Contributor.cpp
+++ b/src/libs/subsonic/impl/responses/Contributor.cpp
@@ -20,7 +20,7 @@
 #include "responses/Contributor.hpp"
 
 #include "database/Object.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
 #include "SubsonicResponse.hpp"
 #include "responses/Artist.hpp"
diff --git a/src/libs/subsonic/impl/responses/Genre.cpp b/src/libs/subsonic/impl/responses/Genre.cpp
index 2ae28e9f..0b0504d4 100644
--- a/src/libs/subsonic/impl/responses/Genre.cpp
+++ b/src/libs/subsonic/impl/responses/Genre.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/Genre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 #include "RequestContext.hpp"
 
diff --git a/src/libs/subsonic/impl/responses/ItemDate.cpp b/src/libs/subsonic/impl/responses/ItemDate.cpp
index c5c92c99..98441b15 100644
--- a/src/libs/subsonic/impl/responses/ItemDate.cpp
+++ b/src/libs/subsonic/impl/responses/ItemDate.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/Genre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/responses/ItemGenre.cpp b/src/libs/subsonic/impl/responses/ItemGenre.cpp
index db4dea6c..0850ffdb 100644
--- a/src/libs/subsonic/impl/responses/ItemGenre.cpp
+++ b/src/libs/subsonic/impl/responses/ItemGenre.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/ItemGenre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/responses/Lyrics.cpp b/src/libs/subsonic/impl/responses/Lyrics.cpp
index 67b91454..2273d046 100644
--- a/src/libs/subsonic/impl/responses/Lyrics.cpp
+++ b/src/libs/subsonic/impl/responses/Lyrics.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/Lyrics.hpp"
 
-#include "database/TrackLyrics.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "RequestContext.hpp"
 
diff --git a/src/libs/subsonic/impl/responses/Playlist.cpp b/src/libs/subsonic/impl/responses/Playlist.cpp
index d053c14a..e3a9befb 100644
--- a/src/libs/subsonic/impl/responses/Playlist.cpp
+++ b/src/libs/subsonic/impl/responses/Playlist.cpp
@@ -21,9 +21,9 @@
 
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artwork.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/artwork/IArtworkService.hpp"
 
 #include "CoverArtId.hpp"
diff --git a/src/libs/subsonic/impl/responses/RecordLabel.cpp b/src/libs/subsonic/impl/responses/RecordLabel.cpp
index 749a3443..81f813cd 100644
--- a/src/libs/subsonic/impl/responses/RecordLabel.cpp
+++ b/src/libs/subsonic/impl/responses/RecordLabel.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/RecordLabel.hpp"
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/responses/ReplayGain.cpp b/src/libs/subsonic/impl/responses/ReplayGain.cpp
index 5fd9d821..a2fd1dd9 100644
--- a/src/libs/subsonic/impl/responses/ReplayGain.cpp
+++ b/src/libs/subsonic/impl/responses/ReplayGain.cpp
@@ -19,7 +19,7 @@
 
 #include "responses/ReplayGain.hpp"
 
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/responses/Song.cpp b/src/libs/subsonic/impl/responses/Song.cpp
index 093cdc7a..5462bb9c 100644
--- a/src/libs/subsonic/impl/responses/Song.cpp
+++ b/src/libs/subsonic/impl/responses/Song.cpp
@@ -27,16 +27,16 @@
 #include "core/MimeTypes.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/libs/subsonic/impl/responses/User.cpp b/src/libs/subsonic/impl/responses/User.cpp
index 885d2189..8859b2c1 100644
--- a/src/libs/subsonic/impl/responses/User.cpp
+++ b/src/libs/subsonic/impl/responses/User.cpp
@@ -19,8 +19,8 @@
 
 #include "responses/User.hpp"
 
-#include "database/MediaLibrary.hpp"
-#include "database/User.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/User.hpp"
 
 #include "RequestContext.hpp"
 #include "SubsonicId.hpp"
diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp
index 1ffac05b..20a2f297 100644
--- a/src/lms/ui/Auth.cpp
+++ b/src/lms/ui/Auth.cpp
@@ -30,7 +30,7 @@
 
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
 
diff --git a/src/lms/ui/Auth.hpp b/src/lms/ui/Auth.hpp
index 9763d7fe..a0496d78 100644
--- a/src/lms/ui/Auth.hpp
+++ b/src/lms/ui/Auth.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WTemplateFormView.h>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::auth
 {
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index 437bed35..3acf03b2 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -29,13 +29,13 @@
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/artwork/IArtworkService.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IEnvService.hpp"
diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp
index 166716cf..f5a54586 100644
--- a/src/lms/ui/LmsApplication.hpp
+++ b/src/lms/ui/LmsApplication.hpp
@@ -27,7 +27,7 @@
 
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 #include "services/scanner/ScannerEvents.hpp"
 
 #include "Auth.hpp"
diff --git a/src/lms/ui/LmsApplicationManager.hpp b/src/lms/ui/LmsApplicationManager.hpp
index 92c14189..dfe40a3d 100644
--- a/src/lms/ui/LmsApplicationManager.hpp
+++ b/src/lms/ui/LmsApplicationManager.hpp
@@ -25,7 +25,7 @@
 
 #include <Wt/WSignal.h>
 
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index 58a29e14..7bddd090 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -27,13 +27,13 @@
 #include "core/ILogger.hpp"
 #include "core/String.hpp"
 #include "core/Utils.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 "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 #include "LmsApplication.hpp"
 #include "Utils.hpp"
diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp
index 0bdc41e7..ea5472ac 100644
--- a/src/lms/ui/MediaPlayer.hpp
+++ b/src/lms/ui/MediaPlayer.hpp
@@ -27,8 +27,8 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp
index b7835fe1..3290581b 100644
--- a/src/lms/ui/PlayQueue.cpp
+++ b/src/lms/ui/PlayQueue.cpp
@@ -32,12 +32,12 @@
 #include "core/ILogger.hpp"
 #include "core/Random.hpp"
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/recommendation/IPlaylistGeneratorService.hpp"
 
diff --git a/src/lms/ui/PlayQueue.hpp b/src/lms/ui/PlayQueue.hpp
index a6debe27..01186781 100644
--- a/src/lms/ui/PlayQueue.hpp
+++ b/src/lms/ui/PlayQueue.hpp
@@ -27,8 +27,8 @@
 #include <Wt/WText.h>
 
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 #include "common/Template.hpp"
 
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index 6507d5aa..6849717b 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -34,7 +34,7 @@
 #include "core/String.hpp"
 #include "database/Session.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
 
diff --git a/src/lms/ui/State.cpp b/src/lms/ui/State.cpp
index 46d0790a..52f6c7e1 100644
--- a/src/lms/ui/State.cpp
+++ b/src/lms/ui/State.cpp
@@ -20,8 +20,8 @@
 #include "State.hpp"
 
 #include "database/Session.hpp"
-#include "database/UIState.hpp"
-#include "database/User.hpp"
+#include "database/objects/UIState.hpp"
+#include "database/objects/User.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/Utils.cpp b/src/lms/ui/Utils.cpp
index ba11e50c..a8ce3a8d 100644
--- a/src/lms/ui/Utils.cpp
+++ b/src/lms/ui/Utils.cpp
@@ -25,14 +25,14 @@
 #include <Wt/WAnchor.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "LmsApplication.hpp"
 #include "ModalManager.hpp"
diff --git a/src/lms/ui/Utils.hpp b/src/lms/ui/Utils.hpp
index f2cdc20a..64dcd021 100644
--- a/src/lms/ui/Utils.hpp
+++ b/src/lms/ui/Utils.hpp
@@ -28,11 +28,11 @@
 #include <Wt/WInteractWidget.h>
 #include <Wt/WString.h>
 
-#include "database/ArtistId.hpp"
-#include "database/ClusterId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 
 #include "database/Types.hpp"
 #include "resource/ArtworkResource.hpp"
diff --git a/src/lms/ui/admin/InitWizardView.cpp b/src/lms/ui/admin/InitWizardView.cpp
index 3cec9844..0e2838ab 100644
--- a/src/lms/ui/admin/InitWizardView.cpp
+++ b/src/lms/ui/admin/InitWizardView.cpp
@@ -28,7 +28,7 @@
 #include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IPasswordService.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/admin/MediaLibrariesView.cpp b/src/lms/ui/admin/MediaLibrariesView.cpp
index 57731d91..344d0aa1 100644
--- a/src/lms/ui/admin/MediaLibrariesView.cpp
+++ b/src/lms/ui/admin/MediaLibrariesView.cpp
@@ -22,8 +22,8 @@
 #include <Wt/WPushButton.h>
 
 #include "core/Service.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "services/scanner/IScannerService.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/admin/MediaLibrariesView.hpp b/src/lms/ui/admin/MediaLibrariesView.hpp
index 8ba277e7..f201c0cf 100644
--- a/src/lms/ui/admin/MediaLibrariesView.hpp
+++ b/src/lms/ui/admin/MediaLibrariesView.hpp
@@ -22,7 +22,7 @@
 #include <Wt/WContainerWidget.h>
 #include <Wt/WTemplate.h>
 
-#include "database/MediaLibraryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/admin/MediaLibraryModal.cpp b/src/lms/ui/admin/MediaLibraryModal.cpp
index fb9a20ba..b5b3ef3b 100644
--- a/src/lms/ui/admin/MediaLibraryModal.cpp
+++ b/src/lms/ui/admin/MediaLibraryModal.cpp
@@ -26,8 +26,8 @@
 
 #include "core/Path.hpp"
 #include "core/String.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/admin/MediaLibraryModal.hpp b/src/lms/ui/admin/MediaLibraryModal.hpp
index 03f20689..137b5a5c 100644
--- a/src/lms/ui/admin/MediaLibraryModal.hpp
+++ b/src/lms/ui/admin/MediaLibraryModal.hpp
@@ -22,7 +22,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplateFormView.h>
 
-#include "database/MediaLibraryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/admin/ScanSettingsView.cpp b/src/lms/ui/admin/ScanSettingsView.cpp
index 807d7c17..0ec0cacd 100644
--- a/src/lms/ui/admin/ScanSettingsView.cpp
+++ b/src/lms/ui/admin/ScanSettingsView.cpp
@@ -30,8 +30,8 @@
 
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
+#include "database/objects/ScanSettings.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scanner/IScannerService.hpp"
 
diff --git a/src/lms/ui/admin/ScannerReportResource.cpp b/src/lms/ui/admin/ScannerReportResource.cpp
index e430757f..5279d1a8 100644
--- a/src/lms/ui/admin/ScannerReportResource.cpp
+++ b/src/lms/ui/admin/ScannerReportResource.cpp
@@ -24,7 +24,7 @@
 
 #include "core/String.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "LmsApplication.hpp"
 #include "services/scanner/ScanErrors.hpp"
diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp
index 2f6869d8..206c30ae 100644
--- a/src/lms/ui/admin/UserView.cpp
+++ b/src/lms/ui/admin/UserView.cpp
@@ -31,7 +31,7 @@
 #include "core/Service.hpp"
 #include "core/String.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
 
diff --git a/src/lms/ui/admin/UsersView.cpp b/src/lms/ui/admin/UsersView.cpp
index 65d08173..39239e59 100644
--- a/src/lms/ui/admin/UsersView.cpp
+++ b/src/lms/ui/admin/UsersView.cpp
@@ -26,7 +26,7 @@
 #include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IPasswordService.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/common/LoginNameValidator.cpp b/src/lms/ui/common/LoginNameValidator.cpp
index b1abc51e..c712f200 100644
--- a/src/lms/ui/common/LoginNameValidator.cpp
+++ b/src/lms/ui/common/LoginNameValidator.cpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WLengthValidator.h>
 
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/explore/ArtistCollector.cpp b/src/lms/ui/explore/ArtistCollector.cpp
index e0d4907b..058dfe59 100644
--- a/src/lms/ui/explore/ArtistCollector.cpp
+++ b/src/lms/ui/explore/ArtistCollector.cpp
@@ -20,10 +20,10 @@
 #include "ArtistCollector.hpp"
 
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/lms/ui/explore/ArtistCollector.hpp b/src/lms/ui/explore/ArtistCollector.hpp
index 9e5967ac..7d09cdb1 100644
--- a/src/lms/ui/explore/ArtistCollector.hpp
+++ b/src/lms/ui/explore/ArtistCollector.hpp
@@ -22,8 +22,8 @@
 #include <optional>
 
 #include "DatabaseCollectorBase.hpp"
-#include "database/ArtistId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
 
 namespace lms::db
 {
diff --git a/src/lms/ui/explore/ArtistListHelpers.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp
index 0dadb5dc..3d81a9c8 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 "database/objects/Artist.hpp"
 
 #include "Utils.hpp"
 
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index c2da9b5c..36a0b8f5 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -22,15 +22,15 @@
 #include <Wt/WPushButton.h>
 
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/ArtworkId.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 "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index 4a613508..a05f3de3 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -21,10 +21,10 @@
 
 #include <map>
 
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 #include "ReleaseTypes.hpp"
 #include "common/Template.hpp"
diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp
index 630d1f4f..24ef72a6 100644
--- a/src/lms/ui/explore/ArtistsView.cpp
+++ b/src/lms/ui/explore/ArtistsView.cpp
@@ -22,9 +22,9 @@
 #include <Wt/WLineEdit.h>
 #include <Wt/WPushButton.h>
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
 #include "ArtistListHelpers.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp
index 1f565c7e..e618e9e1 100644
--- a/src/lms/ui/explore/Filters.cpp
+++ b/src/lms/ui/explore/Filters.cpp
@@ -26,12 +26,12 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Cluster.hpp"
-#include "database/LabelId.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/ReleaseTypeId.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/LabelId.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ReleaseTypeId.hpp"
 
 #include "LmsApplication.hpp"
 #include "ModalManager.hpp"
diff --git a/src/lms/ui/explore/Filters.hpp b/src/lms/ui/explore/Filters.hpp
index 1407c847..c63b7398 100644
--- a/src/lms/ui/explore/Filters.hpp
+++ b/src/lms/ui/explore/Filters.hpp
@@ -23,7 +23,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Filters.hpp"
+#include "database/objects/Filters.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/explore/PlayQueueController.cpp b/src/lms/ui/explore/PlayQueueController.cpp
index 2bfa0fe6..77bc8443 100644
--- a/src/lms/ui/explore/PlayQueueController.cpp
+++ b/src/lms/ui/explore/PlayQueueController.cpp
@@ -19,9 +19,9 @@
 
 #include "explore/PlayQueueController.hpp"
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 #include "LmsApplication.hpp"
 #include "PlayQueue.hpp"
diff --git a/src/lms/ui/explore/PlayQueueController.hpp b/src/lms/ui/explore/PlayQueueController.hpp
index 03771646..21b80255 100644
--- a/src/lms/ui/explore/PlayQueueController.hpp
+++ b/src/lms/ui/explore/PlayQueueController.hpp
@@ -21,10 +21,10 @@
 
 #include <vector>
 
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/explore/ReleaseCollector.cpp b/src/lms/ui/explore/ReleaseCollector.cpp
index b4e25cc7..c404990c 100644
--- a/src/lms/ui/explore/ReleaseCollector.cpp
+++ b/src/lms/ui/explore/ReleaseCollector.cpp
@@ -20,9 +20,9 @@
 #include "ReleaseCollector.hpp"
 
 #include "core/Service.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/lms/ui/explore/ReleaseCollector.hpp b/src/lms/ui/explore/ReleaseCollector.hpp
index 4b002e95..cd434b54 100644
--- a/src/lms/ui/explore/ReleaseCollector.hpp
+++ b/src/lms/ui/explore/ReleaseCollector.hpp
@@ -23,8 +23,8 @@
 
 #include "DatabaseCollectorBase.hpp"
 
-#include "database/ReleaseId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 namespace lms::db
 {
diff --git a/src/lms/ui/explore/ReleaseHelpers.cpp b/src/lms/ui/explore/ReleaseHelpers.cpp
index 45143712..6fe653d5 100644
--- a/src/lms/ui/explore/ReleaseHelpers.cpp
+++ b/src/lms/ui/explore/ReleaseHelpers.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WText.h>
 
 #include "core/EnumSet.hpp"
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
 
 #include "Utils.hpp"
 
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 8fcfa166..c9ae9de9 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -28,15 +28,15 @@
 
 #include "av/IAudioFile.hpp"
 #include "core/String.hpp"
-#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/TrackArtistLink.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp
index 2100998b..55c66ca2 100644
--- a/src/lms/ui/explore/ReleaseView.hpp
+++ b/src/lms/ui/explore/ReleaseView.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "database/ArtworkId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 #include "common/Template.hpp"
 
diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp
index 527df48f..769baafb 100644
--- a/src/lms/ui/explore/ReleasesView.cpp
+++ b/src/lms/ui/explore/ReleasesView.cpp
@@ -22,8 +22,8 @@
 #include <Wt/WLineEdit.h>
 #include <Wt/WPushButton.h>
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Release.hpp"
 
 #include "LmsApplication.hpp"
 #include "SortModeSelector.hpp"
diff --git a/src/lms/ui/explore/TrackCollector.cpp b/src/lms/ui/explore/TrackCollector.cpp
index 74baa2bf..5c7fac86 100644
--- a/src/lms/ui/explore/TrackCollector.cpp
+++ b/src/lms/ui/explore/TrackCollector.cpp
@@ -21,9 +21,9 @@
 
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/lms/ui/explore/TrackCollector.hpp b/src/lms/ui/explore/TrackCollector.hpp
index 034d4cb6..b27ea867 100644
--- a/src/lms/ui/explore/TrackCollector.hpp
+++ b/src/lms/ui/explore/TrackCollector.hpp
@@ -21,7 +21,7 @@
 
 #include <optional>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 #include "DatabaseCollectorBase.hpp"
 
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 5f320bff..1fea0698 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -25,14 +25,14 @@
 
 #include "av/IAudioFile.hpp"
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackLyrics.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 
diff --git a/src/lms/ui/explore/TrackListHelpers.hpp b/src/lms/ui/explore/TrackListHelpers.hpp
index 57f90b3c..3dbae791 100644
--- a/src/lms/ui/explore/TrackListHelpers.hpp
+++ b/src/lms/ui/explore/TrackListHelpers.hpp
@@ -27,10 +27,10 @@
 #include <Wt/WWidget.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::db
 {
diff --git a/src/lms/ui/explore/TrackListView.cpp b/src/lms/ui/explore/TrackListView.cpp
index 2fcb8fbe..61e9a62d 100644
--- a/src/lms/ui/explore/TrackListView.cpp
+++ b/src/lms/ui/explore/TrackListView.cpp
@@ -22,11 +22,11 @@
 #include <Wt/WPushButton.h>
 
 #include "core/String.hpp"
-#include "database/Cluster.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "LmsApplication.hpp"
 #include "LmsApplicationException.hpp"
diff --git a/src/lms/ui/explore/TrackListView.hpp b/src/lms/ui/explore/TrackListView.hpp
index 2e381f3d..8ead2f0f 100644
--- a/src/lms/ui/explore/TrackListView.hpp
+++ b/src/lms/ui/explore/TrackListView.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "database/TrackListId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 #include "common/Template.hpp"
 
diff --git a/src/lms/ui/explore/TrackListsView.cpp b/src/lms/ui/explore/TrackListsView.cpp
index 4ed2bf22..7b2faca9 100644
--- a/src/lms/ui/explore/TrackListsView.cpp
+++ b/src/lms/ui/explore/TrackListsView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPushButton.h>
 
 #include "database/Session.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "DropDownMenuSelector.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/TrackListsView.hpp b/src/lms/ui/explore/TrackListsView.hpp
index 37cf3f40..03478d13 100644
--- a/src/lms/ui/explore/TrackListsView.hpp
+++ b/src/lms/ui/explore/TrackListsView.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Object.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 #include "common/Template.hpp"
 
diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp
index b83aef68..218ecb60 100644
--- a/src/lms/ui/explore/TracksView.cpp
+++ b/src/lms/ui/explore/TracksView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPushButton.h>
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "LmsApplication.hpp"
 #include "SortModeSelector.hpp"
diff --git a/src/lms/ui/resource/ArtworkResource.hpp b/src/lms/ui/resource/ArtworkResource.hpp
index 7b5d6a25..05d8266c 100644
--- a/src/lms/ui/resource/ArtworkResource.hpp
+++ b/src/lms/ui/resource/ArtworkResource.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/WResource.h>
 
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/resource/AudioFileResource.cpp b/src/lms/ui/resource/AudioFileResource.cpp
index 1a90142a..3225d8e1 100644
--- a/src/lms/ui/resource/AudioFileResource.cpp
+++ b/src/lms/ui/resource/AudioFileResource.cpp
@@ -26,7 +26,7 @@
 #include "core/ITraceLogger.hpp"
 #include "core/String.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/resource/AudioFileResource.hpp b/src/lms/ui/resource/AudioFileResource.hpp
index da00ae7d..f9ac913f 100644
--- a/src/lms/ui/resource/AudioFileResource.hpp
+++ b/src/lms/ui/resource/AudioFileResource.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WResource.h>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/lms/ui/resource/AudioTranscodingResource.cpp b/src/lms/ui/resource/AudioTranscodingResource.cpp
index 926985cc..0d67d7e3 100644
--- a/src/lms/ui/resource/AudioTranscodingResource.cpp
+++ b/src/lms/ui/resource/AudioTranscodingResource.cpp
@@ -28,8 +28,8 @@
 #include "core/Service.hpp"
 #include "core/String.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/transcoding/ITranscodingService.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/resource/AudioTranscodingResource.hpp b/src/lms/ui/resource/AudioTranscodingResource.hpp
index 8002279f..362e1c9f 100644
--- a/src/lms/ui/resource/AudioTranscodingResource.hpp
+++ b/src/lms/ui/resource/AudioTranscodingResource.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include <Wt/WResource.h>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::db
 {
diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp
index 3dec9d7f..0f2e8092 100644
--- a/src/lms/ui/resource/DownloadResource.cpp
+++ b/src/lms/ui/resource/DownloadResource.cpp
@@ -23,11 +23,11 @@
 #include <Wt/WDateTime.h>
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/resource/DownloadResource.hpp b/src/lms/ui/resource/DownloadResource.hpp
index b525b560..f8e91fac 100644
--- a/src/lms/ui/resource/DownloadResource.hpp
+++ b/src/lms/ui/resource/DownloadResource.hpp
@@ -23,10 +23,10 @@
 #include <memory>
 
 #include "core/IZipper.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::ui
 {
diff --git a/src/tools/db-generator/LmsDbGenerator.cpp b/src/tools/db-generator/LmsDbGenerator.cpp
index f9aaf881..f6daa1b5 100644
--- a/src/tools/db-generator/LmsDbGenerator.cpp
+++ b/src/tools/db-generator/LmsDbGenerator.cpp
@@ -32,16 +32,16 @@
 #include "core/Service.hpp"
 #include "core/StreamLogger.hpp"
 #include "core/SystemPaths.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 namespace lms
 {
diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp
index 067b3062..b5235951 100644
--- a/src/tools/recommendation/LmsRecommendation.cpp
+++ b/src/tools/recommendation/LmsRecommendation.cpp
@@ -27,13 +27,13 @@
 #include "core/Service.hpp"
 #include "core/StreamLogger.hpp"
 #include "core/SystemPaths.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 
 namespace lms
diff --git a/src/tools/similarity-parameters/LmsSimilarityParameters.cpp b/src/tools/similarity-parameters/LmsSimilarityParameters.cpp
index ea0e2fa7..1f2d8a24 100644
--- a/src/tools/similarity-parameters/LmsSimilarityParameters.cpp
+++ b/src/tools/similarity-parameters/LmsSimilarityParameters.cpp
@@ -24,13 +24,13 @@
 #include "core/Config.hpp"
 #include "core/Service.hpp"
 #include "core/StreamLogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/SessionPool.hpp"
-#include "database/Track.hpp"
-#include "database/TrackFeatures.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackFeatures.hpp"
 #include "similarity/features/SimilarityFeaturesSearcher.hpp"
 
 #include "GeneticAlgorithm.hpp"