diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/create_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs
similarity index 100%
rename from crates/lib/mysql_queries/src/queries/voice_designer/create_dataset.rs
rename to crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/delete_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/delete_dataset.rs
similarity index 100%
rename from crates/lib/mysql_queries/src/queries/voice_designer/delete_dataset.rs
rename to crates/lib/mysql_queries/src/queries/voice_designer/datasets/delete_dataset.rs
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/get_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs
similarity index 100%
rename from crates/lib/mysql_queries/src/queries/voice_designer/get_dataset.rs
rename to crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/mod.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/mod.rs
new file mode 100644
index 0000000000..979ccf56d1
--- /dev/null
+++ b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/mod.rs
@@ -0,0 +1,4 @@
+pub mod create_dataset;
+pub mod delete_dataset;
+pub mod get_dataset;
+pub mod update_dataset;
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/update_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs
similarity index 100%
rename from crates/lib/mysql_queries/src/queries/voice_designer/update_dataset.rs
rename to crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/mod.rs b/crates/lib/mysql_queries/src/queries/voice_designer/mod.rs
index 6056b6fbd9..cf33dc01ad 100644
--- a/crates/lib/mysql_queries/src/queries/voice_designer/mod.rs
+++ b/crates/lib/mysql_queries/src/queries/voice_designer/mod.rs
@@ -1,5 +1,3 @@
-pub mod create_dataset;
-pub mod update_dataset;
-pub mod get_dataset;
-pub mod delete_dataset;
-pub mod create_voice;
\ No newline at end of file
+pub mod datasets;
+pub mod voice_samples;
+pub mod voices;
\ No newline at end of file
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/mod.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/mod.rs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/create_voice.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/create_voice.rs
similarity index 100%
rename from crates/lib/mysql_queries/src/queries/voice_designer/create_voice.rs
rename to crates/lib/mysql_queries/src/queries/voice_designer/voices/create_voice.rs
diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voices/mod.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/mod.rs
new file mode 100644
index 0000000000..4f06022ccd
--- /dev/null
+++ b/crates/lib/mysql_queries/src/queries/voice_designer/voices/mod.rs
@@ -0,0 +1 @@
+pub mod create_voice;
diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/create_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/create_dataset.rs
index 3ebc21e77c..04b0087c7f 100644
--- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/create_dataset.rs
+++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/create_dataset.rs
@@ -10,7 +10,7 @@ use enums::common::visibility::Visibility;
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
-use mysql_queries::queries::voice_designer::create_dataset::{create_dataset, CreateDatasetArgs};
+use mysql_queries::queries::voice_designer::datasets::create_dataset::{create_dataset, CreateDatasetArgs};
 use tokens::tokens::zs_dataset::ZsDatasetToken;
 
 use crate::server_state::ServerState;
diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/delete_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/delete_dataset.rs
index 47a58ac606..9b60a8229a 100644
--- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/delete_dataset.rs
+++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/delete_dataset.rs
@@ -10,8 +10,8 @@ use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction::
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
-use mysql_queries::queries::voice_designer::delete_dataset::{delete_dataset_as_mod, delete_dataset_as_user, undelete_dataset_as_mod, undelete_dataset_as_user};
-use mysql_queries::queries::voice_designer::get_dataset::get_dataset_by_token;
+use mysql_queries::queries::voice_designer::datasets::delete_dataset::{delete_dataset_as_mod, delete_dataset_as_user, undelete_dataset_as_mod, undelete_dataset_as_user};
+use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token;
 use tokens::tokens::zs_dataset::ZsDatasetToken;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 
diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/update_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/update_dataset.rs
index 136a295578..73ab915a07 100644
--- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/update_dataset.rs
+++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/update_dataset.rs
@@ -11,9 +11,9 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::response_success_helpers::simple_json_success;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
-use mysql_queries::queries::voice_designer::create_dataset::{create_dataset, CreateDatasetArgs};
-use mysql_queries::queries::voice_designer::get_dataset::get_dataset_by_token;
-use mysql_queries::queries::voice_designer::update_dataset::{update_dataset, UpdateDatasetArgs};
+use mysql_queries::queries::voice_designer::datasets::create_dataset::{create_dataset, CreateDatasetArgs};
+use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token;
+use mysql_queries::queries::voice_designer::datasets::update_dataset::{update_dataset, UpdateDatasetArgs};
 use tokens::tokens::zs_dataset::ZsDatasetToken;
 
 use crate::server_state::ServerState;