diff --git a/src/KeyVault/KeyVault/ChangeLog.md b/src/KeyVault/KeyVault/ChangeLog.md
index ca0e7c5c0f86..b5891e912c13 100644
--- a/src/KeyVault/KeyVault/ChangeLog.md
+++ b/src/KeyVault/KeyVault/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Formatted the table view of `*-AzKeyVault`, `*-AzKeyVaultKey` and `*-AzKeyVaultSecret`
 * Added security domain properties into the output of `New/Update/Get-AzKeyVaultManagedHsm` (`PSManagedHsm`).
 * Supported Setting for Managed HSM: Added `Get-AzKeyVaultSetting` and `Update-AzKeyVaultSetting`.
 * Updated Azure.Core to 1.34.0.
diff --git a/src/KeyVault/KeyVault/Commands/BackupAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/BackupAzureKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Commands/BackupAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/BackupAzureKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/GetAzureKeyVaultSecret.cs
similarity index 99%
rename from src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/GetAzureKeyVaultSecret.cs
index df03cb72d57f..c4a14d5b9f2a 100644
--- a/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/Secret/GetAzureKeyVaultSecret.cs
@@ -15,10 +15,6 @@
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
 using System.Security;
diff --git a/src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/RemoveAzureKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/RemoveAzureKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/RestoreAzureKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/RestoreAzureKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/SetAzureKeyVaultSecret.cs
similarity index 98%
rename from src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/SetAzureKeyVaultSecret.cs
index 4b4204c05952..940e669780df 100644
--- a/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/Secret/SetAzureKeyVaultSecret.cs
@@ -15,10 +15,8 @@
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Management.Automation;
 using System.Security;
 
diff --git a/src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs b/src/KeyVault/KeyVault/Commands/Secret/UndoAzureKeyVaultSecretRemoval.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs
rename to src/KeyVault/KeyVault/Commands/Secret/UndoAzureKeyVaultSecretRemoval.cs
diff --git a/src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/Secret/UpdateAzureKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Commands/Secret/UpdateAzureKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/KeyVault.format.ps1xml b/src/KeyVault/KeyVault/KeyVault.format.ps1xml
index f013d89a01ec..97ca2f7e9484 100644
--- a/src/KeyVault/KeyVault/KeyVault.format.ps1xml
+++ b/src/KeyVault/KeyVault/KeyVault.format.ps1xml
@@ -59,6 +59,70 @@
         </ListEntries>
       </ListControl>     
     </View>
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultKeyIdentityItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultKeyIdentityItem</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Vault/HSM Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Enabled</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Created</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Expires</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Tags</Label>
+          </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Name</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>VaultName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Enabled</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Created</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Expires</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Tags</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
     <View>
       <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultKey</Name>
       <ViewSelectedBy>
@@ -326,6 +390,62 @@
           </ListEntry>
         </ListEntries>
       </ListControl>
+    </View>    
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultSecretIdentityItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultSecretIdentityItem</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Vault Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Created</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Expires</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Tags</Label>
+        </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Name</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>VaultName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Created</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Expires</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>TagsTable</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
     </View>
     <View>
       <Name>Microsoft.Azure.Commands.KeyVault.Models.PSDeletedKeyVaultSecretIdentityItem</Name>
@@ -422,6 +542,54 @@
           </ListEntry>
         </ListEntries>
       </ListControl>
+    </View>
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultIdentityItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultIdentityItem</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Resource Group Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Location</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Tags</Label>
+          </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>VaultName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>ResourceGroupName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Location</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>TagsTable</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
     </View>    
     <View>
       <Name>Microsoft.Azure.Commands.KeyVault.Models.PSDeletedKeyVault</Name>
@@ -619,8 +787,203 @@
           </TableRowEntry>
         </TableRowEntries>
       </TableControl>
