diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor b/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor
index 24c2ab78..f0c66d61 100644
--- a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor	
+++ b/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor	
@@ -1,4 +1,4 @@
-@inherits AIStudio.Tools.MSGComponentBase
+@inherits MSGComponentBase
 
 <div class="d-flex flex-column" style="@this.Height">
     <div class="flex-auto overflow-auto">
diff --git a/app/MindWork AI Studio/Tools/MSGComponentBase.cs b/app/MindWork AI Studio/Components/MSGComponentBase.cs
similarity index 96%
rename from app/MindWork AI Studio/Tools/MSGComponentBase.cs
rename to app/MindWork AI Studio/Components/MSGComponentBase.cs
index ff72e0e7..c1606ba8 100644
--- a/app/MindWork AI Studio/Tools/MSGComponentBase.cs	
+++ b/app/MindWork AI Studio/Components/MSGComponentBase.cs	
@@ -1,6 +1,8 @@
+using AIStudio.Tools;
+
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Tools;
+namespace AIStudio.Components;
 
 public abstract class MSGComponentBase : ComponentBase, IDisposable, IMessageBusReceiver
 {
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor b/app/MindWork AI Studio/Components/Pages/Chat.razor
index 0017303b..edd85516 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor	
@@ -2,7 +2,7 @@
 @using AIStudio.Chat
 @using AIStudio.Settings
 
-@inherits AIStudio.Tools.MSGComponentBase
+@inherits MSGComponentBase
 
 <MudText Typo="Typo.h3" Class="mb-2 mr-3">
     @if (this.chatThread is not null && this.chatThread.WorkspaceId != Guid.Empty)