diff --git a/debug/curl/upload_tts.py b/debug/curl/upload_tts.py
index b5bf458be1..5a696c86bf 100755
--- a/debug/curl/upload_tts.py
+++ b/debug/curl/upload_tts.py
@@ -4,7 +4,7 @@ import requests
 import re
 
 login_url = 'http://localhost:12345/login'
-upload_url = 'http://localhost:12345/upload_tts'
+upload_url = 'http://localhost:12345/tts/upload'
 
 payload = {
   'username_or_email': 'echelon',
diff --git a/src/endpoints/enqueue_inference/mod.rs b/src/endpoints/enqueue_inference/mod.rs
deleted file mode 100644
index 2b7f9d8025..0000000000
--- a/src/endpoints/enqueue_inference/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod infer_tts;
-pub mod infer_w2l;
diff --git a/src/endpoints/enqueue_uploads/mod.rs b/src/endpoints/enqueue_uploads/mod.rs
deleted file mode 100644
index 1212193bbc..0000000000
--- a/src/endpoints/enqueue_uploads/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod upload_tts_model;
-pub mod upload_w2l_template;
diff --git a/src/endpoints/mod.rs b/src/endpoints/mod.rs
index 970c7a3129..60bd52fecb 100644
--- a/src/endpoints/mod.rs
+++ b/src/endpoints/mod.rs
@@ -1,6 +1,6 @@
 pub mod default_route_404;
-pub mod enqueue_inference;
-pub mod enqueue_uploads;
 pub mod misc;
 pub mod root_index;
-pub mod users;
\ No newline at end of file
+pub mod tts;
+pub mod users;
+pub mod w2l;
\ No newline at end of file
diff --git a/src/endpoints/enqueue_inference/infer_tts.rs b/src/endpoints/tts/enqueue_infer_tts.rs
similarity index 100%
rename from src/endpoints/enqueue_inference/infer_tts.rs
rename to src/endpoints/tts/enqueue_infer_tts.rs
diff --git a/src/endpoints/enqueue_uploads/upload_tts_model.rs b/src/endpoints/tts/enqueue_upload_tts_model.rs
similarity index 100%
rename from src/endpoints/enqueue_uploads/upload_tts_model.rs
rename to src/endpoints/tts/enqueue_upload_tts_model.rs
diff --git a/src/endpoints/tts/mod.rs b/src/endpoints/tts/mod.rs
new file mode 100644
index 0000000000..371b17ad4d
--- /dev/null
+++ b/src/endpoints/tts/mod.rs
@@ -0,0 +1,2 @@
+pub mod enqueue_infer_tts;
+pub mod enqueue_upload_tts_model;
\ No newline at end of file
diff --git a/src/endpoints/enqueue_inference/infer_w2l.rs b/src/endpoints/w2l/enqueue_infer_w2l.rs
similarity index 97%
rename from src/endpoints/enqueue_inference/infer_w2l.rs
rename to src/endpoints/w2l/enqueue_infer_w2l.rs
index a1250d6fa0..1a4e549a25 100644
--- a/src/endpoints/enqueue_inference/infer_w2l.rs
+++ b/src/endpoints/w2l/enqueue_infer_w2l.rs
@@ -103,6 +103,7 @@ pub async fn infer_w2l_handler(
       return Err(InferW2lError::BadInput("w2l token is required".to_string()));
     },
     Some(t) => {
+      // TODO: CHECK DATABASE!
       t.to_string()
     },
   };
@@ -112,7 +113,10 @@ pub async fn infer_w2l_handler(
       // TODO: Allow audio uploads.
       return Err(InferW2lError::BadInput("tts token is required".to_string()));
     },
-    Some(t) => t.to_string(),
+    Some(t) => {
+      // TODO: CHECK DATABASE!
+      t.to_string()
+    },
   };
 
   let ip_address = get_request_ip(&http_request);
diff --git a/src/endpoints/enqueue_uploads/upload_w2l_template.rs b/src/endpoints/w2l/enqueue_upload_w2l_template.rs
similarity index 100%
rename from src/endpoints/enqueue_uploads/upload_w2l_template.rs
rename to src/endpoints/w2l/enqueue_upload_w2l_template.rs
diff --git a/src/endpoints/w2l/mod.rs b/src/endpoints/w2l/mod.rs
new file mode 100644
index 0000000000..d34936265e
--- /dev/null
+++ b/src/endpoints/w2l/mod.rs
@@ -0,0 +1,2 @@
+pub mod enqueue_infer_w2l;
+pub mod enqueue_upload_w2l_template;
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 011bbb1417..c8b808c009 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,14 +19,14 @@ use actix_http::http;
 use actix_web::middleware::{Logger, DefaultHeaders};
 use actix_web::{HttpServer, web, HttpResponse, App};
 use crate::endpoints::default_route_404::default_route_404;
-use crate::endpoints::enqueue_uploads::upload_tts_model::upload_tts_model_handler;
-use crate::endpoints::enqueue_uploads::upload_w2l_template::upload_w2l_template_handler;
 use crate::endpoints::misc::enable_alpha::enable_alpha;
 use crate::endpoints::root_index::get_root_index;
 use crate::endpoints::users::create_account::create_account_handler;
 use crate::endpoints::users::login::login_handler;
 use crate::endpoints::users::logout::logout_handler;
 use crate::endpoints::users::session_info::session_info_handler;
+use crate::endpoints::w2l::enqueue_infer_w2l::infer_w2l_handler;
+use crate::endpoints::w2l::enqueue_upload_w2l_template::upload_w2l_template_handler;
 use crate::server_state::{ServerState, EnvConfig};
 use crate::util::cookies::CookieManager;
 use crate::util::session_checker::SessionChecker;
@@ -34,7 +34,7 @@ use log::{info};
 use sqlx::MySqlPool;
 use sqlx::mysql::MySqlPoolOptions;
 use std::sync::Arc;
-use crate::endpoints::enqueue_inference::infer_w2l::infer_w2l_handler;
+use crate::endpoints::tts::enqueue_upload_tts_model::upload_tts_model_handler;
 
 const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345";
 const DEFAULT_RUST_LOG: &'static str = "debug,actix_web=info";
@@ -171,9 +171,17 @@ pub async fn serve(server_state: ServerState) -> AnyhowResult<()>
           .route(web::head().to(|| HttpResponse::Ok()))
       )
       .service(
-        web::resource("/upload_tts")
-          .route(web::post().to(upload_tts_model_handler))
-          .route(web::head().to(|| HttpResponse::Ok()))
+        web::scope("/tts")
+          .service(
+            web::resource("/upload")
+              .route(web::post().to(upload_tts_model_handler))
+              .route(web::head().to(|| HttpResponse::Ok()))
+          )
+          //.service(
+          //  web::resource("/inference")
+          //    .route(web::post().to())
+          //    .route(web::head().to(|| HttpResponse::Ok()))
+          //)
       )
       .service(
         web::scope("/w2l")