diff --git a/app/MindWork AI Studio/App.razor b/app/MindWork AI Studio/App.razor
new file mode 100644
index 00000000..fdfd775b
--- /dev/null
+++ b/app/MindWork AI Studio/App.razor
@@ -0,0 +1,30 @@
+@using Microsoft.AspNetCore.Components.Web
+
+@* ReSharper disable Html.PathError *@
+
+
+
+
+ MindWork AI Studio
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/App.razor b/app/MindWork AI Studio/Components/App.razor
deleted file mode 100644
index b173c9a9..00000000
--- a/app/MindWork AI Studio/Components/App.razor
+++ /dev/null
@@ -1,28 +0,0 @@
-@* ReSharper disable Html.PathError *@
-
-
-
-
- MindWork AI Studio
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs b/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs
index 22483e78..0dbb8e51 100644
--- a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs
+++ b/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs
@@ -1,4 +1,4 @@
-using AIStudio.Components.Layout;
+using AIStudio.Layout;
using AIStudio.Tools;
using Microsoft.AspNetCore.Components;
diff --git a/app/MindWork AI Studio/Components/Layout/NavBarItem.cs b/app/MindWork AI Studio/Components/Layout/NavBarItem.cs
deleted file mode 100644
index 668634cb..00000000
--- a/app/MindWork AI Studio/Components/Layout/NavBarItem.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace AIStudio.Components.Layout;
-
-public record NavBarItem(string Name, string Icon, Color IconColor, string Path, bool MatchAll);
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor b/app/MindWork AI Studio/Layout/MainLayout.razor
similarity index 97%
rename from app/MindWork AI Studio/Components/Layout/MainLayout.razor
rename to app/MindWork AI Studio/Layout/MainLayout.razor
index 63c4a46c..9fbb3286 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor
+++ b/app/MindWork AI Studio/Layout/MainLayout.razor
@@ -1,4 +1,7 @@
@using AIStudio.Settings.DataModel
+@using Microsoft.AspNetCore.Components.Routing
+@using MudBlazor
+
@inherits LayoutComponentBase
diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Layout/MainLayout.razor.cs
similarity index 99%
rename from app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs
rename to app/MindWork AI Studio/Layout/MainLayout.razor.cs
index 57f3887e..c0ab46f3 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs
+++ b/app/MindWork AI Studio/Layout/MainLayout.razor.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Components.Routing;
using DialogOptions = AIStudio.Dialogs.DialogOptions;
-namespace AIStudio.Components.Layout;
+namespace AIStudio.Layout;
public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDisposable
{
diff --git a/app/MindWork AI Studio/Layout/NavBarItem.cs b/app/MindWork AI Studio/Layout/NavBarItem.cs
new file mode 100644
index 00000000..d76a806d
--- /dev/null
+++ b/app/MindWork AI Studio/Layout/NavBarItem.cs
@@ -0,0 +1,3 @@
+namespace AIStudio.Layout;
+
+public record NavBarItem(string Name, string Icon, Color IconColor, string Path, bool MatchAll);
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Program.cs b/app/MindWork AI Studio/Program.cs
index 5bc114a2..5079c181 100644
--- a/app/MindWork AI Studio/Program.cs
+++ b/app/MindWork AI Studio/Program.cs
@@ -1,6 +1,5 @@
using AIStudio;
using AIStudio.Agents;
-using AIStudio.Components;
using AIStudio.Settings;
using AIStudio.Tools;
diff --git a/app/MindWork AI Studio/Components/Routes.razor b/app/MindWork AI Studio/Routes.razor
similarity index 66%
rename from app/MindWork AI Studio/Components/Routes.razor
rename to app/MindWork AI Studio/Routes.razor
index fca67351..4a026adc 100644
--- a/app/MindWork AI Studio/Components/Routes.razor
+++ b/app/MindWork AI Studio/Routes.razor
@@ -1,4 +1,7 @@
-
+@using Microsoft.AspNetCore.Components.Routing
+@using MudBlazor
+
+