diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml
index 6bad71b..04da252 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local1="clr-namespace:FRESHMusicPlayer"
-             xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
+             xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
              DispatcherUnhandledException="Application_DispatcherUnhandledException"
              Startup="App_Startup">
     <Application.Resources>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml.cs
index ee5bea0..f480b86 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/App.xaml.cs
@@ -44,7 +44,7 @@ namespace FRESHMusicPlayer
             string fileName = $"\\{DateTime.Now:M.d.yyyy hh mm tt}.txt";
             if (!Directory.Exists(logPath)) Directory.CreateDirectory(logPath);
             File.WriteAllText(logPath + fileName, e.Exception.ToString());
-            MessageBox.Show(string.Format(FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.APPLICATION_CRITICALERROR, e.Exception.Message.ToString(), logPath + fileName));       
+            MessageBox.Show(string.Format(FRESHMusicPlayer.Properties.Resources.APPLICATION_CRITICALERROR, e.Exception.Message.ToString(), logPath + fileName));       
             e.Handled = true;
         }
     }
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer.csproj
similarity index 98%
rename from FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj
rename to FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer.csproj
index aea5f23..7679ece 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>FRESHMusicPlayer_WPF_UI_Test</RootNamespace>
-    <AssemblyName>FRESHMusicPlayer-WPF-UI-Test</AssemblyName>
+    <RootNamespace>FRESHMusicPlayer</RootNamespace>
+    <AssemblyName>FRESHMusicPlayer</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml
index c397bad..ea544ac 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml
@@ -1,10 +1,10 @@
-<Window x:Class="FRESHMusicPlayer_WPF_UI_Test.Forms.TagEditor"
+<Window x:Class="FRESHMusicPlayer.Forms.TagEditor"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         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:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
-        xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Forms"
+        xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
+        xmlns:local="clr-namespace:FRESHMusicPlayer.Forms"
         mc:Ignorable="d"
         Title="TagEditor" Height="451" Width="600" Closing="Window_Closing">
     <Grid Background="{StaticResource BackgroundColor}">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml.cs
index 3b33d5a..70e1d46 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Forms/TagEditor.xaml.cs
@@ -10,7 +10,7 @@ using System.Windows.Controls;
 using Winforms = System.Windows.Forms;
 using System.Windows.Shapes;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Forms
