diff --git a/crates/tabby/src/main.rs b/crates/tabby/src/main.rs
index 978aed9..f7645cf 100644
--- a/crates/tabby/src/main.rs
+++ b/crates/tabby/src/main.rs
@@ -1,4 +1,3 @@
-mod chat;
 mod download;
 mod serve;
 
diff --git a/crates/tabby/src/serve/chat.rs b/crates/tabby/src/serve/chat.rs
index f24aa67..4b51683 100644
--- a/crates/tabby/src/serve/chat.rs
+++ b/crates/tabby/src/serve/chat.rs
@@ -9,7 +9,7 @@ use axum::{
 use axum_streams::StreamBodyAs;
 use tracing::instrument;
 
-use crate::chat::{ChatCompletionRequest, ChatService};
+use crate::services::chat::{ChatCompletionRequest, ChatService};
 
 #[utoipa::path(
     post,
diff --git a/crates/tabby/src/serve/mod.rs b/crates/tabby/src/serve/mod.rs
index b58141d..2aafac7 100644
--- a/crates/tabby/src/serve/mod.rs
+++ b/crates/tabby/src/serve/mod.rs
@@ -32,7 +32,7 @@ use self::{
     engine::{create_engine, EngineInfo},
     health::HealthState,
 };
-use crate::{chat::ChatService, fatal};
+use crate::{fatal, services::chat::ChatService};
 
 #[derive(OpenApi)]
 #[openapi(
@@ -61,9 +61,9 @@ Install following IDE / Editor extensions to get started with [Tabby](https://gi
         completions::Snippet,
         completions::DebugOptions,
         completions::DebugData,
-        crate::chat::ChatCompletionRequest,
-        crate::chat::Message,
-        crate::chat::ChatCompletionChunk,
+        crate::services::chat::ChatCompletionRequest,
+        crate::services::chat::Message,
+        crate::services::chat::ChatCompletionChunk,
         health::HealthState,
         health::Version,
         SearchResponse,
@@ -174,7 +174,7 @@ async fn load_model(args: &ServeArgs) {
 }
 
 async fn api_router(args: &ServeArgs, config: &Config) -> Router {
-    let code = Arc::new(crate::services::create_code_search());
+    let code = Arc::new(crate::services::code::create_code_search());
     let completion_state = {
         let (
             engine,
diff --git a/crates/tabby/src/chat.rs b/crates/tabby/src/services/chat.rs
similarity index 100%
rename from crates/tabby/src/chat.rs
rename to crates/tabby/src/services/chat.rs
diff --git a/crates/tabby/src/chat/prompt.rs b/crates/tabby/src/services/chat/prompt.rs
similarity index 100%
rename from crates/tabby/src/chat/prompt.rs
rename to crates/tabby/src/services/chat/prompt.rs
diff --git a/crates/tabby/src/services/search.rs b/crates/tabby/src/services/code.rs
similarity index 100%
rename from crates/tabby/src/services/search.rs
rename to crates/tabby/src/services/code.rs
diff --git a/crates/tabby/src/services/mod.rs b/crates/tabby/src/services/mod.rs
index 9675e1f..74476ac 100644
--- a/crates/tabby/src/services/mod.rs
+++ b/crates/tabby/src/services/mod.rs
@@ -1,3 +1,2 @@
-mod search;
-
-pub use search::*;
+pub mod chat;
+pub mod code;