+    </View>    
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificateIdentityItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificateIdentityItem</TypeName>
+      </ViewSelectedBy>
+      <ListControl>
+        <ListEntries>
+          <ListEntry>
+            <ListItems>
+              <ListItem>
+                <Label>Name</Label>
+                <PropertyName>Name</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Vault Name</Label>
+                <PropertyName>VaultName</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Version</Label>
+                <PropertyName>Version</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>Id</Label>
+                <PropertyName>Id</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Enabled</Label>
+                <PropertyName>Enabled</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Expires</Label>
+                <PropertyName>Expires</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Not Before</Label>
+                <PropertyName>NotBefore</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Created</Label>
+                <PropertyName>Created</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Updated</Label>
+                <PropertyName>Updated</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Tags</Label>
+                <PropertyName>TagsTable</PropertyName>
+              </ListItem>
+            </ListItems>
+          </ListEntry>
+        </ListEntries>
+      </ListControl>
+    </View>
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificateIdentityItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificateIdentityItem</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Vault Name</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Enabled</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Created</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Expires</Label>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Tags</Label>
+          </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Name</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>VaultName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Enabled</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Created</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Expires</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Tags</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
+    <View>
+      <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificate</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultCertificate</TypeName>
+      </ViewSelectedBy>
+      <ListControl>
+        <ListEntries>
+          <ListEntry>
+            <ListItems>
+              <ListItem>
+                <Label>Name</Label>
+                <PropertyName>Name</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Vault Name</Label>
+                <PropertyName>VaultName</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Version</Label>
+                <PropertyName>Version</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>Id</Label>
+                <PropertyName>Id</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>KeyId</Label>
+                <PropertyName>KeyId</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>SecretId</Label>
+                <PropertyName>SecretId</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>Certificate</Label>
+                <PropertyName>Certificate</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>Thumbprint</Label>
+                <PropertyName>Thumbprint</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>Policy</Label>
+                <PropertyName>Policy</PropertyName>
+              </ListItem>             
+              <ListItem>
+                <Label>RecoveryLevel</Label>
+                <PropertyName>RecoveryLevel</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Enabled</Label>
+                <PropertyName>Enabled</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Expires</Label>
+                <PropertyName>Expires</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Not Before</Label>
+                <PropertyName>NotBefore</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Created</Label>
+                <PropertyName>Created</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Updated</Label>
+                <PropertyName>Updated</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Tags</Label>
+                <PropertyName>TagsTable</PropertyName>
+              </ListItem>
+            </ListItems>
+          </ListEntry>
+        </ListEntries>
+      </ListControl>     
     </View>
-
     <View>
       <Name>Microsoft.Azure.Commands.KeyVault.Models.PSKeyVaultSetting</Name>
       <ViewSelectedBy>
diff --git a/src/KeyVault/KeyVault/Models/PSDeletedKeyVaultCertificate.cs b/src/KeyVault/KeyVault/Models/Certificate/PSDeletedKeyVaultCertificate.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSDeletedKeyVaultCertificate.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSDeletedKeyVaultCertificate.cs
diff --git a/src/KeyVault/KeyVault/Models/PSDeletedKeyVaultCertificateIdentityItem.cs b/src/KeyVault/KeyVault/Models/Certificate/PSDeletedKeyVaultCertificateIdentityItem.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSDeletedKeyVaultCertificateIdentityItem.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSDeletedKeyVaultCertificateIdentityItem.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificate.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificate.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificate.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificate.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateAdministratorDetails.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateAdministratorDetails.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateAdministratorDetails.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateAdministratorDetails.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateContact.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateContact.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateContact.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateContact.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIdentityItem.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIdentityItem.cs
similarity index 96%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIdentityItem.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIdentityItem.cs
index 957e8e73be33..a67ea4fa559d 100644
--- a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIdentityItem.cs
+++ b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIdentityItem.cs
@@ -77,5 +77,10 @@ internal PSKeyVaultCertificateIdentityItem(CertificateBundle certBundle)
         public DateTime? Updated { get; protected set; }
 
         public Hashtable Tags { get; set; }
+        public string TagsTable
+        {
+            get { return (Tags == null) ? null : Tags.ConvertToTagsTable(); }
+        }
+
     }
 }
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIssuer.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIssuer.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIssuer.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIssuer.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIssuerIdentityItem.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIssuerIdentityItem.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateIssuerIdentityItem.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateIssuerIdentityItem.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateOperation.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateOperation.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateOperation.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateOperation.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificateOrganizationDetails.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateOrganizationDetails.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificateOrganizationDetails.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificateOrganizationDetails.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultCertificatePolicy.cs b/src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificatePolicy.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultCertificatePolicy.cs
rename to src/KeyVault/KeyVault/Models/Certificate/PSKeyVaultCertificatePolicy.cs
diff --git a/src/KeyVault/KeyVault/Models/PSDeletedKeyVaultSecret.cs b/src/KeyVault/KeyVault/Models/Secret/PSDeletedKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSDeletedKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Models/Secret/PSDeletedKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/Models/PSDeletedKeyVaultSecretIdentityItem.cs b/src/KeyVault/KeyVault/Models/Secret/PSDeletedKeyVaultSecretIdentityItem.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSDeletedKeyVaultSecretIdentityItem.cs
rename to src/KeyVault/KeyVault/Models/Secret/PSDeletedKeyVaultSecretIdentityItem.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultSecret.cs b/src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecret.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultSecret.cs
rename to src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecret.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultSecretAttributes.cs b/src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecretAttributes.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultSecretAttributes.cs
rename to src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecretAttributes.cs
diff --git a/src/KeyVault/KeyVault/Models/PSKeyVaultSecretIdentityItem.cs b/src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecretIdentityItem.cs
similarity index 100%
rename from src/KeyVault/KeyVault/Models/PSKeyVaultSecretIdentityItem.cs
rename to src/KeyVault/KeyVault/Models/Secret/PSKeyVaultSecretIdentityItem.cs