diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor
similarity index 99%
rename from app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor
rename to app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor
index 499ae17c..6f2d2fb7 100644
--- a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor	
+++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor	
@@ -1,5 +1,4 @@
-@attribute [Route(Path.ASSISTANT_AGENDA)]
-@using AIStudio.Tools
+@attribute [Route(PagePath.ASSISTANT_AGENDA)]
 @inherits AssistantBaseCore
 
 <MudTextField T="string" @bind-Text="@this.inputName" Validation="@this.ValidateName" Label="Meeting Name" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Tag" Variant="Variant.Outlined" Margin="Margin.Dense" UserAttributes="@USER_INPUT_ATTRIBUTES" HelperText="Name the meeting, seminar, etc." Placeholder="Weekly jour fixe" Class="mb-3"/>
diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs
similarity index 99%
rename from app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs
rename to app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs
index 8fc405a3..14ea8331 100644
--- a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
@@ -1,9 +1,10 @@
 using System.Text;
 
 using AIStudio.Chat;
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.Agenda;
+namespace AIStudio.Assistants.Agenda;
 
 public partial class AssistantAgenda : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs
similarity index 92%
rename from app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs
rename to app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs
index 7e0e99ec..a805f01d 100644
--- a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.Agenda;
+namespace AIStudio.Assistants.Agenda;
 
 public enum NumberParticipants
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs
similarity index 95%
rename from app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs
rename to app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs
index f0966a2c..0f3aaa92 100644
--- a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.Agenda;
+namespace AIStudio.Assistants.Agenda;
 
 public static class NumberParticipantsExtensions
 {
diff --git a/app/MindWork AI Studio/Components/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
similarity index 98%
rename from app/MindWork AI Studio/Components/AssistantBase.razor
rename to app/MindWork AI Studio/Assistants/AssistantBase.razor
index a0a5b26a..60c560d3 100644
--- a/app/MindWork AI Studio/Components/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -1,6 +1,6 @@
 @using AIStudio.Chat
 @using AIStudio.Components.Pages
-@using AIStudio.Tools
+
 <MudText Typo="Typo.h3" Class="mb-2 mr-3">
     @(this.Title)
 </MudText>
diff --git a/app/MindWork AI Studio/Components/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs
similarity index 93%
rename from app/MindWork AI Studio/Components/AssistantBase.razor.cs
rename to app/MindWork AI Studio/Assistants/AssistantBase.razor.cs
index a4441f99..668a283c 100644
--- a/app/MindWork AI Studio/Components/AssistantBase.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
@@ -6,9 +6,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-using Path = AIStudio.Components.Pages.Path;
-
-namespace AIStudio.Components;
+namespace AIStudio.Assistants;
 
 public abstract partial class AssistantBase : ComponentBase
 {
@@ -184,17 +182,17 @@ public abstract partial class AssistantBase : ComponentBase
 
         var (eventItem, path) = destination switch
         {
-            SendTo.AGENDA_ASSISTANT => (Event.SEND_TO_AGENDA_ASSISTANT, Path.ASSISTANT_AGENDA),
-            SendTo.CODING_ASSISTANT => (Event.SEND_TO_CODING_ASSISTANT, Path.ASSISTANT_CODING),
-            SendTo.REWRITE_ASSISTANT => (Event.SEND_TO_REWRITE_ASSISTANT, Path.ASSISTANT_REWRITE),
-            SendTo.TRANSLATION_ASSISTANT => (Event.SEND_TO_TRANSLATION_ASSISTANT, Path.ASSISTANT_TRANSLATION),
-            SendTo.ICON_FINDER_ASSISTANT => (Event.SEND_TO_ICON_FINDER_ASSISTANT, Path.ASSISTANT_ICON_FINDER),
-            SendTo.GRAMMAR_SPELLING_ASSISTANT => (Event.SEND_TO_GRAMMAR_SPELLING_ASSISTANT, Path.ASSISTANT_GRAMMAR_SPELLING),
-            SendTo.TEXT_SUMMARIZER_ASSISTANT => (Event.SEND_TO_TEXT_SUMMARIZER_ASSISTANT, Path.ASSISTANT_SUMMARIZER),
+            SendTo.AGENDA_ASSISTANT => (Event.SEND_TO_AGENDA_ASSISTANT, PagePath.ASSISTANT_AGENDA),
+            SendTo.CODING_ASSISTANT => (Event.SEND_TO_CODING_ASSISTANT, PagePath.ASSISTANT_CODING),
+            SendTo.REWRITE_ASSISTANT => (Event.SEND_TO_REWRITE_ASSISTANT, PagePath.ASSISTANT_REWRITE),
+            SendTo.TRANSLATION_ASSISTANT => (Event.SEND_TO_TRANSLATION_ASSISTANT, PagePath.ASSISTANT_TRANSLATION),
+            SendTo.ICON_FINDER_ASSISTANT => (Event.SEND_TO_ICON_FINDER_ASSISTANT, PagePath.ASSISTANT_ICON_FINDER),
+            SendTo.GRAMMAR_SPELLING_ASSISTANT => (Event.SEND_TO_GRAMMAR_SPELLING_ASSISTANT, PagePath.ASSISTANT_GRAMMAR_SPELLING),
+            SendTo.TEXT_SUMMARIZER_ASSISTANT => (Event.SEND_TO_TEXT_SUMMARIZER_ASSISTANT, PagePath.ASSISTANT_SUMMARIZER),
             
-            SendTo.CHAT => (Event.SEND_TO_CHAT, Path.CHAT),
+            SendTo.CHAT => (Event.SEND_TO_CHAT, PagePath.CHAT),
             
-            _ => (Event.NONE, Path.ASSISTANTS),
+            _ => (Event.NONE, PagePath.ASSISTANTS),
         };
 
         switch (destination)
diff --git a/app/MindWork AI Studio/Components/AssistantBaseCore.cs b/app/MindWork AI Studio/Assistants/AssistantBaseCore.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/AssistantBaseCore.cs
rename to app/MindWork AI Studio/Assistants/AssistantBaseCore.cs
index d6fe7f71..96b16a1e 100644
--- a/app/MindWork AI Studio/Components/AssistantBaseCore.cs	
+++ b/app/MindWork AI Studio/Assistants/AssistantBaseCore.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 
-namespace AIStudio.Components;
+namespace AIStudio.Assistants;
 
 //
 // See https://stackoverflow.com/a/77300384/2258393 for why this class is necessary
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor
similarity index 96%
rename from app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor
rename to app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor
index b387c4eb..49f12c82 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.ASSISTANT_CODING)]
+@attribute [Route(PagePath.ASSISTANT_CODING)]
 @inherits AssistantBaseCore
 
 <MudExpansionPanels Class="mb-3">
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs
rename to app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
index 8b577fee..3f8f461e 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
@@ -1,8 +1,9 @@
 using System.Text;
 
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.Coding;
+namespace AIStudio.Assistants.Coding;
 
 public partial class AssistantCoding : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs b/app/MindWork AI Studio/Assistants/Coding/CodingContext.cs
