diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
index 211f6226..196b2a1b 100644
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_subdirectory(av)
+add_subdirectory(database)
 add_subdirectory(image)
 add_subdirectory(lmscore)
 add_subdirectory(metadata)
diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt
new file mode 100644
index 00000000..38b13e75
--- /dev/null
+++ b/src/libs/database/CMakeLists.txt
@@ -0,0 +1,40 @@
+add_library(lmsdatabase SHARED
+	impl/Artist.cpp
+	impl/Cluster.cpp
+	impl/Db.cpp
+	impl/TrackArtistLink.cpp
+	impl/TrackFeatures.cpp
+	impl/TrackList.cpp
+	impl/Release.cpp
+	impl/ScanSettings.cpp
+	impl/Session.cpp
+	impl/SqlQuery.cpp
+	impl/Track.cpp
+	impl/TrackBookmark.cpp
+	impl/User.cpp
+	impl/Utils.cpp
+	)
+
+target_include_directories(lmsdatabase INTERFACE
+	include
+	)
+
+target_include_directories(lmsdatabase PRIVATE
+	include
+	)
+
+target_link_libraries(lmsdatabase PRIVATE
+	Wt::DboSqlite3
+	)
+
+target_link_libraries(lmsdatabase PUBLIC
+	lmsutils
+	std::filesystem
+	Wt::Dbo
+	)
+
+install(TARGETS lmsdatabase DESTINATION lib)
+
+if(BUILD_TESTING)
+	add_subdirectory(test)
+endif()
diff --git a/src/libs/lmscore/impl/database/Artist.cpp b/src/libs/database/impl/Artist.cpp
similarity index 98%
rename from src/libs/lmscore/impl/database/Artist.cpp
rename to src/libs/database/impl/Artist.cpp
index 3e9e35b3..9ca631fa 100644
--- a/src/libs/lmscore/impl/database/Artist.cpp
+++ b/src/libs/database/impl/Artist.cpp
@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/lmscore/impl/database/Cluster.cpp b/src/libs/database/impl/Cluster.cpp
similarity index 95%
rename from src/libs/lmscore/impl/database/Cluster.cpp
rename to src/libs/database/impl/Cluster.cpp
index 2fdf0cc7..184a03a1 100644
--- a/src/libs/lmscore/impl/database/Cluster.cpp
+++ b/src/libs/database/impl/Cluster.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
 
diff --git a/src/libs/lmscore/impl/database/Db.cpp b/src/libs/database/impl/Db.cpp
similarity index 95%
rename from src/libs/lmscore/impl/database/Db.cpp
rename to src/libs/database/impl/Db.cpp
index 2d434ae7..5035466c 100644
--- a/src/libs/lmscore/impl/database/Db.cpp
+++ b/src/libs/database/impl/Db.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
 
 #include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {
