diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
index 0b79fecd..6e3d6340 100644
--- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
+++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Client.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/Behaviour/ClientController.cs b/SafeExamBrowser.Client/Behaviour/ClientController.cs
index 8b0a6a3e..a007db12 100644
--- a/SafeExamBrowser.Client/Behaviour/ClientController.cs
+++ b/SafeExamBrowser.Client/Behaviour/ClientController.cs
@@ -8,7 +8,7 @@
 
 using System;
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs
index d423f805..260513da 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs
index d5d41a93..acf187c4 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
index 7b27edec..ca6dd33a 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs
index 84845921..aae069ab 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs
index 2f87b070..0098ee19 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs
index fcf9a087..85ae98ae 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs
index 94bcce9c..fe61c71e 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
index 5a62a7f4..f6d92319 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs
index 3ffe568f..14f8d695 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs
index 27319b23..d0b566d8 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index 6a2d62b5..395e0a9a 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/SafeExamBrowser.Client/CompositionRoot.cs
@@ -16,7 +16,7 @@ using SafeExamBrowser.Client.Communication;
 using SafeExamBrowser.Client.Notifications;
 using SafeExamBrowser.Configuration;
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Contracts/Behaviour/Operations/IOperation.cs b/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs
similarity index 94%
rename from SafeExamBrowser.Contracts/Behaviour/Operations/IOperation.cs
rename to SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs
index 1b38a9c3..a170f216 100644
--- a/SafeExamBrowser.Contracts/Behaviour/Operations/IOperation.cs
+++ b/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperation.cs
@@ -8,7 +8,7 @@
 
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Contracts.Behaviour.Operations
+namespace SafeExamBrowser.Contracts.Behaviour.OperationModel
 {
 	/// <summary>
 	/// Defines an operation which will be executed as part of an <see cref="IOperationSequence"/>.
diff --git a/SafeExamBrowser.Contracts/Behaviour/Operations/IOperationSequence.cs b/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs
similarity index 96%
rename from SafeExamBrowser.Contracts/Behaviour/Operations/IOperationSequence.cs
rename to SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs
index b3d18c52..16810312 100644
--- a/SafeExamBrowser.Contracts/Behaviour/Operations/IOperationSequence.cs
+++ b/SafeExamBrowser.Contracts/Behaviour/OperationModel/IOperationSequence.cs
@@ -8,7 +8,7 @@
 
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Contracts.Behaviour.Operations
+namespace SafeExamBrowser.Contracts.Behaviour.OperationModel
 {
 	/// <summary>
 	/// A sequence of <see cref="IOperation"/>s which can be used for sequential procedures, e.g. the initialization &amp; finalization of an
diff --git a/SafeExamBrowser.Contracts/Behaviour/Operations/OperationResult.cs b/SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs
similarity index 93%
rename from SafeExamBrowser.Contracts/Behaviour/Operations/OperationResult.cs
rename to SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs
index 9276d3ac..37ce1b36 100644
--- a/SafeExamBrowser.Contracts/Behaviour/Operations/OperationResult.cs
+++ b/SafeExamBrowser.Contracts/Behaviour/OperationModel/OperationResult.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Behaviour.Operations
+namespace SafeExamBrowser.Contracts.Behaviour.OperationModel
 {
 	/// <summary>
 	/// Defines the result of the sequential execution of <see cref="IOperation"/>s (as part of an <see cref="IOperationSequence"/>).
diff --git a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
index 1dd5f84b..412ca807 100644
--- a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
+++ b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
@@ -55,8 +55,8 @@
   <ItemGroup>
     <Compile Include="Behaviour\IApplicationController.cs" />
     <Compile Include="Behaviour\IRuntimeController.cs" />
-    <Compile Include="Behaviour\Operations\IOperationSequence.cs" />
-    <Compile Include="Behaviour\Operations\OperationResult.cs" />
+    <Compile Include="Behaviour\OperationModel\IOperationSequence.cs" />
+    <Compile Include="Behaviour\OperationModel\OperationResult.cs" />
     <Compile Include="Communication\IClientHost.cs" />
     <Compile Include="Communication\ICommunication.cs" />
     <Compile Include="Communication\IClientProxy.cs" />
@@ -81,7 +81,7 @@
     <Compile Include="Configuration\ISession.cs" />
     <Compile Include="Configuration\Settings\ConfigurationMode.cs" />
     <Compile Include="Behaviour\INotificationController.cs" />
-    <Compile Include="Behaviour\Operations\IOperation.cs" />
+    <Compile Include="Behaviour\OperationModel\IOperation.cs" />
     <Compile Include="Behaviour\IClientController.cs" />
     <Compile Include="Configuration\IIconResource.cs" />
     <Compile Include="Configuration\IApplicationInfo.cs" />
diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
index c20a0bed..13243876 100644
--- a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
+++ b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
@@ -10,7 +10,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Core.Behaviour.Operations;
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs b/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs
index 2894a589..74603973 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs b/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs
index 5dfbce7d..8a1f7405 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.UserInterface;
 
 namespace SafeExamBrowser.Core.Behaviour.Operations
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs b/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs
index f48f5a75..63b20c3d 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.UserInterface;
 
 namespace SafeExamBrowser.Core.Behaviour.Operations
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs b/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs
index b9481682..df710010 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs
@@ -9,7 +9,7 @@
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs b/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs
index ab00ded2..345a333c 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs
+++ b/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 
diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs
index 579d9c3f..3e1c3bff 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ConfigurationOperationTests.cs
@@ -10,7 +10,7 @@ using System;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
index cbb6e255..e9995376 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
@@ -9,7 +9,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs
index f750741d..c9bb0ae8 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/ConfigurationOperation.cs
@@ -8,7 +8,7 @@
 
 using System;
 using System.IO;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs
index bf6b515d..0e9d8036 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/KioskModeOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs
index b2ad0b7f..9ad51fdd 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceEndOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceEndOperation.cs
index e0d63f2e..80c0bccd 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceEndOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceEndOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceOperation.cs
index 2c49b169..222eadf7 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceOperation.cs
@@ -7,7 +7,7 @@
  */
 
 using System.Threading;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceStartOperation.cs b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceStartOperation.cs
index 811301a2..e0324b3c 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceStartOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/SessionSequenceStartOperation.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs b/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
index 10ce4e9d..030016ef 100644
--- a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
@@ -8,7 +8,7 @@
 
 using System;
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs
index c8660a51..047c316b 100644
--- a/SafeExamBrowser.Runtime/CompositionRoot.cs
+++ b/SafeExamBrowser.Runtime/CompositionRoot.cs
@@ -10,7 +10,7 @@ using System;
 using System.Collections.Generic;
 using SafeExamBrowser.Configuration;
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Behaviour.Operations;
+using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Core.Behaviour.Operations;