diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializer27Tests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer27Tests.cs
similarity index 99%
rename from mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializer27Tests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer27Tests.cs
index 2bd6f3a2f..30c9370d1 100644
--- a/mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializer27Tests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer27Tests.cs
@@ -8,8 +8,7 @@ using mRemoteNG.Security;
 using NSubstitute;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionNodeSerializer27Tests
     {
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializerTests.cs
similarity index 99%
rename from mRemoteNGTests/Config/Serializers/XmlConnectionsDeserializerTests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializerTests.cs
index 3d49b1544..44a9ee333 100644
--- a/mRemoteNGTests/Config/Serializers/XmlConnectionsDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializerTests.cs
@@ -10,7 +10,7 @@ using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsDeserializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompilerTests.cs
similarity index 98%
rename from mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompilerTests.cs
index 4e5aaec4e..b36a950de 100644
--- a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompilerTests.cs
@@ -8,8 +8,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsDocumentCompilerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptorTests.cs
similarity index 97%
rename from mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptorTests.cs
index 2fc3d9a81..96e551a22 100644
--- a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptorTests.cs
@@ -8,8 +8,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsDocumentEncryptorTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlConnectionsSerializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializerTests.cs
similarity index 98%
rename from mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlConnectionsSerializerTests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializerTests.cs
index 97814c4d7..b632c0ff1 100644
--- a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlConnectionsSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializerTests.cs
@@ -10,7 +10,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsSerializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/XmlRootNodeSerializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializerTests.cs
similarity index 98%
rename from mRemoteNGTests/Config/Serializers/XmlRootNodeSerializerTests.cs
rename to mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializerTests.cs
index 51c04e7da..9d6f820eb 100644
--- a/mRemoteNGTests/Config/Serializers/XmlRootNodeSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializerTests.cs
@@ -7,8 +7,7 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlRootNodeSerializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/XmlCredentialSerializerTests.cs b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs
similarity index 97%
rename from mRemoteNGTests/Config/Serializers/XmlCredentialSerializerTests.cs
rename to mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs
index 7798943bf..509b3ad8b 100644
--- a/mRemoteNGTests/Config/Serializers/XmlCredentialSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs
@@ -5,8 +5,7 @@ using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
 {
     public class XmlCredentialSerializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/CsvConnectionsSerializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormatTests.cs
similarity index 98%
rename from mRemoteNGTests/Config/Serializers/CsvConnectionsSerializerMremotengFormatTests.cs
rename to mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormatTests.cs
index 1bdd88d21..fdecccd7f 100644
--- a/mRemoteNGTests/Config/Serializers/CsvConnectionsSerializerMremotengFormatTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormatTests.cs
@@ -7,7 +7,7 @@ using mRemoteNG.Tree;
 using NSubstitute;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
     public class CsvConnectionsSerializerMremotengFormatTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/PortScanDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs
similarity index 96%
rename from mRemoteNGTests/Config/Serializers/PortScanDeserializerTests.cs
rename to mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs
index e7025d653..0c163597d 100644
--- a/mRemoteNGTests/Config/Serializers/PortScanDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs
@@ -5,8 +5,7 @@ using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Tools;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
     public class PortScanDeserializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/PuttyConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
similarity index 98%
rename from mRemoteNGTests/Config/Serializers/PuttyConnectionManagerDeserializerTests.cs
rename to mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
index f8d5fbe30..b6b612598 100644
--- a/mRemoteNGTests/Config/Serializers/PuttyConnectionManagerDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
@@ -6,8 +6,7 @@ using mRemoteNG.Container;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
     public class PuttyConnectionManagerDeserializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs
similarity index 99%
rename from mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionDeserializerTests.cs
rename to mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs
index 1e77602e7..811dc31a0 100644
--- a/mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs
@@ -7,8 +7,7 @@ using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
 
-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
     public class RemoteDesktopConnectionDeserializerTests
     {
diff --git a/mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs
similarity index 99%
rename from mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionManagerDeserializerTests.cs
rename to mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs
index dd483ffbb..3ee6bbf02 100644
--- a/mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionManagerDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.IO;
+using System.Linq;
 using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
@@ -6,9 +7,8 @@ using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
-using System.IO;
 
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
     public class RemoteDesktopConnectionManagerDeserializerTests
     {
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index 66df85494..dd3e39e87 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -113,20 +113,20 @@
     <Compile Include="Config\CredentialHarvesterTests.cs" />
     <Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIdsTests.cs" />
     <Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
-    <Compile Include="Config\Serializers\CsvConnectionsSerializerMremotengFormatTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsSerializerMremotengFormatTests.cs" />
     <Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
-    <Compile Include="Config\Serializers\PortScanDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\PuttyConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionNodeSerializer27Tests.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\RemoteDesktopConnectionDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDocumentCompilerTests.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDocumentEncryptorTests.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializers\XmlConnectionsSerializerTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionNodeSerializer27Tests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentCompilerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentEncryptorTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\XmlCredentialSerializerTests.cs" />
-    <Compile Include="Config\Serializers\XmlRootNodeSerializerTests.cs" />
+    <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialSerializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlRootNodeSerializerTests.cs" />
     <Compile Include="Connection\AbstractConnectionInfoDataTests.cs" />
     <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
     <Compile Include="Connection\Protocol\ProtocolListTests.cs" />