diff --git a/ffplayout-api/src/utils/routes.rs b/ffplayout-api/src/utils/routes.rs
index 47088d21..de98af8d 100644
--- a/ffplayout-api/src/utils/routes.rs
+++ b/ffplayout-api/src/utils/routes.rs
@@ -32,176 +32,6 @@ struct ResponseObj<T> {
     data: Option<T>,
 }
 
-/// curl -X GET http://127.0.0.1:8080/api/settings/1 -H "Authorization: Bearer <TOKEN>"
-#[get("/settings/{id}")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn get_settings(id: web::Path<i64>) -> Result<impl Responder, ServiceError> {
-    if let Ok(settings) = db_get_settings(&id).await {
-        return Ok(web::Json(ResponseObj {
-            message: format!("Settings from {}", settings.channel_name),
-            status: 200,
-            data: Some(settings),
-        }));
-    }
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X PATCH http://127.0.0.1:8080/api/settings/1 -H "Content-Type: application/json"  \
-/// --data '{"id":1,"channel_name":"Channel 1","preview_url":"http://localhost/live/stream.m3u8", \
-/// "config_path":"/etc/ffplayout/ffplayout.yml","extra_extensions":".jpg,.jpeg,.png"}' \
-/// -H "Authorization: Bearer <TOKEN>"
-#[patch("/settings/{id}")]
-#[has_any_role("Role::Admin", type = "Role")]
-async fn patch_settings(
-    id: web::Path<i64>,
-    data: web::Json<Settings>,
-) -> Result<impl Responder, ServiceError> {
-    if db_update_settings(*id, data.into_inner()).await.is_ok() {
-        return Ok("Update Success");
-    };
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X GET http://localhost:8080/api/playout/config/1 --header 'Authorization: <TOKEN>'
-#[get("/playout/config/{id}")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn get_playout_config(
-    id: web::Path<i64>,
-    _details: AuthDetails<Role>,
-) -> Result<impl Responder, ServiceError> {
-    if let Ok(settings) = db_get_settings(&id).await {
-        if let Ok(config) = read_playout_config(&settings.config_path) {
-            return Ok(web::Json(config));
-        }
-    };
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X PUT http://localhost:8080/api/playout/config/1  -H "Content-Type: application/json" \
-/// --data { <CONFIG DATA> } --header 'Authorization: <TOKEN>'
-#[put("/playout/config/{id}")]
-#[has_any_role("Role::Admin", type = "Role")]
-async fn update_playout_config(
-    id: web::Path<i64>,
-    data: web::Json<PlayoutConfig>,
-) -> Result<impl Responder, ServiceError> {
-    if let Ok(settings) = db_get_settings(&id).await {
-        if let Ok(f) = std::fs::OpenOptions::new()
-            .write(true)
-            .truncate(true)
-            .open(&settings.config_path)
-        {
-            serde_yaml::to_writer(f, &data).unwrap();
-
-            return Ok("Update playout config success.");
-        } else {
-            return Err(ServiceError::InternalServerError);
-        };
-    };
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X PUT http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
-/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
-#[get("/presets/")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn get_presets() -> Result<impl Responder, ServiceError> {
-    if let Ok(presets) = db_get_presets().await {
-        return Ok(web::Json(presets));
-    }
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X PUT http://localhost:8080/api/presets/1 --header 'Content-Type: application/json' \
-/// --data '{"name": "<PRESET NAME>", "text": "TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
-/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}}' \
-/// --header 'Authorization: <TOKEN>'
-#[put("/presets/{id}")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn update_preset(
-    id: web::Path<i64>,
-    data: web::Json<TextPreset>,
-) -> Result<impl Responder, ServiceError> {
-    if db_update_preset(&id, data.into_inner()).await.is_ok() {
-        return Ok("Update Success");
-    }
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X POST http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
-/// --data '{"name": "<PRESET NAME>", "text": "TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
-/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}}' \
-/// --header 'Authorization: <TOKEN>'
-#[post("/presets/")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn add_preset(data: web::Json<TextPreset>) -> Result<impl Responder, ServiceError> {
-    if db_add_preset(data.into_inner()).await.is_ok() {
-        return Ok("Add preset Success");
-    }
-
-    Err(ServiceError::InternalServerError)
-}
-
-/// curl -X PUT http://localhost:8080/api/user/1 --header 'Content-Type: application/json' \
-/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
-#[put("/user/{id}")]
-#[has_any_role("Role::Admin", "Role::User", type = "Role")]
-async fn update_user(
-    id: web::Path<i64>,
-    user: web::ReqData<LoginUser>,
-    data: web::Json<User>,
-) -> Result<impl Responder, ServiceError> {
-    if id.into_inner() == user.id {
-        let mut fields = String::new();
-
-        if let Some(email) = data.email.clone() {
-            fields.push_str(format!("email = '{email}'").as_str());
-        }
-
-        if !data.password.is_empty() {
-            if !fields.is_empty() {
-                fields.push_str(", ");
-            }
-
-            let salt = SaltString::generate(&mut OsRng);
-            let password_hash = Argon2::default()
-                .hash_password(data.password.clone().as_bytes(), &salt)
-                .unwrap();
-
-            fields.push_str(format!("password = '{}', salt = '{salt}'", password_hash).as_str());
-        }
-
-        if db_update_user(user.id, fields).await.is_ok() {
-            return Ok("Update Success");
-        };
-
-        return Err(ServiceError::InternalServerError);
-    }
-
-    Err(ServiceError::Unauthorized)
-}
-
-/// curl -X POST 'http://localhost:8080/api/user/' --header 'Content-Type: application/json' \
-/// -d '{"email": "<EMAIL>", "username": "<USER>", "password": "<PASS>", "role_id": 1}' \
-/// --header 'Authorization: Bearer <TOKEN>'
-#[post("/user/")]
-#[has_any_role("Role::Admin", type = "Role")]
-async fn add_user(data: web::Json<User>) -> Result<impl Responder, ServiceError> {
-    match db_add_user(data.into_inner()).await {
-        Ok(_) => Ok("Add User Success"),
-        Err(e) => {
-            error!("{e}");
-            Err(ServiceError::InternalServerError)
-        }
-    }
-}
-
 /// curl -X POST http://127.0.0.1:8080/auth/login/ -H "Content-Type: application/json" \
 /// -d '{"username": "<USER>", "password": "<PASS>" }'
 #[post("/auth/login/")]