+namespace FRESHMusicPlayer.Forms
 {
     /// <summary>
     /// Interaction logic for TagEditor.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml
index 934c1aa..ff25ec8 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml
@@ -3,7 +3,7 @@
         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:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
+        xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
         mc:Ignorable="d"
         Title="FRESHMusicPlayer 8 Development" Height="540" Width="800" Closed="Window_Closed" KeyDown="Window_PreviewKeyDown" DragOver="Window_DragOver" Drop="Window_Drop" AllowDrop="True" Background="White" SourceInitialized="Window_SourceInitialized">
     <Window.Resources>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs
index c786524..5d22817 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs
@@ -2,7 +2,7 @@
 using FRESHMusicPlayer.Handlers;
 using FRESHMusicPlayer.Handlers.Notifications;
 using FRESHMusicPlayer.Utilities;
-using FRESHMusicPlayer_WPF_UI_Test.Forms;
+using FRESHMusicPlayer.Forms;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -279,7 +279,7 @@ namespace FRESHMusicPlayer
             Track track = new Track(Player.FilePath);
             Title = $"{track.Artist} - {track.Title} | FRESHMusicPlayer 8 Development";
             TitleLabel.Text = track.Title;
-            ArtistLabel.Text = track.Artist == "" ? FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.MAINWINDOW_NOARTIST : track.Artist;
+            ArtistLabel.Text = track.Artist == "" ? FRESHMusicPlayer.Properties.Resources.MAINWINDOW_NOARTIST : track.Artist;
             ProgressBar.Maximum = Player.CurrentBackend.TotalTime.TotalSeconds;
             if (Player.CurrentBackend.TotalTime.TotalSeconds != 0) ProgressIndicator2.Text = Player.CurrentBackend.TotalTime.ToString(@"mm\:ss");
             else ProgressIndicator2.Text = "∞";
@@ -303,7 +303,7 @@ namespace FRESHMusicPlayer
             NotificationHandler.Add(new Notification
             {
                 HeaderText = "A playback error occured",
-                ContentText = String.Format(FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.MAINWINDOW_PLAYBACK_ERROR_DETAILS),
+                ContentText = String.Format(FRESHMusicPlayer.Properties.Resources.MAINWINDOW_PLAYBACK_ERROR_DETAILS),
                 IsImportant = true,
                 DisplayAsToast = true,
                 Type = NotificationType.Failure
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml
index 1573b06..55d79e0 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml
@@ -1,10 +1,10 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.ImportPage"
+<Page x:Class="FRESHMusicPlayer.Pages.ImportPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
-      xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
+      xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
       mc:Ignorable="d" 
       d:DesignHeight="372" d:DesignWidth="694"
       Title="ImportPage" DragEnter="Page_DragEnter" Drop="Page_Drop" AllowDrop="True">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml.cs
index 47009ef..707352c 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using WinForms = System.Windows.Forms;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for ImportPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml
index d19dbdd..ab5c429 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml
@@ -1,10 +1,10 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.LibraryPage"
+<Page x:Class="FRESHMusicPlayer.Pages.Library.LibraryPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
+      xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
       mc:Ignorable="d" 
       d:DesignHeight="372" d:DesignWidth="694"
       Title="LibraryPage" Unloaded="Page_Unloaded" DragEnter="Page_DragEnter" Drop="Page_Drop" AllowDrop="True">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml.cs
index 4e64763..09d7a3e 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/LibraryPage.xaml.cs
@@ -23,7 +23,7 @@ using System.Diagnostics;
 using LiteDB;
 using FRESHMusicPlayer.Utilities;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
+namespace FRESHMusicPlayer.Pages.Library
 {
     /// <summary>
     /// Interaction logic for LibraryPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml
index c8134a9..1974042 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.SearchPage"
+<Page x:Class="FRESHMusicPlayer.Pages.Library.SearchPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="SearchPage">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml.cs
index 6389a65..9490a7c 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SearchPage.xaml.cs
@@ -20,7 +20,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
+namespace FRESHMusicPlayer.Pages.Library
 {
     /// <summary>
     /// Interaction logic for SearchPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml
index 605d917..a9ac786 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.SongEntry"
+<UserControl x:Class="FRESHMusicPlayer.Pages.Library.SongEntry"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
+             xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
              mc:Ignorable="d" 
              d:DesignHeight="40" d:DesignWidth="344" MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave" MouseLeftButtonDown="UserControl_MouseLeftButtonDown">
     <UserControl.Triggers>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml.cs
index 4a9a3c4..9e56d5f 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Library/SongEntry.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
+namespace FRESHMusicPlayer.Pages.Library
 {
     /// <summary>
     /// Interaction logic for SongEntry.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml
index 193dc0a..fdc602d 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml
@@ -1,10 +1,10 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.NotificationPage"
+<Page x:Class="FRESHMusicPlayer.Pages.NotificationPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
-      xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
+      xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
       mc:Ignorable="d" 
       d:DesignHeight="372" d:DesignWidth="235"
       Title="NotificationPage" Unloaded="Page_Unloaded">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml.cs
index 081b12b..694957a 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/NotificationPage.xaml.cs
@@ -17,7 +17,7 @@ using FRESHMusicPlayer.Handlers.Notifications;
 using FRESHMusicPlayer;
 using System.Windows.Media.Animation;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for NotificationPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml
index baf0ef5..d57be62 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.QueueEntry"
+<UserControl x:Class="FRESHMusicPlayer.Pages.QueueEntry"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml.cs
index ce37f5f..f8b4826 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueEntry.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for QueueEntry.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml
index c998f16..6861c6f 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml
@@ -1,10 +1,10 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.QueueManagement"
+<Page x:Class="FRESHMusicPlayer.Pages.QueueManagement"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
+      xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="372" d:DesignWidth="235"
       Title="QueueManagementPage" Unloaded="Page_Unloaded">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml.cs
index 3cb8c5d..c8ea10b 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/QueueManagement/QueueManagementPage.xaml.cs
@@ -20,7 +20,7 @@ using ATL.Playlist;
 using FRESHMusicPlayer.Handlers.Notifications;
 using System.IO;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for QueueManagementPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml
index ea38f05..fdf4e4b 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.SettingsPage"
+<Page x:Class="FRESHMusicPlayer.Pages.SettingsPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="1072" d:DesignWidth="335"
       Title="SettingsPage" Unloaded="Page_Unloaded">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml.cs
index e4f7be0..4908cbf 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml.cs
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for SettingsPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml
index c893f0d..76236c7 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.TestPage"
+<Page x:Class="FRESHMusicPlayer.Pages.TestPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="TestPage">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml.cs
index 54d5a9b..13be3ce 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TestPage.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for TestPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml
index 32edf03..d91c603 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml
@@ -1,10 +1,10 @@
-<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.TrackInfoPage"
+<Page x:Class="FRESHMusicPlayer.Pages.TrackInfoPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
-      xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
+      xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
+      xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="372" d:DesignWidth="235"
       Title="TrackInfoPage" Unloaded="Page_Unloaded">
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml.cs
index 13f92de..3ecd935 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/TrackInfoPage.xaml.cs
@@ -17,7 +17,7 @@ using System.Windows.Navigation;
 using Imaging = System.Drawing.Imaging;
 using System.Windows.Shapes;
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Pages
+namespace FRESHMusicPlayer.Pages
 {
     /// <summary>
     /// Interaction logic for TrackInfoPage.xaml
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Resources.Designer.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Resources.Designer.cs
index 2ba30ac..73f2aa3 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Resources.Designer.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Properties {
+namespace FRESHMusicPlayer.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace FRESHMusicPlayer_WPF_UI_Test.Properties {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FRESHMusicPlayer_WPF_UI_Test.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FRESHMusicPlayer.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Settings.Designer.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Settings.Designer.cs
index c5c9ba6..1394203 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Settings.Designer.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace FRESHMusicPlayer_WPF_UI_Test.Properties
-{
-
-
+namespace FRESHMusicPlayer.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln b/FRESHMusicPlayer/FRESHMusicPlayer.sln
similarity index 88%
rename from FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln
rename to FRESHMusicPlayer/FRESHMusicPlayer.sln
index 6d8e83b..8fcc49a 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln
+++ b/FRESHMusicPlayer/FRESHMusicPlayer.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution