diff --git a/SafeExamBrowser.Browser/BrowserApplicationController.cs b/SafeExamBrowser.Browser/BrowserApplicationController.cs
index 4e4325fe..4ddf752e 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationController.cs
+++ b/SafeExamBrowser.Browser/BrowserApplicationController.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using CefSharp;
 using SafeExamBrowser.Browser.Handlers;
 using SafeExamBrowser.Contracts.Behaviour;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
index 6e3d6340..a7d611fd 100644
--- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
+++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
@@ -10,7 +10,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Client.Behaviour;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
 using SafeExamBrowser.Contracts.UserInterface;
diff --git a/SafeExamBrowser.Client/Behaviour/ClientController.cs b/SafeExamBrowser.Client/Behaviour/ClientController.cs
index bb418bbd..f8dec7fb 100644
--- a/SafeExamBrowser.Client/Behaviour/ClientController.cs
+++ b/SafeExamBrowser.Client/Behaviour/ClientController.cs
@@ -9,7 +9,8 @@
 using System;
 using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Hosts;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
index 16097709..d95282de 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/ConfigurationOperation.cs
@@ -8,7 +8,7 @@
 
 using System;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs b/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
index f6d92319..d0a7a3c9 100644
--- a/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
+++ b/SafeExamBrowser.Client/Behaviour/Operations/RuntimeConnectionOperation.cs
@@ -8,7 +8,7 @@
 
 using System;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
diff --git a/SafeExamBrowser.Client/Communication/ClientHost.cs b/SafeExamBrowser.Client/Communication/ClientHost.cs
index 664858f7..2a9d4446 100644
--- a/SafeExamBrowser.Client/Communication/ClientHost.cs
+++ b/SafeExamBrowser.Client/Communication/ClientHost.cs
@@ -8,8 +8,8 @@
 
 using System;
 using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Core.Communication;
 
diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index 7b8a9741..82d5000c 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/SafeExamBrowser.Client/CompositionRoot.cs
@@ -17,7 +17,8 @@ using SafeExamBrowser.Client.Notifications;
 using SafeExamBrowser.Configuration;
 using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Hosts;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Configuration/SessionData.cs b/SafeExamBrowser.Configuration/SessionData.cs
index f872fef7..46059f64 100644
--- a/SafeExamBrowser.Configuration/SessionData.cs
+++ b/SafeExamBrowser.Configuration/SessionData.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.WindowsApi;
 
