diff --git a/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs b/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs
index 8993264cf..7a91d6a3d 100644
--- a/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs
+++ b/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Specs.Utilities;
 using NUnit.Framework;
 using TechTalk.SpecFlow;
diff --git a/mRemoteNGTests/Credential/CompositeRepositoryUnlockerTests.cs b/mRemoteNGTests/Credential/CompositeRepositoryUnlockerTests.cs
index a9940859e..773d2f4a2 100644
--- a/mRemoteNGTests/Credential/CompositeRepositoryUnlockerTests.cs
+++ b/mRemoteNGTests/Credential/CompositeRepositoryUnlockerTests.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Security;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using NSubstitute;
 using NUnit.Framework;
 
diff --git a/mRemoteNGTests/Credential/CredentialRepositoryListTests.cs b/mRemoteNGTests/Credential/CredentialRepositoryListTests.cs
index e445c163f..b4a998f00 100644
--- a/mRemoteNGTests/Credential/CredentialRepositoryListTests.cs
+++ b/mRemoteNGTests/Credential/CredentialRepositoryListTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using NSubstitute;
 using NUnit.Framework;
 
diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs
index 6f941e90e..af13999b7 100644
--- a/mRemoteV1/App/Runtime.cs
+++ b/mRemoteV1/App/Runtime.cs
@@ -19,6 +19,7 @@ using System.Windows.Forms;
 using System.Xml;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Messages.MessageWriters;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
diff --git a/mRemoteV1/Credential/CompositeRepositoryUnlocker.cs b/mRemoteV1/Credential/Repositories/CompositeRepositoryUnlocker.cs
similarity index 98%
rename from mRemoteV1/Credential/CompositeRepositoryUnlocker.cs
rename to mRemoteV1/Credential/Repositories/CompositeRepositoryUnlocker.cs
index 5d3b2bc9e..79dd9572e 100644
--- a/mRemoteV1/Credential/CompositeRepositoryUnlocker.cs
+++ b/mRemoteV1/Credential/Repositories/CompositeRepositoryUnlocker.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security;
 
