diff --git a/Src/DSInternals.PowerShell/Commands/AddADDBSidHistoryCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/AddADDBSidHistoryCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/AddADDBSidHistoryCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/AddADDBSidHistoryCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBAccountCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBAccountCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBAccountCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBAccountCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBBackupKeyCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBBackupKeyCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBBackupKeyCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBBackupKeyCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBDomainControllerCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBDomainControllerCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBDomainControllerCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBDomainControllerCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBIndexCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBIndexCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBIndexCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBIndexCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBObjectCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBObjectCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBObjectCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBObjectCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADDBSchemaAttributeCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetADDBSchemaAttributeCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADDBSchemaAttributeCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetADDBSchemaAttributeCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetBootKeyCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/GetBootKeyCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetBootKeyCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/GetBootKeyCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/RemoveADDBObjectCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/RemoveADDBObjectCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/RemoveADDBObjectCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/RemoveADDBObjectCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/RestoreADDBAttributeCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/RestoreADDBAttributeCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/RestoreADDBAttributeCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/RestoreADDBAttributeCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/SetADDBBootKeyCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/SetADDBBootKeyCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/SetADDBBootKeyCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/SetADDBBootKeyCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/SetADDBDomainControllerCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/SetADDBDomainControllerCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/SetADDBDomainControllerCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/SetADDBDomainControllerCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/SetADDBPrimaryGroupCommand.cs b/Src/DSInternals.PowerShell/Commands/Datastore/SetADDBPrimaryGroupCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/SetADDBPrimaryGroupCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Datastore/SetADDBPrimaryGroupCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertFromGPPrefPasswordCommand.cs b/Src/DSInternals.PowerShell/Commands/Encryption/ConvertFromGPPrefPasswordCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertFromGPPrefPasswordCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Encryption/ConvertFromGPPrefPasswordCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertFromUnicodePasswordCommand.cs b/Src/DSInternals.PowerShell/Commands/Encryption/ConvertFromUnicodePasswordCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertFromUnicodePasswordCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Encryption/ConvertFromUnicodePasswordCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToGPPrefPasswordCommand.cs b/Src/DSInternals.PowerShell/Commands/Encryption/ConvertToGPPrefPasswordCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToGPPrefPasswordCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Encryption/ConvertToGPPrefPasswordCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToUnicodePasswordCommand.cs b/Src/DSInternals.PowerShell/Commands/Encryption/ConvertToUnicodePasswordCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToUnicodePasswordCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Encryption/ConvertToUnicodePasswordCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/SaveDPAPIBlobCommand.cs b/Src/DSInternals.PowerShell/Commands/Encryption/SaveDPAPIBlobCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/SaveDPAPIBlobCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Encryption/SaveDPAPIBlobCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToLMHashCommand.cs b/Src/DSInternals.PowerShell/Commands/Hash/ConvertToLMHashCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToLMHashCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Hash/ConvertToLMHashCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToNTHashCommand.cs b/Src/DSInternals.PowerShell/Commands/Hash/ConvertToNTHashCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToNTHashCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Hash/ConvertToNTHashCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToOrgIdHashCommand.cs b/Src/DSInternals.PowerShell/Commands/Hash/ConvertToOrgIdHashCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToOrgIdHashCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Hash/ConvertToOrgIdHashCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/SetSamAccountPasswordHashCommand.cs b/Src/DSInternals.PowerShell/Commands/Hash/SetSamAccountPasswordHashCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/SetSamAccountPasswordHashCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Hash/SetSamAccountPasswordHashCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertFromADManagedPasswordBlobCommand.cs b/Src/DSInternals.PowerShell/Commands/Misc/ConvertFromADManagedPasswordBlobCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertFromADManagedPasswordBlobCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Misc/ConvertFromADManagedPasswordBlobCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/ConvertToHexCommand.cs b/Src/DSInternals.PowerShell/Commands/Misc/ConvertToHexCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/ConvertToHexCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Misc/ConvertToHexCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADReplAccountCommand.cs b/Src/DSInternals.PowerShell/Commands/Replication/GetADReplAccountCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADReplAccountCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Replication/GetADReplAccountCommand.cs
diff --git a/Src/DSInternals.PowerShell/Commands/GetADReplBackupKeyCommand.cs b/Src/DSInternals.PowerShell/Commands/Replication/GetADReplBackupKeyCommand.cs
similarity index 100%
rename from Src/DSInternals.PowerShell/Commands/GetADReplBackupKeyCommand.cs
rename to Src/DSInternals.PowerShell/Commands/Replication/GetADReplBackupKeyCommand.cs
diff --git a/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj b/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj
index be9ae4d..fcab767 100644
--- a/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj
+++ b/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj
@@ -51,29 +51,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
True
True
@@ -83,14 +83,14 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+