SEBWIN-226: Cleaned up configuration and core contracts by creating new namespaces SafeExamBrowser.Applications, SafeExamBrowser.Client and SafeExamBrowser.Runtime.

SafeExamBrowser.Browser/BrowserApplicationController.cs

@@ -12,9 +12,9 @@ using System.Linq;
 using CefSharp;
 using CefSharp.WinForms;
 using SafeExamBrowser.Browser.Events;
+using SafeExamBrowser.Contracts.Applications;
 using SafeExamBrowser.Contracts.Browser;
 using SafeExamBrowser.Contracts.Configuration;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;

SafeExamBrowser.Browser/BrowserApplicationInfo.cs

@@ -6,7 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Applications;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.Browser
 {

SafeExamBrowser.Browser/BrowserApplicationInstance.cs

@@ -8,11 +8,11 @@
 
 using SafeExamBrowser.Browser.Events;
 using SafeExamBrowser.Browser.Handlers;
+using SafeExamBrowser.Contracts.Applications;
+using SafeExamBrowser.Contracts.Applications.Events;
 using SafeExamBrowser.Contracts.Browser;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
-using SafeExamBrowser.Contracts.Core;
-using SafeExamBrowser.Contracts.Core.Events;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;

SafeExamBrowser.Browser/BrowserIconResource.cs

@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.Browser
 {

SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Applications;
 
 namespace SafeExamBrowser.Browser
 {

SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs

@@ -9,8 +9,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Client.Operations;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Applications;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;

SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs

@@ -9,9 +9,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Client.Operations;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Configuration.Settings;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.SystemComponents;

SafeExamBrowser.Client/ClientController.cs

@@ -9,6 +9,7 @@
 using System;
 using System.IO;
 using SafeExamBrowser.Contracts.Browser;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Communication.Data;
 using SafeExamBrowser.Contracts.Communication.Events;
 using SafeExamBrowser.Contracts.Communication.Hosts;
@@ -16,7 +17,6 @@ using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Cryptography;
 using SafeExamBrowser.Contracts.Configuration.Settings;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.Core.OperationModel.Events;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.Client/CompositionRoot.cs

@@ -17,17 +17,17 @@ using SafeExamBrowser.Client.Notifications;
 using SafeExamBrowser.Client.Operations;
 using SafeExamBrowser.Communication.Hosts;
 using SafeExamBrowser.Communication.Proxies;
-using SafeExamBrowser.Configuration;
 using SafeExamBrowser.Configuration.Cryptography;
 using SafeExamBrowser.Contracts.Browser;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
+using SafeExamBrowser.Contracts.SystemComponents;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.MessageBox;
 using SafeExamBrowser.Contracts.WindowsApi;

SafeExamBrowser.Client/Notifications/AboutNotificationController.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;

SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs

@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.Client.Notifications
 {

SafeExamBrowser.Client/Notifications/AboutNotificationInfo.cs

@@ -6,7 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Client;
+using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.I18n;
 
 namespace SafeExamBrowser.Client.Notifications

SafeExamBrowser.Client/Notifications/LogNotificationController.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;

SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs

@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.Client.Notifications
 {

SafeExamBrowser.Client/Notifications/LogNotificationInfo.cs

@@ -6,7 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Client;
+using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.I18n;
 
 namespace SafeExamBrowser.Client.Notifications

SafeExamBrowser.Client/Operations/BrowserOperation.cs

@@ -6,8 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Applications;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.Core.OperationModel.Events;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.Client/Operations/TaskbarOperation.cs

@@ -6,9 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Configuration.Settings;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.Core.OperationModel.Events;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs

@@ -143,6 +143,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 
 			// TODO: Default values for testing of alpha version only, remove for final release!
 			settings.Browser.AllowDeveloperConsole = true;
+			settings.Browser.MainWindowSettings.AllowAddressBar = true;
 			settings.KioskMode = KioskMode.None;
 			settings.Taskbar.AllowApplicationLog = true;
 

SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj

@@ -95,7 +95,6 @@
     <Compile Include="DataResources\NetworkResourceLoader.cs" />
     <Compile Include="SessionConfiguration.cs" />
     <Compile Include="SubStream.cs" />
-    <Compile Include="SystemInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">

SafeExamBrowser.Contracts/Applications/Events/IconChangedEventHandler.cs

@@ -6,9 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
-namespace SafeExamBrowser.Contracts.Core.Events
+namespace SafeExamBrowser.Contracts.Applications.Events
 {
 	/// <summary>
 	/// Event handler used to indicate that the icon of an <see cref="IApplicationInstance"/> has changed.

SafeExamBrowser.Contracts/Applications/Events/InstanceTerminatedEventHandler.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Core.Events
+namespace SafeExamBrowser.Contracts.Applications.Events
 {
 	/// <summary>
 	/// Event handler used to indicate that an <see cref="IApplicationInstance"/> with a particular ID has terminated.

SafeExamBrowser.Contracts/Applications/Events/NameChangedEventHandler.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Core.Events
+namespace SafeExamBrowser.Contracts.Applications.Events
 {
 	/// <summary>
 	/// Event handler used to indicate that a name has changed to a new value.

SafeExamBrowser.Contracts/Applications/IApplicationController.cs

@@ -8,7 +8,7 @@
 
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Applications
 {
 	/// <summary>
 	/// Controls the lifetime and functionality of a (third-party) application which can be accessed via the <see cref="ITaskbar"/>.

SafeExamBrowser.Contracts/Applications/IApplicationInfo.cs

@@ -6,7 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Configuration
+using SafeExamBrowser.Contracts.Core;
+
+namespace SafeExamBrowser.Contracts.Applications
 {
 	/// <summary>
 	/// The information about a (third-party) application which can be accessed via the <see cref="UserInterface.Taskbar.ITaskbar"/>.

SafeExamBrowser.Contracts/Applications/IApplicationInstance.cs

@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core.Events;
+using SafeExamBrowser.Contracts.Applications.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Applications
 {
 	/// <summary>
 	/// Defines an instance of a (third-party) application which can be accessed via the <see cref="UserInterface.Taskbar.ITaskbar"/>.

SafeExamBrowser.Contracts/Applications/InstanceIdentifier.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Applications
 {
 	/// <summary>
 	/// Defines an identifier which uniquely identifies an <see cref="IApplicationInstance"/> in the context of a (third-party) application.

SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Applications;
 
 namespace SafeExamBrowser.Contracts.Browser
 {

SafeExamBrowser.Contracts/Client/IClientController.cs

@@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Client
 {
 	/// <summary>
 	/// Controls the lifetime and is responsible for the event handling of the client application component.

SafeExamBrowser.Contracts/Client/INotificationController.cs

@@ -8,7 +8,7 @@
 
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Client
 {
 	/// <summary>
 	/// Controls the lifetime and functionality of a notification which is part of the <see cref="ITaskbar"/>.

SafeExamBrowser.Contracts/Client/INotificationInfo.cs

@@ -6,7 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Configuration
+using SafeExamBrowser.Contracts.Core;
+
+namespace SafeExamBrowser.Contracts.Client
 {
 	/// <summary>
 	/// The information about a notification which is part of the <see cref="UserInterface.Taskbar.ITaskbar"/>.

SafeExamBrowser.Contracts/Core/IIconResource.cs

@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Configuration
+namespace SafeExamBrowser.Contracts.Core
 {
 	/// <summary>
 	/// Defines an icon resource, i.e. the path to and type of an icon.

SafeExamBrowser.Contracts/Runtime/IRuntimeController.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Runtime
 {
 	/// <summary>
 	/// Controls the lifetime and is responsible for the event handling of the runtime application component.

SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj

@@ -72,12 +72,12 @@
     <Compile Include="Configuration\SaveStatus.cs" />
     <Compile Include="Configuration\Settings\BrowserWindowSettings.cs" />
     <Compile Include="Configuration\Settings\UserInterfaceMode.cs" />
-    <Compile Include="Core\Events\IconChangedEventHandler.cs" />
+    <Compile Include="Applications\Events\IconChangedEventHandler.cs" />
-    <Compile Include="Core\Events\InstanceTerminatedEventHandler.cs" />
+    <Compile Include="Applications\Events\InstanceTerminatedEventHandler.cs" />
-    <Compile Include="Core\Events\NameChangedEventHandler.cs" />
+    <Compile Include="Applications\Events\NameChangedEventHandler.cs" />
-    <Compile Include="Core\IApplicationController.cs" />
+    <Compile Include="Applications\IApplicationController.cs" />
-    <Compile Include="Core\InstanceIdentifier.cs" />
+    <Compile Include="Applications\InstanceIdentifier.cs" />
-    <Compile Include="Core\IRuntimeController.cs" />
+    <Compile Include="Runtime\IRuntimeController.cs" />
     <Compile Include="Core\OperationModel\Events\ActionRequiredEventArgs.cs" />
     <Compile Include="Core\OperationModel\Events\ActionRequiredEventHandler.cs" />
     <Compile Include="Core\OperationModel\Events\ProgressChangedEventArgs.cs" />
@@ -131,15 +131,15 @@
     <Compile Include="Configuration\AppConfig.cs" />
     <Compile Include="Configuration\ISessionConfiguration.cs" />
     <Compile Include="Configuration\Settings\ConfigurationMode.cs" />
-    <Compile Include="Core\INotificationController.cs" />
+    <Compile Include="Client\INotificationController.cs" />
     <Compile Include="Core\OperationModel\IOperation.cs" />
-    <Compile Include="Core\IClientController.cs" />
+    <Compile Include="Client\IClientController.cs" />
-    <Compile Include="Configuration\IIconResource.cs" />
+    <Compile Include="Core\IIconResource.cs" />
-    <Compile Include="Configuration\IApplicationInfo.cs" />
+    <Compile Include="Applications\IApplicationInfo.cs" />
-    <Compile Include="Core\IApplicationInstance.cs" />
+    <Compile Include="Applications\IApplicationInstance.cs" />
-    <Compile Include="Configuration\INotificationInfo.cs" />
+    <Compile Include="Client\INotificationInfo.cs" />
-    <Compile Include="Configuration\ISystemInfo.cs" />
+    <Compile Include="SystemComponents\ISystemInfo.cs" />
-    <Compile Include="Configuration\OperatingSystem.cs" />
+    <Compile Include="SystemComponents\OperatingSystem.cs" />
     <Compile Include="Configuration\Settings\BrowserSettings.cs" />
     <Compile Include="Configuration\Settings\KeyboardSettings.cs" />
     <Compile Include="Configuration\Settings\MouseSettings.cs" />

SafeExamBrowser.Contracts/SystemComponents/ISystemInfo.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Configuration
+namespace SafeExamBrowser.Contracts.SystemComponents
 {
 	/// <summary>
 	/// Provides access to information about the operating system.

SafeExamBrowser.Contracts/SystemComponents/OperatingSystem.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Configuration
+namespace SafeExamBrowser.Contracts.SystemComponents
 {
 	/// <summary>
 	/// Defines all operating systems supported by the application.

SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserWindow.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.UserInterface.Browser.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 

SafeExamBrowser.Contracts/UserInterface/IUserInterfaceFactory.cs

@@ -6,6 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.Applications;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Applications;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
 {

SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Core;
+using SafeExamBrowser.Contracts.Applications;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar

SafeExamBrowser.Runtime/CompositionRoot.cs

@@ -18,16 +18,18 @@ using SafeExamBrowser.Configuration.DataCompression;
 using SafeExamBrowser.Configuration.DataFormats;
 using SafeExamBrowser.Configuration.DataResources;
 using SafeExamBrowser.Contracts.Configuration;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.Runtime;
+using SafeExamBrowser.Contracts.SystemComponents;
 using SafeExamBrowser.Core.OperationModel;
 using SafeExamBrowser.Core.Operations;
 using SafeExamBrowser.I18n;
 using SafeExamBrowser.Logging;
 using SafeExamBrowser.Runtime.Communication;
 using SafeExamBrowser.Runtime.Operations;
+using SafeExamBrowser.SystemComponents;
 using SafeExamBrowser.UserInterface.Desktop;
 using SafeExamBrowser.WindowsApi;
 

SafeExamBrowser.Runtime/RuntimeController.cs

@@ -14,11 +14,11 @@ using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.Core.OperationModel.Events;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.Runtime;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.MessageBox;
 using SafeExamBrowser.Contracts.UserInterface.Windows;

SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj

@@ -160,6 +160,10 @@
       <Project>{e107026c-2011-4552-a7d8-3a0d37881df6}</Project>
       <Name>SafeExamBrowser.Logging</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SafeExamBrowser.SystemComponents\SafeExamBrowser.SystemComponents.csproj">
+      <Project>{acee2ef1-14d2-4b52-8994-5c053055bb51}</Project>
+      <Name>SafeExamBrowser.SystemComponents</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SafeExamBrowser.UserInterface.Desktop\SafeExamBrowser.UserInterface.Desktop.csproj">
       <Project>{a502df54-7169-4647-94bd-18b192924866}</Project>
       <Name>SafeExamBrowser.UserInterface.Desktop</Name>

SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj

@@ -61,6 +61,7 @@
     <Compile Include="KeyboardLayout.cs" />
     <Compile Include="PowerSupply.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SystemInfo.cs" />
     <Compile Include="WirelessNetwork.cs" />
     <Compile Include="WirelessNetworkDefinition.cs" />
   </ItemGroup>

SafeExamBrowser.SystemComponents/SystemInfo.cs

@@ -7,9 +7,10 @@
  */
 
 using System.Windows.Forms;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.SystemComponents;
+using BatteryChargeStatus = System.Windows.Forms.BatteryChargeStatus;
 
-namespace SafeExamBrowser.Configuration
+namespace SafeExamBrowser.SystemComponents
 {
 	public class SystemInfo : ISystemInfo
 	{

SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs

@@ -12,8 +12,8 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
+using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.Browser;

SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs

@@ -6,7 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,8 +13,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Threading;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Applications;
-using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Desktop.Utilities;

SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs

@@ -8,7 +8,7 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Applications;
 using SafeExamBrowser.Contracts.Core;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Desktop.Utilities;

SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs

@@ -8,7 +8,7 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Desktop.Utilities;

SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs

@@ -10,6 +10,8 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Media;
 using FontAwesome.WPF;
+using SafeExamBrowser.Contracts.Applications;
+using SafeExamBrowser.Contracts.Client;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs

@@ -13,7 +13,7 @@ using System.Windows.Documents;
 using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.UserInterface.Desktop.Utilities
 {

SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs

@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
 
 namespace SafeExamBrowser.UserInterface.Desktop.Utilities
 {