diff --git a/crates/stef-lsp/src/compile.rs b/crates/stef-lsp/src/handlers/compile.rs
similarity index 100%
rename from crates/stef-lsp/src/compile.rs
rename to crates/stef-lsp/src/handlers/compile.rs
diff --git a/crates/stef-lsp/src/document_symbols.rs b/crates/stef-lsp/src/handlers/document_symbols.rs
similarity index 100%
rename from crates/stef-lsp/src/document_symbols.rs
rename to crates/stef-lsp/src/handlers/document_symbols.rs
diff --git a/crates/stef-lsp/src/handlers.rs b/crates/stef-lsp/src/handlers/mod.rs
similarity index 98%
rename from crates/stef-lsp/src/handlers.rs
rename to crates/stef-lsp/src/handlers/mod.rs
index e70b80d..509dc9b 100644
--- a/crates/stef-lsp/src/handlers.rs
+++ b/crates/stef-lsp/src/handlers/mod.rs
@@ -14,7 +14,11 @@ use lsp_types::{
 };
 use ropey::Rope;
 
-use crate::{compile, document_symbols, semantic_tokens, state::FileBuilder, GlobalState};
+use crate::{state::FileBuilder, GlobalState};
+
+mod compile;
+mod document_symbols;
+mod semantic_tokens;
 
 pub fn initialize(
     _state: &mut GlobalState<'_>,
diff --git a/crates/stef-lsp/src/semantic_tokens.rs b/crates/stef-lsp/src/handlers/semantic_tokens.rs
similarity index 100%
rename from crates/stef-lsp/src/semantic_tokens.rs
rename to crates/stef-lsp/src/handlers/semantic_tokens.rs
diff --git a/crates/stef-lsp/src/main.rs b/crates/stef-lsp/src/main.rs
index a96f9bc..bcac12b 100644
--- a/crates/stef-lsp/src/main.rs
+++ b/crates/stef-lsp/src/main.rs
@@ -20,12 +20,9 @@ use crate::state::GlobalState;
 
 mod cli;
 mod client;
-mod compile;
 mod config;
-mod document_symbols;
 mod handlers;
 mod logging;
-mod semantic_tokens;
 mod state;
 
 fn main() -> Result<()> {