diff --git a/RedBookPlayer.Models/Hardware/DeEmphasisFilter.cs b/RedBookPlayer.Models/Audio/DeEmphasisFilter.cs
similarity index 97%
rename from RedBookPlayer.Models/Hardware/DeEmphasisFilter.cs
rename to RedBookPlayer.Models/Audio/DeEmphasisFilter.cs
index 5b74b1d..3ee46f7 100644
--- a/RedBookPlayer.Models/Hardware/DeEmphasisFilter.cs
+++ b/RedBookPlayer.Models/Audio/DeEmphasisFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using NWaves.Filters.BiQuad;
 
-namespace RedBookPlayer.Models.Hardware
+namespace RedBookPlayer.Models.Audio
 {
     /// <summary>
     /// Filter for applying de-emphasis to audio
diff --git a/RedBookPlayer.Models/Hardware/FilterStage.cs b/RedBookPlayer.Models/Audio/FilterStage.cs
similarity index 97%
rename from RedBookPlayer.Models/Hardware/FilterStage.cs
rename to RedBookPlayer.Models/Audio/FilterStage.cs
index b9189ec..f53a8b5 100644
--- a/RedBookPlayer.Models/Hardware/FilterStage.cs
+++ b/RedBookPlayer.Models/Audio/FilterStage.cs
@@ -1,7 +1,7 @@
 using NWaves.Audio;
 using NWaves.Filters.BiQuad;
 
-namespace RedBookPlayer.Models.Hardware
+namespace RedBookPlayer.Models.Audio
 {
     /// <summary>
     /// Output stage that represents all filters on the audio
diff --git a/RedBookPlayer.Models/Hardware/IAudioBackend.cs b/RedBookPlayer.Models/Audio/IAudioBackend.cs
similarity index 93%
rename from RedBookPlayer.Models/Hardware/IAudioBackend.cs
rename to RedBookPlayer.Models/Audio/IAudioBackend.cs
index b461c2a..b8417dc 100644
--- a/RedBookPlayer.Models/Hardware/IAudioBackend.cs
+++ b/RedBookPlayer.Models/Audio/IAudioBackend.cs
@@ -1,4 +1,4 @@
-namespace RedBookPlayer.Models.Hardware
+namespace RedBookPlayer.Models.Audio
 {
     public interface IAudioBackend
     {
diff --git a/RedBookPlayer.Models/Hardware/Linux/AudioBackend.cs b/RedBookPlayer.Models/Audio/Linux/AudioBackend.cs
similarity index 96%
rename from RedBookPlayer.Models/Hardware/Linux/AudioBackend.cs
rename to RedBookPlayer.Models/Audio/Linux/AudioBackend.cs
index 92043fb..1ee5ec5 100644
--- a/RedBookPlayer.Models/Hardware/Linux/AudioBackend.cs
+++ b/RedBookPlayer.Models/Audio/Linux/AudioBackend.cs
@@ -1,6 +1,6 @@
 using CSCore.SoundOut;
 
-namespace RedBookPlayer.Models.Hardware.Linux
+namespace RedBookPlayer.Models.Audio.Linux
 {
     public class AudioBackend : IAudioBackend
     {
diff --git a/RedBookPlayer.Models/Hardware/PlayerSource.cs b/RedBookPlayer.Models/Audio/PlayerSource.cs
similarity index 96%
rename from RedBookPlayer.Models/Hardware/PlayerSource.cs
rename to RedBookPlayer.Models/Audio/PlayerSource.cs
index 203ff4f..41c8360 100644
--- a/RedBookPlayer.Models/Hardware/PlayerSource.cs
+++ b/RedBookPlayer.Models/Audio/PlayerSource.cs
@@ -2,7 +2,7 @@ using System;
 using CSCore;
 using WaveFormat = CSCore.WaveFormat;
 
-namespace RedBookPlayer.Models.Hardware
+namespace RedBookPlayer.Models.Audio
 {
     public class PlayerSource : IWaveSource
     {
diff --git a/RedBookPlayer.Models/Hardware/SoundOutput.cs b/RedBookPlayer.Models/Audio/SoundOutput.cs
similarity index 99%
rename from RedBookPlayer.Models/Hardware/SoundOutput.cs
rename to RedBookPlayer.Models/Audio/SoundOutput.cs
index 246c004..14b2b85 100644
--- a/RedBookPlayer.Models/Hardware/SoundOutput.cs
+++ b/RedBookPlayer.Models/Audio/SoundOutput.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using ReactiveUI;
 
-namespace RedBookPlayer.Models.Hardware
+namespace RedBookPlayer.Models.Audio
 {
     public class SoundOutput : ReactiveObject
     {
diff --git a/RedBookPlayer.Models/Hardware/Windows/AudioBackend.cs b/RedBookPlayer.Models/Audio/Windows/AudioBackend.cs
similarity index 96%
rename from RedBookPlayer.Models/Hardware/Windows/AudioBackend.cs
rename to RedBookPlayer.Models/Audio/Windows/AudioBackend.cs
index c55b0ff..0026b7a 100644
--- a/RedBookPlayer.Models/Hardware/Windows/AudioBackend.cs
+++ b/RedBookPlayer.Models/Audio/Windows/AudioBackend.cs
@@ -1,6 +1,6 @@
 using CSCore.SoundOut;
 
-namespace RedBookPlayer.Models.Hardware.Windows
+namespace RedBookPlayer.Models.Audio.Windows
 {
     public class AudioBackend : IAudioBackend
     {
diff --git a/RedBookPlayer.Models/Hardware/Player.cs b/RedBookPlayer.Models/Hardware/Player.cs
index 0eb284b..2297f42 100644
--- a/RedBookPlayer.Models/Hardware/Player.cs
+++ b/RedBookPlayer.Models/Hardware/Player.cs
@@ -7,6 +7,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Avalonia.Threading;
 using ReactiveUI;
+using RedBookPlayer.Models.Audio;
 using RedBookPlayer.Models.Discs;
 using RedBookPlayer.Models.Factories;