diff --git a/.gitignore b/.gitignore
index 49aa517..5e5c9ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,7 +192,11 @@ templates/*
 !templates/place_your_templates_here.txt
 !templates/alpaca.jinja
 !templates/chatml.jinja
-!templates/chatml_with_headers_tool_calling.jinja
+
+# Tool calling templates folder
+templates/tool_calls/*
+!templates/tool_calls
+!templates/tool_calls/chatml_with_headers.jinja
 
 # Sampler overrides folder
 sampler_overrides/*
diff --git a/templates/chatml_with_headers_tool_calling.jinja b/templates/tool_calls/chatml_with_headers.jinja
similarity index 100%
rename from templates/chatml_with_headers_tool_calling.jinja
rename to templates/tool_calls/chatml_with_headers.jinja