-namespace mRemoteNG.Credential
+namespace mRemoteNG.Credential.Repositories
 {
     public class CompositeRepositoryUnlocker
     {
diff --git a/mRemoteV1/Credential/CredentialRepoUnlockerBuilder.cs b/mRemoteV1/Credential/Repositories/CredentialRepoUnlockerBuilder.cs
similarity index 85%
rename from mRemoteV1/Credential/CredentialRepoUnlockerBuilder.cs
rename to mRemoteV1/Credential/Repositories/CredentialRepoUnlockerBuilder.cs
index a6b0a3899..21b829ba0 100644
--- a/mRemoteV1/Credential/CredentialRepoUnlockerBuilder.cs
+++ b/mRemoteV1/Credential/Repositories/CredentialRepoUnlockerBuilder.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace mRemoteNG.Credential
+namespace mRemoteNG.Credential.Repositories
 {
     public class CredentialRepoUnlockerBuilder
     {
diff --git a/mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs b/mRemoteV1/Credential/Repositories/CredentialRepositoryChangedArgs.cs
similarity index 90%
rename from mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs
rename to mRemoteV1/Credential/Repositories/CredentialRepositoryChangedArgs.cs
index a6d38aefb..93776caba 100644
--- a/mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs
+++ b/mRemoteV1/Credential/Repositories/CredentialRepositoryChangedArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace mRemoteNG.Credential
+namespace mRemoteNG.Credential.Repositories
 {
     public class CredentialRepositoryChangedArgs : EventArgs
     {
diff --git a/mRemoteV1/Credential/CredentialRepositoryConfig.cs b/mRemoteV1/Credential/Repositories/CredentialRepositoryConfig.cs
similarity index 96%
rename from mRemoteV1/Credential/CredentialRepositoryConfig.cs
rename to mRemoteV1/Credential/Repositories/CredentialRepositoryConfig.cs
index 1f800f7ed..7a7575bd5 100644
--- a/mRemoteV1/Credential/CredentialRepositoryConfig.cs
+++ b/mRemoteV1/Credential/Repositories/CredentialRepositoryConfig.cs
@@ -1,9 +1,8 @@
 using System;
 using System.ComponentModel;
 using System.Security;
-using mRemoteNG.Credential.Repositories;
 
-namespace mRemoteNG.Credential
+namespace mRemoteNG.Credential.Repositories
 {
     public class CredentialRepositoryConfig : ICredentialRepositoryConfig
     {
diff --git a/mRemoteV1/Credential/CredentialRepositoryList.cs b/mRemoteV1/Credential/Repositories/CredentialRepositoryList.cs
similarity index 98%
rename from mRemoteV1/Credential/CredentialRepositoryList.cs
rename to mRemoteV1/Credential/Repositories/CredentialRepositoryList.cs
index b89babe92..f73360cd0 100644
--- a/mRemoteV1/Credential/CredentialRepositoryList.cs
+++ b/mRemoteV1/Credential/Repositories/CredentialRepositoryList.cs
@@ -4,8 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using mRemoteNG.Tools.CustomCollections;
 
-
-namespace mRemoteNG.Credential
+namespace mRemoteNG.Credential.Repositories
 {
     public class CredentialRepositoryList : ICredentialRepositoryList
     {
diff --git a/mRemoteV1/UI/Controls/CredentialRecordListView.cs b/mRemoteV1/UI/Controls/CredentialRecordListView.cs
index bfbcb0d8a..5cff35be8 100644
--- a/mRemoteV1/UI/Controls/CredentialRecordListView.cs
+++ b/mRemoteV1/UI/Controls/CredentialRecordListView.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using BrightIdeasSoftware;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Tools.CustomCollections;
 using mRemoteNG.UI.Controls.PageSequence;
 
diff --git a/mRemoteV1/UI/Controls/CredentialRepositoryListView.cs b/mRemoteV1/UI/Controls/CredentialRepositoryListView.cs
index 687d4c30d..725fbe352 100644
--- a/mRemoteV1/UI/Controls/CredentialRepositoryListView.cs
+++ b/mRemoteV1/UI/Controls/CredentialRepositoryListView.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using BrightIdeasSoftware;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Tools.CustomCollections;
 
 namespace mRemoteNG.UI.Controls
diff --git a/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs b/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
index de506a35b..561da3c18 100644
--- a/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
+++ b/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 
 namespace mRemoteNG.UI.Forms
 {
diff --git a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoriesPage.Designer.cs b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoriesPage.Designer.cs
index 91c86bc19..181b0147c 100644
--- a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoriesPage.Designer.cs
+++ b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoriesPage.Designer.cs
@@ -1,4 +1,6 @@
-namespace mRemoteNG.UI.Forms.CredentialManagerPages
+using mRemoteNG.Credential.Repositories;
+
+namespace mRemoteNG.UI.Forms.CredentialManagerPages
 {
     partial class CredentialRepositoriesPage
     {
@@ -28,7 +30,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            mRemoteNG.Credential.CredentialRepositoryList credentialRepositoryList1 = new mRemoteNG.Credential.CredentialRepositoryList();
+            CredentialRepositoryList credentialRepositoryList1 = new CredentialRepositoryList();
             this.buttonAdd = new System.Windows.Forms.Button();
             this.buttonRemove = new System.Windows.Forms.Button();
             this.buttonEdit = new System.Windows.Forms.Button();
diff --git a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositorySelectionPage.Designer.cs b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositorySelectionPage.Designer.cs
index e36e3536f..508a247bb 100644
--- a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositorySelectionPage.Designer.cs
+++ b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositorySelectionPage.Designer.cs
@@ -1,4 +1,6 @@
-namespace mRemoteNG.UI.Forms.CredentialManagerPages
+using mRemoteNG.Credential.Repositories;
+
+namespace mRemoteNG.UI.Forms.CredentialManagerPages
 {
     partial class CredentialRepositorySelectionPage
     {
@@ -28,7 +30,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            mRemoteNG.Credential.CredentialRepositoryList credentialRepositoryList1 = new mRemoteNG.Credential.CredentialRepositoryList();
+            CredentialRepositoryList credentialRepositoryList1 = new CredentialRepositoryList();
             this.credentialRepositoryListView = new mRemoteNG.UI.Controls.CredentialRepositoryListView();
             this.buttonContinue = new System.Windows.Forms.Button();
             this.buttonBack = new System.Windows.Forms.Button();
diff --git a/mRemoteV1/UI/Forms/UnlockerFormFactory.cs b/mRemoteV1/UI/Forms/UnlockerFormFactory.cs
index ef05bdb14..4f002400d 100644
--- a/mRemoteV1/UI/Forms/UnlockerFormFactory.cs
+++ b/mRemoteV1/UI/Forms/UnlockerFormFactory.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 
 namespace mRemoteNG.UI.Forms
 {
diff --git a/mRemoteV1/UI/Menu/ToolsMenu.cs b/mRemoteV1/UI/Menu/ToolsMenu.cs
index a19298060..336751aa8 100644
--- a/mRemoteV1/UI/Menu/ToolsMenu.cs
+++ b/mRemoteV1/UI/Menu/ToolsMenu.cs
@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Forms.CredentialManagerPages;
 
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index db5a74477..1a457f57d 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -215,11 +215,11 @@
     <Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTPS.CertEvent.cs" />
     <Compile Include="Connection\Protocol\ProtocolFactory.cs" />
     <Compile Include="Connection\Protocol\VNC\VNCEnum.cs" />
-    <Compile Include="Credential\CompositeRepositoryUnlocker.cs" />
+    <Compile Include="Credential\Repositories\CompositeRepositoryUnlocker.cs" />
     <Compile Include="Credential\CredentialChangedEventArgs.cs" />
     <Compile Include="Credential\CredentialDeletionMsgBoxConfirmer.cs" />
     <Compile Include="Credential\CredentialDomainUserComparer.cs" />
-    <Compile Include="Credential\CredentialRepoUnlockerBuilder.cs" />
+    <Compile Include="Credential\Repositories\CredentialRepoUnlockerBuilder.cs" />
     <Compile Include="Credential\CredentialServiceFactory.cs" />
     <Compile Include="Credential\CredentialsService.cs" />
     <Compile Include="Security\Factories\CryptoProviderFactoryFromSettings.cs" />
@@ -230,11 +230,11 @@
     <Compile Include="Security\RandomGenerator.cs" />
     <Compile Include="Tools\CustomCollections\IFullyNotifiableList.cs" />
     <Compile Include="Tools\CustomCollections\FullyObservableCollection.cs" />
-    <Compile Include="Credential\CredentialRepositoryChangedArgs.cs" />
-    <Compile Include="Credential\CredentialRepositoryList.cs" />
+    <Compile Include="Credential\Repositories\CredentialRepositoryChangedArgs.cs" />
+    <Compile Include="Credential\Repositories\CredentialRepositoryList.cs" />
     <Compile Include="Credential\CredentialRecord.cs" />
     <Compile Include="Credential\CredentialRecordTypeConverter.cs" />
-    <Compile Include="Credential\CredentialRepositoryConfig.cs" />
+    <Compile Include="Credential\Repositories\CredentialRepositoryConfig.cs" />
     <Compile Include="Credential\ICredentialRecord.cs" />
     <Compile Include="Credential\ICredentialRepositoryList.cs" />
     <Compile Include="Credential\ICredentialRepository.cs" />