diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index e8ea3b22..a93f3fad 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/SafeExamBrowser.Client/CompositionRoot.cs
@@ -23,7 +23,7 @@ using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.WindowsApi;
-using SafeExamBrowser.Core.Behaviour.Operations;
+using SafeExamBrowser.Core.Behaviour.OperationModel;
 using SafeExamBrowser.Core.Communication;
 using SafeExamBrowser.Core.I18n;
 using SafeExamBrowser.Core.Logging;
diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/CommunicationOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/CommunicationOperationTests.cs
index 14a095a4..89977446 100644
--- a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/CommunicationOperationTests.cs
+++ b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/CommunicationOperationTests.cs
@@ -10,7 +10,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Contracts.Communication;
 using SafeExamBrowser.Contracts.Logging;
-using SafeExamBrowser.Core.Behaviour.Operations;
+using SafeExamBrowser.Core.Behaviour.OperationModel;
 
 namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
 {
diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/I18nOperationTests.cs b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/I18nOperationTests.cs
index 490ad50d..8d6e5a16 100644
--- a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/I18nOperationTests.cs
+++ b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/I18nOperationTests.cs
@@ -10,7 +10,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
-using SafeExamBrowser.Core.Behaviour.Operations;
+using SafeExamBrowser.Core.Behaviour.OperationModel;
 
 namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
 {
diff --git a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
index 13243876..229706e9 100644
--- a/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
+++ b/SafeExamBrowser.Core.UnitTests/Behaviour/Operations/OperationSequenceTests.cs
@@ -13,7 +13,7 @@ using Moq;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
-using SafeExamBrowser.Core.Behaviour.Operations;
+using SafeExamBrowser.Core.Behaviour.OperationModel;
 
 namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
 {
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs b/SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs
similarity index 97%
rename from SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs
rename to SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs
index 5300c801..84682de1 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/CommunicationOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/OperationModel/CommunicationOperation.cs
@@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Core.Behaviour.Operations
+namespace SafeExamBrowser.Core.Behaviour.OperationModel
 {
 	/// <summary>
 	/// An operation to handle the lifetime of an <see cref="ICommunicationHost"/>. The host is started during <see cref="Perform"/>,
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs b/SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs
similarity index 96%
rename from SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs
rename to SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs
index d2099a0e..37c2ac00 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/DelayedInitializationOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/OperationModel/DelayedInitializationOperation.cs
@@ -10,7 +10,7 @@ using System;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Core.Behaviour.Operations
+namespace SafeExamBrowser.Core.Behaviour.OperationModel
 {
 	/// <summary>
 	/// A wrapper operation to allow for a delayed (just-in-time) instantiation of an operation. Is useful when e.g. dependencies for a
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs b/SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs
similarity index 95%
rename from SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs
rename to SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs
index 6bb0a61c..3444258a 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/DelegateOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/OperationModel/DelegateOperation.cs
@@ -10,7 +10,7 @@ using System;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Core.Behaviour.Operations
+namespace SafeExamBrowser.Core.Behaviour.OperationModel
 {
 	/// <summary>
 	/// A generic operation to allow for the (inline) definition of an operation via delegates. Useful if implementing a complete
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs b/SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs
similarity index 96%
rename from SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs
rename to SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs
index 01d4e577..00522c58 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/I18nOperation.cs
+++ b/SafeExamBrowser.Core/Behaviour/OperationModel/I18nOperation.cs
@@ -15,7 +15,7 @@ using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Core.I18n;
 
-namespace SafeExamBrowser.Core.Behaviour.Operations
+namespace SafeExamBrowser.Core.Behaviour.OperationModel
 {
 	/// <summary>
 	/// An operation to handle the initialization of an <see cref="IText"/> module with text data from the default directory.
diff --git a/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs b/SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs
similarity index 98%
rename from SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs
rename to SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs
index 29fa91fc..0c9596dd 100644
--- a/SafeExamBrowser.Core/Behaviour/Operations/OperationSequence.cs
+++ b/SafeExamBrowser.Core/Behaviour/OperationModel/OperationSequence.cs
@@ -13,7 +13,7 @@ using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.Core.Behaviour.Operations
+namespace SafeExamBrowser.Core.Behaviour.OperationModel
 {
 	/// <summary>
 	/// Default implementation of the <see cref="IOperationSequence"/>.
diff --git a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
index a22369f9..ec65ac98 100644
--- a/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
+++ b/SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
@@ -55,11 +55,11 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Behaviour\Operations\CommunicationOperation.cs" />
-    <Compile Include="Behaviour\Operations\DelayedInitializationOperation.cs" />
-    <Compile Include="Behaviour\Operations\I18nOperation.cs" />
-    <Compile Include="Behaviour\Operations\DelegateOperation.cs" />
-    <Compile Include="Behaviour\Operations\OperationSequence.cs" />
+    <Compile Include="Behaviour\OperationModel\CommunicationOperation.cs" />
+    <Compile Include="Behaviour\OperationModel\DelayedInitializationOperation.cs" />
+    <Compile Include="Behaviour\OperationModel\I18nOperation.cs" />
+    <Compile Include="Behaviour\OperationModel\DelegateOperation.cs" />
+    <Compile Include="Behaviour\OperationModel\OperationSequence.cs" />
     <Compile Include="Communication\BaseProxy.cs" />
     <Compile Include="Communication\BaseHost.cs" />
     <Compile Include="Communication\ClientProxy.cs" />
diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs
index 0a7fbe62..fb9912aa 100644
--- a/SafeExamBrowser.Runtime/CompositionRoot.cs
+++ b/SafeExamBrowser.Runtime/CompositionRoot.cs
@@ -13,7 +13,7 @@ using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Logging;
-using SafeExamBrowser.Core.Behaviour.Operations;
+using SafeExamBrowser.Core.Behaviour.OperationModel;
 using SafeExamBrowser.Core.Communication;
 using SafeExamBrowser.Core.I18n;
 using SafeExamBrowser.Core.Logging;