diff --git a/RedBookPlayer/Discs/CompactDisc.cs b/RedBookPlayer.Common/Discs/CompactDisc.cs
similarity index 99%
rename from RedBookPlayer/Discs/CompactDisc.cs
rename to RedBookPlayer.Common/Discs/CompactDisc.cs
index f25a7ec..9078929 100644
--- a/RedBookPlayer/Discs/CompactDisc.cs
+++ b/RedBookPlayer.Common/Discs/CompactDisc.cs
@@ -9,7 +9,7 @@ using Aaru.Helpers;
 using ReactiveUI;
 using static Aaru.Decoders.CD.FullTOC;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public class CompactDisc : OpticalDisc, IReactiveObject
     {
diff --git a/RedBookPlayer/Discs/OpticalDisc.cs b/RedBookPlayer.Common/Discs/OpticalDisc.cs
similarity index 99%
rename from RedBookPlayer/Discs/OpticalDisc.cs
rename to RedBookPlayer.Common/Discs/OpticalDisc.cs
index e641bdd..0cb5fb3 100644
--- a/RedBookPlayer/Discs/OpticalDisc.cs
+++ b/RedBookPlayer.Common/Discs/OpticalDisc.cs
@@ -2,7 +2,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using ReactiveUI;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public abstract class OpticalDisc : ReactiveObject
     {
diff --git a/RedBookPlayer/Discs/OpticalDiscFactory.cs b/RedBookPlayer.Common/Discs/OpticalDiscFactory.cs
similarity index 99%
rename from RedBookPlayer/Discs/OpticalDiscFactory.cs
rename to RedBookPlayer.Common/Discs/OpticalDiscFactory.cs
index 76ab981..416cbe4 100644
--- a/RedBookPlayer/Discs/OpticalDiscFactory.cs
+++ b/RedBookPlayer.Common/Discs/OpticalDiscFactory.cs
@@ -4,7 +4,7 @@ using Aaru.CommonTypes.Metadata;
 using Aaru.DiscImages;
 using Aaru.Filters;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public static class OpticalDiscFactory
     {
diff --git a/RedBookPlayer/Hardware/DeEmphasisFilter.cs b/RedBookPlayer.Common/Hardware/DeEmphasisFilter.cs
similarity index 97%
rename from RedBookPlayer/Hardware/DeEmphasisFilter.cs
rename to RedBookPlayer.Common/Hardware/DeEmphasisFilter.cs
index 546cbb3..d33117e 100644
--- a/RedBookPlayer/Hardware/DeEmphasisFilter.cs
+++ b/RedBookPlayer.Common/Hardware/DeEmphasisFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using NWaves.Filters.BiQuad;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     /// <summary>
     /// Filter for applying de-emphasis to audio
diff --git a/RedBookPlayer/Hardware/Player.cs b/RedBookPlayer.Common/Hardware/Player.cs
similarity index 99%
rename from RedBookPlayer/Hardware/Player.cs
rename to RedBookPlayer.Common/Hardware/Player.cs
index 635abcb..585f5f4 100644
--- a/RedBookPlayer/Hardware/Player.cs
+++ b/RedBookPlayer.Common/Hardware/Player.cs
@@ -2,9 +2,9 @@ using System;
 using System.ComponentModel;
 using Aaru.CommonTypes.Enums;
 using ReactiveUI;
-using RedBookPlayer.Discs;
+using RedBookPlayer.Common.Discs;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class Player : ReactiveObject
     {
diff --git a/RedBookPlayer/Hardware/PlayerSource.cs b/RedBookPlayer.Common/Hardware/PlayerSource.cs
similarity index 96%
rename from RedBookPlayer/Hardware/PlayerSource.cs
rename to RedBookPlayer.Common/Hardware/PlayerSource.cs
index 17b4a5c..630a8d1 100644
--- a/RedBookPlayer/Hardware/PlayerSource.cs
+++ b/RedBookPlayer.Common/Hardware/PlayerSource.cs
@@ -2,7 +2,7 @@ using System;
 using CSCore;
 using WaveFormat = CSCore.WaveFormat;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class PlayerSource : IWaveSource
     {
diff --git a/RedBookPlayer/Hardware/SoundOutput.cs b/RedBookPlayer.Common/Hardware/SoundOutput.cs
similarity index 99%
rename from RedBookPlayer/Hardware/SoundOutput.cs
rename to RedBookPlayer.Common/Hardware/SoundOutput.cs
index d97466e..2058a26 100644
--- a/RedBookPlayer/Hardware/SoundOutput.cs
+++ b/RedBookPlayer.Common/Hardware/SoundOutput.cs
@@ -5,9 +5,9 @@ using CSCore.SoundOut;
 using NWaves.Audio;
 using NWaves.Filters.BiQuad;
 using ReactiveUI;
-using RedBookPlayer.Discs;
+using RedBookPlayer.Common.Discs;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class SoundOutput : ReactiveObject
     {
diff --git a/RedBookPlayer.Common/RedBookPlayer.Common.csproj b/RedBookPlayer.Common/RedBookPlayer.Common.csproj
new file mode 100644
index 0000000..bfbe9f2
--- /dev/null
+++ b/RedBookPlayer.Common/RedBookPlayer.Common.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
+    <PackageReference Include="NWaves" Version="0.9.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Aaru\Aaru.Images\Aaru.Images.csproj" />
+    <ProjectReference Include="..\Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru\Aaru.Decoders\Aaru.Decoders.csproj" />
+    <ProjectReference Include="..\cscore\CSCore\CSCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/RedBookPlayer/nuget.config b/RedBookPlayer.Common/nuget.config
similarity index 100%
rename from RedBookPlayer/nuget.config
rename to RedBookPlayer.Common/nuget.config
diff --git a/RedBookPlayer/App.xaml b/RedBookPlayer.GUI/App.xaml
similarity index 100%
rename from RedBookPlayer/App.xaml
rename to RedBookPlayer.GUI/App.xaml
diff --git a/RedBookPlayer/App.xaml.cs b/RedBookPlayer.GUI/App.xaml.cs
similarity index 100%
rename from RedBookPlayer/App.xaml.cs
rename to RedBookPlayer.GUI/App.xaml.cs
diff --git a/RedBookPlayer/Assets/-.png b/RedBookPlayer.GUI/Assets/-.png
similarity index 100%
rename from RedBookPlayer/Assets/-.png
rename to RedBookPlayer.GUI/Assets/-.png
diff --git a/RedBookPlayer/Assets/0.png b/RedBookPlayer.GUI/Assets/0.png
similarity index 100%
rename from RedBookPlayer/Assets/0.png
rename to RedBookPlayer.GUI/Assets/0.png
diff --git a/RedBookPlayer/Assets/1.png b/RedBookPlayer.GUI/Assets/1.png
similarity index 100%
rename from RedBookPlayer/Assets/1.png
rename to RedBookPlayer.GUI/Assets/1.png
diff --git a/RedBookPlayer/Assets/2.png b/RedBookPlayer.GUI/Assets/2.png
similarity index 100%
rename from RedBookPlayer/Assets/2.png
rename to RedBookPlayer.GUI/Assets/2.png
diff --git a/RedBookPlayer/Assets/3.png b/RedBookPlayer.GUI/Assets/3.png
similarity index 100%
rename from RedBookPlayer/Assets/3.png
rename to RedBookPlayer.GUI/Assets/3.png
diff --git a/RedBookPlayer/Assets/4.png b/RedBookPlayer.GUI/Assets/4.png
similarity index 100%
rename from RedBookPlayer/Assets/4.png
rename to RedBookPlayer.GUI/Assets/4.png
diff --git a/RedBookPlayer/Assets/5.png b/RedBookPlayer.GUI/Assets/5.png
similarity index 100%
rename from RedBookPlayer/Assets/5.png
rename to RedBookPlayer.GUI/Assets/5.png
diff --git a/RedBookPlayer/Assets/6.png b/RedBookPlayer.GUI/Assets/6.png
similarity index 100%
rename from RedBookPlayer/Assets/6.png
rename to RedBookPlayer.GUI/Assets/6.png
diff --git a/RedBookPlayer/Assets/7.png b/RedBookPlayer.GUI/Assets/7.png
similarity index 100%
rename from RedBookPlayer/Assets/7.png
rename to RedBookPlayer.GUI/Assets/7.png
diff --git a/RedBookPlayer/Assets/8.png b/RedBookPlayer.GUI/Assets/8.png
similarity index 100%
rename from RedBookPlayer/Assets/8.png
rename to RedBookPlayer.GUI/Assets/8.png
diff --git a/RedBookPlayer/Assets/9.png b/RedBookPlayer.GUI/Assets/9.png
similarity index 100%
rename from RedBookPlayer/Assets/9.png
rename to RedBookPlayer.GUI/Assets/9.png
diff --git a/RedBookPlayer/Assets/colon.png b/RedBookPlayer.GUI/Assets/colon.png
similarity index 100%
rename from RedBookPlayer/Assets/colon.png
rename to RedBookPlayer.GUI/Assets/colon.png
diff --git a/RedBookPlayer/GUI/MainWindow.xaml b/RedBookPlayer.GUI/MainWindow.xaml
similarity index 100%
rename from RedBookPlayer/GUI/MainWindow.xaml
rename to RedBookPlayer.GUI/MainWindow.xaml
diff --git a/RedBookPlayer/GUI/MainWindow.xaml.cs b/RedBookPlayer.GUI/MainWindow.xaml.cs
similarity index 100%
rename from RedBookPlayer/GUI/MainWindow.xaml.cs
rename to RedBookPlayer.GUI/MainWindow.xaml.cs
diff --git a/RedBookPlayer/GUI/PlayerView.xaml b/RedBookPlayer.GUI/PlayerView.xaml
similarity index 100%
rename from RedBookPlayer/GUI/PlayerView.xaml
rename to RedBookPlayer.GUI/PlayerView.xaml
diff --git a/RedBookPlayer/GUI/PlayerView.xaml.cs b/RedBookPlayer.GUI/PlayerView.xaml.cs
similarity index 100%
rename from RedBookPlayer/GUI/PlayerView.xaml.cs
rename to RedBookPlayer.GUI/PlayerView.xaml.cs
diff --git a/RedBookPlayer/GUI/PlayerViewModel.cs b/RedBookPlayer.GUI/PlayerViewModel.cs
similarity index 99%
rename from RedBookPlayer/GUI/PlayerViewModel.cs
rename to RedBookPlayer.GUI/PlayerViewModel.cs
index 0712a80..b3984d7 100644
--- a/RedBookPlayer/GUI/PlayerViewModel.cs
+++ b/RedBookPlayer.GUI/PlayerViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using ReactiveUI;
-using RedBookPlayer.Hardware;
+using RedBookPlayer.Common.Hardware;
 
 namespace RedBookPlayer.GUI
 {
diff --git a/RedBookPlayer/Program.cs b/RedBookPlayer.GUI/Program.cs
similarity index 95%
rename from RedBookPlayer/Program.cs
rename to RedBookPlayer.GUI/Program.cs
index 731908b..b1919b6 100644
--- a/RedBookPlayer/Program.cs
+++ b/RedBookPlayer.GUI/Program.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Logging.Serilog;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     internal class Program
     {
diff --git a/RedBookPlayer/RedBookPlayer.csproj b/RedBookPlayer.GUI/RedBookPlayer.GUI.csproj
similarity index 58%
rename from RedBookPlayer/RedBookPlayer.csproj
rename to RedBookPlayer.GUI/RedBookPlayer.GUI.csproj
index bc7ee1e..d2a03b6 100644
--- a/RedBookPlayer/RedBookPlayer.csproj
+++ b/RedBookPlayer.GUI/RedBookPlayer.GUI.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(RuntimeIdentifier)|$(Configuration)' == 'win-x64|Debug'">
@@ -21,17 +21,9 @@
     <PackageReference Include="Avalonia" Version="0.9.12" />
     <PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
-    <PackageReference Include="NWaves" Version="0.9.4" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.3" />
-    <PackageReference Include="Avalonia.Skia.Linux.Natives" Version="1.68.0.2" ExcludeAssets="all" />
-    <PackageReference Include="SkiaSharp" Version="1.68.3" />
-    <PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Aaru\Aaru.Images\Aaru.Images.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.Decoders\Aaru.Decoders.csproj" />
-    <ProjectReference Include="..\cscore\CSCore\CSCore.csproj" />
+    <ProjectReference Include="..\RedBookPlayer.Common\RedBookPlayer.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\*" />
diff --git a/RedBookPlayer/Settings.cs b/RedBookPlayer.GUI/Settings.cs
similarity index 99%
rename from RedBookPlayer/Settings.cs
rename to RedBookPlayer.GUI/Settings.cs
index 36e95fb..2329e7c 100644
--- a/RedBookPlayer/Settings.cs
+++ b/RedBookPlayer.GUI/Settings.cs
@@ -4,7 +4,7 @@ using System.Text.Json;
 using Avalonia.Input;
 using RedBookPlayer.GUI;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class Settings
     {
diff --git a/RedBookPlayer/GUI/SettingsWindow.xaml b/RedBookPlayer.GUI/SettingsWindow.xaml
similarity index 100%
rename from RedBookPlayer/GUI/SettingsWindow.xaml
rename to RedBookPlayer.GUI/SettingsWindow.xaml
diff --git a/RedBookPlayer/GUI/SettingsWindow.xaml.cs b/RedBookPlayer.GUI/SettingsWindow.xaml.cs
similarity index 100%
rename from RedBookPlayer/GUI/SettingsWindow.xaml.cs
rename to RedBookPlayer.GUI/SettingsWindow.xaml.cs
diff --git a/RedBookPlayer.GUI/nuget.config b/RedBookPlayer.GUI/nuget.config
new file mode 100644
index 0000000..7c07e22
--- /dev/null
+++ b/RedBookPlayer.GUI/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/RedBookPlayer.sln b/RedBookPlayer.sln
index a622fe1..a36debc 100644
--- a/RedBookPlayer.sln
+++ b/RedBookPlayer.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31321.278
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedBookPlayer", "RedBookPlayer\RedBookPlayer.csproj", "{94944959-0352-4ABF-9C5C-19FF33747ECE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedBookPlayer.GUI", "RedBookPlayer.GUI\RedBookPlayer.GUI.csproj", "{94944959-0352-4ABF-9C5C-19FF33747ECE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cscore", "cscore", "{9A371299-4C59-4E46-9C3B-4FE024017491}"
 EndProject
@@ -40,6 +40,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedBookPlayer.Common", "RedBookPlayer.Common\RedBookPlayer.Common.csproj", "{462A3B8E-A5D4-4539-8469-1647B47AB2A8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -194,6 +196,18 @@ Global
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x64.Build.0 = Release|Any CPU
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x86.ActiveCfg = Release|Any CPU
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x86.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x64.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE