diff --git a/RedBookPlayer/App.xaml.cs b/RedBookPlayer/App.xaml.cs
index 43a5898..03c77fd 100644
--- a/RedBookPlayer/App.xaml.cs
+++ b/RedBookPlayer/App.xaml.cs
@@ -5,6 +5,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using RedBookPlayer.GUI;
 
 namespace RedBookPlayer
 {
diff --git a/RedBookPlayer/MainWindow.xaml b/RedBookPlayer/GUI/MainWindow.xaml
similarity index 75%
rename from RedBookPlayer/MainWindow.xaml
rename to RedBookPlayer/GUI/MainWindow.xaml
index eeab898..89d5f64 100644
--- a/RedBookPlayer/MainWindow.xaml
+++ b/RedBookPlayer/GUI/MainWindow.xaml
@@ -1,6 +1,6 @@
 <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.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight">
+        x:Class="RedBookPlayer.GUI.MainWindow" Title="RedBookPlayer" SizeToContent="WidthAndHeight">
     <ContentControl Name="Content" />
 </Window>
\ No newline at end of file
diff --git a/RedBookPlayer/MainWindow.xaml.cs b/RedBookPlayer/GUI/MainWindow.xaml.cs
similarity index 99%
rename from RedBookPlayer/MainWindow.xaml.cs
rename to RedBookPlayer/GUI/MainWindow.xaml.cs
index f6166cc..70fae17 100644
--- a/RedBookPlayer/MainWindow.xaml.cs
+++ b/RedBookPlayer/GUI/MainWindow.xaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class MainWindow : Window
     {
diff --git a/RedBookPlayer/PlayerView.xaml b/RedBookPlayer/GUI/PlayerView.xaml
similarity index 98%
rename from RedBookPlayer/PlayerView.xaml
rename to RedBookPlayer/GUI/PlayerView.xaml
index ad79b76..9221ecd 100644
--- a/RedBookPlayer/PlayerView.xaml
+++ b/RedBookPlayer/GUI/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.PlayerView" Width="900" Height="400">
+             x:Class="RedBookPlayer.GUI.PlayerView" Width="900" Height="400">
     <StackPanel Margin="16" VerticalAlignment="Center">
         <Button Click="LoadButton_Click" Margin="32,0,32,16">Load</Button>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">
diff --git a/RedBookPlayer/PlayerView.xaml.cs b/RedBookPlayer/GUI/PlayerView.xaml.cs
similarity index 99%
rename from RedBookPlayer/PlayerView.xaml.cs
rename to RedBookPlayer/GUI/PlayerView.xaml.cs
index 2f1a092..d6e9f3b 100644
--- a/RedBookPlayer/PlayerView.xaml.cs
+++ b/RedBookPlayer/GUI/PlayerView.xaml.cs
@@ -12,7 +12,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Threading;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class PlayerView : UserControl
     {
diff --git a/RedBookPlayer/PlayerViewModel.cs b/RedBookPlayer/GUI/PlayerViewModel.cs
similarity index 97%
rename from RedBookPlayer/PlayerViewModel.cs
rename to RedBookPlayer/GUI/PlayerViewModel.cs
index f87664b..5090377 100644
--- a/RedBookPlayer/PlayerViewModel.cs
+++ b/RedBookPlayer/GUI/PlayerViewModel.cs
@@ -1,6 +1,6 @@
 using ReactiveUI;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class PlayerViewModel : ReactiveObject
     {
diff --git a/RedBookPlayer/SettingsWindow.xaml b/RedBookPlayer/GUI/SettingsWindow.xaml
similarity index 95%
rename from RedBookPlayer/SettingsWindow.xaml
rename to RedBookPlayer/GUI/SettingsWindow.xaml
index 3f2ce4c..7f5c54a 100644
--- a/RedBookPlayer/SettingsWindow.xaml
+++ b/RedBookPlayer/GUI/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.SettingsWindow" Title="Settings" Width="450" Height="600">
+        d:DesignHeight="450" x:Class="RedBookPlayer.GUI.SettingsWindow" Title="Settings" Width="450" Height="600">
     <DockPanel Margin="16">
         <TextBlock DockPanel.Dock="Top" Margin="0,0,0,4">Themes</TextBlock>
         <StackPanel DockPanel.Dock="Bottom">
diff --git a/RedBookPlayer/SettingsWindow.xaml.cs b/RedBookPlayer/GUI/SettingsWindow.xaml.cs
similarity index 98%
rename from RedBookPlayer/SettingsWindow.xaml.cs
rename to RedBookPlayer/GUI/SettingsWindow.xaml.cs
index ae39c0f..f88a3ac 100644
--- a/RedBookPlayer/SettingsWindow.xaml.cs
+++ b/RedBookPlayer/GUI/SettingsWindow.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class SettingsWindow : Window
     {
diff --git a/RedBookPlayer/Player.cs b/RedBookPlayer/Player.cs
index a496e26..ba49032 100644
--- a/RedBookPlayer/Player.cs
+++ b/RedBookPlayer/Player.cs
@@ -9,6 +9,7 @@ using CSCore.SoundOut;
 using NWaves.Audio;
 using NWaves.Filters.BiQuad;
 using RedBookPlayer.Discs;
+using RedBookPlayer.GUI;
 
 namespace RedBookPlayer
 {