diff --git a/src/libs/lmscore/impl/database/Release.cpp b/src/libs/database/impl/Release.cpp
similarity index 98%
rename from src/libs/lmscore/impl/database/Release.cpp
rename to src/libs/database/impl/Release.cpp
index 3a9c91ef..310de51e 100644
--- a/src/libs/lmscore/impl/database/Release.cpp
+++ b/src/libs/database/impl/Release.cpp
@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/lmscore/impl/database/ScanSettings.cpp b/src/libs/database/impl/ScanSettings.cpp
similarity index 96%
rename from src/libs/lmscore/impl/database/ScanSettings.cpp
rename to src/libs/database/impl/ScanSettings.cpp
index fefa2d8c..9aafed53 100644
--- a/src/libs/lmscore/impl/database/ScanSettings.cpp
+++ b/src/libs/database/impl/ScanSettings.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
@@ -25,8 +25,8 @@
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Cluster.hpp"
+#include "database/Session.hpp"
 
 namespace {
 
diff --git a/src/libs/lmscore/impl/database/Session.cpp b/src/libs/database/impl/Session.cpp
similarity index 97%
rename from src/libs/lmscore/impl/database/Session.cpp
rename to src/libs/database/impl/Session.cpp
index 9d0280ed..56ec77d1 100644
--- a/src/libs/lmscore/impl/database/Session.cpp
+++ b/src/libs/database/impl/Session.cpp
@@ -17,22 +17,27 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
+
+#include <map>
+#include <mutex>
+#include <thread>
+#include <string_view>
 
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Track.hpp"
+#include "database/TrackBookmark.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackList.hpp"
+#include "database/TrackFeatures.hpp"
+#include "database/User.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/impl/database/SqlQuery.cpp b/src/libs/database/impl/SqlQuery.cpp
similarity index 100%
rename from src/libs/lmscore/impl/database/SqlQuery.cpp
rename to src/libs/database/impl/SqlQuery.cpp
diff --git a/src/libs/lmscore/impl/database/SqlQuery.hpp b/src/libs/database/impl/SqlQuery.hpp
similarity index 100%
rename from src/libs/lmscore/impl/database/SqlQuery.hpp
rename to src/libs/database/impl/SqlQuery.hpp
diff --git a/src/libs/lmscore/impl/database/StringViewTraits.hpp b/src/libs/database/impl/StringViewTraits.hpp
similarity index 100%
rename from src/libs/lmscore/impl/database/StringViewTraits.hpp
rename to src/libs/database/impl/StringViewTraits.hpp
diff --git a/src/libs/lmscore/impl/database/Track.cpp b/src/libs/database/impl/Track.cpp
similarity index 98%
rename from src/libs/lmscore/impl/database/Track.cpp
rename to src/libs/database/impl/Track.cpp
index 3e72e71a..82dc99cf 100644
--- a/src/libs/lmscore/impl/database/Track.cpp
+++ b/src/libs/database/impl/Track.cpp
@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackFeatures.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"
diff --git a/src/libs/lmscore/impl/database/TrackArtistLink.cpp b/src/libs/database/impl/TrackArtistLink.cpp
similarity index 90%
rename from src/libs/lmscore/impl/database/TrackArtistLink.cpp
rename to src/libs/database/impl/TrackArtistLink.cpp
index 059338c5..f8791dee 100644
--- a/src/libs/lmscore/impl/database/TrackArtistLink.cpp
+++ b/src/libs/database/impl/TrackArtistLink.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 
 #include "Traits.hpp"
 
diff --git a/src/libs/lmscore/impl/database/TrackBookmark.cpp b/src/libs/database/impl/TrackBookmark.cpp
similarity index 93%
rename from src/libs/lmscore/impl/database/TrackBookmark.cpp
rename to src/libs/database/impl/TrackBookmark.cpp
index adf3e23a..91f457bd 100644
--- a/src/libs/lmscore/impl/database/TrackBookmark.cpp
+++ b/src/libs/database/impl/TrackBookmark.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackBookmark.hpp"
+#include "database/TrackBookmark.hpp"
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "Traits.hpp"
 
 namespace Database {
diff --git a/src/libs/lmscore/impl/database/TrackFeatures.cpp b/src/libs/database/impl/TrackFeatures.cpp
similarity index 94%
rename from src/libs/lmscore/impl/database/TrackFeatures.cpp
rename to src/libs/database/impl/TrackFeatures.cpp
index dde9cd72..5770d0b1 100644
--- a/src/libs/lmscore/impl/database/TrackFeatures.cpp
+++ b/src/libs/database/impl/TrackFeatures.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {
diff --git a/src/libs/lmscore/impl/database/TrackList.cpp b/src/libs/database/impl/TrackList.cpp
similarity index 98%
rename from src/libs/lmscore/impl/database/TrackList.cpp
rename to src/libs/database/impl/TrackList.cpp
index c8bff04b..a9863d52 100644
--- a/src/libs/lmscore/impl/database/TrackList.cpp
+++ b/src/libs/database/impl/TrackList.cpp
@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
 
 #include <cassert>
 
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
+#include "database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/lmscore/impl/database/Traits.hpp b/src/libs/database/impl/Traits.hpp
similarity index 97%
rename from src/libs/lmscore/impl/database/Traits.hpp
rename to src/libs/database/impl/Traits.hpp
index 9365085c..bdfa0045 100644
--- a/src/libs/lmscore/impl/database/Traits.hpp
+++ b/src/libs/database/impl/Traits.hpp
@@ -22,7 +22,7 @@
 #include <type_traits>
 #include <Wt/Dbo/StdSqlTraits.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Wt::Dbo
 {
diff --git a/src/libs/lmscore/impl/database/User.cpp b/src/libs/database/impl/User.cpp
similarity index 95%
rename from src/libs/lmscore/impl/database/User.cpp
rename to src/libs/database/impl/User.cpp
index 3f8ca7e0..44f8c2b1 100644
--- a/src/libs/lmscore/impl/database/User.cpp
+++ b/src/libs/database/impl/User.cpp
@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
 #include "utils/Logger.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"
diff --git a/src/libs/lmscore/impl/database/Utils.cpp b/src/libs/database/impl/Utils.cpp
similarity index 100%
rename from src/libs/lmscore/impl/database/Utils.cpp
rename to src/libs/database/impl/Utils.cpp
diff --git a/src/libs/lmscore/impl/database/Utils.hpp b/src/libs/database/impl/Utils.hpp
similarity index 100%
rename from src/libs/lmscore/impl/database/Utils.hpp
rename to src/libs/database/impl/Utils.hpp
diff --git a/src/libs/lmscore/include/lmscore/database/Artist.hpp b/src/libs/database/include/database/Artist.hpp
similarity index 99%
rename from src/libs/lmscore/include/lmscore/database/Artist.hpp
rename to src/libs/database/include/database/Artist.hpp
index a3458a3e..23ef7812 100644
--- a/src/libs/lmscore/include/lmscore/database/Artist.hpp
+++ b/src/libs/database/include/database/Artist.hpp
@@ -27,7 +27,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
diff --git a/src/libs/lmscore/include/lmscore/database/Cluster.hpp b/src/libs/database/include/database/Cluster.hpp
similarity index 98%
rename from src/libs/lmscore/include/lmscore/database/Cluster.hpp
rename to src/libs/database/include/database/Cluster.hpp
index 290d1a30..42a11e77 100644
--- a/src/libs/lmscore/include/lmscore/database/Cluster.hpp
+++ b/src/libs/database/include/database/Cluster.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/Db.hpp b/src/libs/database/include/database/Db.hpp
similarity index 100%
rename from src/libs/lmscore/include/lmscore/database/Db.hpp
rename to src/libs/database/include/database/Db.hpp
diff --git a/src/libs/lmscore/include/lmscore/database/Release.hpp b/src/libs/database/include/database/Release.hpp
similarity index 99%
rename from src/libs/lmscore/include/lmscore/database/Release.hpp
rename to src/libs/database/include/database/Release.hpp
index d75d9921..ce45a1a8 100644
--- a/src/libs/lmscore/include/lmscore/database/Release.hpp
+++ b/src/libs/database/include/database/Release.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database
diff --git a/src/libs/lmscore/include/lmscore/database/ScanSettings.hpp b/src/libs/database/include/database/ScanSettings.hpp
similarity index 98%
rename from src/libs/lmscore/include/lmscore/database/ScanSettings.hpp
rename to src/libs/database/include/database/ScanSettings.hpp
index 4d8673cb..9cb8cb5a 100644
--- a/src/libs/lmscore/include/lmscore/database/ScanSettings.hpp
+++ b/src/libs/database/include/database/ScanSettings.hpp
@@ -25,7 +25,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/Session.hpp b/src/libs/database/include/database/Session.hpp
similarity index 100%
rename from src/libs/lmscore/include/lmscore/database/Session.hpp
rename to src/libs/database/include/database/Session.hpp
diff --git a/src/libs/lmscore/include/lmscore/database/Track.hpp b/src/libs/database/include/database/Track.hpp
similarity index 99%
rename from src/libs/lmscore/include/lmscore/database/Track.hpp
rename to src/libs/database/include/database/Track.hpp
index dc71a21f..3e2c2ced 100644
--- a/src/libs/lmscore/include/lmscore/database/Track.hpp
+++ b/src/libs/database/include/database/Track.hpp
@@ -34,7 +34,7 @@
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/TrackArtistLink.hpp b/src/libs/database/include/database/TrackArtistLink.hpp
similarity index 98%
rename from src/libs/lmscore/include/lmscore/database/TrackArtistLink.hpp
rename to src/libs/database/include/database/TrackArtistLink.hpp
index e8a140e5..55d3b0c5 100644
--- a/src/libs/lmscore/include/lmscore/database/TrackArtistLink.hpp
+++ b/src/libs/database/include/database/TrackArtistLink.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database
diff --git a/src/libs/lmscore/include/lmscore/database/TrackBookmark.hpp b/src/libs/database/include/database/TrackBookmark.hpp
similarity index 98%
rename from src/libs/lmscore/include/lmscore/database/TrackBookmark.hpp
rename to src/libs/database/include/database/TrackBookmark.hpp
index 089bac05..2c4af0db 100644
--- a/src/libs/lmscore/include/lmscore/database/TrackBookmark.hpp
+++ b/src/libs/database/include/database/TrackBookmark.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/TrackFeatures.hpp b/src/libs/database/include/database/TrackFeatures.hpp
similarity index 97%
rename from src/libs/lmscore/include/lmscore/database/TrackFeatures.hpp
rename to src/libs/database/include/database/TrackFeatures.hpp
index 527cde69..99c36d6d 100644
--- a/src/libs/lmscore/include/lmscore/database/TrackFeatures.hpp
+++ b/src/libs/database/include/database/TrackFeatures.hpp
@@ -26,7 +26,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/TrackList.hpp b/src/libs/database/include/database/TrackList.hpp
similarity index 99%
rename from src/libs/lmscore/include/lmscore/database/TrackList.hpp
rename to src/libs/database/include/database/TrackList.hpp
index 4449e057..03aaca0f 100644
--- a/src/libs/lmscore/include/lmscore/database/TrackList.hpp
+++ b/src/libs/database/include/database/TrackList.hpp
@@ -21,12 +21,13 @@
 
 #include <optional>
 #include <string>
+#include <set>
 #include <vector>
 
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 
diff --git a/src/libs/lmscore/include/lmscore/database/Types.hpp b/src/libs/database/include/database/Types.hpp
similarity index 100%
rename from src/libs/lmscore/include/lmscore/database/Types.hpp
rename to src/libs/database/include/database/Types.hpp
diff --git a/src/libs/lmscore/include/lmscore/database/User.hpp b/src/libs/database/include/database/User.hpp
similarity index 99%
rename from src/libs/lmscore/include/lmscore/database/User.hpp
rename to src/libs/database/include/database/User.hpp
index 8422132a..b94d41af 100644
--- a/src/libs/lmscore/include/lmscore/database/User.hpp
+++ b/src/libs/database/include/database/User.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database {
diff --git a/src/libs/lmscore/test/database/Artist.cpp b/src/libs/database/test/Artist.cpp
similarity index 100%
rename from src/libs/lmscore/test/database/Artist.cpp
rename to src/libs/database/test/Artist.cpp
diff --git a/src/libs/lmscore/test/database/CMakeLists.txt b/src/libs/database/test/CMakeLists.txt
similarity index 94%
rename from src/libs/lmscore/test/database/CMakeLists.txt
rename to src/libs/database/test/CMakeLists.txt
index 0a107ff2..605c3af5 100644
--- a/src/libs/lmscore/test/database/CMakeLists.txt
+++ b/src/libs/database/test/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(test-database
 	)
 
 target_link_libraries(test-database PRIVATE
-	lmscore
+	lmsdatabase
 	GTest::GTest
 	)
 
diff --git a/src/libs/lmscore/test/database/Cluster.cpp b/src/libs/database/test/Cluster.cpp
similarity index 100%
rename from src/libs/lmscore/test/database/Cluster.cpp
rename to src/libs/database/test/Cluster.cpp
diff --git a/src/libs/lmscore/test/database/Common.hpp b/src/libs/database/test/Common.hpp
similarity index 90%
rename from src/libs/lmscore/test/database/Common.hpp
rename to src/libs/database/test/Common.hpp
index 3d6ac552..8864e681 100644
--- a/src/libs/lmscore/test/database/Common.hpp
+++ b/src/libs/database/test/Common.hpp
@@ -24,17 +24,17 @@
 
 #include <gtest/gtest.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/Types.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackBookmark.hpp"
+#include "database/TrackList.hpp"
+#include "database/Types.hpp"
+#include "database/User.hpp"
 
 template <typename T>
 class ScopedEntity
diff --git a/src/libs/lmscore/test/database/DatabaseTest.cpp b/src/libs/database/test/DatabaseTest.cpp
similarity index 100%
rename from src/libs/lmscore/test/database/DatabaseTest.cpp
rename to src/libs/database/test/DatabaseTest.cpp
diff --git a/src/libs/lmscore/test/database/Release.cpp b/src/libs/database/test/Release.cpp
similarity index 100%
rename from src/libs/lmscore/test/database/Release.cpp
rename to src/libs/database/test/Release.cpp
diff --git a/src/libs/lmscore/test/database/Track.cpp b/src/libs/database/test/Track.cpp
similarity index 100%
rename from src/libs/lmscore/test/database/Track.cpp
rename to src/libs/database/test/Track.cpp
diff --git a/src/libs/lmscore/CMakeLists.txt b/src/libs/lmscore/CMakeLists.txt
index 40460f1b..4403380a 100644
--- a/src/libs/lmscore/CMakeLists.txt
+++ b/src/libs/lmscore/CMakeLists.txt
@@ -7,20 +7,6 @@ add_library(lmscore SHARED
 	impl/auth/PasswordServiceBase.cpp
 	impl/auth/http-headers/HttpHeadersEnvService.cpp
 	impl/auth/internal/InternalPasswordService.cpp
-	impl/database/Artist.cpp
-	impl/database/Cluster.cpp
-	impl/database/Db.cpp
-	impl/database/TrackArtistLink.cpp
-	impl/database/TrackFeatures.cpp
-	impl/database/TrackList.cpp
-	impl/database/Release.cpp
-	impl/database/ScanSettings.cpp
-	impl/database/Session.cpp
-	impl/database/SqlQuery.cpp
-	impl/database/Track.cpp
-	impl/database/TrackBookmark.cpp
-	impl/database/User.cpp
-	impl/database/Utils.cpp
 	impl/cover/CoverService.cpp
 	)
 
@@ -35,7 +21,6 @@ target_include_directories(lmscore PRIVATE
 
 target_link_libraries(lmscore PRIVATE
 	lmsav
-	Wt::DboSqlite3
 	)
 
 target_link_libraries(lmscore PUBLIC
@@ -44,7 +29,6 @@ target_link_libraries(lmscore PUBLIC
 	lmsutils
 	std::filesystem
 	Wt::Wt
-	Wt::Dbo
 	)
 
 if (USE_PAM)
@@ -57,6 +41,3 @@ endif (USE_PAM)
 
 install(TARGETS lmscore DESTINATION lib)
 
-if(BUILD_TESTING)
-	add_subdirectory(test)
-endif()
diff --git a/src/libs/lmscore/impl/auth/AuthServiceBase.cpp b/src/libs/lmscore/impl/auth/AuthServiceBase.cpp
index 680226f7..6e0d0589 100644
--- a/src/libs/lmscore/impl/auth/AuthServiceBase.cpp
+++ b/src/libs/lmscore/impl/auth/AuthServiceBase.cpp
@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth
diff --git a/src/libs/lmscore/impl/auth/AuthServiceBase.hpp b/src/libs/lmscore/impl/auth/AuthServiceBase.hpp
index f002baf0..81acba59 100644
--- a/src/libs/lmscore/impl/auth/AuthServiceBase.hpp
+++ b/src/libs/lmscore/impl/auth/AuthServiceBase.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string_view>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/impl/auth/AuthTokenService.cpp b/src/libs/lmscore/impl/auth/AuthTokenService.cpp
index 32a9b03f..05949870 100644
--- a/src/libs/lmscore/impl/auth/AuthTokenService.cpp
+++ b/src/libs/lmscore/impl/auth/AuthTokenService.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WRandom.h>
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp b/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp
index 23c0d41f..e80d1b9b 100644
--- a/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp
+++ b/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp
@@ -28,8 +28,8 @@
 #endif // LMS_SUPPORT_PAM
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp
index ff26a585..233fb9aa 100644
--- a/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp
+++ b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp
@@ -22,8 +22,8 @@
 
 #include "lmscore/auth/IAuthTokenService.hpp"
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp
index 9e3a1921..42b830f1 100644
--- a/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp
+++ b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Auth/HashFunction.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "auth/PasswordServiceBase.hpp"
 #include "auth/LoginThrottler.hpp"
 
diff --git a/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp
index 9f612633..708ce457 100644
--- a/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp
+++ b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp
@@ -27,6 +27,7 @@
 #include <security/pam_appl.h>
 
 #include "lmscore/auth/Types.hpp"
+#include "database/Session.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth
diff --git a/src/libs/lmscore/impl/cover/CoverService.cpp b/src/libs/lmscore/impl/cover/CoverService.cpp
index f773d8e5..a968d5c4 100644
--- a/src/libs/lmscore/impl/cover/CoverService.cpp
+++ b/src/libs/lmscore/impl/cover/CoverService.cpp
@@ -21,10 +21,10 @@
 
 #include "av/IAudioFile.hpp"
 
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 
 #include "image/Exception.hpp"
 #include "image/IRawImage.hpp"
diff --git a/src/libs/lmscore/impl/cover/CoverService.hpp b/src/libs/lmscore/impl/cover/CoverService.hpp
index 30c93bed..f1a845ac 100644
--- a/src/libs/lmscore/impl/cover/CoverService.hpp
+++ b/src/libs/lmscore/impl/cover/CoverService.hpp
@@ -31,7 +31,7 @@
 
 #include "lmscore/cover/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp b/src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp
index 0fa5f2cb..5d9dd51b 100644
--- a/src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp
+++ b/src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp
@@ -27,7 +27,7 @@
 #include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/include/lmscore/auth/IEnvService.hpp b/src/libs/lmscore/include/lmscore/auth/IEnvService.hpp
index 9a845fcc..ecb23349 100644
--- a/src/libs/lmscore/include/lmscore/auth/IEnvService.hpp
+++ b/src/libs/lmscore/include/lmscore/auth/IEnvService.hpp
@@ -20,8 +20,9 @@
 #pragma once
 
 #include <optional>
+#include <string>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp b/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp
index 3509d6f1..86edc868 100644
--- a/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp
+++ b/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp
@@ -26,7 +26,7 @@
 #include <Wt/Dbo/ptr.h>
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/lmscore/include/lmscore/auth/Types.hpp b/src/libs/lmscore/include/lmscore/auth/Types.hpp
index 519c9981..8b97df6e 100644
--- a/src/libs/lmscore/include/lmscore/auth/Types.hpp
+++ b/src/libs/lmscore/include/lmscore/auth/Types.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace Auth
diff --git a/src/libs/lmscore/include/lmscore/cover/ICoverService.hpp b/src/libs/lmscore/include/lmscore/cover/ICoverService.hpp
index 925e18ed..039260ef 100644
--- a/src/libs/lmscore/include/lmscore/cover/ICoverService.hpp
+++ b/src/libs/lmscore/include/lmscore/cover/ICoverService.hpp
@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace Database
diff --git a/src/libs/lmscore/test/CMakeLists.txt b/src/libs/lmscore/test/CMakeLists.txt
deleted file mode 100644
index d74e1951..00000000
--- a/src/libs/lmscore/test/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-add_subdirectory(database)
-
diff --git a/src/libs/recommendation/CMakeLists.txt b/src/libs/recommendation/CMakeLists.txt
index 3130d76b..4682173d 100644
--- a/src/libs/recommendation/CMakeLists.txt
+++ b/src/libs/recommendation/CMakeLists.txt
@@ -17,7 +17,7 @@ target_include_directories(lmsrecommendation PRIVATE
 	)
 
 target_link_libraries(lmsrecommendation PRIVATE
-	lmscore
+	lmsdatabase
 	lmssom
 	std::filesystem
 	)
diff --git a/src/libs/recommendation/impl/Engine.cpp b/src/libs/recommendation/impl/Engine.cpp
index f7d2bf05..b6808ceb 100644
--- a/src/libs/recommendation/impl/Engine.cpp
+++ b/src/libs/recommendation/impl/Engine.cpp
@@ -25,9 +25,9 @@
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
 
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/ScanSettings.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/libs/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/recommendation/impl/clusters/ClustersEngine.cpp
index 13be84a3..b0703a0f 100644
--- a/src/libs/recommendation/impl/clusters/ClustersEngine.cpp
+++ b/src/libs/recommendation/impl/clusters/ClustersEngine.cpp
@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
 
 namespace Recommendation {
 
diff --git a/src/libs/recommendation/impl/features/FeaturesEngine.cpp b/src/libs/recommendation/impl/features/FeaturesEngine.cpp
index 560e0126..7b1f39b6 100644
--- a/src/libs/recommendation/impl/features/FeaturesEngine.cpp
+++ b/src/libs/recommendation/impl/features/FeaturesEngine.cpp
@@ -21,14 +21,14 @@
 
 #include <numeric>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackFeatures.hpp"
+#include "database/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"
diff --git a/src/libs/recommendation/impl/features/FeaturesEngineCache.hpp b/src/libs/recommendation/impl/features/FeaturesEngineCache.hpp
index 5dd0032a..08372345 100644
--- a/src/libs/recommendation/impl/features/FeaturesEngineCache.hpp
+++ b/src/libs/recommendation/impl/features/FeaturesEngineCache.hpp
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "som/Network.hpp"
 
 namespace Recommendation {
diff --git a/src/libs/recommendation/include/recommendation/IEngine.hpp b/src/libs/recommendation/include/recommendation/IEngine.hpp
index d0a4218c..26f180bc 100644
--- a/src/libs/recommendation/include/recommendation/IEngine.hpp
+++ b/src/libs/recommendation/include/recommendation/IEngine.hpp
@@ -21,8 +21,8 @@
 
 #include <functional>
 #include <memory>
-
-#include "lmscore/database/Types.hpp"
+#include <string_view>
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database
diff --git a/src/libs/scanner/CMakeLists.txt b/src/libs/scanner/CMakeLists.txt
index 6dcbfebc..5f1467b8 100644
--- a/src/libs/scanner/CMakeLists.txt
+++ b/src/libs/scanner/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(lmsscanner PRIVATE
 	)
 
 target_link_libraries(lmsscanner PRIVATE
-	lmscore
+	lmsdatabase
 	lmsmetadata
 	lmsrecommendation
 	lmsutils
diff --git a/src/libs/scanner/impl/Scanner.cpp b/src/libs/scanner/impl/Scanner.cpp
index e8563f00..125324dc 100644
--- a/src/libs/scanner/impl/Scanner.cpp
+++ b/src/libs/scanner/impl/Scanner.cpp
@@ -24,13 +24,13 @@
 
 #include <Wt/WLocalDateTime.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Track.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackFeatures.hpp"
 #include "metadata/TagLibParser.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Exception.hpp"
diff --git a/src/libs/scanner/impl/Scanner.hpp b/src/libs/scanner/impl/Scanner.hpp
index 7469cb11..76aeb819 100644
--- a/src/libs/scanner/impl/Scanner.hpp
+++ b/src/libs/scanner/impl/Scanner.hpp
@@ -30,9 +30,9 @@
 
 #include <boost/asio/system_timer.hpp>
 
-#include "lmscore/database/Types.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Types.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Session.hpp"
 #include "metadata/IParser.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Path.hpp"
diff --git a/src/libs/scanner/include/scanner/ScannerStats.hpp b/src/libs/scanner/include/scanner/ScannerStats.hpp
index 440cf63c..5528ce8b 100644
--- a/src/libs/scanner/include/scanner/ScannerStats.hpp
+++ b/src/libs/scanner/include/scanner/ScannerStats.hpp
@@ -24,7 +24,7 @@
 #include <filesystem>
 #include <vector>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Scanner {
 
diff --git a/src/libs/scrobbling/CMakeLists.txt b/src/libs/scrobbling/CMakeLists.txt
index 6b26570c..d69a6f5a 100644
--- a/src/libs/scrobbling/CMakeLists.txt
+++ b/src/libs/scrobbling/CMakeLists.txt
@@ -17,7 +17,7 @@ target_include_directories(lmsscrobbling PRIVATE
 	)
 
 target_link_libraries(lmsscrobbling PRIVATE
-	lmscore
+	lmsutils
 	)
 
 target_link_libraries(lmsscrobbling PUBLIC
diff --git a/src/libs/scrobbling/impl/Scrobbling.cpp b/src/libs/scrobbling/impl/Scrobbling.cpp
index 39f3b67d..b1a91936 100644
--- a/src/libs/scrobbling/impl/Scrobbling.cpp
+++ b/src/libs/scrobbling/impl/Scrobbling.cpp
@@ -19,13 +19,13 @@
 
 #include "Scrobbling.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 
 #include "internal/InternalScrobbler.hpp"
 #include "listenbrainz/ListenBrainzScrobbler.hpp"
diff --git a/src/libs/scrobbling/impl/internal/InternalScrobbler.cpp b/src/libs/scrobbling/impl/internal/InternalScrobbler.cpp
index eb71a438..e5b23d51 100644
--- a/src/libs/scrobbling/impl/internal/InternalScrobbler.cpp
+++ b/src/libs/scrobbling/impl/internal/InternalScrobbler.cpp
@@ -19,11 +19,11 @@
 
 #include "InternalScrobbler.hpp"
 
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Scrobbling
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
index 12660e0a..08202d9e 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
+++ b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
@@ -24,13 +24,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
index c4522501..8196da8b 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+++ b/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
@@ -25,13 +25,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "scrobbling/Exception.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp b/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
index f1043c69..e71a8ae4 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
+++ b/src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp
@@ -26,7 +26,7 @@
 #include <boost/asio/steady_timer.hpp>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "scrobbling/Listen.hpp"
 
 namespace Database
diff --git a/src/libs/scrobbling/impl/listenbrainz/Utils.cpp b/src/libs/scrobbling/impl/listenbrainz/Utils.cpp
index 0cda3eb1..ab293954 100644
--- a/src/libs/scrobbling/impl/listenbrainz/Utils.cpp
+++ b/src/libs/scrobbling/impl/listenbrainz/Utils.cpp
@@ -21,9 +21,9 @@
 
 #include <string_view>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 
 static constexpr std::string_view historyTracklistName {"__scrobbler_listenbrainz_history__"};
 
diff --git a/src/libs/scrobbling/impl/listenbrainz/Utils.hpp b/src/libs/scrobbling/impl/listenbrainz/Utils.hpp
index 206fa527..6b2d1271 100644
--- a/src/libs/scrobbling/impl/listenbrainz/Utils.hpp
+++ b/src/libs/scrobbling/impl/listenbrainz/Utils.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include "utils/UUID.hpp"
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp b/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp
index 4937494d..cda27ca1 100644
--- a/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp
+++ b/src/libs/scrobbling/include/scrobbling/IScrobbling.hpp
@@ -29,7 +29,7 @@
 #include <Wt/WDateTime.h>
 
 #include "scrobbling/Listen.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/libs/scrobbling/include/scrobbling/Listen.hpp b/src/libs/scrobbling/include/scrobbling/Listen.hpp
index e0d71cba..ae80dbac 100644
--- a/src/libs/scrobbling/include/scrobbling/Listen.hpp
+++ b/src/libs/scrobbling/include/scrobbling/Listen.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Scrobbling
 {
diff --git a/src/libs/subsonic/impl/ParameterParsing.hpp b/src/libs/subsonic/impl/ParameterParsing.hpp
index bd2f536c..bb8a91d3 100644
--- a/src/libs/subsonic/impl/ParameterParsing.hpp
+++ b/src/libs/subsonic/impl/ParameterParsing.hpp
@@ -20,7 +20,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/String.hpp"
 #include "SubsonicResponse.hpp"
 
diff --git a/src/libs/subsonic/impl/RequestContext.hpp b/src/libs/subsonic/impl/RequestContext.hpp
index d15a29ca..9d73bcb4 100644
--- a/src/libs/subsonic/impl/RequestContext.hpp
+++ b/src/libs/subsonic/impl/RequestContext.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "ProtocolVersion.hpp"
 
diff --git a/src/libs/subsonic/impl/Stream.cpp b/src/libs/subsonic/impl/Stream.cpp
index 610cd24c..d3d181ed 100644
--- a/src/libs/subsonic/impl/Stream.cpp
+++ b/src/libs/subsonic/impl/Stream.cpp
@@ -22,9 +22,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/IResourceHandler.hpp"
 #include "utils/Logger.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"
diff --git a/src/libs/subsonic/impl/SubsonicId.hpp b/src/libs/subsonic/impl/SubsonicId.hpp
index 2ff87309..0ac2a16a 100644
--- a/src/libs/subsonic/impl/SubsonicId.hpp
+++ b/src/libs/subsonic/impl/SubsonicId.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/String.hpp"
 
 namespace API::Subsonic
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index d15aeba3..866cccf9 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -29,15 +29,15 @@
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackBookmark.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "recommendation/IEngine.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/IConfig.hpp"
diff --git a/src/libs/subsonic/impl/SubsonicResource.hpp b/src/libs/subsonic/impl/SubsonicResource.hpp
index a5c2c344..2d549f41 100644
--- a/src/libs/subsonic/impl/SubsonicResource.hpp
+++ b/src/libs/subsonic/impl/SubsonicResource.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WResource.h>
 #include <Wt/Http/Response.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "RequestContext.hpp"
 
diff --git a/src/lms/main.cpp b/src/lms/main.cpp
index 8ebbd485..7ae3a787 100644
--- a/src/lms/main.cpp
+++ b/src/lms/main.cpp
@@ -29,8 +29,8 @@
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
 #include "scanner/IScanner.hpp"
 #include "recommendation/IEngine.hpp"
 #include "subsonic/SubsonicResource.hpp"
diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp
index 8158d63f..6f406cac 100644
--- a/src/lms/ui/Auth.cpp
+++ b/src/lms/ui/Auth.cpp
@@ -30,8 +30,8 @@
 
 #include "lmscore/auth/IAuthTokenService.hpp"
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
diff --git a/src/lms/ui/Auth.hpp b/src/lms/ui/Auth.hpp
index dc893223..5fda238b 100644
--- a/src/lms/ui/Auth.hpp
+++ b/src/lms/ui/Auth.hpp
@@ -21,18 +21,19 @@
 
 #include <Wt/WTemplateFormView.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
-namespace UserInterface
+namespace UserInterface {
+
+std::optional<Database::UserId>
+processAuthToken(const Wt::WEnvironment& env);
+
+class Auth : public Wt::WTemplateFormView
 {
-	std::optional<Database::UserId>
-	processAuthToken(const Wt::WEnvironment& env);
+	public:
+		Auth();
 
-	class Auth : public Wt::WTemplateFormView
-	{
-		public:
-			Auth();
+		Wt::Signal<Database::UserId> userLoggedIn;
+};
 
-			Wt::Signal<Database::UserId> userLoggedIn;
-	};
 } // namespace UserInterface
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index 7f6b059f..c68012fc 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -31,12 +31,12 @@
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/LmsApplicationException.hpp b/src/lms/ui/LmsApplicationException.hpp
index 2bb07492..0671a6c4 100644
--- a/src/lms/ui/LmsApplicationException.hpp
+++ b/src/lms/ui/LmsApplicationException.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace UserInterface {
diff --git a/src/lms/ui/LmsApplicationManager.hpp b/src/lms/ui/LmsApplicationManager.hpp
index a8f61d1e..1d7761f7 100644
--- a/src/lms/ui/LmsApplicationManager.hpp
+++ b/src/lms/ui/LmsApplicationManager.hpp
@@ -25,7 +25,7 @@
 
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/LmsTheme.hpp b/src/lms/ui/LmsTheme.hpp
index 3e354b1e..10ee14c2 100644
--- a/src/lms/ui/LmsTheme.hpp
+++ b/src/lms/ui/LmsTheme.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WBootstrapTheme.h>
 #include <Wt/WLinkedCssStyleSheet.h>
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 namespace UserInterface {
 
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index 96cb31f2..4ee65e06 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -25,13 +25,13 @@
 
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/Types.hpp"
-#include "lmscore/database/User.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 "resource/CoverResource.hpp"
 #include "resource/AudioTranscodeResource.hpp"
diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp
index 7cb028c9..d4f1700b 100644
--- a/src/lms/ui/MediaPlayer.hpp
+++ b/src/lms/ui/MediaPlayer.hpp
@@ -27,7 +27,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface {
 
diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp
index 49c7ab53..554b34d2 100644
--- a/src/lms/ui/PlayQueue.cpp
+++ b/src/lms/ui/PlayQueue.cpp
@@ -22,12 +22,12 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"
diff --git a/src/lms/ui/PlayQueue.hpp b/src/lms/ui/PlayQueue.hpp
index a8e14046..1bbb996a 100644
--- a/src/lms/ui/PlayQueue.hpp
+++ b/src/lms/ui/PlayQueue.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Similarity
diff --git a/src/lms/ui/PlayQueueAction.hpp b/src/lms/ui/PlayQueueAction.hpp
index aa52bddc..fffd8133 100644
--- a/src/lms/ui/PlayQueueAction.hpp
+++ b/src/lms/ui/PlayQueueAction.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index 9aecceda..d2cb3a95 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -35,7 +35,7 @@
 #include "common/ValueStringModel.hpp"
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/DatabaseSettingsView.cpp b/src/lms/ui/admin/DatabaseSettingsView.cpp
index cef99be5..d410b4cd 100644
--- a/src/lms/ui/admin/DatabaseSettingsView.cpp
+++ b/src/lms/ui/admin/DatabaseSettingsView.cpp
@@ -26,9 +26,9 @@
 #include <Wt/WString.h>
 #include <Wt/WTemplateFormView.h>
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Cluster.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Session.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/InitWizardView.cpp b/src/lms/ui/admin/InitWizardView.cpp
index b3ba29da..3ca4d184 100644
--- a/src/lms/ui/admin/InitWizardView.cpp
+++ b/src/lms/ui/admin/InitWizardView.cpp
@@ -25,8 +25,8 @@
 #include <Wt/WPushButton.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp
index bd12f280..f01cfc71 100644
--- a/src/lms/ui/admin/ScannerController.cpp
+++ b/src/lms/ui/admin/ScannerController.cpp
@@ -28,8 +28,8 @@
 #include <Wt/WResource.h>
 #include <Wt/WSplitButton.h>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Service.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp
index 874442cd..b0f99755 100644
--- a/src/lms/ui/admin/UserView.cpp
+++ b/src/lms/ui/admin/UserView.cpp
@@ -28,8 +28,8 @@
 #include <Wt/WFormModel.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/User.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/User.hpp"
+#include "database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
diff --git a/src/lms/ui/admin/UsersView.cpp b/src/lms/ui/admin/UsersView.cpp
index 358021bf..8f26e470 100644
--- a/src/lms/ui/admin/UsersView.cpp
+++ b/src/lms/ui/admin/UsersView.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WTemplate.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/User.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/User.hpp"
+#include "database/Session.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
diff --git a/src/lms/ui/common/LoginNameValidator.cpp b/src/lms/ui/common/LoginNameValidator.cpp
index a7767364..d1574d3f 100644
--- a/src/lms/ui/common/LoginNameValidator.cpp
+++ b/src/lms/ui/common/LoginNameValidator.cpp
@@ -20,7 +20,7 @@
 #include "LoginNameValidator.hpp"
 
 #include <Wt/WLengthValidator.h>
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/common/PasswordValidator.hpp b/src/lms/ui/common/PasswordValidator.hpp
index 337341bb..a3efe8e6 100644
--- a/src/lms/ui/common/PasswordValidator.hpp
+++ b/src/lms/ui/common/PasswordValidator.hpp
@@ -22,6 +22,7 @@
 #include <functional>
 #include <Wt/WValidator.h>
 
+#include "database/Types.hpp"
 #include "lmscore/auth/Types.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/ArtistCollector.cpp b/src/lms/ui/explore/ArtistCollector.cpp
index 4a698e36..0c73aa3e 100644
--- a/src/lms/ui/explore/ArtistCollector.cpp
+++ b/src/lms/ui/explore/ArtistCollector.cpp
@@ -19,9 +19,9 @@
 
 #include "ArtistCollector.hpp"
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/User.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/User.hpp"
+#include "database/TrackList.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ArtistCollector.hpp b/src/lms/ui/explore/ArtistCollector.hpp
index 98c6008c..05734af0 100644
--- a/src/lms/ui/explore/ArtistCollector.hpp
+++ b/src/lms/ui/explore/ArtistCollector.hpp
@@ -24,7 +24,7 @@
 
 #include "DatabaseCollectorBase.hpp"
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ArtistListHelpers.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp
index 2187c585..85adb362 100644
--- a/src/lms/ui/explore/ArtistListHelpers.cpp
+++ b/src/lms/ui/explore/ArtistListHelpers.cpp
@@ -20,7 +20,7 @@
 
 #include <Wt/WAnchor.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
 #include "LmsApplication.hpp"
 
 namespace UserInterface::ArtistListHelpers
diff --git a/src/lms/ui/explore/ArtistListHelpers.hpp b/src/lms/ui/explore/ArtistListHelpers.hpp
index 3f20d107..02659bf7 100644
--- a/src/lms/ui/explore/ArtistListHelpers.hpp
+++ b/src/lms/ui/explore/ArtistListHelpers.hpp
@@ -23,7 +23,7 @@
 
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index 0ea8c110..eb6f1d41 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -25,13 +25,13 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.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/User.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index bc0b1cac..18b3894c 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp
index de06b920..3d71b94c 100644
--- a/src/lms/ui/explore/ArtistsView.cpp
+++ b/src/lms/ui/explore/ArtistsView.cpp
@@ -21,8 +21,8 @@
 
 #include <Wt/WMenu.h>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/Session.hpp"
+#include "database/TrackArtistLink.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/Logger.hpp"
 
diff --git a/src/lms/ui/explore/ArtistsView.hpp b/src/lms/ui/explore/ArtistsView.hpp
index 44ffaea0..f7e61e22 100644
--- a/src/lms/ui/explore/ArtistsView.hpp
+++ b/src/lms/ui/explore/ArtistsView.hpp
@@ -25,7 +25,7 @@
 #include <Wt/WComboBox.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "ArtistCollector.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/DatabaseCollectorBase.hpp b/src/lms/ui/explore/DatabaseCollectorBase.hpp
index 677a2746..224f7657 100644
--- a/src/lms/ui/explore/DatabaseCollectorBase.hpp
+++ b/src/lms/ui/explore/DatabaseCollectorBase.hpp
@@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp
index 16dab2e2..8c821fdb 100644
--- a/src/lms/ui/explore/Explore.cpp
+++ b/src/lms/ui/explore/Explore.cpp
@@ -23,10 +23,10 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/explore/Explore.hpp b/src/lms/ui/explore/Explore.hpp
index 7bd4dd8c..66815002 100644
--- a/src/lms/ui/explore/Explore.hpp
+++ b/src/lms/ui/explore/Explore.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace UserInterface {
diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp
index 2749373e..f8ef1c74 100644
--- a/src/lms/ui/explore/Filters.cpp
+++ b/src/lms/ui/explore/Filters.cpp
@@ -24,8 +24,8 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Cluster.hpp"
+#include "database/Session.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/explore/Filters.hpp b/src/lms/ui/explore/Filters.hpp
index ce4abab9..079d52c2 100644
--- a/src/lms/ui/explore/Filters.hpp
+++ b/src/lms/ui/explore/Filters.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 #include "Filters.hpp"
 
diff --git a/src/lms/ui/explore/ReleaseCollector.cpp b/src/lms/ui/explore/ReleaseCollector.cpp
index f6939725..c5671f54 100644
--- a/src/lms/ui/explore/ReleaseCollector.cpp
+++ b/src/lms/ui/explore/ReleaseCollector.cpp
@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
+#include "database/TrackList.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp
index e374b6fb..71c5daa5 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.cpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.cpp
@@ -23,8 +23,8 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
 #include "resource/CoverResource.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/explore/ReleaseListHelpers.hpp b/src/lms/ui/explore/ReleaseListHelpers.hpp
index 65219f1f..3aad6698 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.hpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <Wt/WTemplate.h>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/explore/ReleasePopup.cpp b/src/lms/ui/explore/ReleasePopup.cpp
index 88482867..7224683f 100644
--- a/src/lms/ui/explore/ReleasePopup.cpp
+++ b/src/lms/ui/explore/ReleasePopup.cpp
@@ -21,9 +21,9 @@
 
 #include <Wt/WPopupMenu.h>
 
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "resource/DownloadResource.hpp"
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/explore/ReleasePopup.hpp b/src/lms/ui/explore/ReleasePopup.hpp
index 393eb072..5ffb4f48 100644
--- a/src/lms/ui/explore/ReleasePopup.hpp
+++ b/src/lms/ui/explore/ReleasePopup.hpp
@@ -22,7 +22,7 @@
 #include <Wt/WWidget.h>
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 2a4cd6d0..15334246 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -25,11 +25,11 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp
index aba128b1..d3700eaa 100644
--- a/src/lms/ui/explore/ReleaseView.hpp
+++ b/src/lms/ui/explore/ReleaseView.hpp
@@ -22,7 +22,7 @@
 #include <unordered_set>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp
index 71e8a608..93c56428 100644
--- a/src/lms/ui/explore/ReleasesView.cpp
+++ b/src/lms/ui/explore/ReleasesView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "ReleaseListHelpers.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/ReleasesView.hpp b/src/lms/ui/explore/ReleasesView.hpp
index f8e9578f..f2a9b91b 100644
--- a/src/lms/ui/explore/ReleasesView.hpp
+++ b/src/lms/ui/explore/ReleasesView.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WContainerWidget.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 #include "ReleaseCollector.hpp"
 
diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp
index 143f4c7f..90a950e8 100644
--- a/src/lms/ui/explore/SearchView.cpp
+++ b/src/lms/ui/explore/SearchView.cpp
@@ -25,10 +25,10 @@
 #include <Wt/WImage.h>
 #include <Wt/WStackedWidget.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 
 #include "common/InfiniteScrollingContainer.hpp"
 #include "common/LoadingIndicator.hpp"
diff --git a/src/lms/ui/explore/TrackCollector.cpp b/src/lms/ui/explore/TrackCollector.cpp
index 22eb6013..77106931 100644
--- a/src/lms/ui/explore/TrackCollector.cpp
+++ b/src/lms/ui/explore/TrackCollector.cpp
@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 1687bd82..ba36cb9d 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -24,9 +24,9 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Track.hpp"
 #include "resource/DownloadResource.hpp"
 #include "resource/CoverResource.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/lms/ui/explore/TrackListHelpers.hpp b/src/lms/ui/explore/TrackListHelpers.hpp
index 94bcc1e6..2e3ea306 100644
--- a/src/lms/ui/explore/TrackListHelpers.hpp
+++ b/src/lms/ui/explore/TrackListHelpers.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <Wt/WTemplate.h>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database
diff --git a/src/lms/ui/explore/TrackPopup.cpp b/src/lms/ui/explore/TrackPopup.cpp
index 143ea92e..8884347c 100644
--- a/src/lms/ui/explore/TrackPopup.cpp
+++ b/src/lms/ui/explore/TrackPopup.cpp
@@ -21,9 +21,9 @@
 
 #include <Wt/WPopupMenu.h>
 
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "resource/DownloadResource.hpp"
 #include "LmsApplication.hpp"
 
diff --git a/src/lms/ui/explore/TrackPopup.hpp b/src/lms/ui/explore/TrackPopup.hpp
index 4b745f73..1597d994 100644
--- a/src/lms/ui/explore/TrackPopup.hpp
+++ b/src/lms/ui/explore/TrackPopup.hpp
@@ -22,7 +22,7 @@
 #include <Wt/WWidget.h>
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace UserInterface
diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp
index 43bd3c0e..daec0fcd 100644
--- a/src/lms/ui/explore/TracksView.cpp
+++ b/src/lms/ui/explore/TracksView.cpp
@@ -23,7 +23,7 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/Logger.hpp"
 
 #include "common/InfiniteScrollingContainer.hpp"
diff --git a/src/lms/ui/explore/TracksView.hpp b/src/lms/ui/explore/TracksView.hpp
index 12fcb897..ac011e01 100644
--- a/src/lms/ui/explore/TracksView.hpp
+++ b/src/lms/ui/explore/TracksView.hpp
@@ -24,7 +24,7 @@
 #include <Wt/WContainerWidget.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 #include "TrackCollector.hpp"
 
diff --git a/src/lms/ui/resource/AudioFileResource.cpp b/src/lms/ui/resource/AudioFileResource.cpp
index ad9d6c91..def318df 100644
--- a/src/lms/ui/resource/AudioFileResource.cpp
+++ b/src/lms/ui/resource/AudioFileResource.cpp
@@ -23,8 +23,8 @@
 #include <Wt/Http/Response.h>
 
 #include "av/IAudioFile.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
diff --git a/src/lms/ui/resource/AudioFileResource.hpp b/src/lms/ui/resource/AudioFileResource.hpp
index 76fbbe7a..fda116eb 100644
--- a/src/lms/ui/resource/AudioFileResource.hpp
+++ b/src/lms/ui/resource/AudioFileResource.hpp
@@ -21,7 +21,7 @@
 
 #include <Wt/WResource.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 
 namespace UserInterface {
diff --git a/src/lms/ui/resource/AudioTranscodeResource.cpp b/src/lms/ui/resource/AudioTranscodeResource.cpp
index 7845f3c8..66ecac06 100644
--- a/src/lms/ui/resource/AudioTranscodeResource.cpp
+++ b/src/lms/ui/resource/AudioTranscodeResource.cpp
@@ -25,9 +25,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
diff --git a/src/lms/ui/resource/AudioTranscodeResource.hpp b/src/lms/ui/resource/AudioTranscodeResource.hpp
index 4c9a594c..ef516e91 100644
--- a/src/lms/ui/resource/AudioTranscodeResource.hpp
+++ b/src/lms/ui/resource/AudioTranscodeResource.hpp
@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include <Wt/WResource.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {
diff --git a/src/lms/ui/resource/CoverResource.cpp b/src/lms/ui/resource/CoverResource.cpp
index 4918b3c4..44d1189d 100644
--- a/src/lms/ui/resource/CoverResource.cpp
+++ b/src/lms/ui/resource/CoverResource.cpp
@@ -23,7 +23,7 @@
 #include <Wt/Http/Response.h>
 
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/lms/ui/resource/CoverResource.hpp b/src/lms/ui/resource/CoverResource.hpp
index 2b5d3b84..1e8cb8ad 100644
--- a/src/lms/ui/resource/CoverResource.hpp
+++ b/src/lms/ui/resource/CoverResource.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <Wt/WResource.h>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {
diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp
index 35061ef6..998096a5 100644
--- a/src/lms/ui/resource/DownloadResource.cpp
+++ b/src/lms/ui/resource/DownloadResource.cpp
@@ -26,10 +26,10 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WLocalDateTime.h>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Zipper.hpp"
diff --git a/src/lms/ui/resource/DownloadResource.hpp b/src/lms/ui/resource/DownloadResource.hpp
index 20e432cb..581a55ec 100644
--- a/src/lms/ui/resource/DownloadResource.hpp
+++ b/src/lms/ui/resource/DownloadResource.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 #include <Wt/WResource.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Zipper.hpp"
 
 namespace UserInterface {
diff --git a/src/tools/cover/LmsCover.cpp b/src/tools/cover/LmsCover.cpp
index f6757c8b..8202497c 100644
--- a/src/tools/cover/LmsCover.cpp
+++ b/src/tools/cover/LmsCover.cpp
@@ -25,10 +25,10 @@
 #include <boost/program_options.hpp>
 
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
diff --git a/src/tools/recommendation/CMakeLists.txt b/src/tools/recommendation/CMakeLists.txt
index 5fd6b6a8..12f20ef0 100644
--- a/src/tools/recommendation/CMakeLists.txt
+++ b/src/tools/recommendation/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(lms-recommendation
 	)
 
 target_link_libraries(lms-recommendation PRIVATE
-	lmscore
+	lmsdatabase
 	lmsrecommendation
 	Boost::program_options
 	)
diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp
index 23c11d26..c88dcc36 100644
--- a/src/tools/recommendation/LmsRecommendation.cpp
+++ b/src/tools/recommendation/LmsRecommendation.cpp
@@ -24,12 +24,12 @@
 
 #include <boost/program_options.hpp>
 
-#include "lmscore/database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
-#include "lmscore/database/Release.hpp"
-#include "lmscore/database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Service.hpp"
 #include "utils/StreamLogger.hpp"