diff --git a/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer26.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer26.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer26.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer26.cs
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer27.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer27.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer27.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer27.cs
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsDeserializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionsDeserializer.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompiler.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompiler.cs
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsDocumentEncryptor.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptor.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionsDocumentEncryptor.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptor.cs
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializer.cs
diff --git a/mRemoteV1/Config/Serializers/XmlRootNodeSerializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlRootNodeSerializer.cs
rename to mRemoteV1/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializer.cs
diff --git a/mRemoteV1/Config/Serializers/XmlCredentialDeserializer.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlCredentialDeserializer.cs
rename to mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/XmlCredentialRecordSerializer.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordSerializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/XmlCredentialRecordSerializer.cs
rename to mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordSerializer.cs
diff --git a/mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/CsvConnectionsSerializerMremotengFormat.cs b/mRemoteV1/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormat.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/CsvConnectionsSerializerMremotengFormat.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormat.cs
diff --git a/mRemoteV1/Config/Serializers/PortScanDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/PortScanDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/PortScanDeserializer.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/PortScanDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/PuttyConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/PuttyConnectionManagerDeserializer.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/RemoteDesktopConnectionDeserializer.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs
diff --git a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs
similarity index 100%
rename from mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs
rename to mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs
diff --git a/mRemoteV1/mRemoteV1.csproj.DotSettings b/mRemoteV1/mRemoteV1.csproj.DotSettings
index 5090f8a1f..eb7e63011 100644
--- a/mRemoteV1/mRemoteV1.csproj.DotSettings
+++ b/mRemoteV1/mRemoteV1.csproj.DotSettings
@@ -1,4 +1,9 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cconnectionserializers/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Ccredentialserializer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cexportserializers/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cexternalserializers/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cmiscserializers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=messages_005Cmessagefilteringoptions/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=tree_005Cclickhandlers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Ccontrols_005Cconnectiontree/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file