diff --git a/SafeExamBrowser.Contracts/Behaviour/IClientController.cs b/SafeExamBrowser.Contracts/Behaviour/IClientController.cs
index ee6e7309..0c824d28 100644
--- a/SafeExamBrowser.Contracts/Behaviour/IClientController.cs
+++ b/SafeExamBrowser.Contracts/Behaviour/IClientController.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/AuthenticationResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/AuthenticationResponse.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/Responses/AuthenticationResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/AuthenticationResponse.cs
index c8cf7d79..9c2c0d4f 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/AuthenticationResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/AuthenticationResponse.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The response to be used to reply to an authentication request (see <see cref="Messages.SimpleMessagePurport.Authenticate"/>).
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/ConfigurationResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/ConfigurationResponse.cs
similarity index 92%
rename from SafeExamBrowser.Contracts/Communication/Responses/ConfigurationResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/ConfigurationResponse.cs
index 91b760b8..e9b4a29d 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/ConfigurationResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/ConfigurationResponse.cs
@@ -9,7 +9,7 @@
 using System;
 using SafeExamBrowser.Contracts.Configuration;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The response to be used to reply to a configuration request (see <see cref="Messages.SimpleMessagePurport.ConfigurationNeeded"/>).
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/ConnectionResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/ConnectionResponse.cs
similarity index 93%
rename from SafeExamBrowser.Contracts/Communication/Responses/ConnectionResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/ConnectionResponse.cs
index 20f35f27..b0bc8e5e 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/ConnectionResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/ConnectionResponse.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The response to a connection request (see <see cref="ICommunication.Connect(Guid?)"/>).
diff --git a/SafeExamBrowser.Contracts/Communication/Messages/DisconnectionMessage.cs b/SafeExamBrowser.Contracts/Communication/Data/DisconnectionMessage.cs
similarity index 90%
rename from SafeExamBrowser.Contracts/Communication/Messages/DisconnectionMessage.cs
rename to SafeExamBrowser.Contracts/Communication/Data/DisconnectionMessage.cs
index 759e6db8..e3898469 100644
--- a/SafeExamBrowser.Contracts/Communication/Messages/DisconnectionMessage.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/DisconnectionMessage.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Messages
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// This is the last message transmitted from a component to its interlocutor in order to terminate a communication session.
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/DisconnectionResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/DisconnectionResponse.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/Responses/DisconnectionResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/DisconnectionResponse.cs
index 04b39952..fcca0e79 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/DisconnectionResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/DisconnectionResponse.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The response transmitted to a <see cref="Messages.DisconnectionMessage"/>
diff --git a/SafeExamBrowser.Contracts/Communication/Messages/Message.cs b/SafeExamBrowser.Contracts/Communication/Data/Message.cs
similarity index 92%
rename from SafeExamBrowser.Contracts/Communication/Messages/Message.cs
rename to SafeExamBrowser.Contracts/Communication/Data/Message.cs
index 13a11b75..11b4d254 100644
--- a/SafeExamBrowser.Contracts/Communication/Messages/Message.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/Message.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Messages
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The base class for messages, from which a message must inherit in order to be sent to an interlocutor via <see cref="ICommunication.Send(Message)"/>.
diff --git a/SafeExamBrowser.Contracts/Communication/Messages/ReconfigurationMessage.cs b/SafeExamBrowser.Contracts/Communication/Data/ReconfigurationMessage.cs
similarity index 92%
rename from SafeExamBrowser.Contracts/Communication/Messages/ReconfigurationMessage.cs
rename to SafeExamBrowser.Contracts/Communication/Data/ReconfigurationMessage.cs
index fdd9d0b2..cb11e704 100644
--- a/SafeExamBrowser.Contracts/Communication/Messages/ReconfigurationMessage.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/ReconfigurationMessage.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Messages
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// This message is transmitted to the runtime to request that the application be reconfigured.
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/ReconfigurationResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/ReconfigurationResponse.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/Responses/ReconfigurationResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/ReconfigurationResponse.cs
index 92d5f6bb..7fa5f22a 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/ReconfigurationResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/ReconfigurationResponse.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The response to a <see cref="Messages.ReconfigurationMessage"/>.
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/Response.cs b/SafeExamBrowser.Contracts/Communication/Data/Response.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/Responses/Response.cs
rename to SafeExamBrowser.Contracts/Communication/Data/Response.cs
index 3b202b8e..e338b4dc 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/Response.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/Response.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The base class for respones, from which a response must inherit in order to be sent to an interlocutor as reply to <see cref="ICommunication.Send(Messages.Message)"/>.
diff --git a/SafeExamBrowser.Contracts/Communication/Messages/SimpleMessage.cs b/SafeExamBrowser.Contracts/Communication/Data/SimpleMessage.cs
similarity index 92%
rename from SafeExamBrowser.Contracts/Communication/Messages/SimpleMessage.cs
rename to SafeExamBrowser.Contracts/Communication/Data/SimpleMessage.cs
index 9ad5313e..89cb674a 100644
--- a/SafeExamBrowser.Contracts/Communication/Messages/SimpleMessage.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/SimpleMessage.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Messages
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// A generic message to send simple purports without data to an interlocutor.
diff --git a/SafeExamBrowser.Contracts/Communication/Messages/SimpleMessagePurport.cs b/SafeExamBrowser.Contracts/Communication/Data/SimpleMessagePurport.cs
similarity index 95%
rename from SafeExamBrowser.Contracts/Communication/Messages/SimpleMessagePurport.cs
rename to SafeExamBrowser.Contracts/Communication/Data/SimpleMessagePurport.cs
index 2a6a604c..ff4039e6 100644
--- a/SafeExamBrowser.Contracts/Communication/Messages/SimpleMessagePurport.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/SimpleMessagePurport.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Messages
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The possible purports of a <see cref="SimpleMessage"/>.
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/SimpleResponse.cs b/SafeExamBrowser.Contracts/Communication/Data/SimpleResponse.cs
similarity index 92%
rename from SafeExamBrowser.Contracts/Communication/Responses/SimpleResponse.cs
rename to SafeExamBrowser.Contracts/Communication/Data/SimpleResponse.cs
index a33a431a..13a212fc 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/SimpleResponse.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/SimpleResponse.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// A generic response to reply simple purports without data to an interlocutor.
diff --git a/SafeExamBrowser.Contracts/Communication/Responses/SimpleResponsePurport.cs b/SafeExamBrowser.Contracts/Communication/Data/SimpleResponsePurport.cs
similarity index 93%
rename from SafeExamBrowser.Contracts/Communication/Responses/SimpleResponsePurport.cs
rename to SafeExamBrowser.Contracts/Communication/Data/SimpleResponsePurport.cs
index 91226141..5349f1ed 100644
--- a/SafeExamBrowser.Contracts/Communication/Responses/SimpleResponsePurport.cs
+++ b/SafeExamBrowser.Contracts/Communication/Data/SimpleResponsePurport.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication.Responses
+namespace SafeExamBrowser.Contracts.Communication.Data
 {
 	/// <summary>
 	/// The possible purports of a <see cref="SimpleResponse"/>.
diff --git a/SafeExamBrowser.Contracts/Communication/IClientHost.cs b/SafeExamBrowser.Contracts/Communication/Hosts/IClientHost.cs
similarity index 93%
rename from SafeExamBrowser.Contracts/Communication/IClientHost.cs
rename to SafeExamBrowser.Contracts/Communication/Hosts/IClientHost.cs
index 1c0b6c5c..62be030d 100644
--- a/SafeExamBrowser.Contracts/Communication/IClientHost.cs
+++ b/SafeExamBrowser.Contracts/Communication/Hosts/IClientHost.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Hosts
 {
 	/// <summary>
 	/// Defines the functionality of the communication host for the client application component.
diff --git a/SafeExamBrowser.Contracts/Communication/IRuntimeHost.cs b/SafeExamBrowser.Contracts/Communication/Hosts/IRuntimeHost.cs
similarity index 95%
rename from SafeExamBrowser.Contracts/Communication/IRuntimeHost.cs
rename to SafeExamBrowser.Contracts/Communication/Hosts/IRuntimeHost.cs
index b1f5df31..3a7334fd 100644
--- a/SafeExamBrowser.Contracts/Communication/IRuntimeHost.cs
+++ b/SafeExamBrowser.Contracts/Communication/Hosts/IRuntimeHost.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Hosts
 {
 	/// <summary>
 	/// Defines the functionality of the communication host for the runtime application component.
diff --git a/SafeExamBrowser.Contracts/Communication/ICommunication.cs b/SafeExamBrowser.Contracts/Communication/ICommunication.cs
index 5448dde9..c0c0707d 100644
--- a/SafeExamBrowser.Contracts/Communication/ICommunication.cs
+++ b/SafeExamBrowser.Contracts/Communication/ICommunication.cs
@@ -8,8 +8,7 @@
 
 using System;
 using System.ServiceModel;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
 using SafeExamBrowser.Contracts.Configuration;
 
 namespace SafeExamBrowser.Contracts.Communication
diff --git a/SafeExamBrowser.Contracts/Communication/IClientProxy.cs b/SafeExamBrowser.Contracts/Communication/Proxies/IClientProxy.cs
similarity index 89%
rename from SafeExamBrowser.Contracts/Communication/IClientProxy.cs
rename to SafeExamBrowser.Contracts/Communication/Proxies/IClientProxy.cs
index 1ac93133..40324cfe 100644
--- a/SafeExamBrowser.Contracts/Communication/IClientProxy.cs
+++ b/SafeExamBrowser.Contracts/Communication/Proxies/IClientProxy.cs
@@ -6,9 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Proxies
 {
 	/// <summary>
 	/// Defines the functionality for a proxy to the communication host of the client application component.
diff --git a/SafeExamBrowser.Contracts/Communication/IProxyFactory.cs b/SafeExamBrowser.Contracts/Communication/Proxies/IProxyFactory.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/IProxyFactory.cs
rename to SafeExamBrowser.Contracts/Communication/Proxies/IProxyFactory.cs
index 920540e3..c32b51e7 100644
--- a/SafeExamBrowser.Contracts/Communication/IProxyFactory.cs
+++ b/SafeExamBrowser.Contracts/Communication/Proxies/IProxyFactory.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Proxies
 {
 	/// <summary>
 	/// A factory to create communication proxies during application runtime.
diff --git a/SafeExamBrowser.Contracts/Communication/IProxyObjectFactory.cs b/SafeExamBrowser.Contracts/Communication/Proxies/IProxyObjectFactory.cs
similarity index 91%
rename from SafeExamBrowser.Contracts/Communication/IProxyObjectFactory.cs
rename to SafeExamBrowser.Contracts/Communication/Proxies/IProxyObjectFactory.cs
index a2565a2b..d10d85d3 100644
--- a/SafeExamBrowser.Contracts/Communication/IProxyObjectFactory.cs
+++ b/SafeExamBrowser.Contracts/Communication/Proxies/IProxyObjectFactory.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Proxies
 {
 	/// <summary>
 	/// A factory to create communication objects for proxies.
diff --git a/SafeExamBrowser.Contracts/Communication/IRuntimeProxy.cs b/SafeExamBrowser.Contracts/Communication/Proxies/IRuntimeProxy.cs
similarity index 96%
rename from SafeExamBrowser.Contracts/Communication/IRuntimeProxy.cs
rename to SafeExamBrowser.Contracts/Communication/Proxies/IRuntimeProxy.cs
index 3aa7c16d..c9a519ba 100644
--- a/SafeExamBrowser.Contracts/Communication/IRuntimeProxy.cs
+++ b/SafeExamBrowser.Contracts/Communication/Proxies/IRuntimeProxy.cs
@@ -8,7 +8,7 @@
 
 using SafeExamBrowser.Contracts.Configuration;
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Proxies
 {
 	/// <summary>
 	/// Defines the functionality for a proxy to the communication host of the runtime application component.
diff --git a/SafeExamBrowser.Contracts/Communication/IServiceProxy.cs b/SafeExamBrowser.Contracts/Communication/Proxies/IServiceProxy.cs
similarity index 95%
rename from SafeExamBrowser.Contracts/Communication/IServiceProxy.cs
rename to SafeExamBrowser.Contracts/Communication/Proxies/IServiceProxy.cs
index 1b4d13b1..82e96968 100644
--- a/SafeExamBrowser.Contracts/Communication/IServiceProxy.cs
+++ b/SafeExamBrowser.Contracts/Communication/Proxies/IServiceProxy.cs
@@ -9,7 +9,7 @@
 using System;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 
-namespace SafeExamBrowser.Contracts.Communication
+namespace SafeExamBrowser.Contracts.Communication.Proxies
 {
 	/// <summary>
 	/// Defines the functionality for a proxy to the communication host of the service application component.
diff --git a/SafeExamBrowser.Contracts/Configuration/ISessionData.cs b/SafeExamBrowser.Contracts/Configuration/ISessionData.cs
index 3cdcda22..1abc441d 100644
--- a/SafeExamBrowser.Contracts/Configuration/ISessionData.cs
+++ b/SafeExamBrowser.Contracts/Configuration/ISessionData.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.WindowsApi;
 
 namespace SafeExamBrowser.Contracts.Configuration
diff --git a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
index 4383dd9c..c7226e24 100644
--- a/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
+++ b/SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
@@ -57,29 +57,29 @@
     <Compile Include="Behaviour\IRuntimeController.cs" />
     <Compile Include="Behaviour\OperationModel\IOperationSequence.cs" />
     <Compile Include="Behaviour\OperationModel\OperationResult.cs" />
-    <Compile Include="Communication\IClientHost.cs" />
+    <Compile Include="Communication\Hosts\IClientHost.cs" />
     <Compile Include="Communication\ICommunication.cs" />
-    <Compile Include="Communication\IClientProxy.cs" />
+    <Compile Include="Communication\Proxies\IClientProxy.cs" />
     <Compile Include="Communication\ICommunicationHost.cs" />
     <Compile Include="Communication\ICommunicationProxy.cs" />
-    <Compile Include="Communication\IProxyObjectFactory.cs" />
-    <Compile Include="Communication\IProxyFactory.cs" />
-    <Compile Include="Communication\IRuntimeHost.cs" />
-    <Compile Include="Communication\IRuntimeProxy.cs" />
-    <Compile Include="Communication\IServiceProxy.cs" />
-    <Compile Include="Communication\Messages\Message.cs" />
-    <Compile Include="Communication\Messages\DisconnectionMessage.cs" />
-    <Compile Include="Communication\Messages\ReconfigurationMessage.cs" />
-    <Compile Include="Communication\Messages\SimpleMessagePurport.cs" />
-    <Compile Include="Communication\Messages\SimpleMessage.cs" />
-    <Compile Include="Communication\Responses\AuthenticationResponse.cs" />
-    <Compile Include="Communication\Responses\ConfigurationResponse.cs" />
-    <Compile Include="Communication\Responses\ConnectionResponse.cs" />
-    <Compile Include="Communication\Responses\DisconnectionResponse.cs" />
-    <Compile Include="Communication\Responses\ReconfigurationResponse.cs" />
-    <Compile Include="Communication\Responses\Response.cs" />
-    <Compile Include="Communication\Responses\SimpleResponsePurport.cs" />
-    <Compile Include="Communication\Responses\SimpleResponse.cs" />
+    <Compile Include="Communication\Proxies\IProxyObjectFactory.cs" />
+    <Compile Include="Communication\Proxies\IProxyFactory.cs" />
+    <Compile Include="Communication\Hosts\IRuntimeHost.cs" />
+    <Compile Include="Communication\Proxies\IRuntimeProxy.cs" />
+    <Compile Include="Communication\Proxies\IServiceProxy.cs" />
+    <Compile Include="Communication\Data\Message.cs" />
+    <Compile Include="Communication\Data\DisconnectionMessage.cs" />
+    <Compile Include="Communication\Data\ReconfigurationMessage.cs" />
+    <Compile Include="Communication\Data\SimpleMessagePurport.cs" />
+    <Compile Include="Communication\Data\SimpleMessage.cs" />
+    <Compile Include="Communication\Data\AuthenticationResponse.cs" />
+    <Compile Include="Communication\Data\ConfigurationResponse.cs" />
+    <Compile Include="Communication\Data\ConnectionResponse.cs" />
+    <Compile Include="Communication\Data\DisconnectionResponse.cs" />
+    <Compile Include="Communication\Data\ReconfigurationResponse.cs" />
+    <Compile Include="Communication\Data\Response.cs" />
+    <Compile Include="Communication\Data\SimpleResponsePurport.cs" />
+    <Compile Include="Communication\Data\SimpleResponse.cs" />
     <Compile Include="Configuration\ClientConfiguration.cs" />
     <Compile Include="Configuration\RuntimeInfo.cs" />
     <Compile Include="Configuration\ISessionData.cs" />
diff --git a/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyImpl.cs b/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyImpl.cs
index efc4d2f2..4bcaf3a8 100644
--- a/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyImpl.cs
+++ b/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyImpl.cs
@@ -7,9 +7,8 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Core.Communication;
 
diff --git a/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyTests.cs b/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyTests.cs
index 8bb613d6..d4e594fe 100644
--- a/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyTests.cs
+++ b/SafeExamBrowser.Core.UnitTests/Communication/BaseProxyTests.cs
@@ -11,8 +11,8 @@ using System.ServiceModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 
 namespace SafeExamBrowser.Core.UnitTests.Communication
diff --git a/SafeExamBrowser.Core/Communication/BaseHost.cs b/SafeExamBrowser.Core/Communication/BaseHost.cs
index 45343238..55e028e4 100644
--- a/SafeExamBrowser.Core/Communication/BaseHost.cs
+++ b/SafeExamBrowser.Core/Communication/BaseHost.cs
@@ -10,8 +10,7 @@ using System;
 using System.ServiceModel;
 using System.Threading;
 using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
 using SafeExamBrowser.Contracts.Logging;
 
 namespace SafeExamBrowser.Core.Communication
diff --git a/SafeExamBrowser.Core/Communication/BaseProxy.cs b/SafeExamBrowser.Core/Communication/BaseProxy.cs
index 7cd2b884..dd4ae85f 100644
--- a/SafeExamBrowser.Core/Communication/BaseProxy.cs
+++ b/SafeExamBrowser.Core/Communication/BaseProxy.cs
@@ -10,8 +10,8 @@ using System;
 using System.ServiceModel;
 using System.Timers;
 using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 
 namespace SafeExamBrowser.Core.Communication
diff --git a/SafeExamBrowser.Core/Communication/ClientProxy.cs b/SafeExamBrowser.Core/Communication/ClientProxy.cs
index 5c9bf375..0cc47a01 100644
--- a/SafeExamBrowser.Core/Communication/ClientProxy.cs
+++ b/SafeExamBrowser.Core/Communication/ClientProxy.cs
@@ -7,9 +7,8 @@
  */
 
 using System.ServiceModel;
-using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 
 namespace SafeExamBrowser.Core.Communication
diff --git a/SafeExamBrowser.Core/Communication/ProxyObjectFactory.cs b/SafeExamBrowser.Core/Communication/ProxyObjectFactory.cs
index d601709c..1c4313b3 100644
--- a/SafeExamBrowser.Core/Communication/ProxyObjectFactory.cs
+++ b/SafeExamBrowser.Core/Communication/ProxyObjectFactory.cs
@@ -8,6 +8,7 @@
 
 using System.ServiceModel;
 using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 
 namespace SafeExamBrowser.Core.Communication
 {
diff --git a/SafeExamBrowser.Core/Communication/RuntimeProxy.cs b/SafeExamBrowser.Core/Communication/RuntimeProxy.cs
index 343ede46..b1f4ce1a 100644
--- a/SafeExamBrowser.Core/Communication/RuntimeProxy.cs
+++ b/SafeExamBrowser.Core/Communication/RuntimeProxy.cs
@@ -7,9 +7,8 @@
  */
 
 using System.ServiceModel;
-using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Logging;
 
diff --git a/SafeExamBrowser.Core/Communication/ServiceProxy.cs b/SafeExamBrowser.Core/Communication/ServiceProxy.cs
index f84d327e..9756ff34 100644
--- a/SafeExamBrowser.Core/Communication/ServiceProxy.cs
+++ b/SafeExamBrowser.Core/Communication/ServiceProxy.cs
@@ -7,7 +7,7 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.Logging;
 
diff --git a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
index 80a3d282..b4199dd2 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/ServiceConnectionOperationTests.cs
@@ -10,7 +10,7 @@ using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 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 9ad51fdd..405b2260 100644
--- a/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/Operations/ServiceConnectionOperation.cs
@@ -8,7 +8,7 @@
 
 using System;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs b/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
index 06ec364b..cf5ce183 100644
--- a/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
@@ -9,7 +9,8 @@
 using System;
 using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Hosts;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
diff --git a/SafeExamBrowser.Runtime/Behaviour/SessionController.cs b/SafeExamBrowser.Runtime/Behaviour/SessionController.cs
index c2b1b440..0cb4231e 100644
--- a/SafeExamBrowser.Runtime/Behaviour/SessionController.cs
+++ b/SafeExamBrowser.Runtime/Behaviour/SessionController.cs
@@ -9,6 +9,8 @@
 using System.Threading;
 using SafeExamBrowser.Contracts.Behaviour.OperationModel;
 using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Hosts;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
diff --git a/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs b/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs
index 6b38b4ce..72957b31 100644
--- a/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs
+++ b/SafeExamBrowser.Runtime/Communication/ProxyFactory.cs
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using SafeExamBrowser.Contracts.Communication;
+using SafeExamBrowser.Contracts.Communication.Proxies;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Core.Communication;
 using SafeExamBrowser.Core.Logging;
diff --git a/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs b/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs
index 5625d8dc..b8e7d935 100644
--- a/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs
+++ b/SafeExamBrowser.Runtime/Communication/RuntimeHost.cs
@@ -9,8 +9,8 @@
 using System;
 using System.Threading.Tasks;
 using SafeExamBrowser.Contracts.Communication;
-using SafeExamBrowser.Contracts.Communication.Messages;
-using SafeExamBrowser.Contracts.Communication.Responses;
+using SafeExamBrowser.Contracts.Communication.Data;
+using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.Logging;