diff --git a/RedBookPlayer.GUI/App.xaml.cs b/RedBookPlayer.GUI/App.xaml.cs
index 03c77fd..20e6a9d 100644
--- a/RedBookPlayer.GUI/App.xaml.cs
+++ b/RedBookPlayer.GUI/App.xaml.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using RedBookPlayer.GUI;
+using RedBookPlayer.GUI.Views;
 
 namespace RedBookPlayer
 {
diff --git a/RedBookPlayer.GUI/MainWindow.xaml b/RedBookPlayer.GUI/Views/MainWindow.xaml
similarity index 76%
rename from RedBookPlayer.GUI/MainWindow.xaml
rename to RedBookPlayer.GUI/Views/MainWindow.xaml
index 56dbf79..1a3e211 100644
--- a/RedBookPlayer.GUI/MainWindow.xaml
+++ b/RedBookPlayer.GUI/Views/MainWindow.xaml
@@ -1,7 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui" 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" mc:Ignorable="d"
-        x:Class="RedBookPlayer.GUI.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight"
+        x:Class="RedBookPlayer.GUI.Views.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight"
         DragDrop.AllowDrop="True">
     <ContentControl Name="Content" />
 </Window>
\ No newline at end of file
diff --git a/RedBookPlayer.GUI/MainWindow.xaml.cs b/RedBookPlayer.GUI/Views/MainWindow.xaml.cs
similarity index 99%
rename from RedBookPlayer.GUI/MainWindow.xaml.cs
rename to RedBookPlayer.GUI/Views/MainWindow.xaml.cs
index 95d8ff0..3e5a26a 100644
--- a/RedBookPlayer.GUI/MainWindow.xaml.cs
+++ b/RedBookPlayer.GUI/Views/MainWindow.xaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using RedBookPlayer.GUI.ViewModels;
 
-namespace RedBookPlayer.GUI
+namespace RedBookPlayer.GUI.Views
 {
     public class MainWindow : Window
     {
diff --git a/RedBookPlayer.GUI/PlayerView.xaml b/RedBookPlayer.GUI/Views/PlayerView.xaml
similarity index 98%
rename from RedBookPlayer.GUI/PlayerView.xaml
rename to RedBookPlayer.GUI/Views/PlayerView.xaml
index 26d230d..941522e 100644
--- a/RedBookPlayer.GUI/PlayerView.xaml
+++ b/RedBookPlayer.GUI/Views/PlayerView.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui" 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" mc:Ignorable="d"
-             x:Class="RedBookPlayer.GUI.PlayerView" Width="900" Height="400">
+             x:Class="RedBookPlayer.GUI.Views.PlayerView" Width="900" Height="400">
     <StackPanel Margin="16" VerticalAlignment="Center">
         <Button Command="{Binding LoadCommand}" Margin="32,0,32,16">Load</Button>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">
diff --git a/RedBookPlayer.GUI/PlayerView.xaml.cs b/RedBookPlayer.GUI/Views/PlayerView.xaml.cs
similarity index 98%
rename from RedBookPlayer.GUI/PlayerView.xaml.cs
rename to RedBookPlayer.GUI/Views/PlayerView.xaml.cs
index bda4343..253fd9b 100644
--- a/RedBookPlayer.GUI/PlayerView.xaml.cs
+++ b/RedBookPlayer.GUI/Views/PlayerView.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using RedBookPlayer.GUI.ViewModels;
 
-namespace RedBookPlayer.GUI
+namespace RedBookPlayer.GUI.Views
 {
     public class PlayerView : UserControl
     {
diff --git a/RedBookPlayer.GUI/SettingsWindow.xaml b/RedBookPlayer.GUI/Views/SettingsWindow.xaml
similarity index 98%
rename from RedBookPlayer.GUI/SettingsWindow.xaml
rename to RedBookPlayer.GUI/Views/SettingsWindow.xaml
index 158ba9e..d64c388 100644
--- a/RedBookPlayer.GUI/SettingsWindow.xaml
+++ b/RedBookPlayer.GUI/Views/SettingsWindow.xaml
@@ -1,7 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui" 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" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="RedBookPlayer.GUI.SettingsWindow" Title="Settings" SizeToContent="WidthAndHeight">
+        d:DesignHeight="450" x:Class="RedBookPlayer.GUI.Views.SettingsWindow" Title="Settings" SizeToContent="WidthAndHeight">
     <StackPanel>
         <TabControl>
             <TabItem Header="UI Settings">
diff --git a/RedBookPlayer.GUI/SettingsWindow.xaml.cs b/RedBookPlayer.GUI/Views/SettingsWindow.xaml.cs
similarity index 99%
rename from RedBookPlayer.GUI/SettingsWindow.xaml.cs
rename to RedBookPlayer.GUI/Views/SettingsWindow.xaml.cs
index 3f1d226..9b5c15d 100644
--- a/RedBookPlayer.GUI/SettingsWindow.xaml.cs
+++ b/RedBookPlayer.GUI/Views/SettingsWindow.xaml.cs
@@ -6,7 +6,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
-namespace RedBookPlayer.GUI
+namespace RedBookPlayer.GUI.Views
 {
     public class SettingsWindow : Window
     {