diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs
index 17551892..9a6f93f7 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
+++ b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
@@ -51,12 +51,12 @@ public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDis
     
     private static readonly IReadOnlyCollection<NavBarItem> NAV_ITEMS = new List<NavBarItem>
     {
-        new("Home", Icons.Material.Filled.Home, Color.Default, Pages.Path.HOME, true),
-        new("Chat", Icons.Material.Filled.Chat, Color.Default, Pages.Path.CHAT, false),
-        new("Assistants", Icons.Material.Filled.Apps, Color.Default, Pages.Path.ASSISTANTS, false),
-        new("Supporters", Icons.Material.Filled.Favorite, Color.Error, Pages.Path.SUPPORTERS, false),
-        new("About", Icons.Material.Filled.Info, Color.Default, Pages.Path.ABOUT, false),
-        new("Settings", Icons.Material.Filled.Settings, Color.Default, Pages.Path.SETTINGS, false),
+        new("Home", Icons.Material.Filled.Home, Color.Default, PagePath.HOME, true),
+        new("Chat", Icons.Material.Filled.Chat, Color.Default, PagePath.CHAT, false),
+        new("Assistants", Icons.Material.Filled.Apps, Color.Default, PagePath.ASSISTANTS, false),
+        new("Supporters", Icons.Material.Filled.Favorite, Color.Error, PagePath.SUPPORTERS, false),
+        new("About", Icons.Material.Filled.Info, Color.Default, PagePath.ABOUT, false),
+        new("Settings", Icons.Material.Filled.Settings, Color.Default, PagePath.SETTINGS, false),
     };
     
     #region Overrides of ComponentBase
diff --git a/app/MindWork AI Studio/Components/Pages/About.razor b/app/MindWork AI Studio/Components/Pages/About.razor
index 41b8f81b..65317383 100644
--- a/app/MindWork AI Studio/Components/Pages/About.razor	
+++ b/app/MindWork AI Studio/Components/Pages/About.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.ABOUT)]
+@attribute [Route(PagePath.ABOUT)]
 @using AIStudio.Tools
 
 <MudText Typo="Typo.h3" Class="mb-2">About MindWork AI Studio</MudText>
diff --git a/app/MindWork AI Studio/Components/Pages/Assistants.razor b/app/MindWork AI Studio/Components/Pages/Assistants.razor
index 9b8bb425..b7630922 100644
--- a/app/MindWork AI Studio/Components/Pages/Assistants.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Assistants.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.ASSISTANTS)]
+@attribute [Route(PagePath.ASSISTANTS)]
 
 <MudText Typo="Typo.h3" Class="mb-2 mr-3">
     Assistants
@@ -10,25 +10,25 @@
         General
     </MudText>
     <MudStack Row="@true" Wrap="@Wrap.Wrap" Class="mb-3">
-        <AssistantBlock Name="Text Summarizer" Description="Using a LLM to summarize a given text." Icon="@Icons.Material.Filled.TextSnippet" Link="@Path.ASSISTANT_SUMMARIZER"/>
-        <AssistantBlock Name="Translation" Description="Translate text into another language." Icon="@Icons.Material.Filled.Translate" Link="@Path.ASSISTANT_TRANSLATION"/>
-        <AssistantBlock Name="Grammar & Spelling" Description="Check grammar and spelling of a given text." Icon="@Icons.Material.Filled.Edit" Link="@Path.ASSISTANT_GRAMMAR_SPELLING"/>
-        <AssistantBlock Name="Rewrite & Improve" Description="Rewrite and improve a given text for a chosen style." Icon="@Icons.Material.Filled.Edit" Link="@Path.ASSISTANT_REWRITE"/>
+        <AssistantBlock Name="Text Summarizer" Description="Using a LLM to summarize a given text." Icon="@Icons.Material.Filled.TextSnippet" Link="@PagePath.ASSISTANT_SUMMARIZER"/>
+        <AssistantBlock Name="Translation" Description="Translate text into another language." Icon="@Icons.Material.Filled.Translate" Link="@PagePath.ASSISTANT_TRANSLATION"/>
+        <AssistantBlock Name="Grammar & Spelling" Description="Check grammar and spelling of a given text." Icon="@Icons.Material.Filled.Edit" Link="@PagePath.ASSISTANT_GRAMMAR_SPELLING"/>
+        <AssistantBlock Name="Rewrite & Improve" Description="Rewrite and improve a given text for a chosen style." Icon="@Icons.Material.Filled.Edit" Link="@PagePath.ASSISTANT_REWRITE"/>
     </MudStack>
 
     <MudText Typo="Typo.h4" Class="mb-2 mr-3 mt-6">
         Business
     </MudText>
     <MudStack Row="@true" Wrap="@Wrap.Wrap" Class="mb-3">
