diff --git a/app/MindWork AI Studio/Program.cs b/app/MindWork AI Studio/Program.cs
index 5079c181..8e8441bc 100644
--- a/app/MindWork AI Studio/Program.cs	
+++ b/app/MindWork AI Studio/Program.cs	
@@ -2,6 +2,7 @@ using AIStudio;
 using AIStudio.Agents;
 using AIStudio.Settings;
 using AIStudio.Tools;
+using AIStudio.Tools.Services;
 
 using MudBlazor.Services;
 
diff --git a/app/MindWork AI Studio/MarkdownClipboardService.cs b/app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs
similarity index 87%
rename from app/MindWork AI Studio/MarkdownClipboardService.cs
rename to app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs
index 3d9740c6..126c13f7 100644
--- a/app/MindWork AI Studio/MarkdownClipboardService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs	
@@ -1,11 +1,9 @@
-using AIStudio.Tools;
-
 // ReSharper disable ClassNeverInstantiated.Global
 
-namespace AIStudio;
+namespace AIStudio.Tools.Services;
 
 /// <summary>
-/// Wire up the clipboard service to copy markdown to the clipboard.
+/// Wire up the clipboard service to copy Markdown to the clipboard.
 /// We use our own Rust-based clipboard service for this.
 /// </summary>
 public sealed class MarkdownClipboardService(Rust rust, IJSRuntime jsRuntime, ISnackbar snackbar) : IMudMarkdownClipboardService
diff --git a/app/MindWork AI Studio/Tools/TemporaryChatService.cs b/app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs
similarity index 98%
rename from app/MindWork AI Studio/Tools/TemporaryChatService.cs
rename to app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs
index 0e76279a..0290298f 100644
--- a/app/MindWork AI Studio/Tools/TemporaryChatService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs	
@@ -1,7 +1,7 @@
 using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public class TemporaryChatService(SettingsManager settingsManager) : BackgroundService
 {
diff --git a/app/MindWork AI Studio/Tools/UpdateService.cs b/app/MindWork AI Studio/Tools/Services/UpdateService.cs
similarity index 99%
rename from app/MindWork AI Studio/Tools/UpdateService.cs
rename to app/MindWork AI Studio/Tools/Services/UpdateService.cs
index 6f6c07d8..c8cfef68 100644
--- a/app/MindWork AI Studio/Tools/UpdateService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/UpdateService.cs	
@@ -3,7 +3,7 @@ using AIStudio.Settings.DataModel;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed class UpdateService : BackgroundService, IMessageBusReceiver
 {