diff --git a/src/callers/song.rs b/src/callers/song.rs
index 0d8c605..db97d00 100644
--- a/src/callers/song.rs
+++ b/src/callers/song.rs
@@ -107,10 +107,11 @@ pub mod endpoint {
     use crate::repo;
     use crate::repo::queue as repo_queue;
 
+    // TODO: Change the name of this endpoint. Including the function name and path
     /// Endpoint to create song
     #[utoipa::path(
         post,
-        path = super::super::endpoints::QUEUEMETADATA,
+        path = super::super::queue::endpoints::QUEUEMETADATA,
         request_body(
             content = super::request::create_metadata::Request,
             description = "Data needed to create the song and save it to the filesystem",
diff --git a/src/main.rs b/src/main.rs
index 1969bc8..ebbd992 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,7 +53,7 @@ pub mod init {
     use utoipa::OpenApi;
 
     use crate::callers::coverart as coverart_caller;
-    use crate::callers::metadata as metadata_caller;
+    use crate::callers::queue::metadata as metadata_caller;
     use crate::callers::queue::coverart as coverart_queue_callers;
     use crate::callers::queue::song as song_queue_callers;
     use crate::callers::song as song_caller;
@@ -184,14 +184,14 @@ pub mod init {
                     )),
             )
             .route(
-                crate::callers::endpoints::QUEUEMETADATA,
-                post(crate::callers::metadata::endpoint::queue_metadata).route_layer(
+                crate::callers::queue::endpoints::QUEUEMETADATA,
+                post(crate::callers::queue::metadata::endpoint::queue_metadata).route_layer(
                     axum::middleware::from_fn(crate::auth::auth::<axum::body::Body>),
                 ),
             )
             .route(
-                crate::callers::endpoints::QUEUEMETADATA,
-                get(crate::callers::metadata::endpoint::fetch_metadata).route_layer(
+                crate::callers::queue::endpoints::QUEUEMETADATA,
+                get(crate::callers::queue::metadata::endpoint::fetch_metadata).route_layer(
                     axum::middleware::from_fn(crate::auth::auth::<axum::body::Body>),
                 ),
             )