diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs
index 63867ff6..2763aade 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
@@ -1,12 +1,12 @@
 using AIStudio.Chat;
 using AIStudio.Provider;
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
 using MudBlazor.Utilities;
 
-using RustService = AIStudio.Tools.RustService;
 using Timer = System.Timers.Timer;
 
 namespace AIStudio.Assistants;
diff --git a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs
index 57975903..49e102a5 100644
--- a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs	
+++ b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs	
@@ -1,9 +1,8 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
-using RustService = AIStudio.Tools.RustService;
-
 namespace AIStudio.Chat;
 
 /// <summary>
diff --git a/app/MindWork AI Studio/Components/SelectDirectory.razor.cs b/app/MindWork AI Studio/Components/SelectDirectory.razor.cs
index 79bc18ef..a4ebbf8b 100644
--- a/app/MindWork AI Studio/Components/SelectDirectory.razor.cs	
+++ b/app/MindWork AI Studio/Components/SelectDirectory.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Components/SelectFile.razor.cs b/app/MindWork AI Studio/Components/SelectFile.razor.cs
index 5d1b7f04..d4a03ad5 100644
--- a/app/MindWork AI Studio/Components/SelectFile.razor.cs	
+++ b/app/MindWork AI Studio/Components/SelectFile.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelBase.cs b/app/MindWork AI Studio/Components/Settings/SettingsPanelBase.cs
index f7f3a1d2..c3384167 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelBase.cs	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelBase.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Components/TextInfoLine.razor.cs b/app/MindWork AI Studio/Components/TextInfoLine.razor.cs
index 4c4e6409..206fae4b 100644
--- a/app/MindWork AI Studio/Components/TextInfoLine.razor.cs	
+++ b/app/MindWork AI Studio/Components/TextInfoLine.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Components/TextInfoLines.razor.cs b/app/MindWork AI Studio/Components/TextInfoLines.razor.cs
index 4d0a9172..2427133c 100644
--- a/app/MindWork AI Studio/Components/TextInfoLines.razor.cs	
+++ b/app/MindWork AI Studio/Components/TextInfoLines.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Dialogs/DataSourceERI-V1InfoDialog.razor.cs b/app/MindWork AI Studio/Dialogs/DataSourceERI-V1InfoDialog.razor.cs
index 304c4f67..192347d0 100644
--- a/app/MindWork AI Studio/Dialogs/DataSourceERI-V1InfoDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/DataSourceERI-V1InfoDialog.razor.cs	
@@ -6,6 +6,7 @@ using AIStudio.Assistants.ERI;
 using AIStudio.Settings.DataModel;
 using AIStudio.Tools.ERIClient;
 using AIStudio.Tools.ERIClient.DataModel;
+using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
diff --git a/app/MindWork AI Studio/Dialogs/DataSourceERI_V1Dialog.razor.cs b/app/MindWork AI Studio/Dialogs/DataSourceERI_V1Dialog.razor.cs
index ec7ba6b5..e042f92a 100644
--- a/app/MindWork AI Studio/Dialogs/DataSourceERI_V1Dialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/DataSourceERI_V1Dialog.razor.cs	
@@ -3,6 +3,7 @@ using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
 using AIStudio.Tools.ERIClient;
 using AIStudio.Tools.ERIClient.DataModel;
+using AIStudio.Tools.Services;
 using AIStudio.Tools.Validation;
 
 using Microsoft.AspNetCore.Components;
diff --git a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs
index 399c9b87..759d9a17 100644
--- a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs	
@@ -1,5 +1,6 @@
 using AIStudio.Provider;
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 using AIStudio.Tools.Validation;
 
 using Microsoft.AspNetCore.Components;
diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs
index 87e5569e..a721b955 100644
--- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
@@ -1,11 +1,11 @@
 using AIStudio.Provider;
 using AIStudio.Settings;
+using AIStudio.Tools.Services;
 using AIStudio.Tools.Validation;
 
 using Microsoft.AspNetCore.Components;
 
 using Host = AIStudio.Provider.SelfHosted.Host;
-using RustService = AIStudio.Tools.RustService;
 
 namespace AIStudio.Dialogs;
 
diff --git a/app/MindWork AI Studio/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Layout/MainLayout.razor.cs
index 47a09be7..b302b23e 100644
--- a/app/MindWork AI Studio/Layout/MainLayout.razor.cs	
+++ b/app/MindWork AI Studio/Layout/MainLayout.razor.cs	
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 
 using DialogOptions = AIStudio.Dialogs.DialogOptions;
-using RustService = AIStudio.Tools.RustService;
 
 namespace AIStudio.Layout;
 
