diff --git a/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs
index 07c8abfd..8fb876c4 100644
--- a/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs	
@@ -1,3 +1,5 @@
+using AIStudio.Settings;
+
 using Microsoft.AspNetCore.Components;
 
 namespace AIStudio.Components;
diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor b/app/MindWork AI Studio/Components/Layout/MainLayout.razor
index 1e6eb6ac..c7044e7b 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor	
+++ b/app/MindWork AI Studio/Components/Layout/MainLayout.razor	
@@ -1,4 +1,4 @@
-@using AIStudio.Settings
+@using AIStudio.Settings.DataModel
 @inherits LayoutComponentBase
 
 <MudPaper Height="calc(100vh);" Elevation="0">
diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs
index 6223b33e..d25ec74c 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
+++ b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
@@ -1,5 +1,6 @@
 using AIStudio.Components.CommonDialogs;
 using AIStudio.Settings;
+using AIStudio.Settings.DataModel;
 using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor b/app/MindWork AI Studio/Components/Pages/Chat.razor
index 807100fa..a039e2c5 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor	
@@ -1,6 +1,7 @@
 @page "/chat"
 @using AIStudio.Chat
 @using AIStudio.Settings
+@using AIStudio.Settings.DataModel
 
 @inherits MSGComponentBase
 
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs
index 491053df..6f1a4038 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
@@ -3,6 +3,7 @@ using AIStudio.Components.Blocks;
 using AIStudio.Components.CommonDialogs;
 using AIStudio.Provider;
 using AIStudio.Settings;
+using AIStudio.Settings.DataModel;
 using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor b/app/MindWork AI Studio/Components/Pages/Settings.razor
index 7292c42c..bb0f8d6f 100644
--- a/app/MindWork AI Studio/Components/Pages/Settings.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Settings.razor	
@@ -1,5 +1,6 @@
 @page "/settings"
 @using AIStudio.Provider
+@using AIStudio.Settings
 @using Host = AIStudio.Provider.SelfHosted.Host
 
 <MudText Typo="Typo.h3" Class="mb-12">Settings</MudText>
diff --git a/app/MindWork AI Studio/Components/ConfigurationSelectData.cs b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/ConfigurationSelectData.cs
rename to app/MindWork AI Studio/Settings/ConfigurationSelectData.cs
index cdb9cf4d..74207eec 100644
--- a/app/MindWork AI Studio/Components/ConfigurationSelectData.cs	
+++ b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs	
@@ -1,6 +1,6 @@
-using AIStudio.Settings;
+using AIStudio.Settings.DataModel;
 
-namespace AIStudio.Components;
+namespace AIStudio.Settings;
 
 /// <summary>
 /// A data structure to map a name to a value.
diff --git a/app/MindWork AI Studio/Settings/Data.cs b/app/MindWork AI Studio/Settings/DataModel/Data.cs
similarity index 97%
rename from app/MindWork AI Studio/Settings/Data.cs
rename to app/MindWork AI Studio/Settings/DataModel/Data.cs
index f18fd854..7304d882 100644
--- a/app/MindWork AI Studio/Settings/Data.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/Data.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 /// <summary>
 /// The data model for the settings file.
diff --git a/app/MindWork AI Studio/Settings/NavBehavior.cs b/app/MindWork AI Studio/Settings/DataModel/NavBehavior.cs
similarity index 76%
rename from app/MindWork AI Studio/Settings/NavBehavior.cs
rename to app/MindWork AI Studio/Settings/DataModel/NavBehavior.cs
index 70170a1d..668bf5ce 100644
--- a/app/MindWork AI Studio/Settings/NavBehavior.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/NavBehavior.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 public enum NavBehavior
 {
diff --git a/app/MindWork AI Studio/Settings/SendBehavior.cs b/app/MindWork AI Studio/Settings/DataModel/SendBehavior.cs
similarity index 95%
rename from app/MindWork AI Studio/Settings/SendBehavior.cs
rename to app/MindWork AI Studio/Settings/DataModel/SendBehavior.cs
index cc92883a..1e05790b 100644
--- a/app/MindWork AI Studio/Settings/SendBehavior.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/SendBehavior.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 /// <summary>
 /// Possible behaviors for sending the input to the AI.
diff --git a/app/MindWork AI Studio/Settings/UpdateBehavior.cs b/app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs
similarity index 70%
rename from app/MindWork AI Studio/Settings/UpdateBehavior.cs
rename to app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs
index 30579f76..0b82604f 100644
--- a/app/MindWork AI Studio/Settings/UpdateBehavior.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 public enum UpdateBehavior
 {
diff --git a/app/MindWork AI Studio/Settings/WorkspaceStorageBehavior.cs b/app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageBehavior.cs
similarity index 75%
rename from app/MindWork AI Studio/Settings/WorkspaceStorageBehavior.cs
rename to app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageBehavior.cs
index d115fb1d..1d6c654f 100644
--- a/app/MindWork AI Studio/Settings/WorkspaceStorageBehavior.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageBehavior.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 public enum WorkspaceStorageBehavior
 {
diff --git a/app/MindWork AI Studio/Settings/WorkspaceStorageTemporaryMaintenancePolicy.cs b/app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageTemporaryMaintenancePolicy.cs
similarity index 86%
rename from app/MindWork AI Studio/Settings/WorkspaceStorageTemporaryMaintenancePolicy.cs
rename to app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageTemporaryMaintenancePolicy.cs
index d635f014..7e221f92 100644
--- a/app/MindWork AI Studio/Settings/WorkspaceStorageTemporaryMaintenancePolicy.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/WorkspaceStorageTemporaryMaintenancePolicy.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Settings;
+namespace AIStudio.Settings.DataModel;
 
 public enum WorkspaceStorageTemporaryMaintenancePolicy
 {
diff --git a/app/MindWork AI Studio/Settings/SettingsManager.cs b/app/MindWork AI Studio/Settings/SettingsManager.cs
index 4a5d2991..338c35c8 100644
--- a/app/MindWork AI Studio/Settings/SettingsManager.cs	
+++ b/app/MindWork AI Studio/Settings/SettingsManager.cs	
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using AIStudio.Provider;
+using AIStudio.Settings.DataModel;
 
 // ReSharper disable NotAccessedPositionalProperty.Local
 
diff --git a/app/MindWork AI Studio/Settings/SettingsMigrations.cs b/app/MindWork AI Studio/Settings/SettingsMigrations.cs
index 516a1c13..6e1669d9 100644
--- a/app/MindWork AI Studio/Settings/SettingsMigrations.cs	
+++ b/app/MindWork AI Studio/Settings/SettingsMigrations.cs	
@@ -1,3 +1,5 @@
+using AIStudio.Settings.DataModel;
+
 using Host = AIStudio.Provider.SelfHosted.Host;
 
 namespace AIStudio.Settings;
diff --git a/app/MindWork AI Studio/Tools/TemporaryChatService.cs b/app/MindWork AI Studio/Tools/TemporaryChatService.cs
index c7122ae2..f820716c 100644
--- a/app/MindWork AI Studio/Tools/TemporaryChatService.cs	
+++ b/app/MindWork AI Studio/Tools/TemporaryChatService.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Settings.DataModel;
 
 namespace AIStudio.Tools;
 
diff --git a/app/MindWork AI Studio/Tools/UpdateService.cs b/app/MindWork AI Studio/Tools/UpdateService.cs
index 29193430..71fcb9b5 100644
--- a/app/MindWork AI Studio/Tools/UpdateService.cs	
+++ b/app/MindWork AI Studio/Tools/UpdateService.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Settings.DataModel;
 
 using Microsoft.AspNetCore.Components;