diff --git a/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs b/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs
index c18b813..bbb33c3 100644
--- a/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs
+++ b/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs
@@ -1,4 +1,4 @@
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 namespace RolandK.AvaloniaExtensions.TestApp;
 
diff --git a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs
index 0cf020c..e6fa009 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using RolandK.AvaloniaExtensions.Mvvm;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
diff --git a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs
index 53439cc..5b76ace 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using RolandK.AvaloniaExtensions.Mvvm;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
diff --git a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs
index f83607b..56108e9 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 
 namespace RolandK.AvaloniaExtensions.Tests.ViewServices;
diff --git a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs
index c27c26c..31c4dc4 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs
@@ -1,4 +1,4 @@
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs
index 710c95d..cf0e585 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 
diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs
index a4d8ad3..b7191bf 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 
diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs
index bae8de9..11eaa24 100644
--- a/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs
+++ b/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 
diff --git a/src/RolandK.AvaloniaExtensions/Attributes.cs b/src/RolandK.AvaloniaExtensions/Attributes.cs
index fc0b95a..d6b2065 100644
--- a/src/RolandK.AvaloniaExtensions/Attributes.cs
+++ b/src/RolandK.AvaloniaExtensions/Attributes.cs
@@ -3,9 +3,9 @@
 
 [assembly: XmlnsDefinition(
     "https://github.com/RolandK.AvaloniaExtensions", 
-    "RolandK.AvaloniaExtensions.Views")]
+    "RolandK.AvaloniaExtensions.Controls")]
 [assembly: XmlnsDefinition(
     "https://github.com/RolandK.AvaloniaExtensions", 
-    "RolandK.AvaloniaExtensions.Mvvm.Markup")]
+    "RolandK.AvaloniaExtensions.Mvvm.Controls")]
 
 [assembly: InternalsVisibleTo("RolandK.AvaloniaExtensions.Tests")]    
\ No newline at end of file
diff --git a/src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml b/src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml
similarity index 93%
rename from src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml
rename to src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml
index 12a2ebe..d767598 100644
--- a/src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml
+++ b/src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="RolandK.AvaloniaExtensions.Views.DialogBoxControl">
+             x:Class="RolandK.AvaloniaExtensions.Controls.DialogBoxControl">
     <Border BorderThickness="1"
             BorderBrush="{DynamicResource DialogBoxControlBorderBrush}">
         <DockPanel LastChildFill="True">
diff --git a/src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml.cs b/src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml.cs
similarity index 87%
rename from src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml.cs
rename to src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml.cs
index 844dd19..af1cdf9 100644
--- a/src/RolandK.AvaloniaExtensions/Views/DialogBoxControl.axaml.cs
+++ b/src/RolandK.AvaloniaExtensions/Controls/DialogBoxControl.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public partial class DialogBoxControl : UserControl
 {
@@ -14,7 +14,7 @@ public string Header
         set => _txtHeader.Text = value;
     }
 
-    public Controls ContentArea
+    public Avalonia.Controls.Controls ContentArea
     {
         get => _gridContent.Children;
     }
