diff --git a/src/api/v1/servers/mod.rs b/src/api/v1/servers/mod.rs
index 35e9bbe..2cdd2e0 100644
--- a/src/api/v1/servers/mod.rs
+++ b/src/api/v1/servers/mod.rs
@@ -6,7 +6,6 @@ use ::uuid::Uuid;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 mod uuid;
-mod channels;
 
 use crate::{api::v1::auth::check_access_token, Data};
 
@@ -35,8 +34,7 @@ const MAX_SIZE: usize = 262_144;
 pub fn web() -> Scope {
     web::scope("/servers")
         .service(res)
-        .service(channels::web())
-        .service(uuid::res)
+        .service(uuid::web())
 }
 
 #[post("")]
diff --git a/src/api/v1/servers/channels/mod.rs b/src/api/v1/servers/uuid/channels/mod.rs
similarity index 100%
rename from src/api/v1/servers/channels/mod.rs
rename to src/api/v1/servers/uuid/channels/mod.rs
diff --git a/src/api/v1/servers/channels/uuid/messages.rs b/src/api/v1/servers/uuid/channels/uuid/messages.rs
similarity index 100%
rename from src/api/v1/servers/channels/uuid/messages.rs
rename to src/api/v1/servers/uuid/channels/uuid/messages.rs
diff --git a/src/api/v1/servers/channels/uuid/mod.rs b/src/api/v1/servers/uuid/channels/uuid/mod.rs
similarity index 100%
rename from src/api/v1/servers/channels/uuid/mod.rs
rename to src/api/v1/servers/uuid/channels/uuid/mod.rs
diff --git a/src/api/v1/servers/uuid.rs b/src/api/v1/servers/uuid/mod.rs
similarity index 94%
rename from src/api/v1/servers/uuid.rs
rename to src/api/v1/servers/uuid/mod.rs
index fdbfeb7..02ad3a1 100644
--- a/src/api/v1/servers/uuid.rs
+++ b/src/api/v1/servers/uuid/mod.rs
@@ -1,4 +1,4 @@
-use actix_web::{error, post, web, Error, HttpResponse};
+use actix_web::{error, post, web, Error, HttpResponse, Scope};
 use futures::StreamExt;
 use log::error;
 use serde::{Deserialize, Serialize};
@@ -6,6 +6,8 @@ use sqlx::FromRow;
 use uuid::Uuid;
 use std::str::FromStr;
 
+mod channels;
+
 use crate::{api::v1::auth::check_access_token, Data};
 
 #[derive(Deserialize)]
@@ -35,7 +37,13 @@ struct Role {
 
 const MAX_SIZE: usize = 262_144;
 
-#[post("/{uuid}")]
+pub fn web() -> Scope {
+    web::scope("/")
+        .service(res)
+        .service(channels::web())
+}
+
+#[post("{uuid}")]
 pub async fn res(mut payload: web::Payload, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
     let mut body = web::BytesMut::new();
     while let Some(chunk) = payload.next().await {