diff --git a/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs
index e9119462..36795a4b 100644
--- a/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs
+++ b/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs
@@ -11,7 +11,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Client.Contracts;
 using SafeExamBrowser.Client.Operations;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.Logging.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts;
diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index 84fc1f09..bbb6ee13 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/SafeExamBrowser.Client/CompositionRoot.cs
@@ -23,7 +23,7 @@ using SafeExamBrowser.Communication.Contracts.Proxies;
 using SafeExamBrowser.Communication.Hosts;
 using SafeExamBrowser.Communication.Proxies;
 using SafeExamBrowser.Configuration.Contracts;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 using SafeExamBrowser.Configuration.Cryptography;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Core.OperationModel;
diff --git a/SafeExamBrowser.Client/Operations/ShellOperation.cs b/SafeExamBrowser.Client/Operations/ShellOperation.cs
index 556757fb..665a1850 100644
--- a/SafeExamBrowser.Client/Operations/ShellOperation.cs
+++ b/SafeExamBrowser.Client/Operations/ShellOperation.cs
@@ -8,7 +8,7 @@
 
 using System.Collections.Generic;
 using SafeExamBrowser.Client.Contracts;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Core.Contracts.OperationModel.Events;
 using SafeExamBrowser.I18n.Contracts;
diff --git a/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj b/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj
index 88729292..1083a29f 100644
--- a/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj
+++ b/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj
@@ -76,22 +76,22 @@
     <Compile Include="SaveStatus.cs" />
     <Compile Include="ServiceConfiguration.cs" />
     <Compile Include="SessionConfiguration.cs" />
-    <Compile Include="Settings\ActionCenterSettings.cs" />
-    <Compile Include="Settings\AudioSettings.cs" />
+    <Compile Include="Settings\UserInterface\ActionCenterSettings.cs" />
+    <Compile Include="Settings\SystemComponents\AudioSettings.cs" />
     <Compile Include="Settings\Browser\BrowserSettings.cs" />
     <Compile Include="Settings\Browser\BrowserWindowSettings.cs" />
     <Compile Include="Settings\Browser\FilterResult.cs" />
     <Compile Include="Settings\Browser\FilterRule.cs" />
     <Compile Include="Settings\Browser\FilterType.cs" />
     <Compile Include="Settings\ConfigurationMode.cs" />
-    <Compile Include="Settings\KeyboardSettings.cs" />
+    <Compile Include="Settings\Monitoring\KeyboardSettings.cs" />
     <Compile Include="Settings\KioskMode.cs" />
-    <Compile Include="Settings\MouseSettings.cs" />
-    <Compile Include="Settings\ServicePolicy.cs" />
-    <Compile Include="Settings\ServiceSettings.cs" />
+    <Compile Include="Settings\Monitoring\MouseSettings.cs" />
+    <Compile Include="Settings\Service\ServicePolicy.cs" />
+    <Compile Include="Settings\Service\ServiceSettings.cs" />
     <Compile Include="Settings\Settings.cs" />
