diff --git a/crates/lib/database_queries/src/lib.rs b/crates/lib/database_queries/src/lib.rs
index a248fcebb1..6f01cc9da8 100644
--- a/crates/lib/database_queries/src/lib.rs
+++ b/crates/lib/database_queries/src/lib.rs
@@ -11,3 +11,4 @@ pub mod twitch_event_rules;
 pub mod twitch_oauth;
 pub mod twitch_pubsub;
 pub mod voice_clone_requests;
+pub mod w2l;
diff --git a/crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs
index 18364cbd18..0f5b4a5e86 100644
--- a/crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs
+++ b/crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs
@@ -13,7 +13,7 @@ pub struct TtsLeaderboardRecordForList {
 }
 
 #[derive(Serialize)]
-pub struct TtsLeaderboardRecordForListRaw {
+struct TtsLeaderboardRecordForListRaw {
   pub username: String,
   pub display_name: String,
   pub gravatar_hash: String,
diff --git a/crates/lib/database_queries/src/w2l/mod.rs b/crates/lib/database_queries/src/w2l/mod.rs
new file mode 100644
index 0000000000..fedcafddb7
--- /dev/null
+++ b/crates/lib/database_queries/src/w2l/mod.rs
@@ -0,0 +1 @@
+pub mod stats;
\ No newline at end of file
diff --git a/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs b/crates/lib/database_queries/src/w2l/stats/calculate_w2l_template_leaderboard.rs
similarity index 98%
rename from crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs
rename to crates/lib/database_queries/src/w2l/stats/calculate_w2l_template_leaderboard.rs
index 94562e359d..52ed9d5979 100644
--- a/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs
+++ b/crates/lib/database_queries/src/w2l/stats/calculate_w2l_template_leaderboard.rs
@@ -13,7 +13,7 @@ pub struct W2lLeaderboardRecordForList {
 }
 
 #[derive(Serialize)]
-pub struct W2lLeaderboardRecordForListRaw {
+struct W2lLeaderboardRecordForListRaw {
   pub username: String,
   pub display_name: String,
   pub gravatar_hash: String,
diff --git a/crates/lib/database_queries/src/w2l/stats/mod.rs b/crates/lib/database_queries/src/w2l/stats/mod.rs
new file mode 100644
index 0000000000..0a326d2cd9
--- /dev/null
+++ b/crates/lib/database_queries/src/w2l/stats/mod.rs
@@ -0,0 +1 @@
+pub mod calculate_w2l_template_leaderboard;
\ No newline at end of file
diff --git a/crates/service/storyteller_web/src/database/queries/mod.rs b/crates/service/storyteller_web/src/database/queries/mod.rs
index 622562cfae..528eebbe5d 100644
--- a/crates/service/storyteller_web/src/database/queries/mod.rs
+++ b/crates/service/storyteller_web/src/database/queries/mod.rs
@@ -1,5 +1,4 @@
 pub mod badges;
-pub mod calculate_w2l_template_leaderboard;
 pub mod categories;
 pub mod create_session;
 pub mod delete_w2l_result;
diff --git a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs
index 79e0ea3e13..5b31ce7826 100644
--- a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs
+++ b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs
@@ -6,13 +6,13 @@ use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage};
 use chrono::{DateTime, Utc};
-use crate::database::queries::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList;
-use crate::database::queries::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
 use crate::server_state::ServerState;
 use database_queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList;
 use database_queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard;
+use database_queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList;
+use database_queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard;
 use log::{info, warn, log};
 use regex::Regex;
 use sqlx::MySqlPool;