diff --git a/src/libs/subsonic/CMakeLists.txt b/src/libs/subsonic/CMakeLists.txt
index a6ad493c..40d18e89 100644
--- a/src/libs/subsonic/CMakeLists.txt
+++ b/src/libs/subsonic/CMakeLists.txt
@@ -1,15 +1,15 @@
 
 add_library(lmssubsonic SHARED
-	impl/entrypoints/AlbumSongLists.cpp
-	impl/entrypoints/Bookmarks.cpp
-	impl/entrypoints/Browsing.cpp
-	impl/entrypoints/MediaAnnotation.cpp
-	impl/entrypoints/MediaLibraryScanning.cpp
-	impl/entrypoints/MediaRetrieval.cpp
-	impl/entrypoints/Playlists.cpp
-	impl/entrypoints/Searching.cpp
-	impl/entrypoints/System.cpp
-	impl/entrypoints/UserManagement.cpp
+	impl/endpoints/AlbumSongLists.cpp
+	impl/endpoints/Bookmarks.cpp
+	impl/endpoints/Browsing.cpp
+	impl/endpoints/MediaAnnotation.cpp
+	impl/endpoints/MediaLibraryScanning.cpp
+	impl/endpoints/MediaRetrieval.cpp
+	impl/endpoints/Playlists.cpp
+	impl/endpoints/Searching.cpp
+	impl/endpoints/System.cpp
+	impl/endpoints/UserManagement.cpp
 	impl/responses/Album.cpp
 	impl/responses/AlbumInfo.cpp
 	impl/responses/Artist.cpp
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index 455a1fa5..925b3764 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -41,16 +41,16 @@
 #include "RequestContext.hpp"
 #include "SubsonicId.hpp"
 #include "SubsonicResponse.hpp"
-#include "entrypoints/AlbumSongLists.hpp"
-#include "entrypoints/Bookmarks.hpp"
-#include "entrypoints/Browsing.hpp"
-#include "entrypoints/MediaAnnotation.hpp"
-#include "entrypoints/MediaLibraryScanning.hpp"
-#include "entrypoints/MediaRetrieval.hpp"
-#include "entrypoints/Playlists.hpp"
-#include "entrypoints/Searching.hpp"
-#include "entrypoints/System.hpp"
-#include "entrypoints/UserManagement.hpp"
+#include "endpoints/AlbumSongLists.hpp"
+#include "endpoints/Bookmarks.hpp"
+#include "endpoints/Browsing.hpp"
+#include "endpoints/MediaAnnotation.hpp"
+#include "endpoints/MediaLibraryScanning.hpp"
+#include "endpoints/MediaRetrieval.hpp"
+#include "endpoints/Playlists.hpp"
+#include "endpoints/Searching.hpp"
+#include "endpoints/System.hpp"
+#include "endpoints/UserManagement.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/entrypoints/AlbumSongLists.cpp b/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/AlbumSongLists.cpp
rename to src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/AlbumSongLists.hpp b/src/libs/subsonic/impl/endpoints/AlbumSongLists.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/AlbumSongLists.hpp
rename to src/libs/subsonic/impl/endpoints/AlbumSongLists.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/Bookmarks.cpp b/src/libs/subsonic/impl/endpoints/Bookmarks.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Bookmarks.cpp
rename to src/libs/subsonic/impl/endpoints/Bookmarks.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/Bookmarks.hpp b/src/libs/subsonic/impl/endpoints/Bookmarks.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Bookmarks.hpp
rename to src/libs/subsonic/impl/endpoints/Bookmarks.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/Browsing.cpp b/src/libs/subsonic/impl/endpoints/Browsing.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Browsing.cpp
rename to src/libs/subsonic/impl/endpoints/Browsing.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/Browsing.hpp b/src/libs/subsonic/impl/endpoints/Browsing.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Browsing.hpp
rename to src/libs/subsonic/impl/endpoints/Browsing.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaAnnotation.cpp b/src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaAnnotation.cpp
rename to src/libs/subsonic/impl/endpoints/MediaAnnotation.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaAnnotation.hpp b/src/libs/subsonic/impl/endpoints/MediaAnnotation.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaAnnotation.hpp
rename to src/libs/subsonic/impl/endpoints/MediaAnnotation.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaLibraryScanning.cpp b/src/libs/subsonic/impl/endpoints/MediaLibraryScanning.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaLibraryScanning.cpp
rename to src/libs/subsonic/impl/endpoints/MediaLibraryScanning.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaLibraryScanning.hpp b/src/libs/subsonic/impl/endpoints/MediaLibraryScanning.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaLibraryScanning.hpp
rename to src/libs/subsonic/impl/endpoints/MediaLibraryScanning.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaRetrieval.cpp
rename to src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/MediaRetrieval.hpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/MediaRetrieval.hpp
rename to src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/Playlists.cpp b/src/libs/subsonic/impl/endpoints/Playlists.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Playlists.cpp
rename to src/libs/subsonic/impl/endpoints/Playlists.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/Playlists.hpp b/src/libs/subsonic/impl/endpoints/Playlists.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Playlists.hpp
rename to src/libs/subsonic/impl/endpoints/Playlists.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/Searching.cpp b/src/libs/subsonic/impl/endpoints/Searching.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Searching.cpp
rename to src/libs/subsonic/impl/endpoints/Searching.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/Searching.hpp b/src/libs/subsonic/impl/endpoints/Searching.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/Searching.hpp
rename to src/libs/subsonic/impl/endpoints/Searching.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/System.cpp b/src/libs/subsonic/impl/endpoints/System.cpp
similarity index 98%
rename from src/libs/subsonic/impl/entrypoints/System.cpp
rename to src/libs/subsonic/impl/endpoints/System.cpp
index 20df9d75..260b1789 100644
--- a/src/libs/subsonic/impl/entrypoints/System.cpp
+++ b/src/libs/subsonic/impl/endpoints/System.cpp
@@ -1,4 +1,4 @@
-#include "entrypoints/System.hpp"
+#include "endpoints/System.hpp"
 
 namespace lms::api::subsonic
 {
diff --git a/src/libs/subsonic/impl/entrypoints/System.hpp b/src/libs/subsonic/impl/endpoints/System.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/System.hpp
rename to src/libs/subsonic/impl/endpoints/System.hpp
diff --git a/src/libs/subsonic/impl/entrypoints/UserManagement.cpp b/src/libs/subsonic/impl/endpoints/UserManagement.cpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/UserManagement.cpp
rename to src/libs/subsonic/impl/endpoints/UserManagement.cpp
diff --git a/src/libs/subsonic/impl/entrypoints/UserManagement.hpp b/src/libs/subsonic/impl/endpoints/UserManagement.hpp
similarity index 100%
rename from src/libs/subsonic/impl/entrypoints/UserManagement.hpp
rename to src/libs/subsonic/impl/endpoints/UserManagement.hpp