diff --git a/app/MindWork AI Studio/Provider/BaseProvider.cs b/app/MindWork AI Studio/Provider/BaseProvider.cs
index 2899e4f5..3ad4e8f2 100644
--- a/app/MindWork AI Studio/Provider/BaseProvider.cs	
+++ b/app/MindWork AI Studio/Provider/BaseProvider.cs	
@@ -4,8 +4,7 @@ using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Settings;
-
-using RustService = AIStudio.Tools.RustService;
+using AIStudio.Tools.Services;
 
 namespace AIStudio.Provider;
 
diff --git a/app/MindWork AI Studio/Tools/ERIClient/ERIClientV1.cs b/app/MindWork AI Studio/Tools/ERIClient/ERIClientV1.cs
index cf9f9e1c..c57d927a 100644
--- a/app/MindWork AI Studio/Tools/ERIClient/ERIClientV1.cs	
+++ b/app/MindWork AI Studio/Tools/ERIClient/ERIClientV1.cs	
@@ -3,6 +3,7 @@ using System.Text.Json;
 
 using AIStudio.Settings;
 using AIStudio.Tools.ERIClient.DataModel;
+using AIStudio.Tools.Services;
 
 namespace AIStudio.Tools.ERIClient;
 
diff --git a/app/MindWork AI Studio/Tools/ERIClient/IERIClient.cs b/app/MindWork AI Studio/Tools/ERIClient/IERIClient.cs
index 9cf27fbf..0408e8d3 100644
--- a/app/MindWork AI Studio/Tools/ERIClient/IERIClient.cs	
+++ b/app/MindWork AI Studio/Tools/ERIClient/IERIClient.cs	
@@ -1,5 +1,6 @@
 using AIStudio.Settings;
 using AIStudio.Tools.ERIClient.DataModel;
+using AIStudio.Tools.Services;
 
 namespace AIStudio.Tools.ERIClient;
 
diff --git a/app/MindWork AI Studio/Tools/RustService.APIKeys.cs b/app/MindWork AI Studio/Tools/Services/RustService.APIKeys.cs
similarity index 99%
rename from app/MindWork AI Studio/Tools/RustService.APIKeys.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.APIKeys.cs
index 1a3b4af7..7b89fe9a 100644
--- a/app/MindWork AI Studio/Tools/RustService.APIKeys.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.APIKeys.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Tools.Rust;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.App.cs b/app/MindWork AI Studio/Tools/Services/RustService.App.cs
similarity index 99%
rename from app/MindWork AI Studio/Tools/RustService.App.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.App.cs
index ea27f6d0..8671e897 100644
--- a/app/MindWork AI Studio/Tools/RustService.App.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.App.cs	
@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.Clipboard.cs b/app/MindWork AI Studio/Tools/Services/RustService.Clipboard.cs
similarity index 98%
rename from app/MindWork AI Studio/Tools/RustService.Clipboard.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.Clipboard.cs
index d3e6520a..9a1b6017 100644
--- a/app/MindWork AI Studio/Tools/RustService.Clipboard.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.Clipboard.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Tools.Rust;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.FileSystem.cs b/app/MindWork AI Studio/Tools/Services/RustService.FileSystem.cs
similarity index 97%
rename from app/MindWork AI Studio/Tools/RustService.FileSystem.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.FileSystem.cs
index bd4c26a9..411400f1 100644
--- a/app/MindWork AI Studio/Tools/RustService.FileSystem.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.FileSystem.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Tools.Rust;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.Secrets.cs b/app/MindWork AI Studio/Tools/Services/RustService.Secrets.cs
similarity index 99%
rename from app/MindWork AI Studio/Tools/RustService.Secrets.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.Secrets.cs
index a70a1273..b41806e1 100644
--- a/app/MindWork AI Studio/Tools/RustService.Secrets.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.Secrets.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Tools.Rust;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.Updates.cs b/app/MindWork AI Studio/Tools/Services/RustService.Updates.cs
similarity index 97%
rename from app/MindWork AI Studio/Tools/RustService.Updates.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.Updates.cs
index edb14663..1686b777 100644
--- a/app/MindWork AI Studio/Tools/RustService.Updates.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.Updates.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Tools.Rust;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 public sealed partial class RustService
 {
diff --git a/app/MindWork AI Studio/Tools/RustService.cs b/app/MindWork AI Studio/Tools/Services/RustService.cs
similarity index 98%
rename from app/MindWork AI Studio/Tools/RustService.cs
rename to app/MindWork AI Studio/Tools/Services/RustService.cs
index 08d68d31..38fab8cc 100644
--- a/app/MindWork AI Studio/Tools/RustService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/RustService.cs	
@@ -3,7 +3,7 @@ using System.Text.Json;
 
 // ReSharper disable NotAccessedPositionalProperty.Local
 
-namespace AIStudio.Tools;
+namespace AIStudio.Tools.Services;
 
 /// <summary>
 /// Calling Rust functions.