diff --git a/crates/tabby/src/routes/completions.rs b/crates/tabby/src/routes/completions.rs
index c5743f6..d394d18 100644
--- a/crates/tabby/src/routes/completions.rs
+++ b/crates/tabby/src/routes/completions.rs
@@ -4,7 +4,7 @@ use axum::{extract::State, Json};
 use hyper::StatusCode;
 use tracing::{instrument, warn};
 
-use crate::services::completions::{CompletionRequest, CompletionResponse, CompletionService};
+use crate::services::completion::{CompletionRequest, CompletionResponse, CompletionService};
 
 #[utoipa::path(
     post,
diff --git a/crates/tabby/src/routes/events.rs b/crates/tabby/src/routes/events.rs
index cbe61fb..61e8037 100644
--- a/crates/tabby/src/routes/events.rs
+++ b/crates/tabby/src/routes/events.rs
@@ -5,7 +5,6 @@ use axum::{
     Json,
 };
 use hyper::StatusCode;
-use utoipa::ToSchema;
 
 use crate::api::event::{Event, EventLogger, LogEventRequest, SelectKind};
 
diff --git a/crates/tabby/src/routes/health.rs b/crates/tabby/src/routes/health.rs
index 3525490..9483ac2 100644
--- a/crates/tabby/src/routes/health.rs
+++ b/crates/tabby/src/routes/health.rs
@@ -1,8 +1,6 @@
 use std::sync::Arc;
 
 use axum::{extract::State, Json};
-use sysinfo::SystemExt;
-use utoipa::ToSchema;
 
 use crate::services::health;
 
diff --git a/crates/tabby/src/serve/mod.rs b/crates/tabby/src/serve/mod.rs
index 8d19667..88d0686 100644
--- a/crates/tabby/src/serve/mod.rs
+++ b/crates/tabby/src/serve/mod.rs
@@ -20,7 +20,7 @@ use utoipa_swagger_ui::SwaggerUi;
 use crate::{
     api::{self},
     fatal, routes,
-    services::{chat, completions, event::create_event_logger, health, model},
+    services::{chat, completion, event::create_event_logger, health, model},
 };
 
 #[derive(OpenApi)]
@@ -43,13 +43,13 @@ Install following IDE / Editor extensions to get started with [Tabby](https://gi
     paths(routes::log_event, routes::completions, routes::completions, routes::health, routes::search),
     components(schemas(
         api::event::LogEventRequest,
-        completions::CompletionRequest,
-        completions::CompletionResponse,
-        completions::Segments,
-        completions::Choice,
-        completions::Snippet,
-        completions::DebugOptions,
-        completions::DebugData,
+        completion::CompletionRequest,
+        completion::CompletionResponse,
+        completion::Segments,
+        completion::Choice,
+        completion::Snippet,
+        completion::DebugOptions,
+        completion::DebugData,
         chat::ChatCompletionRequest,
         chat::Message,
         chat::ChatCompletionChunk,
@@ -172,7 +172,7 @@ async fn api_router(args: &ServeArgs, config: &Config) -> Router {
                 prompt_template, ..
             },
         ) = model::load_text_generation(&args.model, &args.device, args.parallelism).await;
-        let state = completions::CompletionService::new(
+        let state = completion::CompletionService::new(
             engine.clone(),
             code.clone(),
             logger.clone(),
diff --git a/crates/tabby/src/services/completions.rs b/crates/tabby/src/services/completion.rs
similarity index 100%
rename from crates/tabby/src/services/completions.rs
rename to crates/tabby/src/services/completion.rs
diff --git a/crates/tabby/src/services/completions/completions_prompt.rs b/crates/tabby/src/services/completion/completions_prompt.rs
similarity index 100%
rename from crates/tabby/src/services/completions/completions_prompt.rs
rename to crates/tabby/src/services/completion/completions_prompt.rs
diff --git a/crates/tabby/src/services/mod.rs b/crates/tabby/src/services/mod.rs
index 8a5ade9..e83cb06 100644
--- a/crates/tabby/src/services/mod.rs
+++ b/crates/tabby/src/services/mod.rs
@@ -1,6 +1,6 @@
 pub mod chat;
 pub mod code;
-pub mod completions;
+pub mod completion;
 pub mod event;
 pub mod health;
 pub mod model;