diff --git a/Documentation/AddPnPApp.md b/Documentation/Add-PnPApp.md
similarity index 100%
rename from Documentation/AddPnPApp.md
rename to Documentation/Add-PnPApp.md
diff --git a/Documentation/AddPnPClientSidePage.md b/Documentation/Add-PnPClientSidePage.md
similarity index 100%
rename from Documentation/AddPnPClientSidePage.md
rename to Documentation/Add-PnPClientSidePage.md
diff --git a/Documentation/AddPnPClientSidePageSection.md b/Documentation/Add-PnPClientSidePageSection.md
similarity index 100%
rename from Documentation/AddPnPClientSidePageSection.md
rename to Documentation/Add-PnPClientSidePageSection.md
diff --git a/Documentation/AddPnPClientSideText.md b/Documentation/Add-PnPClientSideText.md
similarity index 100%
rename from Documentation/AddPnPClientSideText.md
rename to Documentation/Add-PnPClientSideText.md
diff --git a/Documentation/AddPnPClientSideWebPart.md b/Documentation/Add-PnPClientSideWebPart.md
similarity index 100%
rename from Documentation/AddPnPClientSideWebPart.md
rename to Documentation/Add-PnPClientSideWebPart.md
diff --git a/Documentation/AddPnPContentType.md b/Documentation/Add-PnPContentType.md
similarity index 100%
rename from Documentation/AddPnPContentType.md
rename to Documentation/Add-PnPContentType.md
diff --git a/Documentation/AddPnPContentTypeToDocumentSet.md b/Documentation/Add-PnPContentTypeToDocumentSet.md
similarity index 100%
rename from Documentation/AddPnPContentTypeToDocumentSet.md
rename to Documentation/Add-PnPContentTypeToDocumentSet.md
diff --git a/Documentation/AddPnPContentTypeToList.md b/Documentation/Add-PnPContentTypeToList.md
similarity index 100%
rename from Documentation/AddPnPContentTypeToList.md
rename to Documentation/Add-PnPContentTypeToList.md
diff --git a/Documentation/AddPnPCustomAction.md b/Documentation/Add-PnPCustomAction.md
similarity index 100%
rename from Documentation/AddPnPCustomAction.md
rename to Documentation/Add-PnPCustomAction.md
diff --git a/Documentation/AddPnPDataRowsToProvisioningTemplate.md b/Documentation/Add-PnPDataRowsToProvisioningTemplate.md
similarity index 100%
rename from Documentation/AddPnPDataRowsToProvisioningTemplate.md
rename to Documentation/Add-PnPDataRowsToProvisioningTemplate.md
diff --git a/Documentation/AddPnPDocumentSet.md b/Documentation/Add-PnPDocumentSet.md
similarity index 100%
rename from Documentation/AddPnPDocumentSet.md
rename to Documentation/Add-PnPDocumentSet.md
diff --git a/Documentation/AddPnPEventReceiver.md b/Documentation/Add-PnPEventReceiver.md
similarity index 100%
rename from Documentation/AddPnPEventReceiver.md
rename to Documentation/Add-PnPEventReceiver.md
diff --git a/Documentation/AddPnPField.md b/Documentation/Add-PnPField.md
similarity index 100%
rename from Documentation/AddPnPField.md
rename to Documentation/Add-PnPField.md
diff --git a/Documentation/AddPnPFieldFromXml.md b/Documentation/Add-PnPFieldFromXml.md
similarity index 100%
rename from Documentation/AddPnPFieldFromXml.md
rename to Documentation/Add-PnPFieldFromXml.md
diff --git a/Documentation/AddPnPFieldToContentType.md b/Documentation/Add-PnPFieldToContentType.md
similarity index 100%
rename from Documentation/AddPnPFieldToContentType.md
rename to Documentation/Add-PnPFieldToContentType.md
diff --git a/Documentation/AddPnPFile.md b/Documentation/Add-PnPFile.md
similarity index 100%
rename from Documentation/AddPnPFile.md
rename to Documentation/Add-PnPFile.md
diff --git a/Documentation/AddPnPFileToProvisioningTemplate.md b/Documentation/Add-PnPFileToProvisioningTemplate.md
similarity index 100%
rename from Documentation/AddPnPFileToProvisioningTemplate.md
rename to Documentation/Add-PnPFileToProvisioningTemplate.md
diff --git a/Documentation/AddPnPFolder.md b/Documentation/Add-PnPFolder.md
similarity index 100%
rename from Documentation/AddPnPFolder.md
rename to Documentation/Add-PnPFolder.md
diff --git a/Documentation/AddPnPHtmlPublishingPageLayout.md b/Documentation/Add-PnPHtmlPublishingPageLayout.md
similarity index 100%
rename from Documentation/AddPnPHtmlPublishingPageLayout.md
rename to Documentation/Add-PnPHtmlPublishingPageLayout.md
diff --git a/Documentation/AddPnPIndexedProperty.md b/Documentation/Add-PnPIndexedProperty.md
similarity index 100%
rename from Documentation/AddPnPIndexedProperty.md
rename to Documentation/Add-PnPIndexedProperty.md
diff --git a/Documentation/AddPnPJavaScriptBlock.md b/Documentation/Add-PnPJavaScriptBlock.md
similarity index 100%
rename from Documentation/AddPnPJavaScriptBlock.md
rename to Documentation/Add-PnPJavaScriptBlock.md
diff --git a/Documentation/AddPnPJavaScriptLink.md b/Documentation/Add-PnPJavaScriptLink.md
similarity index 100%
rename from Documentation/AddPnPJavaScriptLink.md
rename to Documentation/Add-PnPJavaScriptLink.md
diff --git a/Documentation/AddPnPListFoldersToProvisioningTemplate.md b/Documentation/Add-PnPListFoldersToProvisioningTemplate.md
similarity index 100%
rename from Documentation/AddPnPListFoldersToProvisioningTemplate.md
rename to Documentation/Add-PnPListFoldersToProvisioningTemplate.md
diff --git a/Documentation/AddPnPListItem.md b/Documentation/Add-PnPListItem.md
similarity index 100%
rename from Documentation/AddPnPListItem.md
rename to Documentation/Add-PnPListItem.md
diff --git a/Documentation/AddPnPMasterPage.md b/Documentation/Add-PnPMasterPage.md
similarity index 100%
rename from Documentation/AddPnPMasterPage.md
rename to Documentation/Add-PnPMasterPage.md
diff --git a/Documentation/AddPnPNavigationNode.md b/Documentation/Add-PnPNavigationNode.md
similarity index 100%
rename from Documentation/AddPnPNavigationNode.md
rename to Documentation/Add-PnPNavigationNode.md
diff --git a/Documentation/AddPnPPublishingImageRendition.md b/Documentation/Add-PnPPublishingImageRendition.md
similarity index 100%
rename from Documentation/AddPnPPublishingImageRendition.md
rename to Documentation/Add-PnPPublishingImageRendition.md
diff --git a/Documentation/AddPnPPublishingPage.md b/Documentation/Add-PnPPublishingPage.md
similarity index 100%
rename from Documentation/AddPnPPublishingPage.md
rename to Documentation/Add-PnPPublishingPage.md
diff --git a/Documentation/AddPnPPublishingPageLayout.md b/Documentation/Add-PnPPublishingPageLayout.md
similarity index 100%
rename from Documentation/AddPnPPublishingPageLayout.md
rename to Documentation/Add-PnPPublishingPageLayout.md
diff --git a/Documentation/AddPnPSiteCollectionAdmin.md b/Documentation/Add-PnPSiteCollectionAdmin.md
similarity index 100%
rename from Documentation/AddPnPSiteCollectionAdmin.md
rename to Documentation/Add-PnPSiteCollectionAdmin.md
diff --git a/Documentation/AddPnPTaxonomyField.md b/Documentation/Add-PnPTaxonomyField.md
similarity index 100%
rename from Documentation/AddPnPTaxonomyField.md
rename to Documentation/Add-PnPTaxonomyField.md
diff --git a/Documentation/AddPnPUserToGroup.md b/Documentation/Add-PnPUserToGroup.md
similarity index 100%
rename from Documentation/AddPnPUserToGroup.md
rename to Documentation/Add-PnPUserToGroup.md
diff --git a/Documentation/AddPnPView.md b/Documentation/Add-PnPView.md
similarity index 100%
rename from Documentation/AddPnPView.md
rename to Documentation/Add-PnPView.md
diff --git a/Documentation/AddPnPWebPartToWebPartPage.md b/Documentation/Add-PnPWebPartToWebPartPage.md
similarity index 100%
rename from Documentation/AddPnPWebPartToWebPartPage.md
rename to Documentation/Add-PnPWebPartToWebPartPage.md
diff --git a/Documentation/AddPnPWebPartToWikiPage.md b/Documentation/Add-PnPWebPartToWikiPage.md
similarity index 100%
rename from Documentation/AddPnPWebPartToWikiPage.md
rename to Documentation/Add-PnPWebPartToWikiPage.md
diff --git a/Documentation/AddPnPWebhookSubscription.md b/Documentation/Add-PnPWebhookSubscription.md
similarity index 100%
rename from Documentation/AddPnPWebhookSubscription.md
rename to Documentation/Add-PnPWebhookSubscription.md
diff --git a/Documentation/AddPnPWikiPage.md b/Documentation/Add-PnPWikiPage.md
similarity index 100%
rename from Documentation/AddPnPWikiPage.md
rename to Documentation/Add-PnPWikiPage.md
diff --git a/Documentation/AddPnPWorkflowDefinition.md b/Documentation/Add-PnPWorkflowDefinition.md
similarity index 100%
rename from Documentation/AddPnPWorkflowDefinition.md
rename to Documentation/Add-PnPWorkflowDefinition.md
diff --git a/Documentation/AddPnPWorkflowSubscription.md b/Documentation/Add-PnPWorkflowSubscription.md
similarity index 100%
rename from Documentation/AddPnPWorkflowSubscription.md
rename to Documentation/Add-PnPWorkflowSubscription.md
diff --git a/Documentation/ApplyPnPProvisioningTemplate.md b/Documentation/Apply-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/ApplyPnPProvisioningTemplate.md
rename to Documentation/Apply-PnPProvisioningTemplate.md
diff --git a/Documentation/ClearPnPListItemAsRecord.md b/Documentation/Clear-PnPListItemAsRecord.md
similarity index 100%
rename from Documentation/ClearPnPListItemAsRecord.md
rename to Documentation/Clear-PnPListItemAsRecord.md
diff --git a/Documentation/ClearPnPTenantRecycleBinItem.md b/Documentation/Clear-PnPTenantRecycleBinItem.md
similarity index 100%
rename from Documentation/ClearPnPTenantRecycleBinItem.md
rename to Documentation/Clear-PnPTenantRecycleBinItem.md
diff --git a/Documentation/ClearPnpRecycleBinItem.md b/Documentation/Clear-PnpRecycleBinItem.md
similarity index 100%
rename from Documentation/ClearPnpRecycleBinItem.md
rename to Documentation/Clear-PnpRecycleBinItem.md
diff --git a/Documentation/ConnectPnPMicrosoftGraph.md b/Documentation/Connect-PnPMicrosoftGraph.md
similarity index 100%
rename from Documentation/ConnectPnPMicrosoftGraph.md
rename to Documentation/Connect-PnPMicrosoftGraph.md
diff --git a/Documentation/ConnectPnPOnline.md b/Documentation/Connect-PnPOnline.md
similarity index 100%
rename from Documentation/ConnectPnPOnline.md
rename to Documentation/Connect-PnPOnline.md
diff --git a/Documentation/ConvertPnPFolderToProvisioningTemplate.md b/Documentation/Convert-PnPFolderToProvisioningTemplate.md
similarity index 100%
rename from Documentation/ConvertPnPFolderToProvisioningTemplate.md
rename to Documentation/Convert-PnPFolderToProvisioningTemplate.md
diff --git a/Documentation/ConvertPnPProvisioningTemplate.md b/Documentation/Convert-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/ConvertPnPProvisioningTemplate.md
rename to Documentation/Convert-PnPProvisioningTemplate.md
diff --git a/Documentation/CopyPnPFile.md b/Documentation/Copy-PnPFile.md
similarity index 100%
rename from Documentation/CopyPnPFile.md
rename to Documentation/Copy-PnPFile.md
diff --git a/Documentation/CopyPnPItemProxy.md b/Documentation/Copy-PnPItemProxy.md
similarity index 100%
rename from Documentation/CopyPnPItemProxy.md
rename to Documentation/Copy-PnPItemProxy.md
diff --git a/Documentation/DisablePnPFeature.md b/Documentation/Disable-PnPFeature.md
similarity index 100%
rename from Documentation/DisablePnPFeature.md
rename to Documentation/Disable-PnPFeature.md
diff --git a/Documentation/DisablePnPInPlaceRecordsManagementForSite.md b/Documentation/Disable-PnPInPlaceRecordsManagementForSite.md
similarity index 100%
rename from Documentation/DisablePnPInPlaceRecordsManagementForSite.md
rename to Documentation/Disable-PnPInPlaceRecordsManagementForSite.md
diff --git a/Documentation/DisablePnPResponsiveUI.md b/Documentation/Disable-PnPResponsiveUI.md
similarity index 100%
rename from Documentation/DisablePnPResponsiveUI.md
rename to Documentation/Disable-PnPResponsiveUI.md
diff --git a/Documentation/DisconnectPnPOnline.md b/Documentation/Disconnect-PnPOnline.md
similarity index 100%
rename from Documentation/DisconnectPnPOnline.md
rename to Documentation/Disconnect-PnPOnline.md
diff --git a/Documentation/EnablePnPFeature.md b/Documentation/Enable-PnPFeature.md
similarity index 100%
rename from Documentation/EnablePnPFeature.md
rename to Documentation/Enable-PnPFeature.md
diff --git a/Documentation/EnablePnPInPlaceRecordsManagementForSite.md b/Documentation/Enable-PnPInPlaceRecordsManagementForSite.md
similarity index 100%
rename from Documentation/EnablePnPInPlaceRecordsManagementForSite.md
rename to Documentation/Enable-PnPInPlaceRecordsManagementForSite.md
diff --git a/Documentation/EnablePnPResponsiveUI.md b/Documentation/Enable-PnPResponsiveUI.md
similarity index 100%
rename from Documentation/EnablePnPResponsiveUI.md
rename to Documentation/Enable-PnPResponsiveUI.md
diff --git a/Documentation/EnsurePnPFolder.md b/Documentation/Ensure-PnPFolder.md
similarity index 100%
rename from Documentation/EnsurePnPFolder.md
rename to Documentation/Ensure-PnPFolder.md
diff --git a/Documentation/ExecutePnPQuery.md b/Documentation/Execute-PnPQuery.md
similarity index 100%
rename from Documentation/ExecutePnPQuery.md
rename to Documentation/Execute-PnPQuery.md
diff --git a/Documentation/ExportPnPTaxonomy.md b/Documentation/Export-PnPTaxonomy.md
similarity index 100%
rename from Documentation/ExportPnPTaxonomy.md
rename to Documentation/Export-PnPTaxonomy.md
diff --git a/Documentation/ExportPnPTermGroupToXml.md b/Documentation/Export-PnPTermGroupToXml.md
similarity index 100%
rename from Documentation/ExportPnPTermGroupToXml.md
rename to Documentation/Export-PnPTermGroupToXml.md
diff --git a/Documentation/FindPnPFile.md b/Documentation/Find-PnPFile.md
similarity index 100%
rename from Documentation/FindPnPFile.md
rename to Documentation/Find-PnPFile.md
diff --git a/Documentation/GetPnPAccessToken.md b/Documentation/Get-PnPAccessToken.md
similarity index 100%
rename from Documentation/GetPnPAccessToken.md
rename to Documentation/Get-PnPAccessToken.md
diff --git a/Documentation/GetPnPApp.md b/Documentation/Get-PnPApp.md
similarity index 100%
rename from Documentation/GetPnPApp.md
rename to Documentation/Get-PnPApp.md
diff --git a/Documentation/GetPnPAppAuthAccessToken.md b/Documentation/Get-PnPAppAuthAccessToken.md
similarity index 100%
rename from Documentation/GetPnPAppAuthAccessToken.md
rename to Documentation/Get-PnPAppAuthAccessToken.md
diff --git a/Documentation/GetPnPAppInstance.md b/Documentation/Get-PnPAppInstance.md
similarity index 100%
rename from Documentation/GetPnPAppInstance.md
rename to Documentation/Get-PnPAppInstance.md
diff --git a/Documentation/GetPnPAuditing.md b/Documentation/Get-PnPAuditing.md
similarity index 100%
rename from Documentation/GetPnPAuditing.md
rename to Documentation/Get-PnPAuditing.md
diff --git a/Documentation/GetPnPAuthenticationRealm.md b/Documentation/Get-PnPAuthenticationRealm.md
similarity index 100%
rename from Documentation/GetPnPAuthenticationRealm.md
rename to Documentation/Get-PnPAuthenticationRealm.md
diff --git a/Documentation/GetPnPAvailableClientSideComponents.md b/Documentation/Get-PnPAvailableClientSideComponents.md
similarity index 100%
rename from Documentation/GetPnPAvailableClientSideComponents.md
rename to Documentation/Get-PnPAvailableClientSideComponents.md
diff --git a/Documentation/GetPnPAzureADManifestKeyCredentials.md b/Documentation/Get-PnPAzureADManifestKeyCredentials.md
similarity index 100%
rename from Documentation/GetPnPAzureADManifestKeyCredentials.md
rename to Documentation/Get-PnPAzureADManifestKeyCredentials.md
diff --git a/Documentation/GetPnPClientSidePage.md b/Documentation/Get-PnPClientSidePage.md
similarity index 100%
rename from Documentation/GetPnPClientSidePage.md
rename to Documentation/Get-PnPClientSidePage.md
diff --git a/Documentation/GetPnPContentType.md b/Documentation/Get-PnPContentType.md
similarity index 100%
rename from Documentation/GetPnPContentType.md
rename to Documentation/Get-PnPContentType.md
diff --git a/Documentation/GetPnPContentTypePublishingHubUrl.md b/Documentation/Get-PnPContentTypePublishingHubUrl.md
similarity index 100%
rename from Documentation/GetPnPContentTypePublishingHubUrl.md
rename to Documentation/Get-PnPContentTypePublishingHubUrl.md
diff --git a/Documentation/GetPnPContext.md b/Documentation/Get-PnPContext.md
similarity index 100%
rename from Documentation/GetPnPContext.md
rename to Documentation/Get-PnPContext.md
diff --git a/Documentation/GetPnPCustomAction.md b/Documentation/Get-PnPCustomAction.md
similarity index 100%
rename from Documentation/GetPnPCustomAction.md
rename to Documentation/Get-PnPCustomAction.md
diff --git a/Documentation/GetPnPDefaultColumnValues.md b/Documentation/Get-PnPDefaultColumnValues.md
similarity index 100%
rename from Documentation/GetPnPDefaultColumnValues.md
rename to Documentation/Get-PnPDefaultColumnValues.md
diff --git a/Documentation/GetPnPDocumentSetTemplate.md b/Documentation/Get-PnPDocumentSetTemplate.md
similarity index 100%
rename from Documentation/GetPnPDocumentSetTemplate.md
rename to Documentation/Get-PnPDocumentSetTemplate.md
diff --git a/Documentation/GetPnPEventReceiver.md b/Documentation/Get-PnPEventReceiver.md
similarity index 100%
rename from Documentation/GetPnPEventReceiver.md
rename to Documentation/Get-PnPEventReceiver.md
diff --git a/Documentation/GetPnPFeature.md b/Documentation/Get-PnPFeature.md
similarity index 100%
rename from Documentation/GetPnPFeature.md
rename to Documentation/Get-PnPFeature.md
diff --git a/Documentation/GetPnPField.md b/Documentation/Get-PnPField.md
similarity index 100%
rename from Documentation/GetPnPField.md
rename to Documentation/Get-PnPField.md
diff --git a/Documentation/GetPnPFile.md b/Documentation/Get-PnPFile.md
similarity index 100%
rename from Documentation/GetPnPFile.md
rename to Documentation/Get-PnPFile.md
diff --git a/Documentation/GetPnPFolder.md b/Documentation/Get-PnPFolder.md
similarity index 100%
rename from Documentation/GetPnPFolder.md
rename to Documentation/Get-PnPFolder.md
diff --git a/Documentation/GetPnPFolderItem.md b/Documentation/Get-PnPFolderItem.md
similarity index 100%
rename from Documentation/GetPnPFolderItem.md
rename to Documentation/Get-PnPFolderItem.md
diff --git a/Documentation/GetPnPGroup.md b/Documentation/Get-PnPGroup.md
similarity index 100%
rename from Documentation/GetPnPGroup.md
rename to Documentation/Get-PnPGroup.md
diff --git a/Documentation/GetPnPGroupPermissions.md b/Documentation/Get-PnPGroupPermissions.md
similarity index 100%
rename from Documentation/GetPnPGroupPermissions.md
rename to Documentation/Get-PnPGroupPermissions.md
diff --git a/Documentation/GetPnPHealthScore.md b/Documentation/Get-PnPHealthScore.md
similarity index 100%
rename from Documentation/GetPnPHealthScore.md
rename to Documentation/Get-PnPHealthScore.md
diff --git a/Documentation/GetPnPHomePage.md b/Documentation/Get-PnPHomePage.md
similarity index 100%
rename from Documentation/GetPnPHomePage.md
rename to Documentation/Get-PnPHomePage.md
diff --git a/Documentation/GetPnPIndexedPropertyKeys.md b/Documentation/Get-PnPIndexedPropertyKeys.md
similarity index 100%
rename from Documentation/GetPnPIndexedPropertyKeys.md
rename to Documentation/Get-PnPIndexedPropertyKeys.md
diff --git a/Documentation/GetPnPJavaScriptLink.md b/Documentation/Get-PnPJavaScriptLink.md
similarity index 100%
rename from Documentation/GetPnPJavaScriptLink.md
rename to Documentation/Get-PnPJavaScriptLink.md
diff --git a/Documentation/GetPnPList.md b/Documentation/Get-PnPList.md
similarity index 100%
rename from Documentation/GetPnPList.md
rename to Documentation/Get-PnPList.md
diff --git a/Documentation/GetPnPListItem.md b/Documentation/Get-PnPListItem.md
similarity index 100%
rename from Documentation/GetPnPListItem.md
rename to Documentation/Get-PnPListItem.md
diff --git a/Documentation/GetPnPMasterPage.md b/Documentation/Get-PnPMasterPage.md
similarity index 100%
rename from Documentation/GetPnPMasterPage.md
rename to Documentation/Get-PnPMasterPage.md
diff --git a/Documentation/GetPnPProperty.md b/Documentation/Get-PnPProperty.md
similarity index 100%
rename from Documentation/GetPnPProperty.md
rename to Documentation/Get-PnPProperty.md
diff --git a/Documentation/GetPnPPropertyBag.md b/Documentation/Get-PnPPropertyBag.md
similarity index 100%
rename from Documentation/GetPnPPropertyBag.md
rename to Documentation/Get-PnPPropertyBag.md
diff --git a/Documentation/GetPnPProvisioningTemplate.md b/Documentation/Get-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/GetPnPProvisioningTemplate.md
rename to Documentation/Get-PnPProvisioningTemplate.md
diff --git a/Documentation/GetPnPProvisioningTemplateFromGallery.md b/Documentation/Get-PnPProvisioningTemplateFromGallery.md
similarity index 100%
rename from Documentation/GetPnPProvisioningTemplateFromGallery.md
rename to Documentation/Get-PnPProvisioningTemplateFromGallery.md
diff --git a/Documentation/GetPnPPublishingImageRendition.md b/Documentation/Get-PnPPublishingImageRendition.md
similarity index 100%
rename from Documentation/GetPnPPublishingImageRendition.md
rename to Documentation/Get-PnPPublishingImageRendition.md
diff --git a/Documentation/GetPnPRecycleBinItem.md b/Documentation/Get-PnPRecycleBinItem.md
similarity index 100%
rename from Documentation/GetPnPRecycleBinItem.md
rename to Documentation/Get-PnPRecycleBinItem.md
diff --git a/Documentation/GetPnPRequestAccessEmails.md b/Documentation/Get-PnPRequestAccessEmails.md
similarity index 100%
rename from Documentation/GetPnPRequestAccessEmails.md
rename to Documentation/Get-PnPRequestAccessEmails.md
diff --git a/Documentation/GetPnPSearchConfiguration.md b/Documentation/Get-PnPSearchConfiguration.md
similarity index 100%
rename from Documentation/GetPnPSearchConfiguration.md
rename to Documentation/Get-PnPSearchConfiguration.md
diff --git a/Documentation/GetPnPSite.md b/Documentation/Get-PnPSite.md
similarity index 100%
rename from Documentation/GetPnPSite.md
rename to Documentation/Get-PnPSite.md
diff --git a/Documentation/GetPnPSiteClosure.md b/Documentation/Get-PnPSiteClosure.md
similarity index 100%
rename from Documentation/GetPnPSiteClosure.md
rename to Documentation/Get-PnPSiteClosure.md
diff --git a/Documentation/GetPnPSiteCollectionAdmin.md b/Documentation/Get-PnPSiteCollectionAdmin.md
similarity index 100%
rename from Documentation/GetPnPSiteCollectionAdmin.md
rename to Documentation/Get-PnPSiteCollectionAdmin.md
diff --git a/Documentation/GetPnPSiteCollectionTermStore.md b/Documentation/Get-PnPSiteCollectionTermStore.md
similarity index 100%
rename from Documentation/GetPnPSiteCollectionTermStore.md
rename to Documentation/Get-PnPSiteCollectionTermStore.md
diff --git a/Documentation/GetPnPSitePolicy.md b/Documentation/Get-PnPSitePolicy.md
similarity index 100%
rename from Documentation/GetPnPSitePolicy.md
rename to Documentation/Get-PnPSitePolicy.md
diff --git a/Documentation/GetPnPSiteSearchQueryResults.md b/Documentation/Get-PnPSiteSearchQueryResults.md
similarity index 100%
rename from Documentation/GetPnPSiteSearchQueryResults.md
rename to Documentation/Get-PnPSiteSearchQueryResults.md
diff --git a/Documentation/GetPnPStoredCredential.md b/Documentation/Get-PnPStoredCredential.md
similarity index 100%
rename from Documentation/GetPnPStoredCredential.md
rename to Documentation/Get-PnPStoredCredential.md
diff --git a/Documentation/GetPnPSubWebs.md b/Documentation/Get-PnPSubWebs.md
similarity index 100%
rename from Documentation/GetPnPSubWebs.md
rename to Documentation/Get-PnPSubWebs.md
diff --git a/Documentation/GetPnPTaxonomyItem.md b/Documentation/Get-PnPTaxonomyItem.md
similarity index 100%
rename from Documentation/GetPnPTaxonomyItem.md
rename to Documentation/Get-PnPTaxonomyItem.md
diff --git a/Documentation/GetPnPTaxonomySession.md b/Documentation/Get-PnPTaxonomySession.md
similarity index 100%
rename from Documentation/GetPnPTaxonomySession.md
rename to Documentation/Get-PnPTaxonomySession.md
diff --git a/Documentation/GetPnPTenantRecycleBinItem.md b/Documentation/Get-PnPTenantRecycleBinItem.md
similarity index 100%
rename from Documentation/GetPnPTenantRecycleBinItem.md
rename to Documentation/Get-PnPTenantRecycleBinItem.md
diff --git a/Documentation/GetPnPTenantSite.md b/Documentation/Get-PnPTenantSite.md
similarity index 100%
rename from Documentation/GetPnPTenantSite.md
rename to Documentation/Get-PnPTenantSite.md
diff --git a/Documentation/GetPnPTerm.md b/Documentation/Get-PnPTerm.md
similarity index 100%
rename from Documentation/GetPnPTerm.md
rename to Documentation/Get-PnPTerm.md
diff --git a/Documentation/GetPnPTermGroup.md b/Documentation/Get-PnPTermGroup.md
similarity index 100%
rename from Documentation/GetPnPTermGroup.md
rename to Documentation/Get-PnPTermGroup.md
diff --git a/Documentation/GetPnPTermSet.md b/Documentation/Get-PnPTermSet.md
similarity index 100%
rename from Documentation/GetPnPTermSet.md
rename to Documentation/Get-PnPTermSet.md
diff --git a/Documentation/GetPnPTheme.md b/Documentation/Get-PnPTheme.md
similarity index 100%
rename from Documentation/GetPnPTheme.md
rename to Documentation/Get-PnPTheme.md
diff --git a/Documentation/GetPnPTimeZoneId.md b/Documentation/Get-PnPTimeZoneId.md
similarity index 100%
rename from Documentation/GetPnPTimeZoneId.md
rename to Documentation/Get-PnPTimeZoneId.md
diff --git a/Documentation/GetPnPUnifiedGroup.md b/Documentation/Get-PnPUnifiedGroup.md
similarity index 100%
rename from Documentation/GetPnPUnifiedGroup.md
rename to Documentation/Get-PnPUnifiedGroup.md
diff --git a/Documentation/GetPnPUser.md b/Documentation/Get-PnPUser.md
similarity index 100%
rename from Documentation/GetPnPUser.md
rename to Documentation/Get-PnPUser.md
diff --git a/Documentation/GetPnPUserProfileProperty.md b/Documentation/Get-PnPUserProfileProperty.md
similarity index 100%
rename from Documentation/GetPnPUserProfileProperty.md
rename to Documentation/Get-PnPUserProfileProperty.md
diff --git a/Documentation/GetPnPView.md b/Documentation/Get-PnPView.md
similarity index 100%
rename from Documentation/GetPnPView.md
rename to Documentation/Get-PnPView.md
diff --git a/Documentation/GetPnPWeb.md b/Documentation/Get-PnPWeb.md
similarity index 100%
rename from Documentation/GetPnPWeb.md
rename to Documentation/Get-PnPWeb.md
diff --git a/Documentation/GetPnPWebPart.md b/Documentation/Get-PnPWebPart.md
similarity index 100%
rename from Documentation/GetPnPWebPart.md
rename to Documentation/Get-PnPWebPart.md
diff --git a/Documentation/GetPnPWebPartProperty.md b/Documentation/Get-PnPWebPartProperty.md
similarity index 100%
rename from Documentation/GetPnPWebPartProperty.md
rename to Documentation/Get-PnPWebPartProperty.md
diff --git a/Documentation/GetPnPWebPartXml.md b/Documentation/Get-PnPWebPartXml.md
similarity index 100%
rename from Documentation/GetPnPWebPartXml.md
rename to Documentation/Get-PnPWebPartXml.md
diff --git a/Documentation/GetPnPWebTemplates.md b/Documentation/Get-PnPWebTemplates.md
similarity index 100%
rename from Documentation/GetPnPWebTemplates.md
rename to Documentation/Get-PnPWebTemplates.md
diff --git a/Documentation/GetPnPWebhookSubscriptions.md b/Documentation/Get-PnPWebhookSubscriptions.md
similarity index 100%
rename from Documentation/GetPnPWebhookSubscriptions.md
rename to Documentation/Get-PnPWebhookSubscriptions.md
diff --git a/Documentation/GetPnPWikiPageContent.md b/Documentation/Get-PnPWikiPageContent.md
similarity index 100%
rename from Documentation/GetPnPWikiPageContent.md
rename to Documentation/Get-PnPWikiPageContent.md
diff --git a/Documentation/GetPnPWorkflowDefinition.md b/Documentation/Get-PnPWorkflowDefinition.md
similarity index 100%
rename from Documentation/GetPnPWorkflowDefinition.md
rename to Documentation/Get-PnPWorkflowDefinition.md
diff --git a/Documentation/GetPnPWorkflowSubscription.md b/Documentation/Get-PnPWorkflowSubscription.md
similarity index 100%
rename from Documentation/GetPnPWorkflowSubscription.md
rename to Documentation/Get-PnPWorkflowSubscription.md
diff --git a/Documentation/ImportPnPAppPackage.md b/Documentation/Import-PnPAppPackage.md
similarity index 100%
rename from Documentation/ImportPnPAppPackage.md
rename to Documentation/Import-PnPAppPackage.md
diff --git a/Documentation/ImportPnPTaxonomy.md b/Documentation/Import-PnPTaxonomy.md
similarity index 100%
rename from Documentation/ImportPnPTaxonomy.md
rename to Documentation/Import-PnPTaxonomy.md
diff --git a/Documentation/ImportPnPTermGroupFromXml.md b/Documentation/Import-PnPTermGroupFromXml.md
similarity index 100%
rename from Documentation/ImportPnPTermGroupFromXml.md
rename to Documentation/Import-PnPTermGroupFromXml.md
diff --git a/Documentation/ImportPnPTermSet.md b/Documentation/Import-PnPTermSet.md
similarity index 100%
rename from Documentation/ImportPnPTermSet.md
rename to Documentation/Import-PnPTermSet.md
diff --git a/Documentation/InstallPnPApp.md b/Documentation/Install-PnPApp.md
similarity index 100%
rename from Documentation/InstallPnPApp.md
rename to Documentation/Install-PnPApp.md
diff --git a/Documentation/InstallPnPSolution.md b/Documentation/Install-PnPSolution.md
similarity index 100%
rename from Documentation/InstallPnPSolution.md
rename to Documentation/Install-PnPSolution.md
diff --git a/Documentation/InvokePnPWebAction.md b/Documentation/Invoke-PnPWebAction.md
similarity index 100%
rename from Documentation/InvokePnPWebAction.md
rename to Documentation/Invoke-PnPWebAction.md
diff --git a/Documentation/LoadPnPProvisioningTemplate.md b/Documentation/Load-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/LoadPnPProvisioningTemplate.md
rename to Documentation/Load-PnPProvisioningTemplate.md
diff --git a/Documentation/Mapping/groupMatting.json b/Documentation/Mapping/groupMatting.json
new file mode 100644
index 000000000..897d5add4
--- /dev/null
+++ b/Documentation/Mapping/groupMatting.json
@@ -0,0 +1 @@
+{"Add-PnPApp":"Apps","Add-PnPClientSidePage":"Client-Side Pages","Add-PnPClientSidePageSection":"Client-Side Pages","Add-PnPClientSideText":"Client-Side Pages","Add-PnPClientSideWebPart":"Client-Side Pages","Add-PnPContentType":"Content Types","Add-PnPContentTypeToDocumentSet":"Document Sets","Add-PnPContentTypeToList":"Content Types","Add-PnPCustomAction":"Branding","Add-PnPDataRowsToProvisioningTemplate":"Provisioning","Add-PnPDocumentSet":"Document Sets","Add-PnPEventReceiver":"Event Receivers","Add-PnPField":"Fields","Add-PnPFieldFromXml":"Fields","Add-PnPFieldToContentType":"Content Types","Add-PnPFile":"Files and Folders","Add-PnPFileToProvisioningTemplate":"Provisioning","Add-PnPFolder":"Files and Folders","Add-PnPHtmlPublishingPageLayout":"Publishing","Add-PnPIndexedProperty":"Webs","Add-PnPJavaScriptBlock":"Branding","Add-PnPJavaScriptLink":"Branding","Add-PnPListFoldersToProvisioningTemplate":"Provisioning","Add-PnPListItem":"Lists","Add-PnPMasterPage":"Publishing","Add-PnPNavigationNode":"Branding","Add-PnPPublishingImageRendition":"Publishing","Add-PnPPublishingPage":"Publishing","Add-PnPPublishingPageLayout":"Publishing","Add-PnPSiteCollectionAdmin":"Sites","Add-PnPTaxonomyField":"Fields","Add-PnPUserToGroup":"User and group management","Add-PnPView":"Lists","Add-PnPWebhookSubscription":"SharePoint WebHooks","Add-PnPWebPartToWebPartPage":"Web Parts","Add-PnPWebPartToWikiPage":"Web Parts","Add-PnPWikiPage":"Publishing","Add-PnPWorkflowDefinition":"Workflows","Add-PnPWorkflowSubscription":"Workflows","Apply-PnPProvisioningTemplate":"Provisioning","Set-PnPSitePolicy":"Information Management","Clear-PnPListItemAsRecord":"Records Management","Clear-PnpRecycleBinItem":"SharePoint Recycle Bin","Clear-PnPTenantRecycleBinItem":"Tenant Administration","Connect-PnPOnline":"Base Cmdlets","Connect-PnPMicrosoftGraph":"Microsoft Graph","Convert-PnPProvisioningTemplate":"Provisioning","Convert-PnPFolderToProvisioningTemplate":"Provisioning","Copy-PnPFile":"Files and Folders","Disable-PnPFeature":"Features","Disable-PnPInPlaceRecordsManagementForSite":"Records Management","Disable-PnPResponsiveUI":"Branding","Disconnect-PnPOnline":"Base Cmdlets","Enable-PnPFeature":"Features","Enable-PnPInPlaceRecordsManagementForSite":"Records Management","Enable-PnPResponsiveUI":"Branding","Ensure-PnPFolder":"Files and Folders","Get-PnPProperty":"Base Cmdlets","Execute-PnPQuery":"Base Cmdlets","Export-PnPTaxonomy":"Taxonomy","Export-PnPTermGroupToXml":"Taxonomy","Find-PnPFile":"Files and Folders","Get-PnPApp":"Apps","Get-PnPAppInstance":"Apps","Get-PnPAuditing":"Sites","Get-PnPAuthenticationRealm":"Base Cmdlets","Get-PnPAvailableClientSideComponents":"Client-Side Pages","Get-PnPAzureADManifestKeyCredentials":"Base Cmdlets","Get-PnPClientSidePage":"Client-Side Pages","Get-PnPContentType":"Content Types","Get-PnPContentTypePublishingHubUrl":"Content Types","Get-PnPCustomAction":"Branding","Get-PnPDefaultColumnValues":"Lists","Get-PnPDocumentSetTemplate":"Document Sets","Get-PnPEventReceiver":"Event Receivers","Get-PnPFeature":"Features","Get-PnPField":"Fields","Get-PnPFile":"Files and Folders","Get-PnPFolder":"Files and Folders","Get-PnPFolderItem":"Files and Folders","Get-PnPGroup":"User and group management","Get-PnPGroupPermissions":"User and group management","Get-PnPHealthScore":"Base Cmdlets","Get-PnPHomePage":"Branding","Get-PnPIndexedPropertyKeys":"Webs","Get-PnPJavaScriptLink":"Branding","Get-PnPList":"Lists","Get-PnPListItem":"Lists","Get-PnPMasterPage":"Branding","Get-PnPAccessToken":"Tenant Administration","Get-PnPAppAuthAccessToken":"Base Cmdlets","Get-PnPSiteCollectionTermStore":"Taxonomy","Get-PnPPropertyBag":"Webs","Get-PnPProvisioningTemplate":"Provisioning","Get-PnPProvisioningTemplateFromGallery":"Lists","Get-PnPPublishingImageRendition":"Publishing","Get-PnPRecycleBinItem":"SharePoint Recycle Bin","Get-PnPRequestAccessEmails":"Webs","Get-PnPSearchConfiguration":"Search","Get-PnPSite":"Sites","Get-PnPSiteClosure":"Information Management","Get-PnPSiteCollectionAdmin":"Sites","Get-PnPSitePolicy":"Information Management","Get-PnPSiteSearchQueryResults":"Search","Get-PnPContext":"Base Cmdlets","Get-PnPStoredCredential":"Base Cmdlets","Get-PnPSubWebs":"Webs","Get-PnPTaxonomyItem":"Taxonomy","Get-PnPTaxonomySession":"Taxonomy","Get-PnPTenantRecycleBinItem":"SharePoint Recycle Bin","Get-PnPTenantSite":"Tenant Administration","Get-PnPTerm":"Taxonomy","Get-PnPTermGroup":"Taxonomy","Get-PnPTermSet":"Taxonomy","Get-PnPTheme":"Branding","Get-PnPTimeZoneId":"Tenant Administration","Get-PnPUnifiedGroup":"Microsoft Graph","Get-PnPUser":"User and group management","Get-PnPUserProfileProperty":"User Profiles","Get-PnPView":"Lists","Get-PnPWeb":"Webs","Get-PnPWebhookSubscriptions":"SharePoint WebHooks","Get-PnPWebPart":"Web Parts","Get-PnPWebPartProperty":"Web Parts","Get-PnPWebPartXml":"Web Parts","Get-PnPWebTemplates":"Tenant Administration","Get-PnPWikiPageContent":"Publishing","Get-PnPWorkflowDefinition":"Workflows","Get-PnPWorkflowSubscription":"Workflows","Import-PnPAppPackage":"Apps","Import-PnPTaxonomy":"Taxonomy","Import-PnPTermGroupFromXml":"Taxonomy","Import-PnPTermSet":"Taxonomy","Install-PnPApp":"Apps","Install-PnPSolution":"Sites","Invoke-PnPWebAction":"Webs","Load-PnPProvisioningTemplate":"Provisioning","Move-PnPFile":"Files and Folders","Move-PnPFolder":"Files and Folders","Move-PnPListItemToRecycleBin":"Lists","Move-PnpRecycleBinItem":"SharePoint Recycle Bin","New-PnPExtensbilityHandlerObject":"Features","New-PnPGroup":"User and group management","New-PnPList":"Lists","New-PnPPersonalSite":"User Profiles","New-PnPUnifiedGroup":"Microsoft Graph","New-PnPProvisioningTemplate":"Provisioning","New-PnPProvisioningTemplateFromFolder":"Provisioning","New-PnPSite":"Tenant Administration","New-PnPTenantSite":"Tenant Administration","New-PnPTerm":"Taxonomy","New-PnPTermGroup":"Taxonomy","New-PnPTermSet":"Taxonomy","New-PnPUser":"User and group management","New-PnPWeb":"Webs","Publish-PnPApp":"Apps","Remove-PnPApp":"Apps","Remove-PnPClientSidePage":"Client-Side Pages","Remove-PnPContentType":"Content Types","Remove-PnPContentTypeFromDocumentSet":"Document Sets","Remove-PnPContentTypeFromList":"Content Types","Remove-PnPCustomAction":"Branding","Remove-PnPIndexedProperty":"Webs","Remove-PnPEventReceiver":"Event Receivers","Remove-PnPField":"Fields","Remove-PnPFieldFromContentType":"Content Types","Remove-PnPFile":"Files and Folders","Remove-PnPFileFromProvisioningTemplate":"Provisioning","Remove-PnPFolder":"Files and Folders","Remove-PnPGroup":"User and group management","Remove-PnPJavaScriptLink":"Branding","Remove-PnPList":"Lists","Remove-PnPListItem":"Lists","Remove-PnPNavigationNode":"Branding","Remove-PnPPropertyBagValue":"Webs","Remove-PnPPublishingImageRendition":"Publishing","Remove-PnPTenantSite":"Tenant Administration","Remove-PnPSiteCollectionAdmin":"Sites","Remove-PnPTaxonomyItem":"Taxonomy","Remove-PnPTermGroup":"Taxonomy","Remove-PnPUnifiedGroup":"Microsoft Graph","Remove-PnPUser":"User and group management","Remove-PnPUserFromGroup":"User and group management","Remove-PnPView":"Lists","Remove-PnPWeb":"Webs","Remove-PnPWebhookSubscription":"SharePoint WebHooks","Remove-PnPWebPart":"Web Parts","Remove-PnPWikiPage":"Publishing","Remove-PnPWorkflowDefinition":"Workflows","Remove-PnPWorkflowSubscription":"Workflows","Rename-PnPFile":"Files and Folders","Rename-PnPFolder":"Files and Folders","Request-PnPReIndexList":"Lists","Request-PnPReIndexWeb":"Webs","Restore-PnpRecycleBinItem":"SharePoint Recycle Bin","Restore-PnPTenantRecycleBinItem":"Tenant Administration","Resume-PnPWorkflowInstance":"Workflows","Save-PnPProvisioningTemplate":"Provisioning","Send-PnPMail":"Utilities","Set-PnPAppSideLoading":"Sites","Set-PnPAuditing":"Sites","Set-PnPAvailablePageLayouts":"Publishing","Set-PnPClientSidePage":"Client-Side Pages","Set-PnPContext":"Base Cmdlets","Set-PnPDefaultColumnValues":"Lists","Set-PnPDefaultContentTypeToList":"Content Types","Set-PnPDefaultPageLayout":"Publishing","Set-PnPField":"Fields","Set-PnPDocumentSetField":"Document Sets","Set-PnPFileCheckedIn":"Files and Folders","Set-PnPFileCheckedOut":"Files and Folders","Set-PnPGroup":"User and group management","Set-PnPGroupPermissions":"User and group management","Set-PnPHomePage":"Branding","Set-PnPIndexedProperties":"Webs","Set-PnPInPlaceRecordsManagement":"Records Management","Set-PnPList":"Lists","Set-PnPListItem":"Lists","Set-PnPListItemAsRecord":"Records Management","Set-PnPListItemPermission":"Lists","Set-PnPListPermission":"Lists","Set-PnPMasterPage":"Branding","Set-PnPMinimalDownloadStrategy":"Branding","Set-PnPPropertyBagValue":"Webs","Set-PnPProvisioningTemplateMetadata":"Provisioning","Set-PnPRequestAccessEmails":"Webs","Set-PnPSearchConfiguration":"Search","Set-PnPSiteClosure":"Information Management","Set-PnPTaxonomyFieldValue":"Taxonomy","Set-PnPTenantSite":"Tenant Administration","Set-PnPTheme":"Branding","Set-PnPTraceLog":"Base Cmdlets","Set-PnPUnifiedGroup":"Microsoft Graph","Set-PnPUserProfileProperty":"User Profiles","Set-PnPView":"Fields","Set-PnPWeb":"Webs","Set-PnPWebhookSubscription":"SharePoint WebHooks","Set-PnPWebPartProperty":"Web Parts","Set-PnPWebPermission":"Webs","Set-PnPWikiPageContent":"Publishing","Copy-PnPItemProxy":"Files and Folders","Move-PnPItemProxy":"Files and Folders","Stop-PnPWorkflowInstance":"Workflows","Submit-PnPSearchQuery":"Search","Test-PnPListItemIsRecord":"Records Management","Uninstall-PnPApp":"Apps","Uninstall-PnPAppInstance":"Apps","Uninstall-PnPSolution":"Sites","Unpublish-PnPApp":"Apps"}
\ No newline at end of file
diff --git a/Documentation/MovePnPFile.md b/Documentation/Move-PnPFile.md
similarity index 100%
rename from Documentation/MovePnPFile.md
rename to Documentation/Move-PnPFile.md
diff --git a/Documentation/MovePnPFolder.md b/Documentation/Move-PnPFolder.md
similarity index 100%
rename from Documentation/MovePnPFolder.md
rename to Documentation/Move-PnPFolder.md
diff --git a/Documentation/MovePnPItemProxy.md b/Documentation/Move-PnPItemProxy.md
similarity index 100%
rename from Documentation/MovePnPItemProxy.md
rename to Documentation/Move-PnPItemProxy.md
diff --git a/Documentation/MovePnPListItemToRecycleBin.md b/Documentation/Move-PnPListItemToRecycleBin.md
similarity index 100%
rename from Documentation/MovePnPListItemToRecycleBin.md
rename to Documentation/Move-PnPListItemToRecycleBin.md
diff --git a/Documentation/MovePnpRecycleBinItem.md b/Documentation/Move-PnpRecycleBinItem.md
similarity index 100%
rename from Documentation/MovePnpRecycleBinItem.md
rename to Documentation/Move-PnpRecycleBinItem.md
diff --git a/Documentation/NewPnPExtensbilityHandlerObject.md b/Documentation/New-PnPExtensbilityHandlerObject.md
similarity index 100%
rename from Documentation/NewPnPExtensbilityHandlerObject.md
rename to Documentation/New-PnPExtensbilityHandlerObject.md
diff --git a/Documentation/NewPnPGroup.md b/Documentation/New-PnPGroup.md
similarity index 100%
rename from Documentation/NewPnPGroup.md
rename to Documentation/New-PnPGroup.md
diff --git a/Documentation/NewPnPList.md b/Documentation/New-PnPList.md
similarity index 100%
rename from Documentation/NewPnPList.md
rename to Documentation/New-PnPList.md
diff --git a/Documentation/NewPnPPersonalSite.md b/Documentation/New-PnPPersonalSite.md
similarity index 100%
rename from Documentation/NewPnPPersonalSite.md
rename to Documentation/New-PnPPersonalSite.md
diff --git a/Documentation/NewPnPProvisioningTemplate.md b/Documentation/New-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/NewPnPProvisioningTemplate.md
rename to Documentation/New-PnPProvisioningTemplate.md
diff --git a/Documentation/NewPnPProvisioningTemplateFromFolder.md b/Documentation/New-PnPProvisioningTemplateFromFolder.md
similarity index 100%
rename from Documentation/NewPnPProvisioningTemplateFromFolder.md
rename to Documentation/New-PnPProvisioningTemplateFromFolder.md
diff --git a/Documentation/NewPnPSite.md b/Documentation/New-PnPSite.md
similarity index 100%
rename from Documentation/NewPnPSite.md
rename to Documentation/New-PnPSite.md
diff --git a/Documentation/NewPnPTenantSite.md b/Documentation/New-PnPTenantSite.md
similarity index 100%
rename from Documentation/NewPnPTenantSite.md
rename to Documentation/New-PnPTenantSite.md
diff --git a/Documentation/NewPnPTerm.md b/Documentation/New-PnPTerm.md
similarity index 100%
rename from Documentation/NewPnPTerm.md
rename to Documentation/New-PnPTerm.md
diff --git a/Documentation/NewPnPTermGroup.md b/Documentation/New-PnPTermGroup.md
similarity index 100%
rename from Documentation/NewPnPTermGroup.md
rename to Documentation/New-PnPTermGroup.md
diff --git a/Documentation/NewPnPTermSet.md b/Documentation/New-PnPTermSet.md
similarity index 100%
rename from Documentation/NewPnPTermSet.md
rename to Documentation/New-PnPTermSet.md
diff --git a/Documentation/NewPnPUnifiedGroup.md b/Documentation/New-PnPUnifiedGroup.md
similarity index 100%
rename from Documentation/NewPnPUnifiedGroup.md
rename to Documentation/New-PnPUnifiedGroup.md
diff --git a/Documentation/NewPnPUser.md b/Documentation/New-PnPUser.md
similarity index 100%
rename from Documentation/NewPnPUser.md
rename to Documentation/New-PnPUser.md
diff --git a/Documentation/NewPnPWeb.md b/Documentation/New-PnPWeb.md
similarity index 100%
rename from Documentation/NewPnPWeb.md
rename to Documentation/New-PnPWeb.md
diff --git a/Documentation/PublishPnPApp.md b/Documentation/Publish-PnPApp.md
similarity index 100%
rename from Documentation/PublishPnPApp.md
rename to Documentation/Publish-PnPApp.md
diff --git a/Documentation/RemovePnPApp.md b/Documentation/Remove-PnPApp.md
similarity index 100%
rename from Documentation/RemovePnPApp.md
rename to Documentation/Remove-PnPApp.md
diff --git a/Documentation/RemovePnPClientSidePage.md b/Documentation/Remove-PnPClientSidePage.md
similarity index 100%
rename from Documentation/RemovePnPClientSidePage.md
rename to Documentation/Remove-PnPClientSidePage.md
diff --git a/Documentation/RemovePnPContentType.md b/Documentation/Remove-PnPContentType.md
similarity index 100%
rename from Documentation/RemovePnPContentType.md
rename to Documentation/Remove-PnPContentType.md
diff --git a/Documentation/RemovePnPContentTypeFromDocumentSet.md b/Documentation/Remove-PnPContentTypeFromDocumentSet.md
similarity index 100%
rename from Documentation/RemovePnPContentTypeFromDocumentSet.md
rename to Documentation/Remove-PnPContentTypeFromDocumentSet.md
diff --git a/Documentation/RemovePnPContentTypeFromList.md b/Documentation/Remove-PnPContentTypeFromList.md
similarity index 100%
rename from Documentation/RemovePnPContentTypeFromList.md
rename to Documentation/Remove-PnPContentTypeFromList.md
diff --git a/Documentation/RemovePnPCustomAction.md b/Documentation/Remove-PnPCustomAction.md
similarity index 100%
rename from Documentation/RemovePnPCustomAction.md
rename to Documentation/Remove-PnPCustomAction.md
diff --git a/Documentation/RemovePnPEventReceiver.md b/Documentation/Remove-PnPEventReceiver.md
similarity index 100%
rename from Documentation/RemovePnPEventReceiver.md
rename to Documentation/Remove-PnPEventReceiver.md
diff --git a/Documentation/RemovePnPField.md b/Documentation/Remove-PnPField.md
similarity index 100%
rename from Documentation/RemovePnPField.md
rename to Documentation/Remove-PnPField.md
diff --git a/Documentation/RemovePnPFieldFromContentType.md b/Documentation/Remove-PnPFieldFromContentType.md
similarity index 100%
rename from Documentation/RemovePnPFieldFromContentType.md
rename to Documentation/Remove-PnPFieldFromContentType.md
diff --git a/Documentation/RemovePnPFile.md b/Documentation/Remove-PnPFile.md
similarity index 100%
rename from Documentation/RemovePnPFile.md
rename to Documentation/Remove-PnPFile.md
diff --git a/Documentation/RemovePnPFileFromProvisioningTemplate.md b/Documentation/Remove-PnPFileFromProvisioningTemplate.md
similarity index 100%
rename from Documentation/RemovePnPFileFromProvisioningTemplate.md
rename to Documentation/Remove-PnPFileFromProvisioningTemplate.md
diff --git a/Documentation/RemovePnPFolder.md b/Documentation/Remove-PnPFolder.md
similarity index 100%
rename from Documentation/RemovePnPFolder.md
rename to Documentation/Remove-PnPFolder.md
diff --git a/Documentation/RemovePnPGroup.md b/Documentation/Remove-PnPGroup.md
similarity index 100%
rename from Documentation/RemovePnPGroup.md
rename to Documentation/Remove-PnPGroup.md
diff --git a/Documentation/RemovePnPIndexedProperty.md b/Documentation/Remove-PnPIndexedProperty.md
similarity index 100%
rename from Documentation/RemovePnPIndexedProperty.md
rename to Documentation/Remove-PnPIndexedProperty.md
diff --git a/Documentation/RemovePnPJavaScriptLink.md b/Documentation/Remove-PnPJavaScriptLink.md
similarity index 100%
rename from Documentation/RemovePnPJavaScriptLink.md
rename to Documentation/Remove-PnPJavaScriptLink.md
diff --git a/Documentation/RemovePnPList.md b/Documentation/Remove-PnPList.md
similarity index 100%
rename from Documentation/RemovePnPList.md
rename to Documentation/Remove-PnPList.md
diff --git a/Documentation/RemovePnPListItem.md b/Documentation/Remove-PnPListItem.md
similarity index 100%
rename from Documentation/RemovePnPListItem.md
rename to Documentation/Remove-PnPListItem.md
diff --git a/Documentation/RemovePnPNavigationNode.md b/Documentation/Remove-PnPNavigationNode.md
similarity index 100%
rename from Documentation/RemovePnPNavigationNode.md
rename to Documentation/Remove-PnPNavigationNode.md
diff --git a/Documentation/RemovePnPPropertyBagValue.md b/Documentation/Remove-PnPPropertyBagValue.md
similarity index 100%
rename from Documentation/RemovePnPPropertyBagValue.md
rename to Documentation/Remove-PnPPropertyBagValue.md
diff --git a/Documentation/RemovePnPPublishingImageRendition.md b/Documentation/Remove-PnPPublishingImageRendition.md
similarity index 100%
rename from Documentation/RemovePnPPublishingImageRendition.md
rename to Documentation/Remove-PnPPublishingImageRendition.md
diff --git a/Documentation/RemovePnPSiteCollectionAdmin.md b/Documentation/Remove-PnPSiteCollectionAdmin.md
similarity index 100%
rename from Documentation/RemovePnPSiteCollectionAdmin.md
rename to Documentation/Remove-PnPSiteCollectionAdmin.md
diff --git a/Documentation/RemovePnPTaxonomyItem.md b/Documentation/Remove-PnPTaxonomyItem.md
similarity index 100%
rename from Documentation/RemovePnPTaxonomyItem.md
rename to Documentation/Remove-PnPTaxonomyItem.md
diff --git a/Documentation/RemovePnPTenantSite.md b/Documentation/Remove-PnPTenantSite.md
similarity index 100%
rename from Documentation/RemovePnPTenantSite.md
rename to Documentation/Remove-PnPTenantSite.md
diff --git a/Documentation/RemovePnPTermGroup.md b/Documentation/Remove-PnPTermGroup.md
similarity index 100%
rename from Documentation/RemovePnPTermGroup.md
rename to Documentation/Remove-PnPTermGroup.md
diff --git a/Documentation/RemovePnPUnifiedGroup.md b/Documentation/Remove-PnPUnifiedGroup.md
similarity index 100%
rename from Documentation/RemovePnPUnifiedGroup.md
rename to Documentation/Remove-PnPUnifiedGroup.md
diff --git a/Documentation/RemovePnPUser.md b/Documentation/Remove-PnPUser.md
similarity index 100%
rename from Documentation/RemovePnPUser.md
rename to Documentation/Remove-PnPUser.md
diff --git a/Documentation/RemovePnPUserFromGroup.md b/Documentation/Remove-PnPUserFromGroup.md
similarity index 100%
rename from Documentation/RemovePnPUserFromGroup.md
rename to Documentation/Remove-PnPUserFromGroup.md
diff --git a/Documentation/RemovePnPView.md b/Documentation/Remove-PnPView.md
similarity index 100%
rename from Documentation/RemovePnPView.md
rename to Documentation/Remove-PnPView.md
diff --git a/Documentation/RemovePnPWeb.md b/Documentation/Remove-PnPWeb.md
similarity index 100%
rename from Documentation/RemovePnPWeb.md
rename to Documentation/Remove-PnPWeb.md
diff --git a/Documentation/RemovePnPWebPart.md b/Documentation/Remove-PnPWebPart.md
similarity index 100%
rename from Documentation/RemovePnPWebPart.md
rename to Documentation/Remove-PnPWebPart.md
diff --git a/Documentation/RemovePnPWebhookSubscription.md b/Documentation/Remove-PnPWebhookSubscription.md
similarity index 100%
rename from Documentation/RemovePnPWebhookSubscription.md
rename to Documentation/Remove-PnPWebhookSubscription.md
diff --git a/Documentation/RemovePnPWikiPage.md b/Documentation/Remove-PnPWikiPage.md
similarity index 100%
rename from Documentation/RemovePnPWikiPage.md
rename to Documentation/Remove-PnPWikiPage.md
diff --git a/Documentation/RemovePnPWorkflowDefinition.md b/Documentation/Remove-PnPWorkflowDefinition.md
similarity index 100%
rename from Documentation/RemovePnPWorkflowDefinition.md
rename to Documentation/Remove-PnPWorkflowDefinition.md
diff --git a/Documentation/RemovePnPWorkflowSubscription.md b/Documentation/Remove-PnPWorkflowSubscription.md
similarity index 100%
rename from Documentation/RemovePnPWorkflowSubscription.md
rename to Documentation/Remove-PnPWorkflowSubscription.md
diff --git a/Documentation/RenamePnPFile.md b/Documentation/Rename-PnPFile.md
similarity index 100%
rename from Documentation/RenamePnPFile.md
rename to Documentation/Rename-PnPFile.md
diff --git a/Documentation/RenamePnPFolder.md b/Documentation/Rename-PnPFolder.md
similarity index 100%
rename from Documentation/RenamePnPFolder.md
rename to Documentation/Rename-PnPFolder.md
diff --git a/Documentation/RequestPnPReIndexList.md b/Documentation/Request-PnPReIndexList.md
similarity index 100%
rename from Documentation/RequestPnPReIndexList.md
rename to Documentation/Request-PnPReIndexList.md
diff --git a/Documentation/RequestPnPReIndexWeb.md b/Documentation/Request-PnPReIndexWeb.md
similarity index 100%
rename from Documentation/RequestPnPReIndexWeb.md
rename to Documentation/Request-PnPReIndexWeb.md
diff --git a/Documentation/RestorePnPTenantRecycleBinItem.md b/Documentation/Restore-PnPTenantRecycleBinItem.md
similarity index 100%
rename from Documentation/RestorePnPTenantRecycleBinItem.md
rename to Documentation/Restore-PnPTenantRecycleBinItem.md
diff --git a/Documentation/RestorePnpRecycleBinItem.md b/Documentation/Restore-PnpRecycleBinItem.md
similarity index 100%
rename from Documentation/RestorePnpRecycleBinItem.md
rename to Documentation/Restore-PnpRecycleBinItem.md
diff --git a/Documentation/ResumePnPWorkflowInstance.md b/Documentation/Resume-PnPWorkflowInstance.md
similarity index 100%
rename from Documentation/ResumePnPWorkflowInstance.md
rename to Documentation/Resume-PnPWorkflowInstance.md
diff --git a/Documentation/SavePnPProvisioningTemplate.md b/Documentation/Save-PnPProvisioningTemplate.md
similarity index 100%
rename from Documentation/SavePnPProvisioningTemplate.md
rename to Documentation/Save-PnPProvisioningTemplate.md
diff --git a/Documentation/SendPnPMail.md b/Documentation/Send-PnPMail.md
similarity index 100%
rename from Documentation/SendPnPMail.md
rename to Documentation/Send-PnPMail.md
diff --git a/Documentation/SetPnPAppSideLoading.md b/Documentation/Set-PnPAppSideLoading.md
similarity index 100%
rename from Documentation/SetPnPAppSideLoading.md
rename to Documentation/Set-PnPAppSideLoading.md
diff --git a/Documentation/SetPnPAuditing.md b/Documentation/Set-PnPAuditing.md
similarity index 100%
rename from Documentation/SetPnPAuditing.md
rename to Documentation/Set-PnPAuditing.md
diff --git a/Documentation/SetPnPAvailablePageLayouts.md b/Documentation/Set-PnPAvailablePageLayouts.md
similarity index 100%
rename from Documentation/SetPnPAvailablePageLayouts.md
rename to Documentation/Set-PnPAvailablePageLayouts.md
diff --git a/Documentation/SetPnPClientSidePage.md b/Documentation/Set-PnPClientSidePage.md
similarity index 100%
rename from Documentation/SetPnPClientSidePage.md
rename to Documentation/Set-PnPClientSidePage.md
diff --git a/Documentation/SetPnPContext.md b/Documentation/Set-PnPContext.md
similarity index 100%
rename from Documentation/SetPnPContext.md
rename to Documentation/Set-PnPContext.md
diff --git a/Documentation/SetPnPDefaultColumnValues.md b/Documentation/Set-PnPDefaultColumnValues.md
similarity index 100%
rename from Documentation/SetPnPDefaultColumnValues.md
rename to Documentation/Set-PnPDefaultColumnValues.md
diff --git a/Documentation/SetPnPDefaultContentTypeToList.md b/Documentation/Set-PnPDefaultContentTypeToList.md
similarity index 100%
rename from Documentation/SetPnPDefaultContentTypeToList.md
rename to Documentation/Set-PnPDefaultContentTypeToList.md
diff --git a/Documentation/SetPnPDefaultPageLayout.md b/Documentation/Set-PnPDefaultPageLayout.md
similarity index 100%
rename from Documentation/SetPnPDefaultPageLayout.md
rename to Documentation/Set-PnPDefaultPageLayout.md
diff --git a/Documentation/SetPnPDocumentSetField.md b/Documentation/Set-PnPDocumentSetField.md
similarity index 100%
rename from Documentation/SetPnPDocumentSetField.md
rename to Documentation/Set-PnPDocumentSetField.md
diff --git a/Documentation/SetPnPField.md b/Documentation/Set-PnPField.md
similarity index 100%
rename from Documentation/SetPnPField.md
rename to Documentation/Set-PnPField.md
diff --git a/Documentation/SetPnPFileCheckedIn.md b/Documentation/Set-PnPFileCheckedIn.md
similarity index 100%
rename from Documentation/SetPnPFileCheckedIn.md
rename to Documentation/Set-PnPFileCheckedIn.md
diff --git a/Documentation/SetPnPFileCheckedOut.md b/Documentation/Set-PnPFileCheckedOut.md
similarity index 100%
rename from Documentation/SetPnPFileCheckedOut.md
rename to Documentation/Set-PnPFileCheckedOut.md
diff --git a/Documentation/SetPnPGroup.md b/Documentation/Set-PnPGroup.md
similarity index 100%
rename from Documentation/SetPnPGroup.md
rename to Documentation/Set-PnPGroup.md
diff --git a/Documentation/SetPnPGroupPermissions.md b/Documentation/Set-PnPGroupPermissions.md
similarity index 100%
rename from Documentation/SetPnPGroupPermissions.md
rename to Documentation/Set-PnPGroupPermissions.md
diff --git a/Documentation/SetPnPHomePage.md b/Documentation/Set-PnPHomePage.md
similarity index 100%
rename from Documentation/SetPnPHomePage.md
rename to Documentation/Set-PnPHomePage.md
diff --git a/Documentation/SetPnPInPlaceRecordsManagement.md b/Documentation/Set-PnPInPlaceRecordsManagement.md
similarity index 100%
rename from Documentation/SetPnPInPlaceRecordsManagement.md
rename to Documentation/Set-PnPInPlaceRecordsManagement.md
diff --git a/Documentation/SetPnPIndexedProperties.md b/Documentation/Set-PnPIndexedProperties.md
similarity index 100%
rename from Documentation/SetPnPIndexedProperties.md
rename to Documentation/Set-PnPIndexedProperties.md
diff --git a/Documentation/SetPnPList.md b/Documentation/Set-PnPList.md
similarity index 100%
rename from Documentation/SetPnPList.md
rename to Documentation/Set-PnPList.md
diff --git a/Documentation/SetPnPListItem.md b/Documentation/Set-PnPListItem.md
similarity index 100%
rename from Documentation/SetPnPListItem.md
rename to Documentation/Set-PnPListItem.md
diff --git a/Documentation/SetPnPListItemAsRecord.md b/Documentation/Set-PnPListItemAsRecord.md
similarity index 100%
rename from Documentation/SetPnPListItemAsRecord.md
rename to Documentation/Set-PnPListItemAsRecord.md
diff --git a/Documentation/SetPnPListItemPermission.md b/Documentation/Set-PnPListItemPermission.md
similarity index 100%
rename from Documentation/SetPnPListItemPermission.md
rename to Documentation/Set-PnPListItemPermission.md
diff --git a/Documentation/SetPnPListPermission.md b/Documentation/Set-PnPListPermission.md
similarity index 100%
rename from Documentation/SetPnPListPermission.md
rename to Documentation/Set-PnPListPermission.md
diff --git a/Documentation/SetPnPMasterPage.md b/Documentation/Set-PnPMasterPage.md
similarity index 100%
rename from Documentation/SetPnPMasterPage.md
rename to Documentation/Set-PnPMasterPage.md
diff --git a/Documentation/SetPnPMinimalDownloadStrategy.md b/Documentation/Set-PnPMinimalDownloadStrategy.md
similarity index 100%
rename from Documentation/SetPnPMinimalDownloadStrategy.md
rename to Documentation/Set-PnPMinimalDownloadStrategy.md
diff --git a/Documentation/SetPnPPropertyBagValue.md b/Documentation/Set-PnPPropertyBagValue.md
similarity index 100%
rename from Documentation/SetPnPPropertyBagValue.md
rename to Documentation/Set-PnPPropertyBagValue.md
diff --git a/Documentation/SetPnPProvisioningTemplateMetadata.md b/Documentation/Set-PnPProvisioningTemplateMetadata.md
similarity index 100%
rename from Documentation/SetPnPProvisioningTemplateMetadata.md
rename to Documentation/Set-PnPProvisioningTemplateMetadata.md
diff --git a/Documentation/SetPnPRequestAccessEmails.md b/Documentation/Set-PnPRequestAccessEmails.md
similarity index 100%
rename from Documentation/SetPnPRequestAccessEmails.md
rename to Documentation/Set-PnPRequestAccessEmails.md
diff --git a/Documentation/SetPnPSearchConfiguration.md b/Documentation/Set-PnPSearchConfiguration.md
similarity index 100%
rename from Documentation/SetPnPSearchConfiguration.md
rename to Documentation/Set-PnPSearchConfiguration.md
diff --git a/Documentation/SetPnPSiteClosure.md b/Documentation/Set-PnPSiteClosure.md
similarity index 100%
rename from Documentation/SetPnPSiteClosure.md
rename to Documentation/Set-PnPSiteClosure.md
diff --git a/Documentation/SetPnPSitePolicy.md b/Documentation/Set-PnPSitePolicy.md
similarity index 100%
rename from Documentation/SetPnPSitePolicy.md
rename to Documentation/Set-PnPSitePolicy.md
diff --git a/Documentation/SetPnPTaxonomyFieldValue.md b/Documentation/Set-PnPTaxonomyFieldValue.md
similarity index 100%
rename from Documentation/SetPnPTaxonomyFieldValue.md
rename to Documentation/Set-PnPTaxonomyFieldValue.md
diff --git a/Documentation/SetPnPTenantSite.md b/Documentation/Set-PnPTenantSite.md
similarity index 100%
rename from Documentation/SetPnPTenantSite.md
rename to Documentation/Set-PnPTenantSite.md
diff --git a/Documentation/SetPnPTheme.md b/Documentation/Set-PnPTheme.md
similarity index 100%
rename from Documentation/SetPnPTheme.md
rename to Documentation/Set-PnPTheme.md
diff --git a/Documentation/SetPnPTraceLog.md b/Documentation/Set-PnPTraceLog.md
similarity index 100%
rename from Documentation/SetPnPTraceLog.md
rename to Documentation/Set-PnPTraceLog.md
diff --git a/Documentation/SetPnPUnifiedGroup.md b/Documentation/Set-PnPUnifiedGroup.md
similarity index 100%
rename from Documentation/SetPnPUnifiedGroup.md
rename to Documentation/Set-PnPUnifiedGroup.md
diff --git a/Documentation/SetPnPUserProfileProperty.md b/Documentation/Set-PnPUserProfileProperty.md
similarity index 100%
rename from Documentation/SetPnPUserProfileProperty.md
rename to Documentation/Set-PnPUserProfileProperty.md
diff --git a/Documentation/SetPnPView.md b/Documentation/Set-PnPView.md
similarity index 100%
rename from Documentation/SetPnPView.md
rename to Documentation/Set-PnPView.md
diff --git a/Documentation/SetPnPWeb.md b/Documentation/Set-PnPWeb.md
similarity index 100%
rename from Documentation/SetPnPWeb.md
rename to Documentation/Set-PnPWeb.md
diff --git a/Documentation/SetPnPWebPartProperty.md b/Documentation/Set-PnPWebPartProperty.md
similarity index 100%
rename from Documentation/SetPnPWebPartProperty.md
rename to Documentation/Set-PnPWebPartProperty.md
diff --git a/Documentation/SetPnPWebPermission.md b/Documentation/Set-PnPWebPermission.md
similarity index 100%
rename from Documentation/SetPnPWebPermission.md
rename to Documentation/Set-PnPWebPermission.md
diff --git a/Documentation/SetPnPWebhookSubscription.md b/Documentation/Set-PnPWebhookSubscription.md
similarity index 100%
rename from Documentation/SetPnPWebhookSubscription.md
rename to Documentation/Set-PnPWebhookSubscription.md
diff --git a/Documentation/SetPnPWikiPageContent.md b/Documentation/Set-PnPWikiPageContent.md
similarity index 100%
rename from Documentation/SetPnPWikiPageContent.md
rename to Documentation/Set-PnPWikiPageContent.md
diff --git a/Documentation/StopPnPWorkflowInstance.md b/Documentation/Stop-PnPWorkflowInstance.md
similarity index 100%
rename from Documentation/StopPnPWorkflowInstance.md
rename to Documentation/Stop-PnPWorkflowInstance.md
diff --git a/Documentation/SubmitPnPSearchQuery.md b/Documentation/Submit-PnPSearchQuery.md
similarity index 100%
rename from Documentation/SubmitPnPSearchQuery.md
rename to Documentation/Submit-PnPSearchQuery.md
diff --git a/Documentation/TestPnPListItemIsRecord.md b/Documentation/Test-PnPListItemIsRecord.md
similarity index 100%
rename from Documentation/TestPnPListItemIsRecord.md
rename to Documentation/Test-PnPListItemIsRecord.md
diff --git a/Documentation/UninstallPnPApp.md b/Documentation/Uninstall-PnPApp.md
similarity index 100%
rename from Documentation/UninstallPnPApp.md
rename to Documentation/Uninstall-PnPApp.md
diff --git a/Documentation/UninstallPnPAppInstance.md b/Documentation/Uninstall-PnPAppInstance.md
similarity index 100%
rename from Documentation/UninstallPnPAppInstance.md
rename to Documentation/Uninstall-PnPAppInstance.md
diff --git a/Documentation/UninstallPnPSolution.md b/Documentation/Uninstall-PnPSolution.md
similarity index 100%
rename from Documentation/UninstallPnPSolution.md
rename to Documentation/Uninstall-PnPSolution.md
diff --git a/Documentation/UnpublishPnPApp.md b/Documentation/Unpublish-PnPApp.md
similarity index 100%
rename from Documentation/UnpublishPnPApp.md
rename to Documentation/Unpublish-PnPApp.md
diff --git a/ModuleFilesGenerator/MarkDownGenerator.cs b/ModuleFilesGenerator/MarkDownGenerator.cs
index 92ab90a83..702d8d3ca 100644
--- a/ModuleFilesGenerator/MarkDownGenerator.cs
+++ b/ModuleFilesGenerator/MarkDownGenerator.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
@@ -22,6 +23,7 @@ internal MarkDownGenerator(List<Model.CmdletInfo> cmdlets, string solutionDir)
         internal void Generate()
         {
             GenerateCmdletDocs();
+            GenerateMappingJson();
             GenerateTOC();
             GenerateMSDNTOC();
 
@@ -33,7 +35,7 @@ internal void Generate()
             {
                 if (mdFile.Name.ToLowerInvariant() != $"readme.{extension}")
                 {
-                    var index = _cmdlets.FindIndex(t => $"{t.Verb}{t.Noun}.{extension}" == mdFile.Name);
+                    var index = _cmdlets.FindIndex(t => $"{t.Verb}-{t.Noun}.{extension}" == mdFile.Name);
                     if (index == -1)
                     {
                         mdFile.Delete();
@@ -53,7 +55,7 @@ private void GenerateCmdletDocs()
 
                 if (!string.IsNullOrEmpty(cmdletInfo.Verb) && !string.IsNullOrEmpty(cmdletInfo.Noun))
                 {
-                    string mdFilePath = $"{_solutionDir}\\Documentation\\{cmdletInfo.Verb}{cmdletInfo.Noun}.{extension}";
+                    string mdFilePath = $"{_solutionDir}\\Documentation\\{cmdletInfo.Verb}-{cmdletInfo.Noun}.{extension}";
 
                     if (System.IO.File.Exists(mdFilePath))
                     {
@@ -255,6 +257,26 @@ private void GenerateCmdletDocs()
             }
         }
 
+        private void GenerateMappingJson()
+        {
+            var groups = new Dictionary<string, string>();
+            foreach (var cmdletInfo in _cmdlets)
+            {
+                groups.Add($"{cmdletInfo.FullCommand}", cmdletInfo.Category);
+            }
+
+            var json = JsonConvert.SerializeObject(groups);
+
+            var mappingFolder = $"{_solutionDir}\\Documentation\\Mapping";
+            if (!System.IO.Directory.Exists(mappingFolder))
+            {
+                System.IO.Directory.CreateDirectory(mappingFolder);
+            }
+
+            var mappingPath = $"{_solutionDir}\\Documentation\\Mapping\\groupMatting.json";
+            System.IO.File.WriteAllText(mappingPath, json);
+        }
+
         private void GenerateTOC()
         {
             var originalMd = string.Empty;
diff --git a/ModuleFilesGenerator/SharePointPnP.PowerShell.ModuleFilesGenerator.csproj b/ModuleFilesGenerator/SharePointPnP.PowerShell.ModuleFilesGenerator.csproj
index b3a528042..53c91a673 100644
--- a/ModuleFilesGenerator/SharePointPnP.PowerShell.ModuleFilesGenerator.csproj
+++ b/ModuleFilesGenerator/SharePointPnP.PowerShell.ModuleFilesGenerator.csproj
@@ -78,6 +78,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/ModuleFilesGenerator/packages.config b/ModuleFilesGenerator/packages.config
index 6a1a03cea..88592c634 100644
--- a/ModuleFilesGenerator/packages.config
+++ b/ModuleFilesGenerator/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="System.Management.Automation.dll" version="10.0.10586.0" targetFramework="net45" />
 </packages>
\ No newline at end of file