similarity index 90%
rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs
rename to app/MindWork AI Studio/Assistants/Coding/CodingContext.cs
index 726eccae..5ef42ed2 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/CodingContext.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.Coding;
+namespace AIStudio.Assistants.Coding;
 
 public sealed class CodingContext(string id, CommonCodingLanguages language, string otherLanguage, string code)
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor
rename to app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs
similarity index 96%
rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs
rename to app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs
index bb425de4..0b599930 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs	
@@ -2,7 +2,7 @@
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Pages.Coding;
+namespace AIStudio.Assistants.Coding;
 
 public partial class CodingContextItem : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs
rename to app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs
index 9d47105c..1010105c 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.Coding;
+namespace AIStudio.Assistants.Coding;
 
 public static class CommonCodingLanguageExtensions
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs
similarity index 89%
rename from app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs
rename to app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs
index 58d9d80c..f42f539b 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.Coding;
+namespace AIStudio.Assistants.Coding;
 
 public enum CommonCodingLanguages
 {
diff --git a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor
similarity index 91%
rename from app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor
rename to app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor
index 989ebce7..9964a29b 100644
--- a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor	
+++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor	
@@ -1,5 +1,4 @@
-@using AIStudio.Tools
-@attribute [Route(Path.ASSISTANT_GRAMMAR_SPELLING)]
+@attribute [Route(PagePath.ASSISTANT_GRAMMAR_SPELLING)]
 @inherits AssistantBaseCore
 
 <MudTextField T="string" @bind-Text="@this.inputText" Validation="@this.ValidateText" AdornmentIcon="@Icons.Material.Filled.DocumentScanner" Adornment="Adornment.Start" Label="Your input to check" Variant="Variant.Outlined" Lines="6" AutoGrow="@true" MaxLines="12" Class="mb-3" UserAttributes="@USER_INPUT_ATTRIBUTES"/>
diff --git a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs
rename to app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs
index eef9cd51..add44121 100644
--- a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
@@ -1,7 +1,8 @@
 using AIStudio.Chat;
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.GrammarSpelling;
+namespace AIStudio.Assistants.GrammarSpelling;
 
 public partial class AssistantGrammarSpelling : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor
similarity index 95%
rename from app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor
rename to app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor
index b6345ba6..0b0654fc 100644
--- a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor	
@@ -1,4 +1,4 @@
-@attribute [Route(Path.ASSISTANT_ICON_FINDER)]
+@attribute [Route(PagePath.ASSISTANT_ICON_FINDER)]
 @inherits AssistantBaseCore
 
 <MudTextField T="string" @bind-Text="@this.inputContext" Validation="@this.ValidatingContext" AdornmentIcon="@Icons.Material.Filled.Description" Adornment="Adornment.Start" Label="Your context" Variant="Variant.Outlined" Lines="3" AutoGrow="@true" MaxLines="12" Class="mb-3" UserAttributes="@USER_INPUT_ATTRIBUTES"/>
diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs
rename to app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs
index 2b987241..829636f1 100644
--- a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
@@ -1,6 +1,7 @@
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.IconFinder;
+namespace AIStudio.Assistants.IconFinder;
 
 public partial class AssistantIconFinder : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs b/app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs
rename to app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs
index 42acf8cf..f7112cfc 100644
--- a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.IconFinder;
+namespace AIStudio.Assistants.IconFinder;
 
 public static class IconSourceExtensions
 {
diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs b/app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs
similarity index 75%
rename from app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs
rename to app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs
index fe477f9f..1b8f0e51 100644
--- a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.IconFinder;
+namespace AIStudio.Assistants.IconFinder;
 
 public enum IconSources
 {
diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor
similarity index 93%
rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor
rename to app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor
index f8dd4ecd..14f5efb3 100644
--- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor	
@@ -1,5 +1,4 @@
-@using AIStudio.Tools
-@attribute [Route(Path.ASSISTANT_REWRITE)]
+@attribute [Route(PagePath.ASSISTANT_REWRITE)]
 @inherits AssistantBaseCore
 
 <MudTextField T="string" @bind-Text="@this.inputText" Validation="@this.ValidateText" AdornmentIcon="@Icons.Material.Filled.DocumentScanner" Adornment="Adornment.Start" Label="Your input to improve" Variant="Variant.Outlined" Lines="6" AutoGrow="@true" MaxLines="12" Class="mb-3" UserAttributes="@USER_INPUT_ATTRIBUTES"/>
diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs
rename to app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs
index ce60f257..ee3b9c87 100644
--- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs	
@@ -1,7 +1,8 @@
 using AIStudio.Chat;
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.RewriteImprove;
+namespace AIStudio.Assistants.RewriteImprove;
 
 public partial class AssistantRewriteImprove : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs
similarity index 78%
rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs
rename to app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs
index 62d82bd0..f2fc7eea 100644
--- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.RewriteImprove;
+namespace AIStudio.Assistants.RewriteImprove;
 
 public enum WritingStyles
 {
diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs
rename to app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs
index ab2027cf..184346a0 100644
--- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.RewriteImprove;
+namespace AIStudio.Assistants.RewriteImprove;
 
 public static class WritingStylesExtensions
 {
diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor
similarity index 96%
rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor
rename to app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor
index d6045354..6a67a73f 100644
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor	
@@ -1,5 +1,4 @@
-@attribute [Route(Path.ASSISTANT_SUMMARIZER)]
-@using AIStudio.Tools
+@attribute [Route(PagePath.ASSISTANT_SUMMARIZER)]
 @inherits AssistantBaseCore
 
 @if (!this.SettingsManager.ConfigurationData.TextSummarizer.HideWebContentReader)
diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs
rename to app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs
index 41936acf..19f95166 100644
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
@@ -1,7 +1,8 @@
 using AIStudio.Chat;
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.TextSummarizer;
+namespace AIStudio.Assistants.TextSummarizer;
 
 public partial class AssistantTextSummarizer : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs
similarity index 80%
rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs
rename to app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs
index 0c9125e8..dbf47960 100644
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.TextSummarizer;
+namespace AIStudio.Assistants.TextSummarizer;
 
 public enum Complexity
 {
diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs
rename to app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs
index 19a335c7..d4b75178 100644
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Pages.TextSummarizer;
+namespace AIStudio.Assistants.TextSummarizer;
 
 public static class ComplexityExtensions
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor
similarity index 96%
rename from app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor
rename to app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor
index b30c7130..86ffdaa0 100644
--- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor	
+++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor	
@@ -1,5 +1,4 @@
-@attribute [Route(Path.ASSISTANT_TRANSLATION)]
-@using AIStudio.Tools
+@attribute [Route(PagePath.ASSISTANT_TRANSLATION)]
 @inherits AssistantBaseCore
 
 @if (!this.SettingsManager.ConfigurationData.Translation.HideWebContentReader)
diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs
rename to app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs
index e718e88f..6aee9036 100644
--- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
@@ -1,7 +1,8 @@
 using AIStudio.Chat;
+using AIStudio.Components.Pages;
 using AIStudio.Tools;
 
-namespace AIStudio.Components.Pages.Translation;
+namespace AIStudio.Assistants.Translation;
 
 public partial class AssistantTranslation : AssistantBaseCore
 {
diff --git a/app/MindWork AI Studio/Assistants/_Imports.razor b/app/MindWork AI Studio/Assistants/_Imports.razor
new file mode 100644
index 00000000..0c329349
--- /dev/null
+++ b/app/MindWork AI Studio/Assistants/_Imports.razor	
@@ -0,0 +1,13 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using AIStudio
+@using AIStudio.Tools
+@using AIStudio.Components
+@using AIStudio.Components.Blocks
+@using MudBlazor
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs
index 62938441..d3873d5b 100644
--- a/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs	
+++ b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs	
@@ -1,8 +1,8 @@
-using AIStudio.Components.Pages.Agenda;
-using AIStudio.Components.Pages.Coding;
-using AIStudio.Components.Pages.IconFinder;
-using AIStudio.Components.Pages.RewriteImprove;
-using AIStudio.Components.Pages.TextSummarizer;
+using AIStudio.Assistants.Agenda;
+using AIStudio.Assistants.Coding;
+using AIStudio.Assistants.IconFinder;
+using AIStudio.Assistants.RewriteImprove;
+using AIStudio.Assistants.TextSummarizer;
 using AIStudio.Settings.DataModel;
 using AIStudio.Tools;
 
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs b/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs
index 4ab8ae7c..aa59871d 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.Pages.Agenda;
+using AIStudio.Assistants.Agenda;
 using AIStudio.Tools;
 
 namespace AIStudio.Settings.DataModel;
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs b/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs
index 052c319a..7608f616 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.Pages.Coding;
+using AIStudio.Assistants.Coding;
 
 namespace AIStudio.Settings.DataModel;
 
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs b/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs
index d47c3df0..6a0257ef 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.Pages.IconFinder;
+using AIStudio.Assistants.IconFinder;
 
 namespace AIStudio.Settings.DataModel;
 
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs b/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs
index 19fe9252..7be49dc7 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.Pages.RewriteImprove;
+using AIStudio.Assistants.RewriteImprove;
 using AIStudio.Tools;
 
 namespace AIStudio.Settings.DataModel;
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs b/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs
index e6ee9ea8..b3ad839d 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.Pages.TextSummarizer;
+using AIStudio.Assistants.TextSummarizer;
 using AIStudio.Tools;
 
 namespace AIStudio.Settings.DataModel;
diff --git a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs
index b19c7b45..3419ccb3 100644
--- a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs	
@@ -1,6 +1,6 @@
-using AIStudio.Components.Pages.Coding;
-using AIStudio.Components.Pages.IconFinder;
-using AIStudio.Components.Pages.TextSummarizer;
+using AIStudio.Assistants.Coding;
+using AIStudio.Assistants.IconFinder;
+using AIStudio.Assistants.TextSummarizer;
 using AIStudio.Tools;
 
 namespace AIStudio.Settings.DataModel.PreviousModels;
diff --git a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs
index 7264fc0e..5cf81d85 100644
--- a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
+++ b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components;
+using AIStudio.Assistants;
 
 namespace AIStudio.Tools;