diff --git a/SafeExamBrowser.Browser/BrowserApplicationController.cs b/SafeExamBrowser.Browser/BrowserApplicationController.cs
index 1917424e..73b8049e 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationController.cs
+++ b/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;
diff --git a/SafeExamBrowser.Browser/BrowserApplicationInfo.cs b/SafeExamBrowser.Browser/BrowserApplicationInfo.cs
index 234652f0..7085b7b7 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationInfo.cs
+++ b/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
{
diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
index f6be129c..510a54d9 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
+++ b/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;
diff --git a/SafeExamBrowser.Browser/BrowserIconResource.cs b/SafeExamBrowser.Browser/BrowserIconResource.cs
index ebe15450..9851860e 100644
--- a/SafeExamBrowser.Browser/BrowserIconResource.cs
+++ b/SafeExamBrowser.Browser/BrowserIconResource.cs
@@ -7,7 +7,7 @@
*/
using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
namespace SafeExamBrowser.Browser
{
diff --git a/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs b/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs
index 629fe454..2d1ed2a3 100644
--- a/SafeExamBrowser.Browser/BrowserInstanceIdentifier.cs
+++ b/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
{
diff --git a/SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs
index be87b8d6..fa51ee1d 100644
--- a/SafeExamBrowser.Client.UnitTests/Operations/BrowserOperationTests.cs
+++ b/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.Core;
+using SafeExamBrowser.Contracts.Applications;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
diff --git a/SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs
index a0a06bf1..17c70860 100644
--- a/SafeExamBrowser.Client.UnitTests/Operations/TaskbarOperationTests.cs
+++ b/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;
diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs
index 67473fe6..624c2c37 100644
--- a/SafeExamBrowser.Client/ClientController.cs
+++ b/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;
diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index 838dec42..e1e74b3b 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/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;
diff --git a/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs b/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs
index b64f5823..cd65f48b 100644
--- a/SafeExamBrowser.Client/Notifications/AboutNotificationController.cs
+++ b/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;
diff --git a/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs b/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs
index 2d1de3d5..2528e2bd 100644
--- a/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs
+++ b/SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs
@@ -7,7 +7,7 @@
*/
using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
namespace SafeExamBrowser.Client.Notifications
{
diff --git a/SafeExamBrowser.Client/Notifications/AboutNotificationInfo.cs b/SafeExamBrowser.Client/Notifications/AboutNotificationInfo.cs
index 9d424218..5aef25af 100644
--- a/SafeExamBrowser.Client/Notifications/AboutNotificationInfo.cs
+++ b/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
diff --git a/SafeExamBrowser.Client/Notifications/LogNotificationController.cs b/SafeExamBrowser.Client/Notifications/LogNotificationController.cs
index 32de3df3..81581a60 100644
--- a/SafeExamBrowser.Client/Notifications/LogNotificationController.cs
+++ b/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;
diff --git a/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs b/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs
index 59961419..1ac8eacb 100644
--- a/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs
+++ b/SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs
@@ -7,7 +7,7 @@
*/
using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Core;
namespace SafeExamBrowser.Client.Notifications
{
diff --git a/SafeExamBrowser.Client/Notifications/LogNotificationInfo.cs b/SafeExamBrowser.Client/Notifications/LogNotificationInfo.cs
index 56727b21..1f9b6d3d 100644
--- a/SafeExamBrowser.Client/Notifications/LogNotificationInfo.cs
+++ b/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
diff --git a/SafeExamBrowser.Client/Operations/BrowserOperation.cs b/SafeExamBrowser.Client/Operations/BrowserOperation.cs
index adbe6e60..e665e379 100644
--- a/SafeExamBrowser.Client/Operations/BrowserOperation.cs
+++ b/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.Core;
+using SafeExamBrowser.Contracts.Applications;
using SafeExamBrowser.Contracts.Core.OperationModel;
using SafeExamBrowser.Contracts.Core.OperationModel.Events;
using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Client/Operations/TaskbarOperation.cs b/SafeExamBrowser.Client/Operations/TaskbarOperation.cs
index 990f4312..d0a049ba 100644
--- a/SafeExamBrowser.Client/Operations/TaskbarOperation.cs
+++ b/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;
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
index a9d93a4e..980d22a4 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
+++ b/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;
diff --git a/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj b/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj
index 102824c0..9a522188 100644
--- a/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj
+++ b/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj
@@ -95,7 +95,6 @@
-
diff --git a/SafeExamBrowser.Contracts/Core/Events/IconChangedEventHandler.cs b/SafeExamBrowser.Contracts/Applications/Events/IconChangedEventHandler.cs
similarity index 84%
rename from SafeExamBrowser.Contracts/Core/Events/IconChangedEventHandler.cs
rename to SafeExamBrowser.Contracts/Applications/Events/IconChangedEventHandler.cs
index e4311c65..9cec9d86 100644
--- a/SafeExamBrowser.Contracts/Core/Events/IconChangedEventHandler.cs
+++ b/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
{
///
/// Event handler used to indicate that the icon of an has changed.
diff --git a/SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs b/SafeExamBrowser.Contracts/Applications/Events/InstanceTerminatedEventHandler.cs
similarity index 90%
rename from SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs
rename to SafeExamBrowser.Contracts/Applications/Events/InstanceTerminatedEventHandler.cs
index 71bd212a..45d6ec30 100644
--- a/SafeExamBrowser.Contracts/Core/Events/InstanceTerminatedEventHandler.cs
+++ b/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
{
///
/// Event handler used to indicate that an with a particular ID has terminated.
diff --git a/SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs b/SafeExamBrowser.Contracts/Applications/Events/NameChangedEventHandler.cs
similarity index 89%
rename from SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs
rename to SafeExamBrowser.Contracts/Applications/Events/NameChangedEventHandler.cs
index 68bbc0fe..5ae40dd4 100644
--- a/SafeExamBrowser.Contracts/Core/Events/NameChangedEventHandler.cs
+++ b/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
{
///
/// Event handler used to indicate that a name has changed to a new value.
diff --git a/SafeExamBrowser.Contracts/Core/IApplicationController.cs b/SafeExamBrowser.Contracts/Applications/IApplicationController.cs
similarity index 95%
rename from SafeExamBrowser.Contracts/Core/IApplicationController.cs
rename to SafeExamBrowser.Contracts/Applications/IApplicationController.cs
index 4849b814..8772dcdb 100644
--- a/SafeExamBrowser.Contracts/Core/IApplicationController.cs
+++ b/SafeExamBrowser.Contracts/Applications/IApplicationController.cs
@@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Applications
{
///
/// Controls the lifetime and functionality of a (third-party) application which can be accessed via the .
diff --git a/SafeExamBrowser.Contracts/Configuration/IApplicationInfo.cs b/SafeExamBrowser.Contracts/Applications/IApplicationInfo.cs
similarity index 90%
rename from SafeExamBrowser.Contracts/Configuration/IApplicationInfo.cs
rename to SafeExamBrowser.Contracts/Applications/IApplicationInfo.cs
index 22ce0527..1c317c38 100644
--- a/SafeExamBrowser.Contracts/Configuration/IApplicationInfo.cs
+++ b/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
{
///
/// The information about a (third-party) application which can be accessed via the .
diff --git a/SafeExamBrowser.Contracts/Core/IApplicationInstance.cs b/SafeExamBrowser.Contracts/Applications/IApplicationInstance.cs
similarity index 93%
rename from SafeExamBrowser.Contracts/Core/IApplicationInstance.cs
rename to SafeExamBrowser.Contracts/Applications/IApplicationInstance.cs
index 3e1f676a..7e4a299d 100644
--- a/SafeExamBrowser.Contracts/Core/IApplicationInstance.cs
+++ b/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
{
///
/// Defines an instance of a (third-party) application which can be accessed via the .
diff --git a/SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs b/SafeExamBrowser.Contracts/Applications/InstanceIdentifier.cs
similarity index 96%
rename from SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs
rename to SafeExamBrowser.Contracts/Applications/InstanceIdentifier.cs
index 38f8fd55..6d23b14e 100644
--- a/SafeExamBrowser.Contracts/Core/InstanceIdentifier.cs
+++ b/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
{
///
/// Defines an identifier which uniquely identifies an in the context of a (third-party) application.
diff --git a/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs b/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs
index a07746dc..0f7f8f4d 100644
--- a/SafeExamBrowser.Contracts/Browser/IBrowserApplicationController.cs
+++ b/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
{
diff --git a/SafeExamBrowser.Contracts/Core/IClientController.cs b/SafeExamBrowser.Contracts/Client/IClientController.cs
similarity index 97%
rename from SafeExamBrowser.Contracts/Core/IClientController.cs
rename to SafeExamBrowser.Contracts/Client/IClientController.cs
index aedb15d8..53921834 100644
--- a/SafeExamBrowser.Contracts/Core/IClientController.cs
+++ b/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
{
///
/// Controls the lifetime and is responsible for the event handling of the client application component.
diff --git a/SafeExamBrowser.Contracts/Core/INotificationController.cs b/SafeExamBrowser.Contracts/Client/INotificationController.cs
similarity index 94%
rename from SafeExamBrowser.Contracts/Core/INotificationController.cs
rename to SafeExamBrowser.Contracts/Client/INotificationController.cs
index 90290428..007c8e06 100644
--- a/SafeExamBrowser.Contracts/Core/INotificationController.cs
+++ b/SafeExamBrowser.Contracts/Client/INotificationController.cs
@@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-namespace SafeExamBrowser.Contracts.Core
+namespace SafeExamBrowser.Contracts.Client
{
///
/// Controls the lifetime and functionality of a notification which is part of the .
diff --git a/SafeExamBrowser.Contracts/Configuration/INotificationInfo.cs b/SafeExamBrowser.Contracts/Client/INotificationInfo.cs
similarity index 89%
rename from SafeExamBrowser.Contracts/Configuration/INotificationInfo.cs
rename to SafeExamBrowser.Contracts/Client/INotificationInfo.cs
index e9d39f7e..e5588994 100644
--- a/SafeExamBrowser.Contracts/Configuration/INotificationInfo.cs
+++ b/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
{
///
/// The information about a notification which is part of the .
diff --git a/SafeExamBrowser.Contracts/Configuration/IIconResource.cs b/SafeExamBrowser.Contracts/Core/IIconResource.cs
similarity index 94%
rename from SafeExamBrowser.Contracts/Configuration/IIconResource.cs
rename to SafeExamBrowser.Contracts/Core/IIconResource.cs
index 62c3dd02..83e51075 100644
--- a/SafeExamBrowser.Contracts/Configuration/IIconResource.cs
+++ b/SafeExamBrowser.Contracts/Core/IIconResource.cs
@@ -8,7 +8,7 @@
using System;
-namespace SafeExamBrowser.Contracts.Configuration
+namespace SafeExamBrowser.Contracts.Core
{
///
/// Defines an icon resource, i.e. the path to and type of an icon.
diff --git a/SafeExamBrowser.Contracts/Core/IRuntimeController.cs b/SafeExamBrowser.Contracts/Runtime/IRuntimeController.cs
similarity index 94%
rename from SafeExamBrowser.Contracts/Core/IRuntimeController.cs
rename to SafeExamBrowser.Contracts/Runtime/IRuntimeController.cs
index b3827f07..66f6a3c8 100644
--- a/SafeExamBrowser.Contracts/Core/IRuntimeController.cs
+++ b/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
{
///
/// Controls the lifetime and is responsible for the event handling of the runtime application component.
diff --git a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
index 8a28d628..bcdef120 100644
--- a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
+++ b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
@@ -72,12 +72,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -131,15 +131,15 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/SafeExamBrowser.Contracts/Configuration/ISystemInfo.cs b/SafeExamBrowser.Contracts/SystemComponents/ISystemInfo.cs
similarity index 94%
rename from SafeExamBrowser.Contracts/Configuration/ISystemInfo.cs
rename to SafeExamBrowser.Contracts/SystemComponents/ISystemInfo.cs
index 0f6956a2..934c7c34 100644
--- a/SafeExamBrowser.Contracts/Configuration/ISystemInfo.cs
+++ b/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
{
///
/// Provides access to information about the operating system.
diff --git a/SafeExamBrowser.Contracts/Configuration/OperatingSystem.cs b/SafeExamBrowser.Contracts/SystemComponents/OperatingSystem.cs
similarity index 90%
rename from SafeExamBrowser.Contracts/Configuration/OperatingSystem.cs
rename to SafeExamBrowser.Contracts/SystemComponents/OperatingSystem.cs
index fa15c7ca..f965368e 100644
--- a/SafeExamBrowser.Contracts/Configuration/OperatingSystem.cs
+++ b/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
{
///
/// Defines all operating systems supported by the application.
diff --git a/SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserWindow.cs b/SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserWindow.cs
index 3245b872..d77f8963 100644
--- a/SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserWindow.cs
+++ b/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;
diff --git a/SafeExamBrowser.Contracts/UserInterface/IUserInterfaceFactory.cs b/SafeExamBrowser.Contracts/UserInterface/IUserInterfaceFactory.cs
index 8f9dc79e..4bac9ad9 100644
--- a/SafeExamBrowser.Contracts/UserInterface/IUserInterfaceFactory.cs
+++ b/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;
diff --git a/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs b/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs
index 3171b456..089032a4 100644
--- a/SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs
+++ b/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
{
diff --git a/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs b/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs
index d5e1b982..dc79b1a4 100644
--- a/SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs
+++ b/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
diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs
index 69031af4..8fc2a894 100644
--- a/SafeExamBrowser.Runtime/CompositionRoot.cs
+++ b/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;
diff --git a/SafeExamBrowser.Runtime/RuntimeController.cs b/SafeExamBrowser.Runtime/RuntimeController.cs
index 68988343..531bf694 100644
--- a/SafeExamBrowser.Runtime/RuntimeController.cs
+++ b/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;
diff --git a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj
index 9ce50189..7c910411 100644
--- a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj
+++ b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj
@@ -160,6 +160,10 @@
{e107026c-2011-4552-a7d8-3a0d37881df6}
SafeExamBrowser.Logging
+
+ {acee2ef1-14d2-4b52-8994-5c053055bb51}
+ SafeExamBrowser.SystemComponents
+
{a502df54-7169-4647-94bd-18b192924866}
SafeExamBrowser.UserInterface.Desktop
diff --git a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj
index 7a0d1012..ede946cf 100644
--- a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj
+++ b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj
@@ -61,6 +61,7 @@
+
diff --git a/SafeExamBrowser.Configuration/SystemInfo.cs b/SafeExamBrowser.SystemComponents/SystemInfo.cs
similarity index 93%
rename from SafeExamBrowser.Configuration/SystemInfo.cs
rename to SafeExamBrowser.SystemComponents/SystemInfo.cs
index 7a7fb056..187be061 100644
--- a/SafeExamBrowser.Configuration/SystemInfo.cs
+++ b/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
{
diff --git a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs
index e8d3d826..9c1c50ad 100644
--- a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs
+++ b/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;
diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs
index 994113b6..5a3baf0b 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationButton.xaml.cs
+++ b/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.Core;
+using SafeExamBrowser.Contracts.Applications;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
using SafeExamBrowser.UserInterface.Desktop.Utilities;
diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs
index fda54826..ff183558 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/ApplicationInstanceButton.xaml.cs
+++ b/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;
diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs
index 34824537..e31db8d1 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/NotificationButton.xaml.cs
+++ b/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;
diff --git a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs
index 3b90f8c5..2cb02c55 100644
--- a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs
+++ b/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;
diff --git a/SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs b/SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs
index 2edc5602..b1191df5 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Utilities/IconResourceLoader.cs
+++ b/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
{
diff --git a/SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs b/SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs
index 458bc227..33ddbd7f 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Utilities/XamlIconResource.cs
+++ b/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
{