-        <AssistantBlock Name="Agenda Planner" Description="Generate an agenda for a given meeting, seminar, etc." Icon="@Icons.Material.Filled.CalendarToday" Link="@Path.ASSISTANT_AGENDA"/>
-        <AssistantBlock Name="Icon Finder" Description="Using a LLM to find an icon for a given context." Icon="@Icons.Material.Filled.FindInPage" Link="@Path.ASSISTANT_ICON_FINDER"/>
+        <AssistantBlock Name="Agenda Planner" Description="Generate an agenda for a given meeting, seminar, etc." Icon="@Icons.Material.Filled.CalendarToday" Link="@PagePath.ASSISTANT_AGENDA"/>
+        <AssistantBlock Name="Icon Finder" Description="Using a LLM to find an icon for a given context." Icon="@Icons.Material.Filled.FindInPage" Link="@PagePath.ASSISTANT_ICON_FINDER"/>
     </MudStack>
 
     <MudText Typo="Typo.h4" Class="mb-2 mr-3 mt-6">
         Software Engineering
     </MudText>
     <MudStack Row="@true" Wrap="@Wrap.Wrap" Class="mb-3">
-        <AssistantBlock Name="Coding" Description="Get coding and debugging support from a LLM." Icon="@Icons.Material.Filled.Code" Link="@Path.ASSISTANT_CODING"/>
+        <AssistantBlock Name="Coding" Description="Get coding and debugging support from a LLM." Icon="@Icons.Material.Filled.Code" Link="@PagePath.ASSISTANT_CODING"/>
     </MudStack>
     
 </InnerScrolling>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor b/app/MindWork AI Studio/Components/Pages/Chat.razor
index 612897db..6a7a400e 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.CHAT)]
+@attribute [Route(PagePath.CHAT)]
 @using AIStudio.Chat
 @using AIStudio.Settings.DataModel
 
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs
index 7cf84d9c..a5066ede 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
@@ -268,11 +268,11 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable
             string chatPath;
             if (this.chatThread.WorkspaceId == Guid.Empty)
             {
-                chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString());
+                chatPath = Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString());
             }
             else
             {
-                chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString());
+                chatPath = Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString());
             }
             
             await this.workspaces.DeleteChat(chatPath, askForConfirmation: false, unloadChat: true);
@@ -345,12 +345,12 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable
         if (this.chatThread!.WorkspaceId == Guid.Empty)
         {
             // Case: The chat is stored in the temporary storage:
-            await this.workspaces.DeleteChat(System.IO.Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false);
+            await this.workspaces.DeleteChat(Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false);
         }
         else
         {
             // Case: The chat is stored in a workspace.
-            await this.workspaces.DeleteChat(System.IO.Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false);
+            await this.workspaces.DeleteChat(Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false);
         }
         
         this.chatThread!.WorkspaceId = workspaceId;
diff --git a/app/MindWork AI Studio/Components/Pages/Home.razor b/app/MindWork AI Studio/Components/Pages/Home.razor
index 34d2080e..5590307e 100644
--- a/app/MindWork AI Studio/Components/Pages/Home.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Home.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.HOME)]
+@attribute [Route(PagePath.HOME)]
 @using AIStudio.Tools
 
 <MudImage Src="svg/banner.svg" />
diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor b/app/MindWork AI Studio/Components/Pages/Settings.razor
index 19bcd2f9..e029143f 100644
--- a/app/MindWork AI Studio/Components/Pages/Settings.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Settings.razor	
@@ -1,6 +1,6 @@
-@attribute [Route(Path.SETTINGS)]
-@using AIStudio.Components.Pages.Coding
-@using AIStudio.Components.Pages.TextSummarizer
+@attribute [Route(PagePath.SETTINGS)]
+@using AIStudio.Assistants.Coding
+@using AIStudio.Assistants.TextSummarizer
 @using AIStudio.Provider
 @using AIStudio.Settings
 @using AIStudio.Tools
diff --git a/app/MindWork AI Studio/Components/Pages/Supporters.razor b/app/MindWork AI Studio/Components/Pages/Supporters.razor
index 2cf9d06d..1d7e5001 100644
--- a/app/MindWork AI Studio/Components/Pages/Supporters.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Supporters.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.SUPPORTERS)]
+@attribute [Route(PagePath.SUPPORTERS)]
 
 <MudText Typo="Typo.h3" Class="mb-2">Supporters</MudText>