-    <Compile Include="Settings\TaskbarSettings.cs" />
-    <Compile Include="Settings\UserInterfaceMode.cs" />
+    <Compile Include="Settings\UserInterface\TaskbarSettings.cs" />
+    <Compile Include="Settings\UserInterface\UserInterfaceMode.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SafeExamBrowser.Logging.Contracts\SafeExamBrowser.Logging.Contracts.csproj">
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs b/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs
index e3630b6a..2b44cc54 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs
@@ -9,7 +9,7 @@
 namespace SafeExamBrowser.Configuration.Contracts.Settings
 {
 	/// <summary>
-	/// Defines all possible kiosk modes which the application supports.
+	/// Defines all kiosk modes which the application supports.
 	/// </summary>
 	public enum KioskMode
 	{
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/KeyboardSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs
similarity index 94%
rename from SafeExamBrowser.Configuration.Contracts/Settings/KeyboardSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs
index 21b3b9b6..0608cf5c 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/KeyboardSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs
@@ -8,10 +8,10 @@
 
 using System;
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring
 {
 	/// <summary>
-	/// Defines all configuration options for the <see cref="Monitoring.IKeyboardInterceptor"/>.
+	/// Defines all configuration options for monitoring keyboard input.
 	/// </summary>
 	[Serializable]
 	public class KeyboardSettings
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/MouseSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs
similarity index 82%
rename from SafeExamBrowser.Configuration.Contracts/Settings/MouseSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs
index 7235d823..0d00e4e0 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/MouseSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs
@@ -8,10 +8,10 @@
 
 using System;
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring
 {
 	/// <summary>
-	/// Defines all configuration options for the <see cref="Monitoring.IMouseInterceptor"/>.
+	/// Defines all configuration options for monitoring mouse input.
 	/// </summary>
 	[Serializable]
 	public class MouseSettings
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/ServicePolicy.cs b/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs
similarity index 93%
rename from SafeExamBrowser.Configuration.Contracts/Settings/ServicePolicy.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs
index e186d318..4c48c4ac 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/ServicePolicy.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.Service
 {
 	/// <summary>
 	/// Defines all possible service policies which the application supports.
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/ServiceSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs
similarity index 97%
rename from SafeExamBrowser.Configuration.Contracts/Settings/ServiceSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs
index 7b718e66..5c95b48d 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/ServiceSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.Service
 {
 	/// <summary>
 	/// Defines all configuration options for the service application component.
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs
index e35ed21d..fed39f96 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs
@@ -8,6 +8,10 @@
 
 using System;
 using SafeExamBrowser.Configuration.Contracts.Settings.Browser;
+using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
+using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 using SafeExamBrowser.Logging.Contracts;
 
 namespace SafeExamBrowser.Configuration.Contracts.Settings
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/AudioSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs
similarity index 93%
rename from SafeExamBrowser.Configuration.Contracts/Settings/AudioSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs
index 47ee4738..03196d36 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/AudioSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents
 {
 	/// <summary>
 	/// Defines all configuration options for the audio device of the computer.
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/ActionCenterSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs
similarity index 91%
rename from SafeExamBrowser.Configuration.Contracts/Settings/ActionCenterSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs
index 23a9c070..b0abdf31 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/ActionCenterSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs
@@ -8,10 +8,10 @@
 
 using System;
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface
 {
 	/// <summary>
-	/// Defines all configuration options for the <see cref="UserInterface.Shell.IActionCenter"/>.
+	/// Defines all configuration options for the action center.
 	/// </summary>
 	[Serializable]
 	public class ActionCenterSettings
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/TaskbarSettings.cs b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs
similarity index 91%
rename from SafeExamBrowser.Configuration.Contracts/Settings/TaskbarSettings.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs
index f552f99d..e2cda72e 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/TaskbarSettings.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs
@@ -8,10 +8,10 @@
 
 using System;
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface
 {
 	/// <summary>
-	/// Defines all configuration options for the <see cref="UserInterface.Shell.ITaskbar"/>.
+	/// Defines all configuration options for the taskbar.
 	/// </summary>
 	[Serializable]
 	public class TaskbarSettings
diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterfaceMode.cs b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs
similarity index 90%
rename from SafeExamBrowser.Configuration.Contracts/Settings/UserInterfaceMode.cs
rename to SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs
index 861532b2..92511639 100644
--- a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterfaceMode.cs
+++ b/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Configuration.Contracts.Settings
+namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface
 {
 	/// <summary>
 	/// Defines all possible look &amp; feel options for the application.
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
index 00279e40..17889783 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using SafeExamBrowser.Configuration.Contracts.Settings;
 using SafeExamBrowser.Configuration.Contracts.Settings.Browser;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 
 namespace SafeExamBrowser.Configuration.ConfigurationData
 {
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs
index 9674b3e4..2fcddb89 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs
@@ -8,6 +8,7 @@
 
 using System.Collections.Generic;
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
 
 namespace SafeExamBrowser.Configuration.ConfigurationData
 {
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs
index 86ce0c72..101ef936 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs
@@ -7,6 +7,7 @@
  */
 
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 
 namespace SafeExamBrowser.Configuration.ConfigurationData
 {
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
index f2f64475..c86130ce 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
@@ -10,6 +10,8 @@ using System;
 using System.IO;
 using SafeExamBrowser.Configuration.Contracts;
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
+using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface;
 using SafeExamBrowser.Logging.Contracts;
 
 namespace SafeExamBrowser.Configuration.ConfigurationData
diff --git a/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs b/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs
index 7a81cae9..4f8e8a15 100644
--- a/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs
+++ b/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 using System.Windows.Input;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring;
 using SafeExamBrowser.Logging.Contracts;
 using SafeExamBrowser.Monitoring.Contracts.Keyboard;
 
diff --git a/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs b/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs
index aa3fce69..af95dd42 100644
--- a/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs
+++ b/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring;
 using SafeExamBrowser.Logging.Contracts;
 using SafeExamBrowser.Monitoring.Contracts.Mouse;
 
diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs
index 65a8c71c..cdee2222 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs
@@ -14,12 +14,13 @@ using SafeExamBrowser.Communication.Contracts.Hosts;
 using SafeExamBrowser.Communication.Contracts.Proxies;
 using SafeExamBrowser.Configuration.Contracts;
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Logging.Contracts;
-using SafeExamBrowser.SystemComponents.Contracts;
-using SafeExamBrowser.UserInterface.Contracts.MessageBox;
 using SafeExamBrowser.Runtime.Operations;
 using SafeExamBrowser.Runtime.Operations.Events;
+using SafeExamBrowser.SystemComponents.Contracts;
+using SafeExamBrowser.UserInterface.Contracts.MessageBox;
 
 namespace SafeExamBrowser.Runtime.UnitTests.Operations
 {
diff --git a/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs
index 84e7215d..5ec0fe9f 100644
--- a/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs
@@ -15,6 +15,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts;
 using SafeExamBrowser.Communication.Contracts.Proxies;
 using SafeExamBrowser.Configuration.Contracts;
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Core.Contracts.OperationModel.Events;
 using SafeExamBrowser.I18n.Contracts;
diff --git a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs
index 00c622fa..2e9da19e 100644
--- a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs
+++ b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs
@@ -12,14 +12,14 @@ using System.Threading;
 using SafeExamBrowser.Communication.Contracts.Hosts;
 using SafeExamBrowser.Communication.Contracts.Proxies;
 using SafeExamBrowser.Configuration.Contracts;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Core.Contracts.OperationModel.Events;
 using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.Logging.Contracts;
+using SafeExamBrowser.Runtime.Operations.Events;
 using SafeExamBrowser.SystemComponents.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.MessageBox;
-using SafeExamBrowser.Runtime.Operations.Events;
 
 namespace SafeExamBrowser.Runtime.Operations
 {
diff --git a/SafeExamBrowser.Runtime/RuntimeController.cs b/SafeExamBrowser.Runtime/RuntimeController.cs
index f5687e0a..8f52015f 100644
--- a/SafeExamBrowser.Runtime/RuntimeController.cs
+++ b/SafeExamBrowser.Runtime/RuntimeController.cs
@@ -14,6 +14,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts;
 using SafeExamBrowser.Communication.Contracts.Proxies;
 using SafeExamBrowser.Configuration.Contracts;
 using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.Service;
 using SafeExamBrowser.Core.Contracts.OperationModel;
 using SafeExamBrowser.Core.Contracts.OperationModel.Events;
 using SafeExamBrowser.I18n.Contracts;
diff --git a/SafeExamBrowser.SystemComponents/Audio/Audio.cs b/SafeExamBrowser.SystemComponents/Audio/Audio.cs
index 42be2a08..581a37be 100644
--- a/SafeExamBrowser.SystemComponents/Audio/Audio.cs
+++ b/SafeExamBrowser.SystemComponents/Audio/Audio.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 using NAudio.CoreAudioApi;
-using SafeExamBrowser.Configuration.Contracts.Settings;
+using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents;
 using SafeExamBrowser.Logging.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts.Audio;
 using SafeExamBrowser.SystemComponents.Contracts.Audio.Events;