diff --git a/src/RolandK.AvaloniaExtensions/Views/DialogHostControl.cs b/src/RolandK.AvaloniaExtensions/Controls/DialogHostControl.cs
similarity index 99%
rename from src/RolandK.AvaloniaExtensions/Views/DialogHostControl.cs
rename to src/RolandK.AvaloniaExtensions/Controls/DialogHostControl.cs
index b42dcf1..e7701da 100644
--- a/src/RolandK.AvaloniaExtensions/Views/DialogHostControl.cs
+++ b/src/RolandK.AvaloniaExtensions/Controls/DialogHostControl.cs
@@ -4,7 +4,7 @@
 using Avalonia.Layout;
 using Avalonia.Media;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public class DialogHostControl : Grid
 {
diff --git a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml
similarity index 96%
rename from src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml
rename to src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml
index ba6c099..f045048 100644
--- a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml
+++ b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml
@@ -2,9 +2,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:local="clr-namespace:RolandK.AvaloniaExtensions.Views"
+             xmlns:local="clr-namespace:RolandK.AvaloniaExtensions.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="RolandK.AvaloniaExtensions.Views.MainWindowFrame">
+             x:Class="RolandK.AvaloniaExtensions.Controls.MainWindowFrame">
     <Grid x:Name="CtrlFullWindowGrid">
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
diff --git a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml.cs b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml.cs
similarity index 93%
rename from src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml.cs
rename to src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml.cs
index 46d8a26..efed611 100644
--- a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrame.axaml.cs
+++ b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrame.axaml.cs
@@ -7,7 +7,7 @@
 using Avalonia.Media;
 using Avalonia.Threading;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public partial class MainWindowFrame : UserControl
 {
@@ -25,15 +25,15 @@ public partial class MainWindowFrame : UserControl
     private Panel _ctrlFooterArea;
     private Panel _ctrlStatusBar;
 
-    public Controls FullBackgroundArea => _ctrlFullBackgroundPanel.Children;
+    public Avalonia.Controls.Controls FullBackgroundArea => _ctrlFullBackgroundPanel.Children;
 
-    public Controls CustomTitleArea => _ctrlCustomTitleArea.Children;
+    public Avalonia.Controls.Controls CustomTitleArea => _ctrlCustomTitleArea.Children;
 
-    public Controls HeaderMenuArea => _ctrlHeaderMenuArea.Children;
+    public Avalonia.Controls.Controls HeaderMenuArea => _ctrlHeaderMenuArea.Children;
 
-    public Controls MainContentArea => _ctrlMainContentArea.Children;
+    public Avalonia.Controls.Controls MainContentArea => _ctrlMainContentArea.Children;
 
-    public Controls FooterArea => _ctrlFooterArea.Children;
+    public Avalonia.Controls.Controls FooterArea => _ctrlFooterArea.Children;
 
     public DialogHostControl Overlay { get; }
 
diff --git a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrameStatus.cs b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrameStatus.cs
similarity index 70%
rename from src/RolandK.AvaloniaExtensions/Views/MainWindowFrameStatus.cs
rename to src/RolandK.AvaloniaExtensions/Controls/MainWindowFrameStatus.cs
index 70896d5..e33cd16 100644
--- a/src/RolandK.AvaloniaExtensions/Views/MainWindowFrameStatus.cs
+++ b/src/RolandK.AvaloniaExtensions/Controls/MainWindowFrameStatus.cs
@@ -1,4 +1,4 @@
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public enum MainWindowFrameStatus
 {
diff --git a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmUserControl.cs b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmUserControl.cs
similarity index 98%
rename from src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmUserControl.cs
rename to src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmUserControl.cs
index 243fc65..d9452a8 100644
--- a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmUserControl.cs
+++ b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmUserControl.cs
@@ -5,7 +5,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class MvvmUserControl : UserControl, IViewServiceHost
 {
diff --git a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmWindow.cs b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmWindow.cs
similarity index 98%
rename from src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmWindow.cs
rename to src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmWindow.cs
index 21fd47f..b1f8b74 100644
--- a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/MvvmWindow.cs
+++ b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/MvvmWindow.cs
@@ -3,7 +3,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class MvvmWindow : Window, IViewServiceHost
 {
diff --git a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/ViewServiceHostUserControl.cs b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/ViewServiceHostUserControl.cs
similarity index 93%
rename from src/RolandK.AvaloniaExtensions/Mvvm/Markup/ViewServiceHostUserControl.cs
rename to src/RolandK.AvaloniaExtensions/Mvvm/Controls/ViewServiceHostUserControl.cs
index 4bf146c..dc39748 100644
--- a/src/RolandK.AvaloniaExtensions/Mvvm/Markup/ViewServiceHostUserControl.cs
+++ b/src/RolandK.AvaloniaExtensions/Mvvm/Controls/ViewServiceHostUserControl.cs
@@ -2,7 +2,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class ViewServiceHostUserControl : UserControl, IViewServiceHost
 {
diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs b/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs
index 8695a11..56d8ab5 100644
--- a/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs
+++ b/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices.FileDialogs;
 using RolandK.AvaloniaExtensions.ViewServices.MessageBox;
 
diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs
index b1057ff..cb828c0 100644
--- a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs
+++ b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using System.Threading.Tasks;
 using Avalonia.Markup.Xaml;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 // Simple message box implementation
 // Based on: https://stackoverflow.com/questions/55706291/how-to-show-a-message-box-in-avaloniaui-beta
diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs
index 9b947e1..c335611 100644
--- a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs
+++ b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
 namespace RolandK.AvaloniaExtensions.ViewServices.MessageBox;