diff --git a/app/MindWork AI Studio/Assistants/_Imports.razor b/app/MindWork AI Studio/Assistants/_Imports.razor
index 0c329349..f83c66b5 100644
--- a/app/MindWork AI Studio/Assistants/_Imports.razor	
+++ b/app/MindWork AI Studio/Assistants/_Imports.razor	
@@ -9,5 +9,4 @@
 @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/Components/Blocks/AssistantBlock.razor b/app/MindWork AI Studio/Components/AssistantBlock.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor
rename to app/MindWork AI Studio/Components/AssistantBlock.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs b/app/MindWork AI Studio/Components/AssistantBlock.razor.cs
similarity index 92%
rename from app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs
rename to app/MindWork AI Studio/Components/AssistantBlock.razor.cs
index 1efe6ec6..4a15ddb5 100644
--- a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs	
+++ b/app/MindWork AI Studio/Components/AssistantBlock.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class AssistantBlock : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs b/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs
deleted file mode 100644
index ad718e71..00000000
--- a/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs	
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace AIStudio.Components.Blocks;
-
-public interface ITreeItem;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs b/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs
deleted file mode 100644
index 6c311272..00000000
--- a/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs	
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace AIStudio.Components.Blocks;
-
-public readonly record struct TreeDivider : ITreeItem;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs b/app/MindWork AI Studio/Components/Changelog.Logs.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs
rename to app/MindWork AI Studio/Components/Changelog.Logs.cs
index 472a68d1..e2ca3ed8 100644
--- a/app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs	
+++ b/app/MindWork AI Studio/Components/Changelog.Logs.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Changelog
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.razor b/app/MindWork AI Studio/Components/Changelog.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/Changelog.razor
rename to app/MindWork AI Studio/Components/Changelog.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs b/app/MindWork AI Studio/Components/Changelog.razor.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs
rename to app/MindWork AI Studio/Components/Changelog.razor.cs
index 97631b7e..c90a46c6 100644
--- a/app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs	
+++ b/app/MindWork AI Studio/Components/Changelog.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Changelog : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor b/app/MindWork AI Studio/Components/ConfigurationOption.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor
rename to app/MindWork AI Studio/Components/ConfigurationOption.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs b/app/MindWork AI Studio/Components/ConfigurationOption.razor.cs
similarity index 96%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs
rename to app/MindWork AI Studio/Components/ConfigurationOption.razor.cs
index 68d5cd4d..b3bed551 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationOption.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 /// <summary>
 /// Configuration component for any boolean option.
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor
rename to app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs
rename to app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs
index c860377c..59213204 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs	
@@ -3,7 +3,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ConfigurationProviderSelection : ComponentBase, IMessageBusReceiver, IDisposable
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor b/app/MindWork AI Studio/Components/ConfigurationSelect.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor
rename to app/MindWork AI Studio/Components/ConfigurationSelect.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs
similarity index 96%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs
rename to app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs
index 4f0fe496..8fb876c4 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs	
@@ -2,7 +2,7 @@ using AIStudio.Settings;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 /// <summary>
 /// Configuration component for selecting a value from a list.
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor b/app/MindWork AI Studio/Components/ConfigurationSlider.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor
rename to app/MindWork AI Studio/Components/ConfigurationSlider.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs b/app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs
rename to app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs
index 238aad3d..7d91cb8b 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs	
@@ -2,7 +2,7 @@ using System.Numerics;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ConfigurationSlider<T> : ConfigurationBase where T : struct, INumber<T>
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor b/app/MindWork AI Studio/Components/ConfigurationText.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor
rename to app/MindWork AI Studio/Components/ConfigurationText.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs b/app/MindWork AI Studio/Components/ConfigurationText.razor.cs
similarity index 96%
rename from app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs
rename to app/MindWork AI Studio/Components/ConfigurationText.razor.cs
index 228fa133..e6cd379e 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationText.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ConfigurationText : ConfigurationBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor b/app/MindWork AI Studio/Components/EnumSelection.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/EnumSelection.razor
rename to app/MindWork AI Studio/Components/EnumSelection.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs b/app/MindWork AI Studio/Components/EnumSelection.razor.cs
similarity index 98%
rename from app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs
rename to app/MindWork AI Studio/Components/EnumSelection.razor.cs
index d87384fc..a7d93dd9 100644
--- a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/EnumSelection.razor.cs	
@@ -2,7 +2,7 @@ using AIStudio.Settings;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class EnumSelection<T> : EnumSelectionBase where T : struct, Enum
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs b/app/MindWork AI Studio/Components/EnumSelectionBase.cs
similarity index 82%
rename from app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs
rename to app/MindWork AI Studio/Components/EnumSelectionBase.cs
index f84478de..635069a8 100644
--- a/app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs	
+++ b/app/MindWork AI Studio/Components/EnumSelectionBase.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public abstract class EnumSelectionBase : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor b/app/MindWork AI Studio/Components/ExpansionPanel.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor
rename to app/MindWork AI Studio/Components/ExpansionPanel.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs
similarity index 93%
rename from app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs
rename to app/MindWork AI Studio/Components/ExpansionPanel.razor.cs
index e1a54e01..47d8b709 100644
--- a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs	
+++ b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ExpansionPanel : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/ITreeItem.cs b/app/MindWork AI Studio/Components/ITreeItem.cs
new file mode 100644
index 00000000..e2fdc277
--- /dev/null
+++ b/app/MindWork AI Studio/Components/ITreeItem.cs	
@@ -0,0 +1,3 @@
+namespace AIStudio.Components;
+
+public interface ITreeItem;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor b/app/MindWork AI Studio/Components/InnerScrolling.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor
rename to app/MindWork AI Studio/Components/InnerScrolling.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs
rename to app/MindWork AI Studio/Components/InnerScrolling.razor.cs
index 0dbb8e51..b204f4ea 100644
--- a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs	
+++ b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs	
@@ -3,7 +3,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class InnerScrolling : MSGComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/Issues.razor b/app/MindWork AI Studio/Components/Issues.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/Issues.razor
rename to app/MindWork AI Studio/Components/Issues.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/Issues.razor.cs b/app/MindWork AI Studio/Components/Issues.razor.cs
similarity index 80%
rename from app/MindWork AI Studio/Components/Blocks/Issues.razor.cs
rename to app/MindWork AI Studio/Components/Issues.razor.cs
index 4a0c2911..effd20f6 100644
--- a/app/MindWork AI Studio/Components/Blocks/Issues.razor.cs	
+++ b/app/MindWork AI Studio/Components/Issues.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Issues : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/Motivation.razor b/app/MindWork AI Studio/Components/Motivation.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/Motivation.razor
rename to app/MindWork AI Studio/Components/Motivation.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs b/app/MindWork AI Studio/Components/Motivation.razor.cs
similarity index 70%
rename from app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs
rename to app/MindWork AI Studio/Components/Motivation.razor.cs
index 5a16e13a..23e1a767 100644
--- a/app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs	
+++ b/app/MindWork AI Studio/Components/Motivation.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Motivation : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor b/app/MindWork AI Studio/Components/MudTextList.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/MudTextList.razor
rename to app/MindWork AI Studio/Components/MudTextList.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs b/app/MindWork AI Studio/Components/MudTextList.razor.cs
similarity index 92%
rename from app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs
rename to app/MindWork AI Studio/Components/MudTextList.razor.cs
index 4c94284b..551878b0 100644
--- a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs	
+++ b/app/MindWork AI Studio/Components/MudTextList.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class MudTextList : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor b/app/MindWork AI Studio/Components/MudTextSlider.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor
rename to app/MindWork AI Studio/Components/MudTextSlider.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs b/app/MindWork AI Studio/Components/MudTextSlider.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs
rename to app/MindWork AI Studio/Components/MudTextSlider.razor.cs
index c3e24111..27f37a5e 100644
--- a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs	
+++ b/app/MindWork AI Studio/Components/MudTextSlider.razor.cs	
@@ -2,7 +2,7 @@ using System.Numerics;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class MudTextSlider<T> : ComponentBase where T : struct, INumber<T>
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor b/app/MindWork AI Studio/Components/MudTextSwitch.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor
rename to app/MindWork AI Studio/Components/MudTextSwitch.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs
rename to app/MindWork AI Studio/Components/MudTextSwitch.razor.cs
index 30492d37..2bce2c27 100644
--- a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs	
+++ b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class MudTextSwitch : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor b/app/MindWork AI Studio/Components/ProcessComponent.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor
rename to app/MindWork AI Studio/Components/ProcessComponent.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs b/app/MindWork AI Studio/Components/ProcessComponent.razor.cs
similarity index 90%
rename from app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs
rename to app/MindWork AI Studio/Components/ProcessComponent.razor.cs
index 6d711326..bbcd6e5d 100644
--- a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ProcessComponent.razor.cs	
@@ -2,7 +2,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ProcessComponent<T> : ComponentBase where T : struct, Enum
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor b/app/MindWork AI Studio/Components/ProviderSelection.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor
rename to app/MindWork AI Studio/Components/ProviderSelection.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs
rename to app/MindWork AI Studio/Components/ProviderSelection.razor.cs
index 96204d0c..ad2249fe 100644
--- a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs	
@@ -2,7 +2,7 @@ using AIStudio.Settings;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ProviderSelection : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor b/app/MindWork AI Studio/Components/ReadWebContent.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor
rename to app/MindWork AI Studio/Components/ReadWebContent.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs
similarity index 99%
rename from app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs
rename to app/MindWork AI Studio/Components/ReadWebContent.razor.cs
index c4a34974..c681dc12 100644
--- a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs	
@@ -5,7 +5,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ReadWebContent : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs b/app/MindWork AI Studio/Components/ReadWebContentSteps.cs
similarity index 72%
rename from app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs
rename to app/MindWork AI Studio/Components/ReadWebContentSteps.cs
index 3dafa015..d1ca45eb 100644
--- a/app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs	
+++ b/app/MindWork AI Studio/Components/ReadWebContentSteps.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public enum ReadWebContentSteps
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor b/app/MindWork AI Studio/Components/SplitButton.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/SplitButton.razor
rename to app/MindWork AI Studio/Components/SplitButton.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs b/app/MindWork AI Studio/Components/SplitButton.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs
rename to app/MindWork AI Studio/Components/SplitButton.razor.cs
index 9a5e2434..c85d7d61 100644
--- a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs	
+++ b/app/MindWork AI Studio/Components/SplitButton.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class SplitButton<T> : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor
rename to app/MindWork AI Studio/Components/ThirdPartyComponent.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs
rename to app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs
index d12399e8..77fdc3c0 100644
--- a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class ThirdPartyComponent : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/TreeButton.cs b/app/MindWork AI Studio/Components/TreeButton.cs
similarity index 75%
rename from app/MindWork AI Studio/Components/Blocks/TreeButton.cs
rename to app/MindWork AI Studio/Components/TreeButton.cs
index ff7eaa5c..19aa3165 100644
--- a/app/MindWork AI Studio/Components/Blocks/TreeButton.cs	
+++ b/app/MindWork AI Studio/Components/TreeButton.cs	
@@ -1,3 +1,3 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public readonly record struct TreeButton(WorkspaceBranch Branch, int Depth, string Text, string Icon, Func<Task> Action) : ITreeItem;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/TreeDivider.cs b/app/MindWork AI Studio/Components/TreeDivider.cs
new file mode 100644
index 00000000..5266d26c
--- /dev/null
+++ b/app/MindWork AI Studio/Components/TreeDivider.cs	
@@ -0,0 +1,3 @@
+namespace AIStudio.Components;
+
+public readonly record struct TreeDivider : ITreeItem;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/TreeItemData.cs b/app/MindWork AI Studio/Components/TreeItemData.cs
similarity index 81%
rename from app/MindWork AI Studio/Components/Blocks/TreeItemData.cs
rename to app/MindWork AI Studio/Components/TreeItemData.cs
index 1eaa7d57..9ae74dab 100644
--- a/app/MindWork AI Studio/Components/Blocks/TreeItemData.cs	
+++ b/app/MindWork AI Studio/Components/TreeItemData.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public class TreeItemData : ITreeItem
 {
@@ -8,7 +8,7 @@ public class TreeItemData : ITreeItem
     
     public string Text { get; init; } = string.Empty;
     
-    public string ShortenedText => Text.Length > 30 ? this.Text[..30] + "..." : this.Text;
+    public string ShortenedText => this.Text.Length > 30 ? this.Text[..30] + "..." : this.Text;
 
     public string Icon { get; init; } = string.Empty;
 
diff --git a/app/MindWork AI Studio/Components/Blocks/TreeItemType.cs b/app/MindWork AI Studio/Components/TreeItemType.cs
similarity index 63%
rename from app/MindWork AI Studio/Components/Blocks/TreeItemType.cs
rename to app/MindWork AI Studio/Components/TreeItemType.cs
index de860ab9..f43823b4 100644
--- a/app/MindWork AI Studio/Components/Blocks/TreeItemType.cs	
+++ b/app/MindWork AI Studio/Components/TreeItemType.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public enum TreeItemType
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/Vision.razor b/app/MindWork AI Studio/Components/Vision.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/Vision.razor
rename to app/MindWork AI Studio/Components/Vision.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/Vision.razor.cs b/app/MindWork AI Studio/Components/Vision.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/Blocks/Vision.razor.cs
rename to app/MindWork AI Studio/Components/Vision.razor.cs
index 233e4b08..649ebdf1 100644
--- a/app/MindWork AI Studio/Components/Blocks/Vision.razor.cs	
+++ b/app/MindWork AI Studio/Components/Vision.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Vision : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs b/app/MindWork AI Studio/Components/WorkspaceBranch.cs
similarity index 68%
rename from app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs
rename to app/MindWork AI Studio/Components/WorkspaceBranch.cs
index 1b19bd34..a491f210 100644
--- a/app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs	
+++ b/app/MindWork AI Studio/Components/WorkspaceBranch.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public enum WorkspaceBranch
 {
diff --git a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor b/app/MindWork AI Studio/Components/Workspaces.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/Blocks/Workspaces.razor
rename to app/MindWork AI Studio/Components/Workspaces.razor
diff --git a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs b/app/MindWork AI Studio/Components/Workspaces.razor.cs
similarity index 99%
rename from app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs
rename to app/MindWork AI Studio/Components/Workspaces.razor.cs
index 01db546b..ee33e64c 100644
--- a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs	
+++ b/app/MindWork AI Studio/Components/Workspaces.razor.cs	
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Components;
 
 using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
-namespace AIStudio.Components.Blocks;
+namespace AIStudio.Components;
 
 public partial class Workspaces : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/_Imports.razor b/app/MindWork AI Studio/Components/_Imports.razor
index 28a7839b..427d3800 100644
--- a/app/MindWork AI Studio/Components/_Imports.razor	
+++ b/app/MindWork AI Studio/Components/_Imports.razor	
@@ -1,12 +1,7 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
+@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.Components
-@using AIStudio.Components.Blocks
 @using MudBlazor
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Dialogs/_Imports.razor b/app/MindWork AI Studio/Dialogs/_Imports.razor
index 702a7c45..7b5a4afd 100644
--- a/app/MindWork AI Studio/Dialogs/_Imports.razor	
+++ b/app/MindWork AI Studio/Dialogs/_Imports.razor	
@@ -7,5 +7,4 @@
 @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/Pages/Chat.razor.cs b/app/MindWork AI Studio/Pages/Chat.razor.cs
index cb53fe3e..9d22184e 100644
--- a/app/MindWork AI Studio/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Chat.razor.cs	
@@ -1,6 +1,5 @@
 using AIStudio.Chat;
 using AIStudio.Components;
-using AIStudio.Components.Blocks;
 using AIStudio.Dialogs;
 using AIStudio.Provider;
 using AIStudio.Settings;
diff --git a/app/MindWork AI Studio/Pages/Home.razor.cs b/app/MindWork AI Studio/Pages/Home.razor.cs
index a370eea0..3202f466 100644
--- a/app/MindWork AI Studio/Pages/Home.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Home.razor.cs	
@@ -1,7 +1,9 @@
-using AIStudio.Components.Blocks;
+using AIStudio.Components;
 
 using Microsoft.AspNetCore.Components;
 
+using Changelog = AIStudio.Components.Changelog;
+
 namespace AIStudio.Pages;
 
 public partial class Home : ComponentBase
diff --git a/app/MindWork AI Studio/Pages/_Imports.razor b/app/MindWork AI Studio/Pages/_Imports.razor
index 702a7c45..7b5a4afd 100644
--- a/app/MindWork AI Studio/Pages/_Imports.razor	
+++ b/app/MindWork AI Studio/Pages/_Imports.razor	
@@ -7,5 +7,4 @@
 @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/ProviderDialog.razor b/app/MindWork AI Studio/Settings/ProviderDialog.razor
index 9d850e45..675fddd1 100644
--- a/app/MindWork AI Studio/Settings/ProviderDialog.razor	
+++ b/app/MindWork AI Studio/Settings/ProviderDialog.razor	
@@ -1,7 +1,7 @@
 @using AIStudio.Provider
 @using AIStudio.Provider.SelfHosted
 @using MudBlazor
-@using AIStudio.Components.Blocks
+@using AIStudio.Components
 
 <MudDialog>
     <DialogContent>
diff --git a/app/MindWork AI Studio/build.nu b/app/MindWork AI Studio/build.nu
index 3fc3a056..c62f8bbf 100755
--- a/app/MindWork AI Studio/build.nu	
+++ b/app/MindWork AI Studio/build.nu	
@@ -370,11 +370,11 @@ def update_changelog []: nothing -> nothing {
     let code = ($"LOGS = \n($tab)[\n($code_rows)\n($tab)];")
     
     # Next, update the Changelog.Logs.cs file:
-    let changelog_logs_source_file = open --raw "Components/Blocks/Changelog.Logs.cs"
+    let changelog_logs_source_file = open --raw "Components/Changelog.Logs.cs"
     let result = $changelog_logs_source_file | str replace --regex '(?ms)LOGS =\s+\[[\w\s".,-:()?]+\];' $code
     
     # Save the updated file:
-    $result | save --raw --force "Components/Blocks/Changelog.Logs.cs"
+    $result | save --raw --force "Components/Changelog.Logs.cs"
     
     let number_change_logs = $table | length
     print $"Updated Changelog.Logs.cs with ($number_change_logs) change logs."