@@ -259,6 +89,176 @@ pub async fn login(credentials: web::Json<User>) -> impl Responder {
     }
 }
 
+/// curl -X PUT http://localhost:8080/api/user/1 --header 'Content-Type: application/json' \
+/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
+#[put("/user/{id}")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn update_user(
+    id: web::Path<i64>,
+    user: web::ReqData<LoginUser>,
+    data: web::Json<User>,
+) -> Result<impl Responder, ServiceError> {
+    if id.into_inner() == user.id {
+        let mut fields = String::new();
+
+        if let Some(email) = data.email.clone() {
+            fields.push_str(format!("email = '{email}'").as_str());
+        }
+
+        if !data.password.is_empty() {
+            if !fields.is_empty() {
+                fields.push_str(", ");
+            }
+
+            let salt = SaltString::generate(&mut OsRng);
+            let password_hash = Argon2::default()
+                .hash_password(data.password.clone().as_bytes(), &salt)
+                .unwrap();
+
+            fields.push_str(format!("password = '{}', salt = '{salt}'", password_hash).as_str());
+        }
+
+        if db_update_user(user.id, fields).await.is_ok() {
+            return Ok("Update Success");
+        };
+
+        return Err(ServiceError::InternalServerError);
+    }
+
+    Err(ServiceError::Unauthorized)
+}
+
+/// curl -X POST 'http://localhost:8080/api/user/' --header 'Content-Type: application/json' \
+/// -d '{"email": "<EMAIL>", "username": "<USER>", "password": "<PASS>", "role_id": 1}' \
+/// --header 'Authorization: Bearer <TOKEN>'
+#[post("/user/")]
+#[has_any_role("Role::Admin", type = "Role")]
+async fn add_user(data: web::Json<User>) -> Result<impl Responder, ServiceError> {
+    match db_add_user(data.into_inner()).await {
+        Ok(_) => Ok("Add User Success"),
+        Err(e) => {
+            error!("{e}");
+            Err(ServiceError::InternalServerError)
+        }
+    }
+}
+
+/// curl -X GET http://127.0.0.1:8080/api/settings/1 -H "Authorization: Bearer <TOKEN>"
+#[get("/settings/{id}")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn get_settings(id: web::Path<i64>) -> Result<impl Responder, ServiceError> {
+    if let Ok(settings) = db_get_settings(&id).await {
+        return Ok(web::Json(ResponseObj {
+            message: format!("Settings from {}", settings.channel_name),
+            status: 200,
+            data: Some(settings),
+        }));
+    }
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X PATCH http://127.0.0.1:8080/api/settings/1 -H "Content-Type: application/json"  \
+/// --data '{"id":1,"channel_name":"Channel 1","preview_url":"http://localhost/live/stream.m3u8", \
+/// "config_path":"/etc/ffplayout/ffplayout.yml","extra_extensions":".jpg,.jpeg,.png"}' \
+/// -H "Authorization: Bearer <TOKEN>"
+#[patch("/settings/{id}")]
+#[has_any_role("Role::Admin", type = "Role")]
+async fn patch_settings(
+    id: web::Path<i64>,
+    data: web::Json<Settings>,
+) -> Result<impl Responder, ServiceError> {
+    if db_update_settings(*id, data.into_inner()).await.is_ok() {
+        return Ok("Update Success");
+    };
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X GET http://localhost:8080/api/playout/config/1 --header 'Authorization: <TOKEN>'
+#[get("/playout/config/{id}")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn get_playout_config(
+    id: web::Path<i64>,
+    _details: AuthDetails<Role>,
+) -> Result<impl Responder, ServiceError> {
+    if let Ok(settings) = db_get_settings(&id).await {
+        if let Ok(config) = read_playout_config(&settings.config_path) {
+            return Ok(web::Json(config));
+        }
+    };
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X PUT http://localhost:8080/api/playout/config/1 -H "Content-Type: application/json" \
+/// --data { <CONFIG DATA> } --header 'Authorization: <TOKEN>'
+#[put("/playout/config/{id}")]
+#[has_any_role("Role::Admin", type = "Role")]
+async fn update_playout_config(
+    id: web::Path<i64>,
+    data: web::Json<PlayoutConfig>,
+) -> Result<impl Responder, ServiceError> {
+    if let Ok(settings) = db_get_settings(&id).await {
+        if let Ok(f) = std::fs::OpenOptions::new()
+            .write(true)
+            .truncate(true)
+            .open(&settings.config_path)
+        {
+            serde_yaml::to_writer(f, &data).unwrap();
+
+            return Ok("Update playout config success.");
+        } else {
+            return Err(ServiceError::InternalServerError);
+        };
+    };
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X GET http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
+/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
+#[get("/presets/")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn get_presets() -> Result<impl Responder, ServiceError> {
+    if let Ok(presets) = db_get_presets().await {
+        return Ok(web::Json(presets));
+    }
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X PUT http://localhost:8080/api/presets/1 --header 'Content-Type: application/json' \
+/// --data '{"name": "<PRESET NAME>", "text": "<TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
+/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}' \
+/// --header 'Authorization: <TOKEN>'
+#[put("/presets/{id}")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn update_preset(
+    id: web::Path<i64>,
+    data: web::Json<TextPreset>,
+) -> Result<impl Responder, ServiceError> {
+    if db_update_preset(&id, data.into_inner()).await.is_ok() {
+        return Ok("Update Success");
+    }
+
+    Err(ServiceError::InternalServerError)
+}
+
+/// curl -X POST http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
+/// --data '{"name": "<PRESET NAME>", "text": "TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
+/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}}' \
+/// --header 'Authorization: <TOKEN>'
+#[post("/presets/")]
+#[has_any_role("Role::Admin", "Role::User", type = "Role")]
+async fn add_preset(data: web::Json<TextPreset>) -> Result<impl Responder, ServiceError> {
+    if db_add_preset(data.into_inner()).await.is_ok() {
+        return Ok("Add preset Success");
+    }
+
+    Err(ServiceError::InternalServerError)
+}
+
 /// ----------------------------------------------------------------------------
 /// ffplayout process controlling
 ///
@@ -447,7 +447,7 @@ pub async fn move_rename(
 
 /// curl -X DELETE http://localhost:8080/api/file/1/remove/
 /// --header 'Content-Type: application/json' --header 'Authorization: <TOKEN>'
-/// -d '{"source": "<SOURCE>", "target": ""}'
+/// -d '{"source": "<SOURCE>"}'
 #[delete("/file/{id}/remove/")]
 #[has_any_role("Role::Admin", "Role::User", type = "Role")]
 pub async fn remove(