diff --git a/.azuredevops/modulePipelines/ms.authorization.locks.yml b/.azuredevops/modulePipelines/ms.authorization.locks.yml
index f14f72fbd5..e5be4f3747 100644
--- a/.azuredevops/modulePipelines/ms.authorization.locks.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.locks.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.locks.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/locks/*'
+      - '/modules/Authorization/locks/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/locks'
+    value: '/modules/Authorization/locks'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index c7c51f5618..416b34e929 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/policyAssignments/*'
+      - '/modules/Authorization/policyAssignments/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/policyAssignments'
+    value: '/modules/Authorization/policyAssignments'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index 82d673f1e0..dbc88b841e 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/policyDefinitions/*'
+      - '/modules/Authorization/policyDefinitions/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/policyDefinitions'
+    value: '/modules/Authorization/policyDefinitions'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index ae9b8f06ee..530075948f 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/policyExemptions/*'
+      - '/modules/Authorization/policyExemptions/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/policyExemptions'
+    value: '/modules/Authorization/policyExemptions'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index ea7756c0a2..c30697998e 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/policySetDefinitions/*'
+      - '/modules/Authorization/policySetDefinitions/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/policySetDefinitions'
+    value: '/modules/Authorization/policySetDefinitions'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index ee575a2fbb..7c30e298ac 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/roleAssignments/*'
+      - '/modules/Authorization/roleAssignments/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/roleAssignments'
+    value: '/modules/Authorization/roleAssignments'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index a54e8bb560..c1c0dc7544 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Authorization/roleDefinitions/*'
+      - '/modules/Authorization/roleDefinitions/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Authorization/roleDefinitions'
+    value: '/modules/Authorization/roleDefinitions'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index c5eea30bd3..a20016eed9 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.DesktopVirtualization/applicationgroups/*'
+      - '/modules/DesktopVirtualization/applicationGroups/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.DesktopVirtualization/applicationgroups'
+    value: '/modules/DesktopVirtualization/applicationGroups'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index 758ca4aec3..14ee912cc4 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.DesktopVirtualization/hostpools/*'
+      - '/modules/DesktopVirtualization/hostPools/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.DesktopVirtualization/hostpools'
+    value: '/modules/DesktopVirtualization/hostPools'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
index 2987ee6399..ec60b85081 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.DesktopVirtualization/scalingplans/*'
+      - '/modules/DesktopVirtualization/scalingPlans/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.DesktopVirtualization/scalingplans'
+    value: '/modules/DesktopVirtualization/scalingPlans'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index 2eaed9716c..1c304d8cc4 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -29,7 +29,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.DesktopVirtualization/workspaces/*'
+      - '/modules/DesktopVirtualization/workspaces/*'
       - '/utilities/pipelines/*'
     exclude:
       - '/utilities/pipelines/deploymentRemoval/*'
@@ -39,7 +39,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.DesktopVirtualization/workspaces'
+    value: '/modules/DesktopVirtualization/workspaces'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index f31fe084a9..6559df9433 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -27,8 +27,8 @@ trigger:
       - main
   paths:
     include:
-      - '/modules/Microsoft.Storage/storageAccounts/*'
-      - '/modules/Microsoft.Network/privateEndpoints/*'
+      - '/modules/Storage/storageAccounts/*'
+      - '/modules/Network/privateEndpoints/*'
       - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
       - '/utilities/pipelines/*'
@@ -40,7 +40,7 @@ variables:
   - template: '../../settings.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/modules/Microsoft.Storage/storageAccounts'
+    value: '/modules/Storage/storageAccounts'
 
 stages:
   - template: /.azuredevops/pipelineTemplates/stages.module.yml
diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
index df7fb6362a..8088092413 100644
--- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
+++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
@@ -29,7 +29,7 @@
 ##   | vmImage                         | '$(vmImage)'                         | You can provide either a [poolname] or [vmImage] to run the job on.                                       | 'ubuntu20.04'                                         |
 ##   | defaultJobTimeoutInMinutes      | 120                                  | The timeout for the job in this pipeline.                                                                 | 120                                                   |
 ##   | removeDeployment                | 'true'                               | Set to [true] to flag resources for removal. If not provided, defaults to true.                           | 'true'                                                |
-##   | templateFilePath                | ''                                   | Path to the template file to deploy.                                                                      | 'arm/Microsoft.AnalysisServices/servers/main.bicep' |
+##   | templateFilePath                | ''                                   | Path to the template file to deploy.                                                                      | 'modules/AnalysisServices/servers/main.bicep'         |
 ##   | customTokens                    | ''                                   | Additional token pairs in json format.                                                                    | '{"tokenName":"tokenValue"}'                          |
 ##   | jobDisplayName                  | ''                                   | The display name of the job.                                                                              | 'Deploy module'                                       |
 ##   | modulePath                      | '$(modulePath)'                      | The path to the module to deploy.                                                                         | 'c:/KeyVault'                                         |
diff --git a/.azuredevops/platformPipelines/platform.updateReadMe.yml b/.azuredevops/platformPipelines/platform.updateReadMe.yml
index e0520cb787..739a6de199 100644
--- a/.azuredevops/platformPipelines/platform.updateReadMe.yml
+++ b/.azuredevops/platformPipelines/platform.updateReadMe.yml
@@ -38,7 +38,7 @@ jobs:
       - checkout: self
         persistCredentials: true
 
-      # Update the root ReadMe Module Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
+      # Update the root ReadMe Module Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
       - task: PowerShell@2
         displayName: 'Update Module Pipelines table'
         inputs:
@@ -64,7 +64,7 @@ jobs:
 
             Set-ReadMeModuleTable @functionInput -Verbose
 
-      # Update the `modules` folder ReadMe ([`/modules/readme.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md))
+      # Update the `modules` folder ReadMe ([`/modules/README.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md))
       - task: PowerShell@2
         displayName: 'Update module folder ReadMe'
         inputs:
@@ -109,7 +109,7 @@ jobs:
 
             Set-ModuleOverviewTable @functionInput -Verbose
 
-      # Update the root ReadMe Platform Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
+      # Update the root ReadMe Platform Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
       - task: PowerShell@2
         displayName: 'Update Platform Pipelines table'
         inputs:
diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 3a3ad7d692..5aabf54567 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -15,7 +15,7 @@
 ##   |===========================================================================================================================================================================================================|
 ##   | Parameter                | Required | Default | Description                                                                                      | Example                                                |
 ##   |--------------------------|----------|---------|--------------------------------------------------------------------------------------------------|--------------------------------------------------------|
-##   | templateFilePath         | true     | ''      | The path to the template file to publish                                                         | 'modules/Microsoft.ApiManagement/service/main.bicep'   |
+##   | templateFilePath         | true     | ''      | The path to the template file to publish                                                         | 'modules/ApiManagement/service/main.bicep'             |
 ##   | templateSpecsRgName      | false    | ''      | Required to publish to template spec. ResourceGroup of the template spec to publish to           | 'artifacts-rg'                                         |
 ##   | templateSpecsRgLocation  | false    | ''      | Required to publish to template spec. Location of the template spec resource group               | 'WestEurope'                                           |
 ##   | templateSpecsDescription | false    | ''      | Required to publish to template spec. Description of the template spec to publish to             | 'This is an API-Management service template'           |
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 0a7760a528..5b7c690efa 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -14,7 +14,7 @@
 ##   |=====================================================================================================================================================================================|
 ##   | Parameter                 | Required | Default | Description                                           | Example                                                                    |
 ##   |---------------------------|----------|---------|-------------------------------------------------------|----------------------------------------------------------------------------|
-##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment   | 'modules/Microsoft.ApiManagement/service/main.bicep'                       |
+##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment   | 'modules/ApiManagement/service/main.bicep'                                 |
 ##   | location                  | true     | ''      | The location to use for deployment                    | 'WestEurope'                                                               |
 ##   | subscriptionId            | false    | ''      | The subscriptionId to deploy to                       | '1a97b80a-4dda-4f50-ab53-349e29344654'                                     |
 ##   | managementGroupId         | false    | ''      | The managementGroupId to deploy to                    | '1a97b80a-4dda-4f50-ab53-349e29344654'                                     |
diff --git a/.github/actions/templates/validateModulePSRule/action.yml b/.github/actions/templates/validateModulePSRule/action.yml
index badc4b37f6..0a27bd7bac 100644
--- a/.github/actions/templates/validateModulePSRule/action.yml
+++ b/.github/actions/templates/validateModulePSRule/action.yml
@@ -13,7 +13,7 @@
 ##   |=================================================================================================================================================================|
 ##   | Parameter                | Required | Default | Description                          | Example                                                                  |
 ##   |--------------------------|----------|---------|--------------------------------------|--------------------------------------------------------------------------|
-##   | templateFilePath         | true     | ''      | The path to the module PSRule tests. | 'modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep'   |
+##   | templateFilePath         | true     | ''      | The path to the module PSRule tests. | 'modules/ApiManagement/service/.test/common/main.test.bicep'             |
 ##   | subscriptionId           | false    | ''      | The subscriptionId to deploy to      | '1a97b80a-4dda-4f50-ab53-349e29344654'                                   |
 ##   | managementGroupId        | false    | ''      | The managementGroupId to deploy to   | '1a97b80a-4dda-4f50-ab53-349e29344654'                                   |
 ##   |=================================================================================================================================================================|
diff --git a/.github/actions/templates/validateModulePester/action.yml b/.github/actions/templates/validateModulePester/action.yml
index 765f7cf989..968766c470 100644
--- a/.github/actions/templates/validateModulePester/action.yml
+++ b/.github/actions/templates/validateModulePester/action.yml
@@ -13,7 +13,7 @@
 ##   |==================================================================================================================================================|
 ##   | Parameter                | Required | Default | Description                          | Example                                                   |
 ##   |--------------------------|----------|---------|--------------------------------------|-----------------------------------------------------------|
-##   | modulePath               | true     | ''      | The path to the module's folder      | 'modules/Microsoft.ApiManagement/service'                 |
+##   | modulePath               | true     | ''      | The path to the module's folder      | 'modules/ApiManagement/service'                           |
 ##   | moduleTestFilePath       | true     | ''      | The path to the module Pester tests. | 'utilities/pipelines/staticValidation/module.tests.ps1'   |
 ##   |==================================================================================================================================================|
 ##
diff --git a/.github/workflows/ms.authorization.locks.yml b/.github/workflows/ms.authorization.locks.yml
index 37ef5fcf3b..b4cdf2cf33 100644
--- a/.github/workflows/ms.authorization.locks.yml
+++ b/.github/workflows/ms.authorization.locks.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.locks.yml'
-      - 'modules/Microsoft.Authorization/locks/**'
+      - 'modules/Authorization/locks/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/locks'
+  modulePath: 'modules/Authorization/locks'
   workflowPath: '.github/workflows/ms.authorization.locks.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index 3124a44cc4..43b3865aba 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.policyassignments.yml'
-      - 'modules/Microsoft.Authorization/policyAssignments/**'
+      - 'modules/Authorization/policyAssignments/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/policyAssignments'
+  modulePath: 'modules/Authorization/policyAssignments'
   workflowPath: '.github/workflows/ms.authorization.policyassignments.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index b52702ef08..0b2ceafcd3 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.policydefinitions.yml'
-      - 'modules/Microsoft.Authorization/policyDefinitions/**'
+      - 'modules/Authorization/policyDefinitions/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/policyDefinitions'
+  modulePath: 'modules/Authorization/policyDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policydefinitions.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index c8044223b8..6b021932c4 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.policyexemptions.yml'
-      - 'modules/Microsoft.Authorization/policyExemptions/**'
+      - 'modules/Authorization/policyExemptions/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/policyExemptions'
+  modulePath: 'modules/Authorization/policyExemptions'
   workflowPath: '.github/workflows/ms.authorization.policyexemptions.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index d5715ec145..bf88d56952 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.policysetdefinitions.yml'
-      - 'modules/Microsoft.Authorization/policySetDefinitions/**'
+      - 'modules/Authorization/policySetDefinitions/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/policySetDefinitions'
+  modulePath: 'modules/Authorization/policySetDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policysetdefinitions.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index e7f884bab5..848c5725f3 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.roleassignments.yml'
-      - 'modules/Microsoft.Authorization/roleAssignments/**'
+      - 'modules/Authorization/roleAssignments/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/roleAssignments'
+  modulePath: 'modules/Authorization/roleAssignments'
   workflowPath: '.github/workflows/ms.authorization.roleassignments.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index caf65f4bcb..213186747d 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.authorization.roledefinitions.yml'
-      - 'modules/Microsoft.Authorization/roleDefinitions/**'
+      - 'modules/Authorization/roleDefinitions/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Authorization/roleDefinitions'
+  modulePath: 'modules/Authorization/roleDefinitions'
   workflowPath: '.github/workflows/ms.authorization.roledefinitions.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index bad0a2859a..4005dd5ad6 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
-      - 'modules/Microsoft.DesktopVirtualization/applicationgroups/**'
+      - 'modules/DesktopVirtualization/applicationGroups/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.DesktopVirtualization/applicationgroups'
+  modulePath: 'modules/DesktopVirtualization/applicationGroups'
   workflowPath: '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index c205f64f16..ad7a8d91b8 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.desktopvirtualization.hostpools.yml'
-      - 'modules/Microsoft.DesktopVirtualization/hostpools/**'
+      - 'modules/DesktopVirtualization/hostPools/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.DesktopVirtualization/hostpools'
+  modulePath: 'modules/DesktopVirtualization/hostPools'
   workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
index 67a75c9cd8..48ec4a7e9a 100644
--- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml
+++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
-      - 'modules/Microsoft.DesktopVirtualization/scalingplans/**'
+      - 'modules/DesktopVirtualization/scalingPlans/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.DesktopVirtualization/scalingplans'
+  modulePath: 'modules/DesktopVirtualization/scalingPlans'
   workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index 67759f1bf3..1c6de58056 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -30,13 +30,13 @@ on:
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
       - '.github/workflows/ms.desktopvirtualization.workspaces.yml'
-      - 'modules/Microsoft.DesktopVirtualization/workspaces/**'
+      - 'modules/DesktopVirtualization/workspaces/**'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/deploymentRemoval/**'
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.DesktopVirtualization/workspaces'
+  modulePath: 'modules/DesktopVirtualization/workspaces'
   workflowPath: '.github/workflows/ms.desktopvirtualization.workspaces.yml'
 
 concurrency:
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 7fad4fa9d6..202bed2edc 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -27,7 +27,7 @@ on:
     branches:
       - main
     paths:
-      - 'modules/Microsoft.Storage/storageAccounts/**'
+      - 'modules/Storage/storageAccounts/**'
       - 'modules/Microsoft.Network/privateEndpoints/**'
       - '.github/actions/templates/**'
       - '.github/workflows/template.module.yml'
@@ -37,7 +37,7 @@ on:
       - '!*/**/readme.md'
 
 env:
-  modulePath: 'modules/Microsoft.Storage/storageAccounts'
+  modulePath: 'modules/Storage/storageAccounts'
   workflowPath: '.github/workflows/ms.storage.storageaccounts.yml'
 
 concurrency:
diff --git a/.github/workflows/platform.updateReadMe.yml b/.github/workflows/platform.updateReadMe.yml
index 001b05c016..ff4c223c64 100644
--- a/.github/workflows/platform.updateReadMe.yml
+++ b/.github/workflows/platform.updateReadMe.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
           token: '${{ secrets.PLATFORM_REPO_UPDATE_PAT }}' # Sets general GIT credentials up
 
-      # Update the root ReadMe Module Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
+      # Update the root ReadMe Module Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
       - name: 'Update Module Pipelines table'
         shell: pwsh
         run: |
@@ -54,7 +54,7 @@ jobs:
 
           Set-ReadMeModuleTable @functionInput -Verbose
 
-      # Update the `modules` folder ReadMe ([`/modules/readme.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md))
+      # Update the `modules` folder ReadMe ([`/modules/README.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md))
       - name: 'Update module folder ReadMe'
         shell: pwsh
         run: |
@@ -92,7 +92,7 @@ jobs:
 
           Set-ModuleOverviewTable @functionInput -Verbose
 
-      # Update the root ReadMe Platform Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
+      # Update the root ReadMe Platform Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md))
       - name: 'Update Platform Pipelines table'
         shell: pwsh
         run: |
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md b/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md
index 2a215bd078..0c99e52de9 100644
--- a/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md
+++ b/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md
@@ -293,7 +293,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmultiple:1.0.0 = {
+module virtualMachinesMultiple 'ts/modules:compute.virtualmachinesmultiple:1.0.0 = {
   name: '${uniqueString(deployment().name)}-VirtualMachinesMultiple'
   params: {
     // Required parameters
@@ -430,7 +430,7 @@ module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmult
 <summary>via Bicep module</summary>
 
 ```bicep
-module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmultiple:1.0.0 = {
+module virtualMachinesMultiple 'ts/modules:compute.virtualmachinesmultiple:1.0.0 = {
   name: '${uniqueString(deployment().name)}-VirtualMachinesMultiple'
   params: {
     // Required parameters
diff --git a/docs/wiki/Contribution guide - Contribution flow.md b/docs/wiki/Contribution guide - Contribution flow.md
index 12179a84e9..411799867e 100644
--- a/docs/wiki/Contribution guide - Contribution flow.md	
+++ b/docs/wiki/Contribution guide - Contribution flow.md	
@@ -53,7 +53,7 @@ How you proceed from here, depends on your scenario:
 - In case your contribution involves changes to the library (the modules) and/or to the CI environment (the pipelines), we kindly ask you to first review the [Module design](./The%20library%20-%20Module%20design) and/or the [Pipeline design](./The%20CI%20environment%20-%20Pipeline%20design) sections respectively, to make sure your contribution complies with the repository's design and principles.
 
 - If your contribution involves the creation of a new module or an update to an existing module:
-  - Make sure you also reflect your changes in the module's `readme.md` file. Refer to the [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) section for details on how to leverage the Readme generator utility to support you with this task.
+  - Make sure you also reflect your changes in the module's `README.md` file. Refer to the [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) section for details on how to leverage the Readme generator utility to support you with this task.
   - If you are adding or updating role assignments to resources deployable by the module, refer to the [Get formatted RBAC roles](./Contribution%20guide%20-%20Get%20formatted%20RBAC%20roles) section for details on how to leverage the RBAC roles formatting utility to support you with this task.
   - If applicable, make sure you set or update the major and minor versions in the corresponding module `version.json` file.
 
diff --git a/docs/wiki/Getting started - Scenario 1 Consume library.md b/docs/wiki/Getting started - Scenario 1 Consume library.md
index a217199062..bd31ed6d68 100644
--- a/docs/wiki/Getting started - Scenario 1 Consume library.md	
+++ b/docs/wiki/Getting started - Scenario 1 Consume library.md	
@@ -87,7 +87,7 @@ To publish a module by running the script:
     To publish the Keyvault module with version 0.4.740 on a Template Spec that will be created in the resource group 'artifact-rg' you can execute the following example:
 
          ```PowerShell
-        Publish-ModuleToTemplateSpecsRG -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -TemplateSpecsRgName 'artifact-rg'  -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'CARML KV Template Spec'
+        Publish-ModuleToTemplateSpecsRG -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -TemplateSpecsRgName 'artifact-rg'  -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'CARML KV Template Spec'
         ```
     If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToTemplateSpecsRG'` function for each of the modules:
 
@@ -127,7 +127,7 @@ To publish a module by running the script:
     To publish the Keyvault module with version 0.4.740 on a Bicep Registry called 'adpsxxazacrx001' that will be created in the resource group 'artifact-rg' you can execute the following command:
 
          ```PowerShell
-        Publish-ModuleToPrivateBicepRegistry -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -BicepRegistryName 'adpsxxazacrx001'  -BicepRegistryRgName 'artifact-rg'
+        Publish-ModuleToPrivateBicepRegistry -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -BicepRegistryName 'adpsxxazacrx001'  -BicepRegistryRgName 'artifact-rg'
         ```
     If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToPrivateBicepRegistry'` function for each of the modules:
 
@@ -167,7 +167,7 @@ To publish a module by running the script:
     To publish the Keyvault module with version 0.4.740 on an artifact feed called 'Artifacts', in the project 'IaC' on organization 'fabrikam' you can execute the following command:
 
          ```PowerShell
-        Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -VstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsFeedProject 'IaC' -VstsFeedName 'Artifacts'
+        Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -VstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsFeedProject 'IaC' -VstsFeedName 'Artifacts'
         ```
     If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToUniversalArtifactsFeed'` function for each of the modules:
 
diff --git a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md
index 515c180bd6..1baefcb4c2 100644
--- a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md	
+++ b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md	
@@ -394,9 +394,9 @@ Finally, the elements described above must further be configured in the followin
 
 | File | Parameter | Notes |
 | - | - | - |
-| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `appSettingsKeyValuePairs.EASYAUTH_SECRET` | Key Vault secret URI without version (e.g., 'https://Test-KeyVault.vault.azure.net/secrets/aBcDeFghIjK69Ln') |
-| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App (e.g., '11111111-1111-1111-1111-11111111111') |
-| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app (e.g., 'api://11111111-1111-1111-1111-11111111111') |
+| `modules/Web/sites/.test/common/main.bicep` | `appSettingsKeyValuePairs.EASYAUTH_SECRET` | Key Vault secret URI without version (e.g., 'https://Test-KeyVault.vault.azure.net/secrets/aBcDeFghIjK69Ln') |
+| `modules/Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App (e.g., '11111111-1111-1111-1111-11111111111') |
+| `modules/Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app (e.g., 'api://11111111-1111-1111-1111-11111111111') |
 
 # 5. (Optional) Convert library to ARM
 
diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md
index 77d4808ec9..1d27f8b713 100644
--- a/docs/wiki/Solution creation.md	
+++ b/docs/wiki/Solution creation.md	
@@ -140,8 +140,8 @@ Once you start building a solution using this library, you may wonder how best t
 
 - Use the [VS-Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep) for Bicep to enable DSL-native features such as auto-complete. Metadata implemented in the modules are automatically loaded through the extension.
 - Use the readme
-  - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#deployment-examples)).
-  - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs.
+  - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#deployment-examples)).
+  - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs.
 - Note the outputs that are returned by each module.
   - If an output you need isn't available, you have 2 choices:
     1. Add the missing output to the module
@@ -173,7 +173,7 @@ param location string = deployment().location
 // =========== //
 
 // Resource Group
-module rg 'modules/Microsoft.Resources/resourceGroups/main.bicep' = {
+module rg 'modules/Resources/resourceGroups/main.bicep' = {
   name: 'registry-rg'
   params: {
     name: resourceGroupName
@@ -182,7 +182,7 @@ module rg 'modules/Microsoft.Resources/resourceGroups/main.bicep' = {
 }
 
 // Network Security Group
-module nsg 'modules/Microsoft.Network/networkSecurityGroups/main.bicep' = {
+module nsg 'modules/Network/networkSecurityGroups/main.bicep' = {
   name: 'registry-nsg'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -194,7 +194,7 @@ module nsg 'modules/Microsoft.Network/networkSecurityGroups/main.bicep' = {
 }
 
 // Virtual Network
-module vnet 'modules/Microsoft.Network/virtualNetworks/main.bicep' = {
+module vnet 'modules/Network/virtualNetworks/main.bicep' = {
   name: 'registry-vnet'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -248,7 +248,7 @@ param location string = deployment().location
 // =========== //
 
 // Resource Group
-module rg 'br/modules:microsoft.resources.resourcegroups:1.0.0' = {
+module rg 'br/modules:resources.resourcegroups:1.0.0' = {
   name: 'registry-rg'
   params: {
     name: resourceGroupName
@@ -257,7 +257,7 @@ module rg 'br/modules:microsoft.resources.resourcegroups:1.0.0' = {
 }
 
 // Network Security Group
-module nsg 'br/modules:microsoft.network.networksecuritygroups:1.0.0' = {
+module nsg 'br/modules:network.networksecuritygroups:1.0.0' = {
   name: 'registry-nsg'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -269,7 +269,7 @@ module nsg 'br/modules:microsoft.network.networksecuritygroups:1.0.0' = {
 }
 
 // Virtual Network
-module vnet 'br/modules:microsoft.network.virtualnetworks:1.0.0' = {
+module vnet 'br/modules:network.virtualnetworks:1.0.0' = {
   name: 'registry-vnet'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -338,7 +338,7 @@ param location string = deployment().location
 // =========== //
 
 // Resource Group
-module rg 'ts/modules:microsoft.resources.resourcegroups:1.0.0' = {
+module rg 'ts/modules:resources.resourcegroups:1.0.0' = {
   name: 'registry-rg'
   params: {
     name: resourceGroupName
@@ -347,7 +347,7 @@ module rg 'ts/modules:microsoft.resources.resourcegroups:1.0.0' = {
 }
 
 // Network Security Group
-module nsg 'ts/modules:microsoft.network.networksecuritygroups:1.0.0' = {
+module nsg 'ts/modules:network.networksecuritygroups:1.0.0' = {
   name: 'registry-nsg'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -359,7 +359,7 @@ module nsg 'ts/modules:microsoft.network.networksecuritygroups:1.0.0' = {
 }
 
 // Virtual Network
-module vnet 'ts/modules:microsoft.network.virtualnetworks:1.0.0' = {
+module vnet 'ts/modules:network.virtualnetworks:1.0.0' = {
   name: 'registry-vnet'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -475,7 +475,7 @@ jobs:
       - name: 'Deploy resource group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './modules/Microsoft.Resources/resourceGroups/main.bicep'
+          templateFilePath: './modules/Resources/resourceGroups/main.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/ResourceGroup/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -486,7 +486,7 @@ jobs:
       - name: 'Deploy network security group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './modules/Microsoft.Network/networkSecurityGroups/main.bicep'
+          templateFilePath: './modules/Network/networkSecurityGroups/main.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/NetworkSecurityGroups/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -497,7 +497,7 @@ jobs:
       - name: 'Deploy virtual network A'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './modules/Microsoft.Network/virtualNetworks/main.bicep'
+          templateFilePath: './modules/Network/virtualNetworks/main.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/VirtualNetwork/vnet-A.parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -562,7 +562,7 @@ stages:
         parameters:
           jobName: resourceGroups
           displayName: 'Resource Group'
-          modulePath: '/modules/Microsoft.Resources/resourceGroups/main.bicep'
+          modulePath: '/modules/Resources/resourceGroups/main.bicep'
           moduleTestFilePath: '$(resourceGroupName)/parameters.json'
           checkoutRepositories:
             - modules
@@ -570,7 +570,7 @@ stages:
         parameters:
           jobName: networkSecurityGroups
           displayName: 'Network Security Groups'
-          modulePath: '/modules/Microsoft.Network/networkSecurityGroups/main.bicep'
+          modulePath: '/modules/Network/networkSecurityGroups/main.bicep'
           moduleTestFilePath: '$(resourceGroupName)/networkSecurityGroups/parameters.json'
           checkoutRepositories:
             - modules
@@ -578,7 +578,7 @@ stages:
         parameters:
           jobName: routeTables
           displayName: 'Route Tables'
-          modulePath: '/modules/Microsoft.Network/routeTables/main.bicep'
+          modulePath: '/modules/Network/routeTables/main.bicep'
           moduleTestFilePath: '$(resourceGroupName)/routeTables/parameters.json'
           checkoutRepositories:
             - modules
@@ -586,7 +586,7 @@ stages:
         parameters:
           jobName: virtualNetworks
           displayName: 'Virtual Networks'
-          modulePath: '/modules/Microsoft.Network/virtualNetworks/main.bicep'
+          modulePath: '/modules/Network/virtualNetworks/main.bicep'
           moduleTestFilePath: '$(resourceGroupName)/virtualNetworks/parameters.json'
           checkoutRepositories:
             - modules
diff --git a/docs/wiki/The CI environment - Publishing.md b/docs/wiki/The CI environment - Publishing.md
index 202939d2a9..f0be435a85 100644
--- a/docs/wiki/The CI environment - Publishing.md	
+++ b/docs/wiki/The CI environment - Publishing.md	
@@ -40,10 +40,10 @@ The names of published modules differ slighly depending on the location they are
 **Examples**
 
   - Vaults
-    - Before: `modules\Microsoft.RecoveryServices\vaults`
+    - Before: `modules\RecoveryServices\vaults`
     - After: `ms.recoveryservices.vaults`
   - ReplicationProtectionContainerMappings
-    - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
+    - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
     - After: `ms.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.mappings`
 
 </details>
@@ -61,11 +61,11 @@ The names of published modules differ slighly depending on the location they are
 **Examples**
 
 - Vaults
-   - Before: `modules\Microsoft.RecoveryServices\vaults`
-   - After: `bicep/modules/microsoft.recoveryservices.vaults`
+   - Before: `modules\RecoveryServices\vaults`
+   - After: `bicep/modules/recoveryservices.vaults`
 - ReplicationProtectionContainerMappings
-   - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
-   - After: `bicep/modules/microsoft.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings`
+   - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
+   - After: `bicep/modules/recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings`
 
 </details>
 
@@ -81,10 +81,10 @@ The names of published modules differ slighly depending on the location they are
 **Examples**
 
 - Vaults
-  - Before: `modules\Microsoft.RecoveryServices\vaults`
+  - Before: `modules\RecoveryServices\vaults`
   - After: `microsoft.recoveryservices.vaults`
 - ReplicationProtectionContainerMappings
-  - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
+  - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings`
   - After: `microsoft.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings`
 
 </details>
@@ -100,9 +100,9 @@ The publishing works as follows:
    1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref (aka. git height). This will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
    1. The module is published with a `major.minor.patch` version (`x.y.z`). For Template Specs and Bicep Registry only, a `major` version (`x`), a `major.minor` version (`x.y`) and a `latest` version are also updated, allowing a consumer to:
       - Reference the latest version of a major, i.e., the latest minor and patch of a major version.
-         > Example: Using Template Specs, the reference to a `major` could look like: `ts/modules:microsoft.resources.resourcegroups:1` which means that the template will always consume whatever the potentially overwritten/updated version `1` contains.
+         > Example: Using Template Specs, the reference to a `major` could look like: `ts/modules:resources.resourcegroups:1` which means that the template will always consume whatever the potentially overwritten/updated version `1` contains.
       - Reference the latest version of a minor, i.e., the latest patch of a minor version.
-         > Example: Using the Bicep registry, the reference to a `major.minor` could look like: `br/modules:microsoft.resources.resourcegroups:0.4` which means that the template will always consume whatever the potentially overwritten/updated version `0.4` contains.
+         > Example: Using the Bicep registry, the reference to a `major.minor` could look like: `br/modules:resources.resourcegroups:0.4` which means that the template will always consume whatever the potentially overwritten/updated version `0.4` contains.
    1. For a changed child module, the direct parent hierarchy is also registered for an update, following the same procedure as above.
    1. The list of module files paths and their versions are passed on as a array list.
 1. The [Get-ModulesMissingFrom*.ps1](https://github.com/Azure/ResourceModules/tree/main/utilities/pipelines/resourcePublish) scripts further check if a given module is missing from the corresponding target location (e.g., Azure Container Registry) and adds each missing entry to to aforementioned array - using the version specified in the module's `version.json` file.
diff --git a/docs/wiki/The CI environment - Static validation.md b/docs/wiki/The CI environment - Static validation.md
index a2d818bba7..9059eef869 100644
--- a/docs/wiki/The CI environment - Static validation.md	
+++ b/docs/wiki/The CI environment - Static validation.md	
@@ -115,7 +115,7 @@ $pathToRepository = '<pathToClonedRepo>'
 
 # REQUIRED INPUT FOR TESTING
 $TestModuleLocallyInput = @{
-    templateFilePath              = "$pathToRepository\modules\Microsoft.Authorization\roleDefinitions\main.bicep"
+    templateFilePath              = "$pathToRepository\modules\Authorization\roleDefinitions\main.bicep"
     PesterTest                    = $true
     DeploymentTest                = $false
     ValidationTest                = $false
diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md
index 68a267fe00..75e68a49cd 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -34,7 +34,7 @@ This section details the design principles followed by the CARML Bicep modules.
 
 ---
 
-Modules are written in a flexible way; therefore, you don't need to modify them from project to project, use case to use case, as they aim to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it - i.e., you don't have to know how the template of the particular module works inside, just take a look at the `readme.md` file of the given module to consume it.
+Modules are written in a flexible way; therefore, you don't need to modify them from project to project, use case to use case, as they aim to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it - i.e., you don't have to know how the template of the particular module works inside, just take a look at the `README.md` file of the given module to consume it.
 
 The modules are multi-purpose; therefore, contain a lot of dynamic expressions (functions, variables, etc.), so there's no need to maintain multiple instances for different use cases.
 
@@ -65,7 +65,7 @@ A **CARML module** consists of
 
 - The Bicep template deployment file (`main.bicep`).
 - One or multiple module test files (`main.test.bicep`) that will be used for testing, located in the `.test` folder and its subfolders.
-- A `readme.md` file which describes the module itself.
+- A `README.md` file which describes the module itself.
 - A `version.json` file which contains information on the module's major and minor version.
 
 A module usually represents a single resource or a set of closely related resources. For example, a storage account and the associated lock or virtual machine and network interfaces. Modules are located in the `modules` folder.
@@ -118,7 +118,7 @@ Use the following naming standard for module files and folders:
       ├─ .test
       |  └─ ...
       ├─ main.bicep
-      └─ readme.md
+      └─ README.md
   ```
 
   > **Example**: `nested_roleAssignments.bicep` in the `Microsoft.Web\sites\.bicep` folder contains the `site` resource RBAC implementation.
@@ -131,7 +131,7 @@ Use the following naming standard for module files and folders:
   >    ├─ .test
   >    |  └─ ...
   >    ├─ main.bicep
-  >    └─ readme.md
+  >    └─ README.md
   > ```
 
 ## Patterns
@@ -557,7 +557,7 @@ Its primary components are in order:
 Note the following recommendations:
 
 - Refer to [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) for creating from scratch or updating the module ReadMe Markdown file.
-- It is not recommended to describe how to use child resources in the parent readme file (for example, 'How to define a \[container] entry for the \[storage account]'). Instead, it is recommended to reference the child resource's ReadMe (for example, 'container/readme.md').
+- It is not recommended to describe how to use child resources in the parent readme file (for example, 'How to define a \[container] entry for the \[storage account]'). Instead, it is recommended to reference the child resource's ReadMe (for example, 'container/README.md').
 
 # Module test files
 
@@ -591,7 +591,7 @@ Test file (`main.test.bicep`) guidelines:
 - References to dependencies should be implemented using resource references in combination with outputs. In other words: You should not hardcode any references into the module template's deployment. Instead use references such as `nestedDependencies.outputs.managedIdentityPrincipalId`
 - If any diagnostic resources (e.g., a Log Analytics workspace) are required for a test scenario, you can reference the centralized `modules/.shared/.templates/diagnostic.dependencies.bicep` template. It will also provide you with all outputs you'd need.
 
-> :scroll: [Example of test file](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep)
+> :scroll: [Example of test file](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/.test/common/main.test.bicep)
 
 Dependency file (`dependencies.bicep`) guidelines:
 
@@ -600,7 +600,7 @@ Dependency file (`dependencies.bicep`) guidelines:
 
   - A special case to point out is the implementation of Key Vaults that require purge protection (for example, for Customer Managed Keys). As this implies that we cannot fully clean up a test deployment, it is recommended to generate a new name for this resource upon each pipeline run using the output of the `utcNow()` function at the time.
 
-    > :scroll: [Example of test using purge protected Key Vault dependency](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts/.test/encr)
+    > :scroll: [Example of test using purge protected Key Vault dependency](https://github.com/Azure/ResourceModules/tree/main/modules/Batch/batchAccounts/.test/encr)
 
   - If you need a Deployment Script to set additional non-template resources up (for example certificates/files, etc.), we recommend to store it as a file in the shared `modules/.shared/.scripts` folder and load it using the template function `loadTextContent()` (for example: `scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1')`). This approach makes it easier to test & validate the logic and further allows reusing the same logic accross multiple test cases.
 
diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md
index 5f001ec519..b75ce04014 100644
--- a/docs/wiki/The library - Module usage.md	
+++ b/docs/wiki/The library - Module usage.md	
@@ -35,9 +35,9 @@ $inputObject = @{
   ResourceGroupName     = 'ExampleGroup'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\modules\Microsoft.KeyVault\vault\main.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\KeyVault\vault\main.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.KeyVault/vaults/main.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/KeyVault/vaults/main.bicep'
 }
 New-AzResourceGroupDeployment @inputObject
 ```
@@ -59,9 +59,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Resources\resourceGroups\main.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/main.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep'
 }
 New-AzDeployment @inputObject
 ```
@@ -84,9 +84,9 @@ $inputObject = @{
   Location              = 'EastUS2'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Authorization\policyAssignments\managementGroup\main.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep'
 }
 New-AzManagementGroupDeployment @inputObject
 ```
@@ -108,9 +108,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Subscription\aliases\main.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/main.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep'
 }
 New-AzTenantDeployment @inputObject
 ```
@@ -135,9 +135,9 @@ $inputObject = @(
   '--resource-group', 'ExampleGroup',
   '--parameters',     '@parameters.json',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep",
+  '--template-file',  "$home\ResourceModules\modules\Storage\storageAccounts\main.bicep",
   # Using a remote reference
-  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Storage/storageAccounts/main.bicep'
+  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Storage/storageAccounts/main.bicep'
 )
 az deployment group create @inputObject
 ```
@@ -159,9 +159,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Resources\resourceGroups\main.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/main.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep'
 )
 az deployment sub create @inputObject
 ```
@@ -184,9 +184,9 @@ $inputObject = @(
   '--location',            'EastUS2',
   '--management-group-id', 'myManagementGroup',
   # Using a local reference
-  '--template-file',       "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep"
+  '--template-file',       "$home\ResourceModules\modules\Authorization\policyAssignments\managementGroup\main.bicep"
   # Using a remote reference
-  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep'
+  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep'
 )
 az deployment mg create @inputObject
 ```
@@ -208,9 +208,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Subscription\aliases\main.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/main.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep'
 )
 az deployment tenant create @inputObject
 ```
@@ -225,21 +225,21 @@ You can also reference modules in another template using the below syntax. To de
 
 ```bicep
 // Using local reference
-module testDeployment 'ResourceModules/modules/Microsoft.KeyVaults/vaults/main.bicep' = {
+module testDeployment 'ResourceModules/modules/KeyVaults/vaults/main.bicep' = {
   scope: resourceGroup
   name: '${uniqueString(deployment().name)}-example'
   params: { ... }
 }
 
 // Using Template-Specs reference (with configuration file)
-module testDeployment 'ts/modules:microsoft.keyvaults.vaults:1.0.0' = {
+module testDeployment 'ts/modules:keyvaults.vaults:1.0.0' = {
   scope: resourceGroup
   name: '${uniqueString(deployment().name)}-example'
   params: { ... }
 }
 
 // Using Bicep reference
-module testDeployment 'br:<registry-name>.azurecr.io/bicep/modules/microsoft.keyvaults.vaults:1.0.0' = {
+module testDeployment 'br:<registry-name>.azurecr.io/bicep/modules/keyvaults.vaults:1.0.0' = {
   scope: resourceGroup
   name: '${uniqueString(deployment().name)}-example'
   params: { ... }
diff --git a/modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep b/modules/AAD/DomainServices/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep
rename to modules/AAD/DomainServices/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep b/modules/AAD/DomainServices/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep
rename to modules/AAD/DomainServices/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.AAD/DomainServices/.test/common/main.test.bicep b/modules/AAD/DomainServices/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/.test/common/main.test.bicep
rename to modules/AAD/DomainServices/.test/common/main.test.bicep
diff --git a/modules/Microsoft.AAD/DomainServices/readme.md b/modules/AAD/DomainServices/README.md
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/readme.md
rename to modules/AAD/DomainServices/README.md
diff --git a/modules/Microsoft.AAD/DomainServices/main.bicep b/modules/AAD/DomainServices/main.bicep
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/main.bicep
rename to modules/AAD/DomainServices/main.bicep
diff --git a/modules/Microsoft.AAD/DomainServices/version.json b/modules/AAD/DomainServices/version.json
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/version.json
rename to modules/AAD/DomainServices/version.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep b/modules/AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
rename to modules/AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/.test/common/dependencies.bicep b/modules/AnalysisServices/servers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.test/common/dependencies.bicep
rename to modules/AnalysisServices/servers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep b/modules/AnalysisServices/servers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep
rename to modules/AnalysisServices/servers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/.test/max/dependencies.bicep b/modules/AnalysisServices/servers/.test/max/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.test/max/dependencies.bicep
rename to modules/AnalysisServices/servers/.test/max/dependencies.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/.test/max/main.test.bicep b/modules/AnalysisServices/servers/.test/max/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.test/max/main.test.bicep
rename to modules/AnalysisServices/servers/.test/max/main.test.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/.test/min/main.test.bicep b/modules/AnalysisServices/servers/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.test/min/main.test.bicep
rename to modules/AnalysisServices/servers/.test/min/main.test.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/readme.md b/modules/AnalysisServices/servers/README.md
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/readme.md
rename to modules/AnalysisServices/servers/README.md
diff --git a/modules/Microsoft.AnalysisServices/servers/main.bicep b/modules/AnalysisServices/servers/main.bicep
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/main.bicep
rename to modules/AnalysisServices/servers/main.bicep
diff --git a/modules/Microsoft.AnalysisServices/servers/version.json b/modules/AnalysisServices/servers/version.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/version.json
rename to modules/AnalysisServices/servers/version.json
diff --git a/modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep b/modules/ApiManagement/service/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep
rename to modules/ApiManagement/service/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ApiManagement/service/.test/common/dependencies.bicep b/modules/ApiManagement/service/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.test/common/dependencies.bicep
rename to modules/ApiManagement/service/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep b/modules/ApiManagement/service/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep
rename to modules/ApiManagement/service/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep b/modules/ApiManagement/service/.test/max/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep
rename to modules/ApiManagement/service/.test/max/dependencies.bicep
diff --git a/modules/Microsoft.ApiManagement/service/.test/max/main.test.bicep b/modules/ApiManagement/service/.test/max/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.test/max/main.test.bicep
rename to modules/ApiManagement/service/.test/max/main.test.bicep
diff --git a/modules/Microsoft.ApiManagement/service/.test/min/main.test.bicep b/modules/ApiManagement/service/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.test/min/main.test.bicep
rename to modules/ApiManagement/service/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ApiManagement/service/readme.md b/modules/ApiManagement/service/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/readme.md
rename to modules/ApiManagement/service/README.md
diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/modules/ApiManagement/service/apiVersionSets/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md
rename to modules/ApiManagement/service/apiVersionSets/README.md
diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/main.bicep b/modules/ApiManagement/service/apiVersionSets/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apiVersionSets/main.bicep
rename to modules/ApiManagement/service/apiVersionSets/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/version.json b/modules/ApiManagement/service/apiVersionSets/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apiVersionSets/version.json
rename to modules/ApiManagement/service/apiVersionSets/version.json
diff --git a/modules/Microsoft.ApiManagement/service/apis/readme.md b/modules/ApiManagement/service/apis/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/readme.md
rename to modules/ApiManagement/service/apis/README.md
diff --git a/modules/Microsoft.ApiManagement/service/apis/main.bicep b/modules/ApiManagement/service/apis/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/main.bicep
rename to modules/ApiManagement/service/apis/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/readme.md b/modules/ApiManagement/service/apis/policies/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/policies/readme.md
rename to modules/ApiManagement/service/apis/policies/README.md
diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/main.bicep b/modules/ApiManagement/service/apis/policies/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/policies/main.bicep
rename to modules/ApiManagement/service/apis/policies/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/version.json b/modules/ApiManagement/service/apis/policies/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/policies/version.json
rename to modules/ApiManagement/service/apis/policies/version.json
diff --git a/modules/Microsoft.ApiManagement/service/apis/version.json b/modules/ApiManagement/service/apis/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/apis/version.json
rename to modules/ApiManagement/service/apis/version.json
diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/readme.md b/modules/ApiManagement/service/authorizationServers/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/authorizationServers/readme.md
rename to modules/ApiManagement/service/authorizationServers/README.md
diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/main.bicep b/modules/ApiManagement/service/authorizationServers/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/authorizationServers/main.bicep
rename to modules/ApiManagement/service/authorizationServers/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/version.json b/modules/ApiManagement/service/authorizationServers/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/authorizationServers/version.json
rename to modules/ApiManagement/service/authorizationServers/version.json
diff --git a/modules/Microsoft.ApiManagement/service/backends/readme.md b/modules/ApiManagement/service/backends/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/backends/readme.md
rename to modules/ApiManagement/service/backends/README.md
diff --git a/modules/Microsoft.ApiManagement/service/backends/main.bicep b/modules/ApiManagement/service/backends/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/backends/main.bicep
rename to modules/ApiManagement/service/backends/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/backends/version.json b/modules/ApiManagement/service/backends/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/backends/version.json
rename to modules/ApiManagement/service/backends/version.json
diff --git a/modules/Microsoft.ApiManagement/service/caches/readme.md b/modules/ApiManagement/service/caches/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/caches/readme.md
rename to modules/ApiManagement/service/caches/README.md
diff --git a/modules/Microsoft.ApiManagement/service/caches/main.bicep b/modules/ApiManagement/service/caches/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/caches/main.bicep
rename to modules/ApiManagement/service/caches/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/caches/version.json b/modules/ApiManagement/service/caches/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/caches/version.json
rename to modules/ApiManagement/service/caches/version.json
diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/readme.md b/modules/ApiManagement/service/identityProviders/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/identityProviders/readme.md
rename to modules/ApiManagement/service/identityProviders/README.md
diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/main.bicep b/modules/ApiManagement/service/identityProviders/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/identityProviders/main.bicep
rename to modules/ApiManagement/service/identityProviders/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/version.json b/modules/ApiManagement/service/identityProviders/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/identityProviders/version.json
rename to modules/ApiManagement/service/identityProviders/version.json
diff --git a/modules/Microsoft.ApiManagement/service/main.bicep b/modules/ApiManagement/service/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/main.bicep
rename to modules/ApiManagement/service/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/namedValues/readme.md b/modules/ApiManagement/service/namedValues/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/namedValues/readme.md
rename to modules/ApiManagement/service/namedValues/README.md
diff --git a/modules/Microsoft.ApiManagement/service/namedValues/main.bicep b/modules/ApiManagement/service/namedValues/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/namedValues/main.bicep
rename to modules/ApiManagement/service/namedValues/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/namedValues/version.json b/modules/ApiManagement/service/namedValues/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/namedValues/version.json
rename to modules/ApiManagement/service/namedValues/version.json
diff --git a/modules/Microsoft.ApiManagement/service/policies/readme.md b/modules/ApiManagement/service/policies/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/policies/readme.md
rename to modules/ApiManagement/service/policies/README.md
diff --git a/modules/Microsoft.ApiManagement/service/policies/main.bicep b/modules/ApiManagement/service/policies/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/policies/main.bicep
rename to modules/ApiManagement/service/policies/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/policies/version.json b/modules/ApiManagement/service/policies/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/policies/version.json
rename to modules/ApiManagement/service/policies/version.json
diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/readme.md b/modules/ApiManagement/service/portalSettings/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/portalSettings/readme.md
rename to modules/ApiManagement/service/portalSettings/README.md
diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/main.bicep b/modules/ApiManagement/service/portalSettings/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/portalSettings/main.bicep
rename to modules/ApiManagement/service/portalSettings/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/version.json b/modules/ApiManagement/service/portalSettings/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/portalSettings/version.json
rename to modules/ApiManagement/service/portalSettings/version.json
diff --git a/modules/Microsoft.ApiManagement/service/products/readme.md b/modules/ApiManagement/service/products/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/readme.md
rename to modules/ApiManagement/service/products/README.md
diff --git a/modules/Microsoft.ApiManagement/service/products/apis/readme.md b/modules/ApiManagement/service/products/apis/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/apis/readme.md
rename to modules/ApiManagement/service/products/apis/README.md
diff --git a/modules/Microsoft.ApiManagement/service/products/apis/main.bicep b/modules/ApiManagement/service/products/apis/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/apis/main.bicep
rename to modules/ApiManagement/service/products/apis/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/products/apis/version.json b/modules/ApiManagement/service/products/apis/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/apis/version.json
rename to modules/ApiManagement/service/products/apis/version.json
diff --git a/modules/Microsoft.ApiManagement/service/products/groups/readme.md b/modules/ApiManagement/service/products/groups/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/groups/readme.md
rename to modules/ApiManagement/service/products/groups/README.md
diff --git a/modules/Microsoft.ApiManagement/service/products/groups/main.bicep b/modules/ApiManagement/service/products/groups/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/groups/main.bicep
rename to modules/ApiManagement/service/products/groups/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/products/groups/version.json b/modules/ApiManagement/service/products/groups/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/groups/version.json
rename to modules/ApiManagement/service/products/groups/version.json
diff --git a/modules/Microsoft.ApiManagement/service/products/main.bicep b/modules/ApiManagement/service/products/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/main.bicep
rename to modules/ApiManagement/service/products/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/products/version.json b/modules/ApiManagement/service/products/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/products/version.json
rename to modules/ApiManagement/service/products/version.json
diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/readme.md b/modules/ApiManagement/service/subscriptions/README.md
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/subscriptions/readme.md
rename to modules/ApiManagement/service/subscriptions/README.md
diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/main.bicep b/modules/ApiManagement/service/subscriptions/main.bicep
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/subscriptions/main.bicep
rename to modules/ApiManagement/service/subscriptions/main.bicep
diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/version.json b/modules/ApiManagement/service/subscriptions/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/subscriptions/version.json
rename to modules/ApiManagement/service/subscriptions/version.json
diff --git a/modules/Microsoft.ApiManagement/service/version.json b/modules/ApiManagement/service/version.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/version.json
rename to modules/ApiManagement/service/version.json
diff --git a/modules/Microsoft.App/containerApps/.bicep/nested_roleAssignments.bicep b/modules/App/containerApps/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/.bicep/nested_roleAssignments.bicep
rename to modules/App/containerApps/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.App/containerApps/.test/common/dependencies.bicep b/modules/App/containerApps/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/.test/common/dependencies.bicep
rename to modules/App/containerApps/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.App/containerApps/.test/common/main.test.bicep b/modules/App/containerApps/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/.test/common/main.test.bicep
rename to modules/App/containerApps/.test/common/main.test.bicep
diff --git a/modules/Microsoft.App/containerApps/.test/min/dependencies.bicep b/modules/App/containerApps/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/.test/min/dependencies.bicep
rename to modules/App/containerApps/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.App/containerApps/.test/min/main.test.bicep b/modules/App/containerApps/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/.test/min/main.test.bicep
rename to modules/App/containerApps/.test/min/main.test.bicep
diff --git a/modules/Microsoft.App/containerApps/readme.md b/modules/App/containerApps/README.md
similarity index 100%
rename from modules/Microsoft.App/containerApps/readme.md
rename to modules/App/containerApps/README.md
diff --git a/modules/Microsoft.App/containerApps/main.bicep b/modules/App/containerApps/main.bicep
similarity index 100%
rename from modules/Microsoft.App/containerApps/main.bicep
rename to modules/App/containerApps/main.bicep
diff --git a/modules/Microsoft.App/containerApps/version.json b/modules/App/containerApps/version.json
similarity index 100%
rename from modules/Microsoft.App/containerApps/version.json
rename to modules/App/containerApps/version.json
diff --git a/modules/Microsoft.App/managedEnvironments/.bicep/nested_roleAssignments.bicep b/modules/App/managedEnvironments/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/.bicep/nested_roleAssignments.bicep
rename to modules/App/managedEnvironments/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/.test/common/dependencies.bicep b/modules/App/managedEnvironments/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/.test/common/dependencies.bicep
rename to modules/App/managedEnvironments/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/.test/common/main.test.bicep b/modules/App/managedEnvironments/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/.test/common/main.test.bicep
rename to modules/App/managedEnvironments/.test/common/main.test.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/.test/min/dependencies.bicep b/modules/App/managedEnvironments/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/.test/min/dependencies.bicep
rename to modules/App/managedEnvironments/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/.test/min/main.test.bicep b/modules/App/managedEnvironments/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/.test/min/main.test.bicep
rename to modules/App/managedEnvironments/.test/min/main.test.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/readme.md b/modules/App/managedEnvironments/README.md
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/readme.md
rename to modules/App/managedEnvironments/README.md
diff --git a/modules/Microsoft.App/managedEnvironments/main.bicep b/modules/App/managedEnvironments/main.bicep
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/main.bicep
rename to modules/App/managedEnvironments/main.bicep
diff --git a/modules/Microsoft.App/managedEnvironments/version.json b/modules/App/managedEnvironments/version.json
similarity index 100%
rename from modules/Microsoft.App/managedEnvironments/version.json
rename to modules/App/managedEnvironments/version.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep b/modules/AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
rename to modules/AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep b/modules/AppConfiguration/configurationStores/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep
rename to modules/AppConfiguration/configurationStores/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/common/main.test.bicep
rename to modules/AppConfiguration/configurationStores/.test/common/main.test.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/min/main.test.bicep
rename to modules/AppConfiguration/configurationStores/.test/min/main.test.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep b/modules/AppConfiguration/configurationStores/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
rename to modules/AppConfiguration/configurationStores/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/pe/main.test.bicep
rename to modules/AppConfiguration/configurationStores/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/AppConfiguration/configurationStores/README.md
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/readme.md
rename to modules/AppConfiguration/configurationStores/README.md
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep b/modules/AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
rename to modules/AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md b/modules/AppConfiguration/configurationStores/keyValues/README.md
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md
rename to modules/AppConfiguration/configurationStores/keyValues/README.md
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/main.bicep b/modules/AppConfiguration/configurationStores/keyValues/main.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/main.bicep
rename to modules/AppConfiguration/configurationStores/keyValues/main.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json b/modules/AppConfiguration/configurationStores/keyValues/version.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json
rename to modules/AppConfiguration/configurationStores/keyValues/version.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/main.bicep b/modules/AppConfiguration/configurationStores/main.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/main.bicep
rename to modules/AppConfiguration/configurationStores/main.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/version.json b/modules/AppConfiguration/configurationStores/version.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/version.json
rename to modules/AppConfiguration/configurationStores/version.json
diff --git a/modules/Microsoft.Authorization/locks/.test/common/main.test.bicep b/modules/Authorization/locks/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/locks/.test/common/main.test.bicep
rename to modules/Authorization/locks/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/locks/readme.md b/modules/Authorization/locks/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/locks/readme.md
rename to modules/Authorization/locks/README.md
diff --git a/modules/Microsoft.Authorization/locks/main.bicep b/modules/Authorization/locks/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/locks/main.bicep
rename to modules/Authorization/locks/main.bicep
diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/readme.md b/modules/Authorization/locks/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/locks/resourceGroup/readme.md
rename to modules/Authorization/locks/resourceGroup/README.md
diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/main.bicep b/modules/Authorization/locks/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/locks/resourceGroup/main.bicep
rename to modules/Authorization/locks/resourceGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/version.json b/modules/Authorization/locks/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/locks/resourceGroup/version.json
rename to modules/Authorization/locks/resourceGroup/version.json
diff --git a/modules/Microsoft.Authorization/locks/subscription/readme.md b/modules/Authorization/locks/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/locks/subscription/readme.md
rename to modules/Authorization/locks/subscription/README.md
diff --git a/modules/Microsoft.Authorization/locks/subscription/main.bicep b/modules/Authorization/locks/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/locks/subscription/main.bicep
rename to modules/Authorization/locks/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/locks/subscription/version.json b/modules/Authorization/locks/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/locks/subscription/version.json
rename to modules/Authorization/locks/subscription/version.json
diff --git a/modules/Microsoft.Authorization/locks/version.json b/modules/Authorization/locks/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/locks/version.json
rename to modules/Authorization/locks/version.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/mg.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/mg.common/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/mg.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/mg.min/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.common/dependencies.bicep b/modules/Authorization/policyAssignments/.test/rg.common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.common/dependencies.bicep
rename to modules/Authorization/policyAssignments/.test/rg.common/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/rg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.common/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/rg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/rg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.min/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/rg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.common/dependencies.bicep b/modules/Authorization/policyAssignments/.test/sub.common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.common/dependencies.bicep
rename to modules/Authorization/policyAssignments/.test/sub.common/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.common/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.min/main.test.bicep
rename to modules/Authorization/policyAssignments/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/readme.md b/modules/Authorization/policyAssignments/README.md
similarity index 98%
rename from modules/Microsoft.Authorization/policyAssignments/readme.md
rename to modules/Authorization/policyAssignments/README.md
index 7308858110..37ec97dd52 100644
--- a/modules/Microsoft.Authorization/policyAssignments/readme.md
+++ b/modules/Authorization/policyAssignments/README.md
@@ -189,7 +189,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-apamgcom'
   params: {
     // Required parameters
@@ -390,7 +390,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name)}-test-apamgmin'
   params: {
     // Required parameters
@@ -439,7 +439,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name)}-test-apargcom'
   params: {
     // Required parameters
@@ -648,7 +648,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name)}-test-apargmin'
   params: {
     // Required parameters
@@ -701,7 +701,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name)}-test-apasubcom'
   params: {
     // Required parameters
@@ -906,7 +906,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep
 <summary>via Bicep module</summary>
 
 ```bicep
-module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = {
+module policyAssignments './Authorization/policyAssignments/main.bicep' = {
   name: '${uniqueString(deployment().name)}-test-apasubmin'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.Authorization/policyAssignments/main.bicep b/modules/Authorization/policyAssignments/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/main.bicep
rename to modules/Authorization/policyAssignments/main.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md b/modules/Authorization/policyAssignments/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
rename to modules/Authorization/policyAssignments/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep b/modules/Authorization/policyAssignments/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep
rename to modules/Authorization/policyAssignments/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json b/modules/Authorization/policyAssignments/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json
rename to modules/Authorization/policyAssignments/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md b/modules/Authorization/policyAssignments/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
rename to modules/Authorization/policyAssignments/resourceGroup/README.md
diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/main.bicep b/modules/Authorization/policyAssignments/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/main.bicep
rename to modules/Authorization/policyAssignments/resourceGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json b/modules/Authorization/policyAssignments/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
rename to modules/Authorization/policyAssignments/resourceGroup/version.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/readme.md b/modules/Authorization/policyAssignments/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/subscription/readme.md
rename to modules/Authorization/policyAssignments/subscription/README.md
diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/main.bicep b/modules/Authorization/policyAssignments/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/subscription/main.bicep
rename to modules/Authorization/policyAssignments/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/version.json b/modules/Authorization/policyAssignments/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/subscription/version.json
rename to modules/Authorization/policyAssignments/subscription/version.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/version.json b/modules/Authorization/policyAssignments/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/version.json
rename to modules/Authorization/policyAssignments/version.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/policyDefinitions/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.test/mg.common/main.test.bicep
rename to modules/Authorization/policyDefinitions/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/policyDefinitions/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.test/mg.min/main.test.bicep
rename to modules/Authorization/policyDefinitions/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/policyDefinitions/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.test/sub.common/main.test.bicep
rename to modules/Authorization/policyDefinitions/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/policyDefinitions/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.test/sub.min/main.test.bicep
rename to modules/Authorization/policyDefinitions/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/readme.md b/modules/Authorization/policyDefinitions/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/readme.md
rename to modules/Authorization/policyDefinitions/README.md
diff --git a/modules/Microsoft.Authorization/policyDefinitions/main.bicep b/modules/Authorization/policyDefinitions/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/main.bicep
rename to modules/Authorization/policyDefinitions/main.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md b/modules/Authorization/policyDefinitions/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
rename to modules/Authorization/policyDefinitions/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/main.bicep b/modules/Authorization/policyDefinitions/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/main.bicep
rename to modules/Authorization/policyDefinitions/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json b/modules/Authorization/policyDefinitions/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
rename to modules/Authorization/policyDefinitions/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md b/modules/Authorization/policyDefinitions/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md
rename to modules/Authorization/policyDefinitions/subscription/README.md
diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/main.bicep b/modules/Authorization/policyDefinitions/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/subscription/main.bicep
rename to modules/Authorization/policyDefinitions/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/version.json b/modules/Authorization/policyDefinitions/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/subscription/version.json
rename to modules/Authorization/policyDefinitions/subscription/version.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/version.json b/modules/Authorization/policyDefinitions/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/version.json
rename to modules/Authorization/policyDefinitions/version.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/mg.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/mg.common/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/mg.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/mg.min/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/rg.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/rg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/rg.common/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/rg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/rg.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/rg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/rg.min/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/rg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/sub.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/sub.common/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/sub.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.test/sub.min/main.test.bicep
rename to modules/Authorization/policyExemptions/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/readme.md b/modules/Authorization/policyExemptions/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/readme.md
rename to modules/Authorization/policyExemptions/README.md
diff --git a/modules/Microsoft.Authorization/policyExemptions/main.bicep b/modules/Authorization/policyExemptions/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/main.bicep
rename to modules/Authorization/policyExemptions/main.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md b/modules/Authorization/policyExemptions/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
rename to modules/Authorization/policyExemptions/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/main.bicep b/modules/Authorization/policyExemptions/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/main.bicep
rename to modules/Authorization/policyExemptions/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json b/modules/Authorization/policyExemptions/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json
rename to modules/Authorization/policyExemptions/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md b/modules/Authorization/policyExemptions/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
rename to modules/Authorization/policyExemptions/resourceGroup/README.md
diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/main.bicep b/modules/Authorization/policyExemptions/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/main.bicep
rename to modules/Authorization/policyExemptions/resourceGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json b/modules/Authorization/policyExemptions/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
rename to modules/Authorization/policyExemptions/resourceGroup/version.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/readme.md b/modules/Authorization/policyExemptions/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/subscription/readme.md
rename to modules/Authorization/policyExemptions/subscription/README.md
diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/main.bicep b/modules/Authorization/policyExemptions/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/subscription/main.bicep
rename to modules/Authorization/policyExemptions/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/version.json b/modules/Authorization/policyExemptions/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/subscription/version.json
rename to modules/Authorization/policyExemptions/subscription/version.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/version.json b/modules/Authorization/policyExemptions/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/version.json
rename to modules/Authorization/policyExemptions/version.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.test/mg.common/main.test.bicep
rename to modules/Authorization/policySetDefinitions/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min/main.test.bicep
rename to modules/Authorization/policySetDefinitions/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.test/sub.common/main.test.bicep
rename to modules/Authorization/policySetDefinitions/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min/main.test.bicep
rename to modules/Authorization/policySetDefinitions/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/readme.md b/modules/Authorization/policySetDefinitions/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/readme.md
rename to modules/Authorization/policySetDefinitions/README.md
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/main.bicep b/modules/Authorization/policySetDefinitions/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/main.bicep
rename to modules/Authorization/policySetDefinitions/main.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md b/modules/Authorization/policySetDefinitions/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
rename to modules/Authorization/policySetDefinitions/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/main.bicep b/modules/Authorization/policySetDefinitions/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/main.bicep
rename to modules/Authorization/policySetDefinitions/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json b/modules/Authorization/policySetDefinitions/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
rename to modules/Authorization/policySetDefinitions/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md b/modules/Authorization/policySetDefinitions/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
rename to modules/Authorization/policySetDefinitions/subscription/README.md
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/main.bicep b/modules/Authorization/policySetDefinitions/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/main.bicep
rename to modules/Authorization/policySetDefinitions/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json b/modules/Authorization/policySetDefinitions/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json
rename to modules/Authorization/policySetDefinitions/subscription/version.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/version.json b/modules/Authorization/policySetDefinitions/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/version.json
rename to modules/Authorization/policySetDefinitions/version.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/mg.common/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/mg.min/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/rg.common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.common/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/rg.common/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/rg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.common/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/rg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/rg.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.min/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/rg.min/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/rg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.min/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/rg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/sub.common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.common/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/sub.common/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.common/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/sub.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.min/dependencies.bicep
rename to modules/Authorization/roleAssignments/.test/sub.min/dependencies.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.min/main.test.bicep
rename to modules/Authorization/roleAssignments/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/readme.md b/modules/Authorization/roleAssignments/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/readme.md
rename to modules/Authorization/roleAssignments/README.md
diff --git a/modules/Microsoft.Authorization/roleAssignments/main.bicep b/modules/Authorization/roleAssignments/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/main.bicep
rename to modules/Authorization/roleAssignments/main.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md b/modules/Authorization/roleAssignments/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
rename to modules/Authorization/roleAssignments/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/main.bicep b/modules/Authorization/roleAssignments/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/main.bicep
rename to modules/Authorization/roleAssignments/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json b/modules/Authorization/roleAssignments/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json
rename to modules/Authorization/roleAssignments/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md b/modules/Authorization/roleAssignments/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
rename to modules/Authorization/roleAssignments/resourceGroup/README.md
diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/main.bicep b/modules/Authorization/roleAssignments/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/main.bicep
rename to modules/Authorization/roleAssignments/resourceGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json b/modules/Authorization/roleAssignments/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
rename to modules/Authorization/roleAssignments/resourceGroup/version.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/readme.md b/modules/Authorization/roleAssignments/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/subscription/readme.md
rename to modules/Authorization/roleAssignments/subscription/README.md
diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/main.bicep b/modules/Authorization/roleAssignments/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/subscription/main.bicep
rename to modules/Authorization/roleAssignments/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/version.json b/modules/Authorization/roleAssignments/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/subscription/version.json
rename to modules/Authorization/roleAssignments/subscription/version.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/version.json b/modules/Authorization/roleAssignments/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/version.json
rename to modules/Authorization/roleAssignments/version.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/rg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/rg.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/rg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/rg.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/main.test.bicep
rename to modules/Authorization/roleDefinitions/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/readme.md b/modules/Authorization/roleDefinitions/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/readme.md
rename to modules/Authorization/roleDefinitions/README.md
diff --git a/modules/Microsoft.Authorization/roleDefinitions/main.bicep b/modules/Authorization/roleDefinitions/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/main.bicep
rename to modules/Authorization/roleDefinitions/main.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md b/modules/Authorization/roleDefinitions/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
rename to modules/Authorization/roleDefinitions/managementGroup/README.md
diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/main.bicep b/modules/Authorization/roleDefinitions/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/main.bicep
rename to modules/Authorization/roleDefinitions/managementGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json b/modules/Authorization/roleDefinitions/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
rename to modules/Authorization/roleDefinitions/managementGroup/version.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md b/modules/Authorization/roleDefinitions/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
rename to modules/Authorization/roleDefinitions/resourceGroup/README.md
diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/main.bicep b/modules/Authorization/roleDefinitions/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/main.bicep
rename to modules/Authorization/roleDefinitions/resourceGroup/main.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json b/modules/Authorization/roleDefinitions/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
rename to modules/Authorization/roleDefinitions/resourceGroup/version.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md b/modules/Authorization/roleDefinitions/subscription/README.md
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md
rename to modules/Authorization/roleDefinitions/subscription/README.md
diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/main.bicep b/modules/Authorization/roleDefinitions/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/subscription/main.bicep
rename to modules/Authorization/roleDefinitions/subscription/main.bicep
diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/version.json b/modules/Authorization/roleDefinitions/subscription/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/subscription/version.json
rename to modules/Authorization/roleDefinitions/subscription/version.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/version.json b/modules/Authorization/roleDefinitions/version.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/version.json
rename to modules/Authorization/roleDefinitions/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep b/modules/Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep b/modules/Automation/automationAccounts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep
rename to modules/Automation/automationAccounts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/.test/common/main.test.bicep b/modules/Automation/automationAccounts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.test/common/main.test.bicep
rename to modules/Automation/automationAccounts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/.test/encr/dependencies.bicep b/modules/Automation/automationAccounts/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.test/encr/dependencies.bicep
rename to modules/Automation/automationAccounts/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/.test/encr/main.test.bicep b/modules/Automation/automationAccounts/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.test/encr/main.test.bicep
rename to modules/Automation/automationAccounts/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/.test/min/main.test.bicep b/modules/Automation/automationAccounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.test/min/main.test.bicep
rename to modules/Automation/automationAccounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/readme.md b/modules/Automation/automationAccounts/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/readme.md
rename to modules/Automation/automationAccounts/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md b/modules/Automation/automationAccounts/jobSchedules/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
rename to modules/Automation/automationAccounts/jobSchedules/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/main.bicep b/modules/Automation/automationAccounts/jobSchedules/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/main.bicep
rename to modules/Automation/automationAccounts/jobSchedules/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/modules/Automation/automationAccounts/jobSchedules/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json
rename to modules/Automation/automationAccounts/jobSchedules/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/main.bicep b/modules/Automation/automationAccounts/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/main.bicep
rename to modules/Automation/automationAccounts/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/modules/readme.md b/modules/Automation/automationAccounts/modules/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/modules/readme.md
rename to modules/Automation/automationAccounts/modules/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/modules/main.bicep b/modules/Automation/automationAccounts/modules/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/modules/main.bicep
rename to modules/Automation/automationAccounts/modules/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/modules/version.json b/modules/Automation/automationAccounts/modules/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/modules/version.json
rename to modules/Automation/automationAccounts/modules/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/readme.md b/modules/Automation/automationAccounts/runbooks/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/runbooks/readme.md
rename to modules/Automation/automationAccounts/runbooks/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/main.bicep b/modules/Automation/automationAccounts/runbooks/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/runbooks/main.bicep
rename to modules/Automation/automationAccounts/runbooks/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/version.json b/modules/Automation/automationAccounts/runbooks/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/runbooks/version.json
rename to modules/Automation/automationAccounts/runbooks/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/readme.md b/modules/Automation/automationAccounts/schedules/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/schedules/readme.md
rename to modules/Automation/automationAccounts/schedules/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/main.bicep b/modules/Automation/automationAccounts/schedules/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/schedules/main.bicep
rename to modules/Automation/automationAccounts/schedules/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/version.json b/modules/Automation/automationAccounts/schedules/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/schedules/version.json
rename to modules/Automation/automationAccounts/schedules/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md b/modules/Automation/automationAccounts/softwareUpdateConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/main.bicep b/modules/Automation/automationAccounts/softwareUpdateConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/main.bicep
rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/modules/Automation/automationAccounts/softwareUpdateConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/variables/readme.md b/modules/Automation/automationAccounts/variables/README.md
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/variables/readme.md
rename to modules/Automation/automationAccounts/variables/README.md
diff --git a/modules/Microsoft.Automation/automationAccounts/variables/main.bicep b/modules/Automation/automationAccounts/variables/main.bicep
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/variables/main.bicep
rename to modules/Automation/automationAccounts/variables/main.bicep
diff --git a/modules/Microsoft.Automation/automationAccounts/variables/version.json b/modules/Automation/automationAccounts/variables/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/variables/version.json
rename to modules/Automation/automationAccounts/variables/version.json
diff --git a/modules/Microsoft.Automation/automationAccounts/version.json b/modules/Automation/automationAccounts/version.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/version.json
rename to modules/Automation/automationAccounts/version.json
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep b/modules/Batch/batchAccounts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep
rename to modules/Batch/batchAccounts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/common/main.test.bicep b/modules/Batch/batchAccounts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/common/main.test.bicep
rename to modules/Batch/batchAccounts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep b/modules/Batch/batchAccounts/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep
rename to modules/Batch/batchAccounts/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/encr/main.test.bicep b/modules/Batch/batchAccounts/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/encr/main.test.bicep
rename to modules/Batch/batchAccounts/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/min/dependencies.bicep b/modules/Batch/batchAccounts/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/min/dependencies.bicep
rename to modules/Batch/batchAccounts/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/.test/min/main.test.bicep b/modules/Batch/batchAccounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.test/min/main.test.bicep
rename to modules/Batch/batchAccounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/readme.md b/modules/Batch/batchAccounts/README.md
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/readme.md
rename to modules/Batch/batchAccounts/README.md
diff --git a/modules/Microsoft.Batch/batchAccounts/main.bicep b/modules/Batch/batchAccounts/main.bicep
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/main.bicep
rename to modules/Batch/batchAccounts/main.bicep
diff --git a/modules/Microsoft.Batch/batchAccounts/version.json b/modules/Batch/batchAccounts/version.json
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/version.json
rename to modules/Batch/batchAccounts/version.json
diff --git a/modules/Microsoft.CDN/profiles/.bicep/nested_roleAssignments.bicep b/modules/CDN/profiles/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/.bicep/nested_roleAssignments.bicep
rename to modules/CDN/profiles/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.CDN/profiles/.test/common/dependencies.bicep b/modules/CDN/profiles/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/.test/common/dependencies.bicep
rename to modules/CDN/profiles/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.CDN/profiles/.test/common/main.test.bicep b/modules/CDN/profiles/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/.test/common/main.test.bicep
rename to modules/CDN/profiles/.test/common/main.test.bicep
diff --git a/modules/Microsoft.CDN/profiles/readme.md b/modules/CDN/profiles/README.md
similarity index 100%
rename from modules/Microsoft.CDN/profiles/readme.md
rename to modules/CDN/profiles/README.md
diff --git a/modules/Microsoft.CDN/profiles/endpoints/readme.md b/modules/CDN/profiles/endpoints/README.md
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/readme.md
rename to modules/CDN/profiles/endpoints/README.md
diff --git a/modules/Microsoft.CDN/profiles/endpoints/main.bicep b/modules/CDN/profiles/endpoints/main.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/main.bicep
rename to modules/CDN/profiles/endpoints/main.bicep
diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/readme.md b/modules/CDN/profiles/endpoints/origins/README.md
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/origins/readme.md
rename to modules/CDN/profiles/endpoints/origins/README.md
diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/main.bicep b/modules/CDN/profiles/endpoints/origins/main.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/origins/main.bicep
rename to modules/CDN/profiles/endpoints/origins/main.bicep
diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/version.json b/modules/CDN/profiles/endpoints/origins/version.json
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/origins/version.json
rename to modules/CDN/profiles/endpoints/origins/version.json
diff --git a/modules/Microsoft.CDN/profiles/endpoints/version.json b/modules/CDN/profiles/endpoints/version.json
similarity index 100%
rename from modules/Microsoft.CDN/profiles/endpoints/version.json
rename to modules/CDN/profiles/endpoints/version.json
diff --git a/modules/Microsoft.CDN/profiles/main.bicep b/modules/CDN/profiles/main.bicep
similarity index 100%
rename from modules/Microsoft.CDN/profiles/main.bicep
rename to modules/CDN/profiles/main.bicep
diff --git a/modules/Microsoft.CDN/profiles/version.json b/modules/CDN/profiles/version.json
similarity index 100%
rename from modules/Microsoft.CDN/profiles/version.json
rename to modules/CDN/profiles/version.json
diff --git a/modules/Microsoft.Cache/redis/.bicep/nested_roleAssignments.bicep b/modules/Cache/redis/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Cache/redis/.bicep/nested_roleAssignments.bicep
rename to modules/Cache/redis/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep b/modules/Cache/redis/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Cache/redis/.test/common/dependencies.bicep
rename to modules/Cache/redis/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Cache/redis/.test/common/main.test.bicep b/modules/Cache/redis/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Cache/redis/.test/common/main.test.bicep
rename to modules/Cache/redis/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Cache/redis/.test/min/main.test.bicep b/modules/Cache/redis/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Cache/redis/.test/min/main.test.bicep
rename to modules/Cache/redis/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Cache/redis/readme.md b/modules/Cache/redis/README.md
similarity index 100%
rename from modules/Microsoft.Cache/redis/readme.md
rename to modules/Cache/redis/README.md
diff --git a/modules/Microsoft.Cache/redis/main.bicep b/modules/Cache/redis/main.bicep
similarity index 100%
rename from modules/Microsoft.Cache/redis/main.bicep
rename to modules/Cache/redis/main.bicep
diff --git a/modules/Microsoft.Cache/redis/version.json b/modules/Cache/redis/version.json
similarity index 100%
rename from modules/Microsoft.Cache/redis/version.json
rename to modules/Cache/redis/version.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep b/modules/CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
rename to modules/CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep b/modules/CognitiveServices/accounts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep
rename to modules/CognitiveServices/accounts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/common/main.test.bicep b/modules/CognitiveServices/accounts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/common/main.test.bicep
rename to modules/CognitiveServices/accounts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep b/modules/CognitiveServices/accounts/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep
rename to modules/CognitiveServices/accounts/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/encr/main.test.bicep b/modules/CognitiveServices/accounts/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/encr/main.test.bicep
rename to modules/CognitiveServices/accounts/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/min/main.test.bicep b/modules/CognitiveServices/accounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/min/main.test.bicep
rename to modules/CognitiveServices/accounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep b/modules/CognitiveServices/accounts/.test/speech/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep
rename to modules/CognitiveServices/accounts/.test/speech/dependencies.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/speech/main.test.bicep b/modules/CognitiveServices/accounts/.test/speech/main.test.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.test/speech/main.test.bicep
rename to modules/CognitiveServices/accounts/.test/speech/main.test.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/readme.md b/modules/CognitiveServices/accounts/README.md
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/readme.md
rename to modules/CognitiveServices/accounts/README.md
diff --git a/modules/Microsoft.CognitiveServices/accounts/main.bicep b/modules/CognitiveServices/accounts/main.bicep
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/main.bicep
rename to modules/CognitiveServices/accounts/main.bicep
diff --git a/modules/Microsoft.CognitiveServices/accounts/version.json b/modules/CognitiveServices/accounts/version.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/version.json
rename to modules/CognitiveServices/accounts/version.json
diff --git a/modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep b/modules/Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/availabilitySets/.test/common/dependencies.bicep b/modules/Compute/availabilitySets/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.test/common/dependencies.bicep
rename to modules/Compute/availabilitySets/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/availabilitySets/.test/common/main.test.bicep b/modules/Compute/availabilitySets/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.test/common/main.test.bicep
rename to modules/Compute/availabilitySets/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/availabilitySets/.test/min/main.test.bicep b/modules/Compute/availabilitySets/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.test/min/main.test.bicep
rename to modules/Compute/availabilitySets/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Compute/availabilitySets/readme.md b/modules/Compute/availabilitySets/README.md
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/readme.md
rename to modules/Compute/availabilitySets/README.md
diff --git a/modules/Microsoft.Compute/availabilitySets/main.bicep b/modules/Compute/availabilitySets/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/main.bicep
rename to modules/Compute/availabilitySets/main.bicep
diff --git a/modules/Microsoft.Compute/availabilitySets/version.json b/modules/Compute/availabilitySets/version.json
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/version.json
rename to modules/Compute/availabilitySets/version.json
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep
rename to modules/Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep
rename to modules/Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep b/modules/Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep
rename to modules/Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep b/modules/Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep
rename to modules/Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/common/dependencies.bicep b/modules/Compute/diskEncryptionSets/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.test/common/dependencies.bicep
rename to modules/Compute/diskEncryptionSets/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/common/main.test.bicep b/modules/Compute/diskEncryptionSets/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.test/common/main.test.bicep
rename to modules/Compute/diskEncryptionSets/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/readme.md b/modules/Compute/diskEncryptionSets/README.md
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/readme.md
rename to modules/Compute/diskEncryptionSets/README.md
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/main.bicep b/modules/Compute/diskEncryptionSets/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/main.bicep
rename to modules/Compute/diskEncryptionSets/main.bicep
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/version.json b/modules/Compute/diskEncryptionSets/version.json
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/version.json
rename to modules/Compute/diskEncryptionSets/version.json
diff --git a/modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep b/modules/Compute/disks/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/disks/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/common/dependencies.bicep b/modules/Compute/disks/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/common/dependencies.bicep
rename to modules/Compute/disks/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/common/main.test.bicep b/modules/Compute/disks/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/common/main.test.bicep
rename to modules/Compute/disks/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/image/dependencies.bicep b/modules/Compute/disks/.test/image/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/image/dependencies.bicep
rename to modules/Compute/disks/.test/image/dependencies.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/image/main.test.bicep b/modules/Compute/disks/.test/image/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/image/main.test.bicep
rename to modules/Compute/disks/.test/image/main.test.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep b/modules/Compute/disks/.test/import/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/import/dependencies.bicep
rename to modules/Compute/disks/.test/import/dependencies.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/import/dependencies_rbac.bicep b/modules/Compute/disks/.test/import/dependencies_rbac.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/import/dependencies_rbac.bicep
rename to modules/Compute/disks/.test/import/dependencies_rbac.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/import/main.test.bicep b/modules/Compute/disks/.test/import/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/import/main.test.bicep
rename to modules/Compute/disks/.test/import/main.test.bicep
diff --git a/modules/Microsoft.Compute/disks/.test/min/main.test.bicep b/modules/Compute/disks/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/.test/min/main.test.bicep
rename to modules/Compute/disks/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Compute/disks/readme.md b/modules/Compute/disks/README.md
similarity index 100%
rename from modules/Microsoft.Compute/disks/readme.md
rename to modules/Compute/disks/README.md
diff --git a/modules/Microsoft.Compute/disks/main.bicep b/modules/Compute/disks/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/disks/main.bicep
rename to modules/Compute/disks/main.bicep
diff --git a/modules/Microsoft.Compute/disks/version.json b/modules/Compute/disks/version.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/version.json
rename to modules/Compute/disks/version.json
diff --git a/modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/galleries/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep b/modules/Compute/galleries/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep
rename to modules/Compute/galleries/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/galleries/.test/common/main.test.bicep b/modules/Compute/galleries/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.test/common/main.test.bicep
rename to modules/Compute/galleries/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/galleries/.test/min/main.test.bicep b/modules/Compute/galleries/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.test/min/main.test.bicep
rename to modules/Compute/galleries/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Compute/galleries/README.md
similarity index 100%
rename from modules/Microsoft.Compute/galleries/readme.md
rename to modules/Compute/galleries/README.md
diff --git a/modules/Microsoft.Compute/galleries/applications/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/applications/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/applications/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/galleries/applications/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/galleries/applications/readme.md b/modules/Compute/galleries/applications/README.md
similarity index 100%
rename from modules/Microsoft.Compute/galleries/applications/readme.md
rename to modules/Compute/galleries/applications/README.md
diff --git a/modules/Microsoft.Compute/galleries/applications/main.bicep b/modules/Compute/galleries/applications/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/applications/main.bicep
rename to modules/Compute/galleries/applications/main.bicep
diff --git a/modules/Microsoft.Compute/galleries/applications/version.json b/modules/Compute/galleries/applications/version.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/applications/version.json
rename to modules/Compute/galleries/applications/version.json
diff --git a/modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/images/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/galleries/images/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/galleries/images/readme.md b/modules/Compute/galleries/images/README.md
similarity index 100%
rename from modules/Microsoft.Compute/galleries/images/readme.md
rename to modules/Compute/galleries/images/README.md
diff --git a/modules/Microsoft.Compute/galleries/images/main.bicep b/modules/Compute/galleries/images/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/images/main.bicep
rename to modules/Compute/galleries/images/main.bicep
diff --git a/modules/Microsoft.Compute/galleries/images/version.json b/modules/Compute/galleries/images/version.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/images/version.json
rename to modules/Compute/galleries/images/version.json
diff --git a/modules/Microsoft.Compute/galleries/main.bicep b/modules/Compute/galleries/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/galleries/main.bicep
rename to modules/Compute/galleries/main.bicep
diff --git a/modules/Microsoft.Compute/galleries/version.json b/modules/Compute/galleries/version.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/version.json
rename to modules/Compute/galleries/version.json
diff --git a/modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep b/modules/Compute/images/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/images/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/images/.test/common/dependencies.bicep b/modules/Compute/images/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/images/.test/common/dependencies.bicep
rename to modules/Compute/images/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/images/.test/common/dependencies_rbac.bicep b/modules/Compute/images/.test/common/dependencies_rbac.bicep
similarity index 100%
rename from modules/Microsoft.Compute/images/.test/common/dependencies_rbac.bicep
rename to modules/Compute/images/.test/common/dependencies_rbac.bicep
diff --git a/modules/Microsoft.Compute/images/.test/common/main.test.bicep b/modules/Compute/images/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/images/.test/common/main.test.bicep
rename to modules/Compute/images/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/images/readme.md b/modules/Compute/images/README.md
similarity index 100%
rename from modules/Microsoft.Compute/images/readme.md
rename to modules/Compute/images/README.md
diff --git a/modules/Microsoft.Compute/images/main.bicep b/modules/Compute/images/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/images/main.bicep
rename to modules/Compute/images/main.bicep
diff --git a/modules/Microsoft.Compute/images/version.json b/modules/Compute/images/version.json
similarity index 100%
rename from modules/Microsoft.Compute/images/version.json
rename to modules/Compute/images/version.json
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep b/modules/Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/common/dependencies.bicep b/modules/Compute/proximityPlacementGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/common/dependencies.bicep
rename to modules/Compute/proximityPlacementGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/common/main.test.bicep b/modules/Compute/proximityPlacementGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/common/main.test.bicep
rename to modules/Compute/proximityPlacementGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/min/main.test.bicep b/modules/Compute/proximityPlacementGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/min/main.test.bicep
rename to modules/Compute/proximityPlacementGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/readme.md b/modules/Compute/proximityPlacementGroups/README.md
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/readme.md
rename to modules/Compute/proximityPlacementGroups/README.md
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/main.bicep b/modules/Compute/proximityPlacementGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/main.bicep
rename to modules/Compute/proximityPlacementGroups/main.bicep
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/version.json b/modules/Compute/proximityPlacementGroups/version.json
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/version.json
rename to modules/Compute/proximityPlacementGroups/version.json
diff --git a/modules/Microsoft.Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep b/modules/Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/common/dependencies.bicep b/modules/Compute/sshPublicKeys/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/.test/common/dependencies.bicep
rename to modules/Compute/sshPublicKeys/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/common/main.test.bicep b/modules/Compute/sshPublicKeys/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/.test/common/main.test.bicep
rename to modules/Compute/sshPublicKeys/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/min/main.test.bicep b/modules/Compute/sshPublicKeys/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/.test/min/main.test.bicep
rename to modules/Compute/sshPublicKeys/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Compute/sshPublicKeys/readme.md b/modules/Compute/sshPublicKeys/README.md
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/readme.md
rename to modules/Compute/sshPublicKeys/README.md
diff --git a/modules/Microsoft.Compute/sshPublicKeys/main.bicep b/modules/Compute/sshPublicKeys/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/main.bicep
rename to modules/Compute/sshPublicKeys/main.bicep
diff --git a/modules/Microsoft.Compute/sshPublicKeys/version.json b/modules/Compute/sshPublicKeys/version.json
similarity index 100%
rename from modules/Microsoft.Compute/sshPublicKeys/version.json
rename to modules/Compute/sshPublicKeys/version.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep b/modules/Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/main.test.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/linux/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/main.test.bicep
rename to modules/Compute/virtualMachineScaleSets/.test/windows/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md b/modules/Compute/virtualMachineScaleSets/README.md
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/readme.md
rename to modules/Compute/virtualMachineScaleSets/README.md
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md b/modules/Compute/virtualMachineScaleSets/extensions/README.md
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
rename to modules/Compute/virtualMachineScaleSets/extensions/README.md
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/main.bicep b/modules/Compute/virtualMachineScaleSets/extensions/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/main.bicep
rename to modules/Compute/virtualMachineScaleSets/extensions/main.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/modules/Compute/virtualMachineScaleSets/extensions/version.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
rename to modules/Compute/virtualMachineScaleSets/extensions/version.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/main.bicep b/modules/Compute/virtualMachineScaleSets/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/main.bicep
rename to modules/Compute/virtualMachineScaleSets/main.bicep
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/version.json b/modules/Compute/virtualMachineScaleSets/version.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/version.json
rename to modules/Compute/virtualMachineScaleSets/version.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep b/modules/Compute/virtualMachines/.bicep/nested_networkInterface.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
rename to modules/Compute/virtualMachines/.bicep/nested_networkInterface.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep b/modules/Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
rename to modules/Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux.atmg/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/linux.atmg/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/main.test.bicep b/modules/Compute/virtualMachines/.test/linux.atmg/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/main.test.bicep
rename to modules/Compute/virtualMachines/.test/linux.atmg/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/linux.min/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/main.test.bicep b/modules/Compute/virtualMachines/.test/linux.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux.min/main.test.bicep
rename to modules/Compute/virtualMachines/.test/linux.min/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/linux/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/main.test.bicep b/modules/Compute/virtualMachines/.test/linux/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/linux/main.test.bicep
rename to modules/Compute/virtualMachines/.test/linux/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.atmg/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/windows.atmg/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.atmg/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/main.test.bicep
rename to modules/Compute/virtualMachines/.test/windows.atmg/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/windows.min/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.min/main.test.bicep
rename to modules/Compute/virtualMachines/.test/windows.min/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep
rename to modules/Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep
rename to modules/Compute/virtualMachines/.test/windows/dependencies.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/main.test.bicep b/modules/Compute/virtualMachines/.test/windows/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.test/windows/main.test.bicep
rename to modules/Compute/virtualMachines/.test/windows/main.test.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/readme.md b/modules/Compute/virtualMachines/README.md
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/readme.md
rename to modules/Compute/virtualMachines/README.md
diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/readme.md b/modules/Compute/virtualMachines/extensions/README.md
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/extensions/readme.md
rename to modules/Compute/virtualMachines/extensions/README.md
diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/main.bicep b/modules/Compute/virtualMachines/extensions/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/extensions/main.bicep
rename to modules/Compute/virtualMachines/extensions/main.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/version.json b/modules/Compute/virtualMachines/extensions/version.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/extensions/version.json
rename to modules/Compute/virtualMachines/extensions/version.json
diff --git a/modules/Microsoft.Compute/virtualMachines/main.bicep b/modules/Compute/virtualMachines/main.bicep
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/main.bicep
rename to modules/Compute/virtualMachines/main.bicep
diff --git a/modules/Microsoft.Compute/virtualMachines/version.json b/modules/Compute/virtualMachines/version.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/version.json
rename to modules/Compute/virtualMachines/version.json
diff --git a/modules/Microsoft.Consumption/budgets/.test/common/main.test.bicep b/modules/Consumption/budgets/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/.test/common/main.test.bicep
rename to modules/Consumption/budgets/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Consumption/budgets/.test/min/main.test.bicep b/modules/Consumption/budgets/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/.test/min/main.test.bicep
rename to modules/Consumption/budgets/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Consumption/budgets/readme.md b/modules/Consumption/budgets/README.md
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/readme.md
rename to modules/Consumption/budgets/README.md
diff --git a/modules/Microsoft.Consumption/budgets/main.bicep b/modules/Consumption/budgets/main.bicep
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/main.bicep
rename to modules/Consumption/budgets/main.bicep
diff --git a/modules/Microsoft.Consumption/budgets/version.json b/modules/Consumption/budgets/version.json
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/version.json
rename to modules/Consumption/budgets/version.json
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/common/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/common/dependencies.bicep
rename to modules/ContainerInstance/containerGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/common/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/common/main.test.bicep
rename to modules/ContainerInstance/containerGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/encr/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/encr/dependencies.bicep
rename to modules/ContainerInstance/containerGroups/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/encr/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/encr/main.test.bicep
rename to modules/ContainerInstance/containerGroups/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/min/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/min/main.test.bicep
rename to modules/ContainerInstance/containerGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/private/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/private/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/private/dependencies.bicep
rename to modules/ContainerInstance/containerGroups/.test/private/dependencies.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/private/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/private/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.test/private/main.test.bicep
rename to modules/ContainerInstance/containerGroups/.test/private/main.test.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/readme.md b/modules/ContainerInstance/containerGroups/README.md
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/readme.md
rename to modules/ContainerInstance/containerGroups/README.md
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/main.bicep b/modules/ContainerInstance/containerGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/main.bicep
rename to modules/ContainerInstance/containerGroups/main.bicep
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/version.json b/modules/ContainerInstance/containerGroups/version.json
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/version.json
rename to modules/ContainerInstance/containerGroups/version.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep b/modules/ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
rename to modules/ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep b/modules/ContainerRegistry/registries/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep
rename to modules/ContainerRegistry/registries/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/main.test.bicep b/modules/ContainerRegistry/registries/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/common/main.test.bicep
rename to modules/ContainerRegistry/registries/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep b/modules/ContainerRegistry/registries/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep
rename to modules/ContainerRegistry/registries/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/encr/main.test.bicep b/modules/ContainerRegistry/registries/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/encr/main.test.bicep
rename to modules/ContainerRegistry/registries/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/min/main.test.bicep b/modules/ContainerRegistry/registries/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/min/main.test.bicep
rename to modules/ContainerRegistry/registries/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep b/modules/ContainerRegistry/registries/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep
rename to modules/ContainerRegistry/registries/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/main.test.bicep b/modules/ContainerRegistry/registries/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.test/pe/main.test.bicep
rename to modules/ContainerRegistry/registries/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/readme.md b/modules/ContainerRegistry/registries/README.md
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/readme.md
rename to modules/ContainerRegistry/registries/README.md
diff --git a/modules/Microsoft.ContainerRegistry/registries/main.bicep b/modules/ContainerRegistry/registries/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/main.bicep
rename to modules/ContainerRegistry/registries/main.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/readme.md b/modules/ContainerRegistry/registries/replications/README.md
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/replications/readme.md
rename to modules/ContainerRegistry/registries/replications/README.md
diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/main.bicep b/modules/ContainerRegistry/registries/replications/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/replications/main.bicep
rename to modules/ContainerRegistry/registries/replications/main.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/version.json b/modules/ContainerRegistry/registries/replications/version.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/replications/version.json
rename to modules/ContainerRegistry/registries/replications/version.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/version.json b/modules/ContainerRegistry/registries/version.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/version.json
rename to modules/ContainerRegistry/registries/version.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md b/modules/ContainerRegistry/registries/webhooks/README.md
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md
rename to modules/ContainerRegistry/registries/webhooks/README.md
diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/main.bicep b/modules/ContainerRegistry/registries/webhooks/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/webhooks/main.bicep
rename to modules/ContainerRegistry/registries/webhooks/main.bicep
diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/version.json b/modules/ContainerRegistry/registries/webhooks/version.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/webhooks/version.json
rename to modules/ContainerRegistry/registries/webhooks/version.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep b/modules/ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
rename to modules/ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/azure/dependencies.bicep b/modules/ContainerService/managedClusters/.test/azure/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.test/azure/dependencies.bicep
rename to modules/ContainerService/managedClusters/.test/azure/dependencies.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/azure/main.test.bicep b/modules/ContainerService/managedClusters/.test/azure/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.test/azure/main.test.bicep
rename to modules/ContainerService/managedClusters/.test/azure/main.test.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/kubenet/dependencies.bicep b/modules/ContainerService/managedClusters/.test/kubenet/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.test/kubenet/dependencies.bicep
rename to modules/ContainerService/managedClusters/.test/kubenet/dependencies.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/kubenet/main.test.bicep b/modules/ContainerService/managedClusters/.test/kubenet/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.test/kubenet/main.test.bicep
rename to modules/ContainerService/managedClusters/.test/kubenet/main.test.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/min/main.test.bicep b/modules/ContainerService/managedClusters/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.test/min/main.test.bicep
rename to modules/ContainerService/managedClusters/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/readme.md b/modules/ContainerService/managedClusters/README.md
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/readme.md
rename to modules/ContainerService/managedClusters/README.md
diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md b/modules/ContainerService/managedClusters/agentPools/README.md
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md
rename to modules/ContainerService/managedClusters/agentPools/README.md
diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/main.bicep b/modules/ContainerService/managedClusters/agentPools/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/agentPools/main.bicep
rename to modules/ContainerService/managedClusters/agentPools/main.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/version.json b/modules/ContainerService/managedClusters/agentPools/version.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/agentPools/version.json
rename to modules/ContainerService/managedClusters/agentPools/version.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/main.bicep b/modules/ContainerService/managedClusters/main.bicep
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/main.bicep
rename to modules/ContainerService/managedClusters/main.bicep
diff --git a/modules/Microsoft.ContainerService/managedClusters/version.json b/modules/ContainerService/managedClusters/version.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/version.json
rename to modules/ContainerService/managedClusters/version.json
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep b/modules/DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep
rename to modules/DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/min/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/min/main.test.bicep
rename to modules/DBforMySQL/flexibleServers/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/private/dependencies.bicep b/modules/DBforMySQL/flexibleServers/.test/private/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/private/dependencies.bicep
rename to modules/DBforMySQL/flexibleServers/.test/private/dependencies.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/private/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/private/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/private/main.test.bicep
rename to modules/DBforMySQL/flexibleServers/.test/private/main.test.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies1.bicep b/modules/DBforMySQL/flexibleServers/.test/public/dependencies1.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies1.bicep
rename to modules/DBforMySQL/flexibleServers/.test/public/dependencies1.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies2.bicep b/modules/DBforMySQL/flexibleServers/.test/public/dependencies2.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies2.bicep
rename to modules/DBforMySQL/flexibleServers/.test/public/dependencies2.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/public/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/main.test.bicep
rename to modules/DBforMySQL/flexibleServers/.test/public/main.test.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/readme.md b/modules/DBforMySQL/flexibleServers/README.md
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/readme.md
rename to modules/DBforMySQL/flexibleServers/README.md
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/readme.md b/modules/DBforMySQL/flexibleServers/databases/README.md
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/readme.md
rename to modules/DBforMySQL/flexibleServers/databases/README.md
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/main.bicep b/modules/DBforMySQL/flexibleServers/databases/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/main.bicep
rename to modules/DBforMySQL/flexibleServers/databases/main.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/version.json b/modules/DBforMySQL/flexibleServers/databases/version.json
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/version.json
rename to modules/DBforMySQL/flexibleServers/databases/version.json
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/readme.md b/modules/DBforMySQL/flexibleServers/firewallRules/README.md
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/readme.md
rename to modules/DBforMySQL/flexibleServers/firewallRules/README.md
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/main.bicep b/modules/DBforMySQL/flexibleServers/firewallRules/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/main.bicep
rename to modules/DBforMySQL/flexibleServers/firewallRules/main.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/version.json b/modules/DBforMySQL/flexibleServers/firewallRules/version.json
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/version.json
rename to modules/DBforMySQL/flexibleServers/firewallRules/version.json
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/main.bicep b/modules/DBforMySQL/flexibleServers/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/main.bicep
rename to modules/DBforMySQL/flexibleServers/main.bicep
diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/version.json b/modules/DBforMySQL/flexibleServers/version.json
similarity index 100%
rename from modules/Microsoft.DBforMySQL/flexibleServers/version.json
rename to modules/DBforMySQL/flexibleServers/version.json
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep b/modules/DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep
rename to modules/DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/readme.md b/modules/DBforPostgreSQL/flexibleServers/README.md
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/readme.md
rename to modules/DBforPostgreSQL/flexibleServers/README.md
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/readme.md b/modules/DBforPostgreSQL/flexibleServers/configurations/README.md
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/readme.md
rename to modules/DBforPostgreSQL/flexibleServers/configurations/README.md
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/main.bicep b/modules/DBforPostgreSQL/flexibleServers/configurations/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/main.bicep
rename to modules/DBforPostgreSQL/flexibleServers/configurations/main.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/version.json b/modules/DBforPostgreSQL/flexibleServers/configurations/version.json
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/version.json
rename to modules/DBforPostgreSQL/flexibleServers/configurations/version.json
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/readme.md b/modules/DBforPostgreSQL/flexibleServers/databases/README.md
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/readme.md
rename to modules/DBforPostgreSQL/flexibleServers/databases/README.md
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/main.bicep b/modules/DBforPostgreSQL/flexibleServers/databases/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/main.bicep
rename to modules/DBforPostgreSQL/flexibleServers/databases/main.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/version.json b/modules/DBforPostgreSQL/flexibleServers/databases/version.json
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/version.json
rename to modules/DBforPostgreSQL/flexibleServers/databases/version.json
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/readme.md b/modules/DBforPostgreSQL/flexibleServers/firewallRules/README.md
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/readme.md
rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/README.md
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/main.bicep b/modules/DBforPostgreSQL/flexibleServers/firewallRules/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/main.bicep
rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/main.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/version.json b/modules/DBforPostgreSQL/flexibleServers/firewallRules/version.json
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/version.json
rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/version.json
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/main.bicep b/modules/DBforPostgreSQL/flexibleServers/main.bicep
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/main.bicep
rename to modules/DBforPostgreSQL/flexibleServers/main.bicep
diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/version.json b/modules/DBforPostgreSQL/flexibleServers/version.json
similarity index 100%
rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/version.json
rename to modules/DBforPostgreSQL/flexibleServers/version.json
diff --git a/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep b/modules/DataFactory/factories/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep
rename to modules/DataFactory/factories/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep b/modules/DataFactory/factories/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep
rename to modules/DataFactory/factories/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DataFactory/factories/.test/common/main.test.bicep b/modules/DataFactory/factories/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.test/common/main.test.bicep
rename to modules/DataFactory/factories/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DataFactory/factories/.test/min/main.test.bicep b/modules/DataFactory/factories/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.test/min/main.test.bicep
rename to modules/DataFactory/factories/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DataFactory/factories/readme.md b/modules/DataFactory/factories/README.md
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/readme.md
rename to modules/DataFactory/factories/README.md
diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md b/modules/DataFactory/factories/integrationRuntimes/README.md
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md
rename to modules/DataFactory/factories/integrationRuntimes/README.md
diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/main.bicep b/modules/DataFactory/factories/integrationRuntimes/main.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/main.bicep
rename to modules/DataFactory/factories/integrationRuntimes/main.bicep
diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json b/modules/DataFactory/factories/integrationRuntimes/version.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json
rename to modules/DataFactory/factories/integrationRuntimes/version.json
diff --git a/modules/Microsoft.DataFactory/factories/main.bicep b/modules/DataFactory/factories/main.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/main.bicep
rename to modules/DataFactory/factories/main.bicep
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md b/modules/DataFactory/factories/managedVirtualNetworks/README.md
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md
rename to modules/DataFactory/factories/managedVirtualNetworks/README.md
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/main.bicep b/modules/DataFactory/factories/managedVirtualNetworks/main.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/main.bicep
rename to modules/DataFactory/factories/managedVirtualNetworks/main.bicep
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/README.md
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md
rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/README.md
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep
rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json
rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json
diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json b/modules/DataFactory/factories/managedVirtualNetworks/version.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json
rename to modules/DataFactory/factories/managedVirtualNetworks/version.json
diff --git a/modules/Microsoft.DataFactory/factories/version.json b/modules/DataFactory/factories/version.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/version.json
rename to modules/DataFactory/factories/version.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep b/modules/DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
rename to modules/DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/common/dependencies.bicep b/modules/DataProtection/backupVaults/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.test/common/dependencies.bicep
rename to modules/DataProtection/backupVaults/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/common/main.test.bicep b/modules/DataProtection/backupVaults/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.test/common/main.test.bicep
rename to modules/DataProtection/backupVaults/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/min/main.test.bicep b/modules/DataProtection/backupVaults/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.test/min/main.test.bicep
rename to modules/DataProtection/backupVaults/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/readme.md b/modules/DataProtection/backupVaults/README.md
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/readme.md
rename to modules/DataProtection/backupVaults/README.md
diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md b/modules/DataProtection/backupVaults/backupPolicies/README.md
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md
rename to modules/DataProtection/backupVaults/backupPolicies/README.md
diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/main.bicep b/modules/DataProtection/backupVaults/backupPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/main.bicep
rename to modules/DataProtection/backupVaults/backupPolicies/main.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json b/modules/DataProtection/backupVaults/backupPolicies/version.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json
rename to modules/DataProtection/backupVaults/backupPolicies/version.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/main.bicep b/modules/DataProtection/backupVaults/main.bicep
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/main.bicep
rename to modules/DataProtection/backupVaults/main.bicep
diff --git a/modules/Microsoft.DataProtection/backupVaults/version.json b/modules/DataProtection/backupVaults/version.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/version.json
rename to modules/DataProtection/backupVaults/version.json
diff --git a/modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Databricks/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Databricks/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Databricks/workspaces/.test/common/dependencies.bicep b/modules/Databricks/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/.test/common/dependencies.bicep
rename to modules/Databricks/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Databricks/workspaces/.test/common/main.test.bicep b/modules/Databricks/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/.test/common/main.test.bicep
rename to modules/Databricks/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Databricks/workspaces/readme.md b/modules/Databricks/workspaces/README.md
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/readme.md
rename to modules/Databricks/workspaces/README.md
diff --git a/modules/Microsoft.Databricks/workspaces/main.bicep b/modules/Databricks/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/main.bicep
rename to modules/Databricks/workspaces/main.bicep
diff --git a/modules/Microsoft.Databricks/workspaces/version.json b/modules/Databricks/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/version.json
rename to modules/Databricks/workspaces/version.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/applicationGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep
rename to modules/DesktopVirtualization/applicationGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep
rename to modules/DesktopVirtualization/applicationGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/main.test.bicep b/modules/DesktopVirtualization/applicationGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/main.test.bicep
rename to modules/DesktopVirtualization/applicationGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep
rename to modules/DesktopVirtualization/applicationGroups/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/main.test.bicep b/modules/DesktopVirtualization/applicationGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/main.test.bicep
rename to modules/DesktopVirtualization/applicationGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/DesktopVirtualization/applicationGroups/README.md
similarity index 97%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
rename to modules/DesktopVirtualization/applicationGroups/README.md
index 46de067ef2..bb77c5a3fa 100644
--- a/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
+++ b/modules/DesktopVirtualization/applicationGroups/README.md
@@ -34,7 +34,7 @@ This module deploys an Azure virtual desktop application group.
 
 | Parameter Name | Type | Default Value | Allowed Values | Description |
 | :-- | :-- | :-- | :-- | :-- |
-| `applications` | _[applications](applications/readme.md)_ array | `[]` |  | List of applications to be created in the Application Group. |
+| `applications` | _[applications](applications/README.md)_ array | `[]` |  | List of applications to be created in the Application Group. |
 | `description` | string | `''` |  | The description of the Application Group to be created. |
 | `diagnosticEventHubAuthorizationRuleId` | string | `''` |  | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. |
 | `diagnosticEventHubName` | string | `''` |  | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. |
@@ -178,7 +178,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/main.bicep' = {
+module applicationGroups './DesktopVirtualization/applicationGroups/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvagcom'
   params: {
     // Required parameters
@@ -335,7 +335,7 @@ module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/ma
 <summary>via Bicep module</summary>
 
 ```bicep
-module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/main.bicep' = {
+module applicationGroups './DesktopVirtualization/applicationGroups/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvagmin'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/DesktopVirtualization/applicationGroups/applications/README.md
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
rename to modules/DesktopVirtualization/applicationGroups/applications/README.md
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/main.bicep b/modules/DesktopVirtualization/applicationGroups/applications/main.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/main.bicep
rename to modules/DesktopVirtualization/applicationGroups/applications/main.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/DesktopVirtualization/applicationGroups/applications/version.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
rename to modules/DesktopVirtualization/applicationGroups/applications/version.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/main.bicep b/modules/DesktopVirtualization/applicationGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/main.bicep
rename to modules/DesktopVirtualization/applicationGroups/main.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/DesktopVirtualization/applicationGroups/version.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/version.json
rename to modules/DesktopVirtualization/applicationGroups/version.json
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/hostPools/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep
rename to modules/DesktopVirtualization/hostPools/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep b/modules/DesktopVirtualization/hostPools/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep
rename to modules/DesktopVirtualization/hostPools/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/main.test.bicep b/modules/DesktopVirtualization/hostPools/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/main.test.bicep
rename to modules/DesktopVirtualization/hostPools/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/min/main.test.bicep b/modules/DesktopVirtualization/hostPools/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/min/main.test.bicep
rename to modules/DesktopVirtualization/hostPools/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/DesktopVirtualization/hostPools/README.md
similarity index 99%
rename from modules/Microsoft.DesktopVirtualization/hostpools/readme.md
rename to modules/DesktopVirtualization/hostPools/README.md
index b7d42ce5a0..29e6c2ace3 100644
--- a/modules/Microsoft.DesktopVirtualization/hostpools/readme.md
+++ b/modules/DesktopVirtualization/hostPools/README.md
@@ -281,7 +281,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = {
+module hostPools './DesktopVirtualization/hostPools/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvhpcom'
   params: {
     // Required parameters
@@ -480,7 +480,7 @@ module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = {
+module hostPools './DesktopVirtualization/hostPools/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvhpmin'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/main.bicep b/modules/DesktopVirtualization/hostPools/main.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/main.bicep
rename to modules/DesktopVirtualization/hostPools/main.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/DesktopVirtualization/hostPools/version.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/version.json
rename to modules/DesktopVirtualization/hostPools/version.json
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/scalingPlans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep
rename to modules/DesktopVirtualization/scalingPlans/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep b/modules/DesktopVirtualization/scalingPlans/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep
rename to modules/DesktopVirtualization/scalingPlans/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/main.test.bicep b/modules/DesktopVirtualization/scalingPlans/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/main.test.bicep
rename to modules/DesktopVirtualization/scalingPlans/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/main.test.bicep b/modules/DesktopVirtualization/scalingPlans/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/main.test.bicep
rename to modules/DesktopVirtualization/scalingPlans/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/DesktopVirtualization/scalingPlans/README.md
similarity index 98%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
rename to modules/DesktopVirtualization/scalingPlans/README.md
index a87db21e19..706c814d8f 100644
--- a/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
+++ b/modules/DesktopVirtualization/scalingPlans/README.md
@@ -277,7 +277,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep' = {
+module scalingPlans './DesktopVirtualization/scalingPlans/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvspcom'
   params: {
     // Required parameters
@@ -384,7 +384,7 @@ module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep'
 <summary>via Bicep module</summary>
 
 ```bicep
-module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep' = {
+module scalingPlans './DesktopVirtualization/scalingPlans/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvspmin'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/main.bicep b/modules/DesktopVirtualization/scalingPlans/main.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/main.bicep
rename to modules/DesktopVirtualization/scalingPlans/main.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/DesktopVirtualization/scalingPlans/version.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/version.json
rename to modules/DesktopVirtualization/scalingPlans/version.json
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep b/modules/DesktopVirtualization/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep
rename to modules/DesktopVirtualization/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/main.test.bicep b/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/main.test.bicep
rename to modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/main.test.bicep b/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/min/main.test.bicep
rename to modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/DesktopVirtualization/workspaces/README.md
similarity index 98%
rename from modules/Microsoft.DesktopVirtualization/workspaces/readme.md
rename to modules/DesktopVirtualization/workspaces/README.md
index afecc24e07..ec9bcee536 100644
--- a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md
+++ b/modules/DesktopVirtualization/workspaces/README.md
@@ -175,7 +175,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = {
+module workspaces './DesktopVirtualization/workspaces/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvwcom'
   params: {
     // Required parameters
@@ -294,7 +294,7 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = {
+module workspaces './DesktopVirtualization/workspaces/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-dvwmin'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/main.bicep b/modules/DesktopVirtualization/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/main.bicep
rename to modules/DesktopVirtualization/workspaces/main.bicep
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/DesktopVirtualization/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/version.json
rename to modules/DesktopVirtualization/workspaces/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/.bicep/nested_roleAssignments.bicep b/modules/DevTestLab/labs/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/.bicep/nested_roleAssignments.bicep
rename to modules/DevTestLab/labs/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/.test/common/dependencies.bicep b/modules/DevTestLab/labs/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/.test/common/dependencies.bicep
rename to modules/DevTestLab/labs/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/.test/common/main.test.bicep b/modules/DevTestLab/labs/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/.test/common/main.test.bicep
rename to modules/DevTestLab/labs/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/.test/min/main.test.bicep b/modules/DevTestLab/labs/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/.test/min/main.test.bicep
rename to modules/DevTestLab/labs/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/readme.md b/modules/DevTestLab/labs/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/readme.md
rename to modules/DevTestLab/labs/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/readme.md b/modules/DevTestLab/labs/artifactSources/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/artifactSources/readme.md
rename to modules/DevTestLab/labs/artifactSources/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/main.bicep b/modules/DevTestLab/labs/artifactSources/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/artifactSources/main.bicep
rename to modules/DevTestLab/labs/artifactSources/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/version.json b/modules/DevTestLab/labs/artifactSources/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/artifactSources/version.json
rename to modules/DevTestLab/labs/artifactSources/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/costs/readme.md b/modules/DevTestLab/labs/costs/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/costs/readme.md
rename to modules/DevTestLab/labs/costs/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/costs/main.bicep b/modules/DevTestLab/labs/costs/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/costs/main.bicep
rename to modules/DevTestLab/labs/costs/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/costs/version.json b/modules/DevTestLab/labs/costs/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/costs/version.json
rename to modules/DevTestLab/labs/costs/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/main.bicep b/modules/DevTestLab/labs/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/main.bicep
rename to modules/DevTestLab/labs/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/readme.md b/modules/DevTestLab/labs/notificationChannels/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/notificationChannels/readme.md
rename to modules/DevTestLab/labs/notificationChannels/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/main.bicep b/modules/DevTestLab/labs/notificationChannels/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/notificationChannels/main.bicep
rename to modules/DevTestLab/labs/notificationChannels/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/version.json b/modules/DevTestLab/labs/notificationChannels/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/notificationChannels/version.json
rename to modules/DevTestLab/labs/notificationChannels/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/readme.md b/modules/DevTestLab/labs/policySets/policies/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/policySets/policies/readme.md
rename to modules/DevTestLab/labs/policySets/policies/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/main.bicep b/modules/DevTestLab/labs/policySets/policies/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/policySets/policies/main.bicep
rename to modules/DevTestLab/labs/policySets/policies/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/version.json b/modules/DevTestLab/labs/policySets/policies/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/policySets/policies/version.json
rename to modules/DevTestLab/labs/policySets/policies/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/schedules/readme.md b/modules/DevTestLab/labs/schedules/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/schedules/readme.md
rename to modules/DevTestLab/labs/schedules/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/schedules/main.bicep b/modules/DevTestLab/labs/schedules/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/schedules/main.bicep
rename to modules/DevTestLab/labs/schedules/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/schedules/version.json b/modules/DevTestLab/labs/schedules/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/schedules/version.json
rename to modules/DevTestLab/labs/schedules/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/version.json b/modules/DevTestLab/labs/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/version.json
rename to modules/DevTestLab/labs/version.json
diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/readme.md b/modules/DevTestLab/labs/virtualNetworks/README.md
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/readme.md
rename to modules/DevTestLab/labs/virtualNetworks/README.md
diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/main.bicep b/modules/DevTestLab/labs/virtualNetworks/main.bicep
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/main.bicep
rename to modules/DevTestLab/labs/virtualNetworks/main.bicep
diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/version.json b/modules/DevTestLab/labs/virtualNetworks/version.json
similarity index 100%
rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/version.json
rename to modules/DevTestLab/labs/virtualNetworks/version.json
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep b/modules/DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/readme.md b/modules/DigitalTwins/digitalTwinsInstances/README.md
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/readme.md
rename to modules/DigitalTwins/digitalTwinsInstances/README.md
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/README.md
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/readme.md
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/README.md
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/README.md
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/readme.md
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/README.md
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/README.md
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/readme.md
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/README.md
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json
rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/main.bicep
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/main.bicep
rename to modules/DigitalTwins/digitalTwinsInstances/main.bicep
diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/version.json b/modules/DigitalTwins/digitalTwinsInstances/version.json
similarity index 100%
rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/version.json
rename to modules/DigitalTwins/digitalTwinsInstances/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep b/modules/DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep
rename to modules/DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep
rename to modules/DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep
rename to modules/DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep
rename to modules/DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/plain/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/dependencies.bicep
rename to modules/DocumentDB/databaseAccounts/.test/plain/dependencies.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/plain/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/main.test.bicep
rename to modules/DocumentDB/databaseAccounts/.test/plain/main.test.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep
rename to modules/DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep
rename to modules/DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/readme.md b/modules/DocumentDB/databaseAccounts/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/readme.md
rename to modules/DocumentDB/databaseAccounts/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/readme.md b/modules/DocumentDB/databaseAccounts/gremlinDatabases/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/readme.md
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/readme.md b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/readme.md
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/gremlinDatabases/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/main.bicep
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/version.json b/modules/DocumentDB/databaseAccounts/gremlinDatabases/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/version.json
rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/main.bicep b/modules/DocumentDB/databaseAccounts/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/main.bicep
rename to modules/DocumentDB/databaseAccounts/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md b/modules/DocumentDB/databaseAccounts/mongodbDatabases/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/mongodbDatabases/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/main.bicep
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/modules/DocumentDB/databaseAccounts/mongodbDatabases/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md b/modules/DocumentDB/databaseAccounts/sqlDatabases/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/README.md
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/README.md
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/sqlDatabases/main.bicep
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/main.bicep
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/main.bicep
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/modules/DocumentDB/databaseAccounts/sqlDatabases/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
rename to modules/DocumentDB/databaseAccounts/sqlDatabases/version.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/version.json b/modules/DocumentDB/databaseAccounts/version.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/version.json
rename to modules/DocumentDB/databaseAccounts/version.json
diff --git a/modules/Microsoft.EventGrid/domains/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/domains/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.bicep/nested_roleAssignments.bicep
rename to modules/EventGrid/domains/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.EventGrid/domains/.test/common/dependencies.bicep b/modules/EventGrid/domains/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.test/common/dependencies.bicep
rename to modules/EventGrid/domains/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/domains/.test/common/main.test.bicep b/modules/EventGrid/domains/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.test/common/main.test.bicep
rename to modules/EventGrid/domains/.test/common/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/domains/.test/min/main.test.bicep b/modules/EventGrid/domains/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.test/min/main.test.bicep
rename to modules/EventGrid/domains/.test/min/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/domains/.test/pe/dependencies.bicep b/modules/EventGrid/domains/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.test/pe/dependencies.bicep
rename to modules/EventGrid/domains/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/domains/.test/pe/main.test.bicep b/modules/EventGrid/domains/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/.test/pe/main.test.bicep
rename to modules/EventGrid/domains/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/domains/readme.md b/modules/EventGrid/domains/README.md
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/readme.md
rename to modules/EventGrid/domains/README.md
diff --git a/modules/Microsoft.EventGrid/domains/main.bicep b/modules/EventGrid/domains/main.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/main.bicep
rename to modules/EventGrid/domains/main.bicep
diff --git a/modules/Microsoft.EventGrid/domains/topics/readme.md b/modules/EventGrid/domains/topics/README.md
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/topics/readme.md
rename to modules/EventGrid/domains/topics/README.md
diff --git a/modules/Microsoft.EventGrid/domains/topics/main.bicep b/modules/EventGrid/domains/topics/main.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/topics/main.bicep
rename to modules/EventGrid/domains/topics/main.bicep
diff --git a/modules/Microsoft.EventGrid/domains/topics/version.json b/modules/EventGrid/domains/topics/version.json
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/topics/version.json
rename to modules/EventGrid/domains/topics/version.json
diff --git a/modules/Microsoft.EventGrid/domains/version.json b/modules/EventGrid/domains/version.json
similarity index 100%
rename from modules/Microsoft.EventGrid/domains/version.json
rename to modules/EventGrid/domains/version.json
diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/.test/common/dependencies.bicep b/modules/EventGrid/eventSubscriptions/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/eventSubscriptions/.test/common/dependencies.bicep
rename to modules/EventGrid/eventSubscriptions/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/.test/common/main.test.bicep b/modules/EventGrid/eventSubscriptions/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/eventSubscriptions/.test/common/main.test.bicep
rename to modules/EventGrid/eventSubscriptions/.test/common/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/readme.md b/modules/EventGrid/eventSubscriptions/README.md
similarity index 100%
rename from modules/Microsoft.EventGrid/eventSubscriptions/readme.md
rename to modules/EventGrid/eventSubscriptions/README.md
diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/main.bicep b/modules/EventGrid/eventSubscriptions/main.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/eventSubscriptions/main.bicep
rename to modules/EventGrid/eventSubscriptions/main.bicep
diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/version.json b/modules/EventGrid/eventSubscriptions/version.json
similarity index 100%
rename from modules/Microsoft.EventGrid/eventSubscriptions/version.json
rename to modules/EventGrid/eventSubscriptions/version.json
diff --git a/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
rename to modules/EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/common/dependencies.bicep b/modules/EventGrid/systemTopics/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.test/common/dependencies.bicep
rename to modules/EventGrid/systemTopics/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/common/main.test.bicep b/modules/EventGrid/systemTopics/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.test/common/main.test.bicep
rename to modules/EventGrid/systemTopics/.test/common/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/min/dependencies.bicep b/modules/EventGrid/systemTopics/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.test/min/dependencies.bicep
rename to modules/EventGrid/systemTopics/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/min/main.test.bicep b/modules/EventGrid/systemTopics/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.test/min/main.test.bicep
rename to modules/EventGrid/systemTopics/.test/min/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/readme.md b/modules/EventGrid/systemTopics/README.md
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/readme.md
rename to modules/EventGrid/systemTopics/README.md
diff --git a/modules/Microsoft.EventGrid/systemTopics/main.bicep b/modules/EventGrid/systemTopics/main.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/main.bicep
rename to modules/EventGrid/systemTopics/main.bicep
diff --git a/modules/Microsoft.EventGrid/systemTopics/version.json b/modules/EventGrid/systemTopics/version.json
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/version.json
rename to modules/EventGrid/systemTopics/version.json
diff --git a/modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/topics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep
rename to modules/EventGrid/topics/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep b/modules/EventGrid/topics/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep
rename to modules/EventGrid/topics/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/topics/.test/common/main.test.bicep b/modules/EventGrid/topics/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.test/common/main.test.bicep
rename to modules/EventGrid/topics/.test/common/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/topics/.test/min/main.test.bicep b/modules/EventGrid/topics/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.test/min/main.test.bicep
rename to modules/EventGrid/topics/.test/min/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep b/modules/EventGrid/topics/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep
rename to modules/EventGrid/topics/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.EventGrid/topics/.test/pe/main.test.bicep b/modules/EventGrid/topics/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.test/pe/main.test.bicep
rename to modules/EventGrid/topics/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.EventGrid/topics/readme.md b/modules/EventGrid/topics/README.md
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/readme.md
rename to modules/EventGrid/topics/README.md
diff --git a/modules/Microsoft.EventGrid/topics/main.bicep b/modules/EventGrid/topics/main.bicep
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/main.bicep
rename to modules/EventGrid/topics/main.bicep
diff --git a/modules/Microsoft.EventGrid/topics/version.json b/modules/EventGrid/topics/version.json
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/version.json
rename to modules/EventGrid/topics/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep b/modules/EventHub/namespaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep
rename to modules/EventHub/namespaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep b/modules/EventHub/namespaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep
rename to modules/EventHub/namespaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/main.test.bicep b/modules/EventHub/namespaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.test/common/main.test.bicep
rename to modules/EventHub/namespaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/main.test.bicep b/modules/EventHub/namespaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.test/min/main.test.bicep
rename to modules/EventHub/namespaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep b/modules/EventHub/namespaces/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep
rename to modules/EventHub/namespaces/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/main.test.bicep b/modules/EventHub/namespaces/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.test/pe/main.test.bicep
rename to modules/EventHub/namespaces/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/readme.md b/modules/EventHub/namespaces/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/readme.md
rename to modules/EventHub/namespaces/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md b/modules/EventHub/namespaces/authorizationRules/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md
rename to modules/EventHub/namespaces/authorizationRules/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/main.bicep b/modules/EventHub/namespaces/authorizationRules/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/authorizationRules/main.bicep
rename to modules/EventHub/namespaces/authorizationRules/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/version.json b/modules/EventHub/namespaces/authorizationRules/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/authorizationRules/version.json
rename to modules/EventHub/namespaces/authorizationRules/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md b/modules/EventHub/namespaces/disasterRecoveryConfigs/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/EventHub/namespaces/disasterRecoveryConfigs/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/main.bicep b/modules/EventHub/namespaces/disasterRecoveryConfigs/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/main.bicep
rename to modules/EventHub/namespaces/disasterRecoveryConfigs/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/modules/EventHub/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
rename to modules/EventHub/namespaces/disasterRecoveryConfigs/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep b/modules/EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep
rename to modules/EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/readme.md b/modules/EventHub/namespaces/eventHubs/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/readme.md
rename to modules/EventHub/namespaces/eventHubs/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/readme.md b/modules/EventHub/namespaces/eventHubs/authorizationRules/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/readme.md
rename to modules/EventHub/namespaces/eventHubs/authorizationRules/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/main.bicep b/modules/EventHub/namespaces/eventHubs/authorizationRules/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/main.bicep
rename to modules/EventHub/namespaces/eventHubs/authorizationRules/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/version.json b/modules/EventHub/namespaces/eventHubs/authorizationRules/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/version.json
rename to modules/EventHub/namespaces/eventHubs/authorizationRules/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/readme.md b/modules/EventHub/namespaces/eventHubs/consumerGroups/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/readme.md
rename to modules/EventHub/namespaces/eventHubs/consumerGroups/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/main.bicep b/modules/EventHub/namespaces/eventHubs/consumerGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/main.bicep
rename to modules/EventHub/namespaces/eventHubs/consumerGroups/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/version.json b/modules/EventHub/namespaces/eventHubs/consumerGroups/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/version.json
rename to modules/EventHub/namespaces/eventHubs/consumerGroups/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/main.bicep b/modules/EventHub/namespaces/eventHubs/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/main.bicep
rename to modules/EventHub/namespaces/eventHubs/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/version.json b/modules/EventHub/namespaces/eventHubs/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/eventHubs/version.json
rename to modules/EventHub/namespaces/eventHubs/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/main.bicep b/modules/EventHub/namespaces/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/main.bicep
rename to modules/EventHub/namespaces/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md b/modules/EventHub/namespaces/networkRuleSets/README.md
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
rename to modules/EventHub/namespaces/networkRuleSets/README.md
diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/main.bicep b/modules/EventHub/namespaces/networkRuleSets/main.bicep
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/main.bicep
rename to modules/EventHub/namespaces/networkRuleSets/main.bicep
diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json b/modules/EventHub/namespaces/networkRuleSets/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json
rename to modules/EventHub/namespaces/networkRuleSets/version.json
diff --git a/modules/Microsoft.EventHub/namespaces/version.json b/modules/EventHub/namespaces/version.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/version.json
rename to modules/EventHub/namespaces/version.json
diff --git a/modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep b/modules/HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
rename to modules/HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.HealthBot/healthBots/.test/common/dependencies.bicep b/modules/HealthBot/healthBots/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.test/common/dependencies.bicep
rename to modules/HealthBot/healthBots/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.HealthBot/healthBots/.test/common/main.test.bicep b/modules/HealthBot/healthBots/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.test/common/main.test.bicep
rename to modules/HealthBot/healthBots/.test/common/main.test.bicep
diff --git a/modules/Microsoft.HealthBot/healthBots/.test/min/main.test.bicep b/modules/HealthBot/healthBots/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.test/min/main.test.bicep
rename to modules/HealthBot/healthBots/.test/min/main.test.bicep
diff --git a/modules/Microsoft.HealthBot/healthBots/readme.md b/modules/HealthBot/healthBots/README.md
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/readme.md
rename to modules/HealthBot/healthBots/README.md
diff --git a/modules/Microsoft.HealthBot/healthBots/main.bicep b/modules/HealthBot/healthBots/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/main.bicep
rename to modules/HealthBot/healthBots/main.bicep
diff --git a/modules/Microsoft.HealthBot/healthBots/version.json b/modules/HealthBot/healthBots/version.json
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/version.json
rename to modules/HealthBot/healthBots/version.json
diff --git a/modules/Microsoft.HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep b/modules/HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/common/dependencies.bicep b/modules/HealthcareApis/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/.test/common/dependencies.bicep
rename to modules/HealthcareApis/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/common/main.test.bicep b/modules/HealthcareApis/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/.test/common/main.test.bicep
rename to modules/HealthcareApis/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/min/main.test.bicep b/modules/HealthcareApis/workspaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/.test/min/main.test.bicep
rename to modules/HealthcareApis/workspaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/readme.md b/modules/HealthcareApis/workspaces/README.md
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/readme.md
rename to modules/HealthcareApis/workspaces/README.md
diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/readme.md b/modules/HealthcareApis/workspaces/dicomservices/README.md
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/readme.md
rename to modules/HealthcareApis/workspaces/dicomservices/README.md
diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/main.bicep b/modules/HealthcareApis/workspaces/dicomservices/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/main.bicep
rename to modules/HealthcareApis/workspaces/dicomservices/main.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/version.json b/modules/HealthcareApis/workspaces/dicomservices/version.json
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/version.json
rename to modules/HealthcareApis/workspaces/dicomservices/version.json
diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep b/modules/HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep
rename to modules/HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/readme.md b/modules/HealthcareApis/workspaces/fhirservices/README.md
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/readme.md
rename to modules/HealthcareApis/workspaces/fhirservices/README.md
diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/main.bicep b/modules/HealthcareApis/workspaces/fhirservices/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/main.bicep
rename to modules/HealthcareApis/workspaces/fhirservices/main.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/version.json b/modules/HealthcareApis/workspaces/fhirservices/version.json
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/version.json
rename to modules/HealthcareApis/workspaces/fhirservices/version.json
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/readme.md b/modules/HealthcareApis/workspaces/iotconnectors/README.md
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/readme.md
rename to modules/HealthcareApis/workspaces/iotconnectors/README.md
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/readme.md b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/README.md
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/readme.md
rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/README.md
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep
rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json
rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/main.bicep b/modules/HealthcareApis/workspaces/iotconnectors/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/main.bicep
rename to modules/HealthcareApis/workspaces/iotconnectors/main.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/version.json b/modules/HealthcareApis/workspaces/iotconnectors/version.json
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/version.json
rename to modules/HealthcareApis/workspaces/iotconnectors/version.json
diff --git a/modules/Microsoft.HealthcareApis/workspaces/main.bicep b/modules/HealthcareApis/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/main.bicep
rename to modules/HealthcareApis/workspaces/main.bicep
diff --git a/modules/Microsoft.HealthcareApis/workspaces/version.json b/modules/HealthcareApis/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.HealthcareApis/workspaces/version.json
rename to modules/HealthcareApis/workspaces/version.json
diff --git a/modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep b/modules/Insights/actionGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/actionGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/actionGroups/.test/common/dependencies.bicep b/modules/Insights/actionGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.test/common/dependencies.bicep
rename to modules/Insights/actionGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/actionGroups/.test/common/main.test.bicep b/modules/Insights/actionGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.test/common/main.test.bicep
rename to modules/Insights/actionGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/actionGroups/.test/min/main.test.bicep b/modules/Insights/actionGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.test/min/main.test.bicep
rename to modules/Insights/actionGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/actionGroups/readme.md b/modules/Insights/actionGroups/README.md
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/readme.md
rename to modules/Insights/actionGroups/README.md
diff --git a/modules/Microsoft.Insights/actionGroups/main.bicep b/modules/Insights/actionGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/main.bicep
rename to modules/Insights/actionGroups/main.bicep
diff --git a/modules/Microsoft.Insights/actionGroups/version.json b/modules/Insights/actionGroups/version.json
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/version.json
rename to modules/Insights/actionGroups/version.json
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep b/modules/Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.test/common/dependencies.bicep b/modules/Insights/activityLogAlerts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/.test/common/dependencies.bicep
rename to modules/Insights/activityLogAlerts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.test/common/main.test.bicep b/modules/Insights/activityLogAlerts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/.test/common/main.test.bicep
rename to modules/Insights/activityLogAlerts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/activityLogAlerts/readme.md b/modules/Insights/activityLogAlerts/README.md
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/readme.md
rename to modules/Insights/activityLogAlerts/README.md
diff --git a/modules/Microsoft.Insights/activityLogAlerts/main.bicep b/modules/Insights/activityLogAlerts/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/main.bicep
rename to modules/Insights/activityLogAlerts/main.bicep
diff --git a/modules/Microsoft.Insights/activityLogAlerts/version.json b/modules/Insights/activityLogAlerts/version.json
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/version.json
rename to modules/Insights/activityLogAlerts/version.json
diff --git a/modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep b/modules/Insights/components/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/components/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/components/.test/common/dependencies.bicep b/modules/Insights/components/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/.test/common/dependencies.bicep
rename to modules/Insights/components/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/components/.test/common/main.test.bicep b/modules/Insights/components/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/.test/common/main.test.bicep
rename to modules/Insights/components/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/components/.test/min/dependencies.bicep b/modules/Insights/components/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/.test/min/dependencies.bicep
rename to modules/Insights/components/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Insights/components/.test/min/main.test.bicep b/modules/Insights/components/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/.test/min/main.test.bicep
rename to modules/Insights/components/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/components/readme.md b/modules/Insights/components/README.md
similarity index 100%
rename from modules/Microsoft.Insights/components/readme.md
rename to modules/Insights/components/README.md
diff --git a/modules/Microsoft.Insights/components/main.bicep b/modules/Insights/components/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/components/main.bicep
rename to modules/Insights/components/main.bicep
diff --git a/modules/Microsoft.Insights/components/version.json b/modules/Insights/components/version.json
similarity index 100%
rename from modules/Microsoft.Insights/components/version.json
rename to modules/Insights/components/version.json
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep b/modules/Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/dependencies.bicep b/modules/Insights/dataCollectionEndpoints/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/dependencies.bicep
rename to modules/Insights/dataCollectionEndpoints/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/main.test.bicep b/modules/Insights/dataCollectionEndpoints/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/main.test.bicep
rename to modules/Insights/dataCollectionEndpoints/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/min/main.test.bicep b/modules/Insights/dataCollectionEndpoints/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/min/main.test.bicep
rename to modules/Insights/dataCollectionEndpoints/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/readme.md b/modules/Insights/dataCollectionEndpoints/README.md
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/readme.md
rename to modules/Insights/dataCollectionEndpoints/README.md
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/main.bicep b/modules/Insights/dataCollectionEndpoints/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/main.bicep
rename to modules/Insights/dataCollectionEndpoints/main.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/version.json b/modules/Insights/dataCollectionEndpoints/version.json
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionEndpoints/version.json
rename to modules/Insights/dataCollectionEndpoints/version.json
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep b/modules/Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customadv/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/customadv/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/customadv/dependencies.bicep
rename to modules/Insights/dataCollectionRules/.test/customadv/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customadv/main.test.bicep b/modules/Insights/dataCollectionRules/.test/customadv/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/customadv/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/customadv/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/custombasic/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/dependencies.bicep
rename to modules/Insights/dataCollectionRules/.test/custombasic/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/main.test.bicep b/modules/Insights/dataCollectionRules/.test/custombasic/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/custombasic/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customiis/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/customiis/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/customiis/dependencies.bicep
rename to modules/Insights/dataCollectionRules/.test/customiis/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customiis/main.test.bicep b/modules/Insights/dataCollectionRules/.test/customiis/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/customiis/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/customiis/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/linux/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/linux/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/linux/dependencies.bicep
rename to modules/Insights/dataCollectionRules/.test/linux/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/linux/main.test.bicep b/modules/Insights/dataCollectionRules/.test/linux/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/linux/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/linux/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/min/main.test.bicep b/modules/Insights/dataCollectionRules/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/min/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/windows/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/windows/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/windows/dependencies.bicep
rename to modules/Insights/dataCollectionRules/.test/windows/dependencies.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/windows/main.test.bicep b/modules/Insights/dataCollectionRules/.test/windows/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/.test/windows/main.test.bicep
rename to modules/Insights/dataCollectionRules/.test/windows/main.test.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/readme.md b/modules/Insights/dataCollectionRules/README.md
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/readme.md
rename to modules/Insights/dataCollectionRules/README.md
diff --git a/modules/Microsoft.Insights/dataCollectionRules/main.bicep b/modules/Insights/dataCollectionRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/main.bicep
rename to modules/Insights/dataCollectionRules/main.bicep
diff --git a/modules/Microsoft.Insights/dataCollectionRules/version.json b/modules/Insights/dataCollectionRules/version.json
similarity index 100%
rename from modules/Microsoft.Insights/dataCollectionRules/version.json
rename to modules/Insights/dataCollectionRules/version.json
diff --git a/modules/Microsoft.Insights/diagnosticSettings/.test/common/main.test.bicep b/modules/Insights/diagnosticSettings/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/.test/common/main.test.bicep
rename to modules/Insights/diagnosticSettings/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/diagnosticSettings/readme.md b/modules/Insights/diagnosticSettings/README.md
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/readme.md
rename to modules/Insights/diagnosticSettings/README.md
diff --git a/modules/Microsoft.Insights/diagnosticSettings/main.bicep b/modules/Insights/diagnosticSettings/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/main.bicep
rename to modules/Insights/diagnosticSettings/main.bicep
diff --git a/modules/Microsoft.Insights/diagnosticSettings/version.json b/modules/Insights/diagnosticSettings/version.json
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/version.json
rename to modules/Insights/diagnosticSettings/version.json
diff --git a/modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep b/modules/Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/metricAlerts/.test/common/dependencies.bicep b/modules/Insights/metricAlerts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/.test/common/dependencies.bicep
rename to modules/Insights/metricAlerts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/metricAlerts/.test/common/main.test.bicep b/modules/Insights/metricAlerts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/.test/common/main.test.bicep
rename to modules/Insights/metricAlerts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/metricAlerts/readme.md b/modules/Insights/metricAlerts/README.md
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/readme.md
rename to modules/Insights/metricAlerts/README.md
diff --git a/modules/Microsoft.Insights/metricAlerts/main.bicep b/modules/Insights/metricAlerts/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/main.bicep
rename to modules/Insights/metricAlerts/main.bicep
diff --git a/modules/Microsoft.Insights/metricAlerts/version.json b/modules/Insights/metricAlerts/version.json
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/version.json
rename to modules/Insights/metricAlerts/version.json
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep b/modules/Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep b/modules/Insights/privateLinkScopes/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep
rename to modules/Insights/privateLinkScopes/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/common/main.test.bicep b/modules/Insights/privateLinkScopes/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.test/common/main.test.bicep
rename to modules/Insights/privateLinkScopes/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/min/main.test.bicep b/modules/Insights/privateLinkScopes/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.test/min/main.test.bicep
rename to modules/Insights/privateLinkScopes/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/readme.md b/modules/Insights/privateLinkScopes/README.md
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/readme.md
rename to modules/Insights/privateLinkScopes/README.md
diff --git a/modules/Microsoft.Insights/privateLinkScopes/main.bicep b/modules/Insights/privateLinkScopes/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/main.bicep
rename to modules/Insights/privateLinkScopes/main.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/modules/Insights/privateLinkScopes/scopedResources/README.md
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
rename to modules/Insights/privateLinkScopes/scopedResources/README.md
diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/main.bicep b/modules/Insights/privateLinkScopes/scopedResources/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/main.bicep
rename to modules/Insights/privateLinkScopes/scopedResources/main.bicep
diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/modules/Insights/privateLinkScopes/scopedResources/version.json
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
rename to modules/Insights/privateLinkScopes/scopedResources/version.json
diff --git a/modules/Microsoft.Insights/privateLinkScopes/version.json b/modules/Insights/privateLinkScopes/version.json
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/version.json
rename to modules/Insights/privateLinkScopes/version.json
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep b/modules/Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.test/common/dependencies.bicep b/modules/Insights/scheduledQueryRules/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/.test/common/dependencies.bicep
rename to modules/Insights/scheduledQueryRules/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.test/common/main.test.bicep b/modules/Insights/scheduledQueryRules/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/.test/common/main.test.bicep
rename to modules/Insights/scheduledQueryRules/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/readme.md b/modules/Insights/scheduledQueryRules/README.md
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/readme.md
rename to modules/Insights/scheduledQueryRules/README.md
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/main.bicep b/modules/Insights/scheduledQueryRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/main.bicep
rename to modules/Insights/scheduledQueryRules/main.bicep
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/version.json b/modules/Insights/scheduledQueryRules/version.json
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/version.json
rename to modules/Insights/scheduledQueryRules/version.json
diff --git a/modules/Microsoft.Insights/webTests/.bicep/nested_roleAssignments.bicep b/modules/Insights/webTests/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/.bicep/nested_roleAssignments.bicep
rename to modules/Insights/webTests/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Insights/webTests/.test/common/dependencies.bicep b/modules/Insights/webTests/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/.test/common/dependencies.bicep
rename to modules/Insights/webTests/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Insights/webTests/.test/common/main.test.bicep b/modules/Insights/webTests/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/.test/common/main.test.bicep
rename to modules/Insights/webTests/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Insights/webTests/.test/min/dependencies.bicep b/modules/Insights/webTests/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/.test/min/dependencies.bicep
rename to modules/Insights/webTests/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Insights/webTests/.test/min/main.test.bicep b/modules/Insights/webTests/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/.test/min/main.test.bicep
rename to modules/Insights/webTests/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Insights/webTests/readme.md b/modules/Insights/webTests/README.md
similarity index 100%
rename from modules/Microsoft.Insights/webTests/readme.md
rename to modules/Insights/webTests/README.md
diff --git a/modules/Microsoft.Insights/webTests/main.bicep b/modules/Insights/webTests/main.bicep
similarity index 100%
rename from modules/Microsoft.Insights/webTests/main.bicep
rename to modules/Insights/webTests/main.bicep
diff --git a/modules/Microsoft.Insights/webTests/version.json b/modules/Insights/webTests/version.json
similarity index 100%
rename from modules/Microsoft.Insights/webTests/version.json
rename to modules/Insights/webTests/version.json
diff --git a/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep
rename to modules/KeyVault/vaults/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep b/modules/KeyVault/vaults/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep
rename to modules/KeyVault/vaults/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/.test/common/main.test.bicep b/modules/KeyVault/vaults/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.test/common/main.test.bicep
rename to modules/KeyVault/vaults/.test/common/main.test.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/.test/min/main.test.bicep b/modules/KeyVault/vaults/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.test/min/main.test.bicep
rename to modules/KeyVault/vaults/.test/min/main.test.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep b/modules/KeyVault/vaults/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep
rename to modules/KeyVault/vaults/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/.test/pe/main.test.bicep b/modules/KeyVault/vaults/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.test/pe/main.test.bicep
rename to modules/KeyVault/vaults/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/readme.md b/modules/KeyVault/vaults/README.md
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/readme.md
rename to modules/KeyVault/vaults/README.md
diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/modules/KeyVault/vaults/accessPolicies/README.md
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md
rename to modules/KeyVault/vaults/accessPolicies/README.md
diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/main.bicep b/modules/KeyVault/vaults/accessPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/accessPolicies/main.bicep
rename to modules/KeyVault/vaults/accessPolicies/main.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json b/modules/KeyVault/vaults/accessPolicies/version.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/accessPolicies/version.json
rename to modules/KeyVault/vaults/accessPolicies/version.json
diff --git a/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
rename to modules/KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/keys/readme.md b/modules/KeyVault/vaults/keys/README.md
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/keys/readme.md
rename to modules/KeyVault/vaults/keys/README.md
diff --git a/modules/Microsoft.KeyVault/vaults/keys/main.bicep b/modules/KeyVault/vaults/keys/main.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/keys/main.bicep
rename to modules/KeyVault/vaults/keys/main.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/keys/version.json b/modules/KeyVault/vaults/keys/version.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/keys/version.json
rename to modules/KeyVault/vaults/keys/version.json
diff --git a/modules/Microsoft.KeyVault/vaults/main.bicep b/modules/KeyVault/vaults/main.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/main.bicep
rename to modules/KeyVault/vaults/main.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
rename to modules/KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/secrets/readme.md b/modules/KeyVault/vaults/secrets/README.md
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/secrets/readme.md
rename to modules/KeyVault/vaults/secrets/README.md
diff --git a/modules/Microsoft.KeyVault/vaults/secrets/main.bicep b/modules/KeyVault/vaults/secrets/main.bicep
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/secrets/main.bicep
rename to modules/KeyVault/vaults/secrets/main.bicep
diff --git a/modules/Microsoft.KeyVault/vaults/secrets/version.json b/modules/KeyVault/vaults/secrets/version.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/secrets/version.json
rename to modules/KeyVault/vaults/secrets/version.json
diff --git a/modules/Microsoft.KeyVault/vaults/version.json b/modules/KeyVault/vaults/version.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/version.json
rename to modules/KeyVault/vaults/version.json
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/common/dependencies.bicep b/modules/KubernetesConfiguration/extensions/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/common/dependencies.bicep
rename to modules/KubernetesConfiguration/extensions/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/common/main.test.bicep b/modules/KubernetesConfiguration/extensions/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/common/main.test.bicep
rename to modules/KubernetesConfiguration/extensions/.test/common/main.test.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/min/dependencies.bicep b/modules/KubernetesConfiguration/extensions/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/min/dependencies.bicep
rename to modules/KubernetesConfiguration/extensions/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/min/main.test.bicep b/modules/KubernetesConfiguration/extensions/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/min/main.test.bicep
rename to modules/KubernetesConfiguration/extensions/.test/min/main.test.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/readme.md b/modules/KubernetesConfiguration/extensions/README.md
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/readme.md
rename to modules/KubernetesConfiguration/extensions/README.md
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/main.bicep b/modules/KubernetesConfiguration/extensions/main.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/main.bicep
rename to modules/KubernetesConfiguration/extensions/main.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/version.json b/modules/KubernetesConfiguration/extensions/version.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/version.json
rename to modules/KubernetesConfiguration/extensions/version.json
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep
rename to modules/KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep
rename to modules/KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep
rename to modules/KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep
rename to modules/KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md b/modules/KubernetesConfiguration/fluxConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
rename to modules/KubernetesConfiguration/fluxConfigurations/README.md
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/main.bicep b/modules/KubernetesConfiguration/fluxConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/main.bicep
rename to modules/KubernetesConfiguration/fluxConfigurations/main.bicep
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json b/modules/KubernetesConfiguration/fluxConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
rename to modules/KubernetesConfiguration/fluxConfigurations/version.json
diff --git a/modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep b/modules/Logic/workflows/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep
rename to modules/Logic/workflows/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep b/modules/Logic/workflows/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep
rename to modules/Logic/workflows/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Logic/workflows/.test/common/main.test.bicep b/modules/Logic/workflows/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.test/common/main.test.bicep
rename to modules/Logic/workflows/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Logic/workflows/README.md
similarity index 100%
rename from modules/Microsoft.Logic/workflows/readme.md
rename to modules/Logic/workflows/README.md
diff --git a/modules/Microsoft.Logic/workflows/main.bicep b/modules/Logic/workflows/main.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/main.bicep
rename to modules/Logic/workflows/main.bicep
diff --git a/modules/Microsoft.Logic/workflows/version.json b/modules/Logic/workflows/version.json
similarity index 100%
rename from modules/Microsoft.Logic/workflows/version.json
rename to modules/Logic/workflows/version.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep b/modules/MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep
rename to modules/MachineLearningServices/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/common/main.test.bicep
rename to modules/MachineLearningServices/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep
rename to modules/MachineLearningServices/workspaces/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/encr/main.test.bicep
rename to modules/MachineLearningServices/workspaces/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/min/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/min/dependencies.bicep
rename to modules/MachineLearningServices/workspaces/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/min/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.test/min/main.test.bicep
rename to modules/MachineLearningServices/workspaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/readme.md b/modules/MachineLearningServices/workspaces/README.md
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/readme.md
rename to modules/MachineLearningServices/workspaces/README.md
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md b/modules/MachineLearningServices/workspaces/computes/README.md
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md
rename to modules/MachineLearningServices/workspaces/computes/README.md
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/main.bicep b/modules/MachineLearningServices/workspaces/computes/main.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/computes/main.bicep
rename to modules/MachineLearningServices/workspaces/computes/main.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/version.json b/modules/MachineLearningServices/workspaces/computes/version.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/computes/version.json
rename to modules/MachineLearningServices/workspaces/computes/version.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/main.bicep b/modules/MachineLearningServices/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/main.bicep
rename to modules/MachineLearningServices/workspaces/main.bicep
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/version.json b/modules/MachineLearningServices/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/version.json
rename to modules/MachineLearningServices/workspaces/version.json
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep b/modules/Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep
rename to modules/Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep b/modules/Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep
rename to modules/Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/main.test.bicep b/modules/Maintenance/maintenanceConfigurations/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/main.test.bicep
rename to modules/Maintenance/maintenanceConfigurations/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/min/main.test.bicep b/modules/Maintenance/maintenanceConfigurations/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/min/main.test.bicep
rename to modules/Maintenance/maintenanceConfigurations/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/readme.md b/modules/Maintenance/maintenanceConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/readme.md
rename to modules/Maintenance/maintenanceConfigurations/README.md
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/main.bicep b/modules/Maintenance/maintenanceConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/main.bicep
rename to modules/Maintenance/maintenanceConfigurations/main.bicep
diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/version.json b/modules/Maintenance/maintenanceConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.Maintenance/maintenanceConfigurations/version.json
rename to modules/Maintenance/maintenanceConfigurations/version.json
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep b/modules/ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
rename to modules/ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep b/modules/ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep
rename to modules/ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep b/modules/ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep
rename to modules/ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/modules/ManagedIdentity/userAssignedIdentities/README.md
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
rename to modules/ManagedIdentity/userAssignedIdentities/README.md
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/main.bicep b/modules/ManagedIdentity/userAssignedIdentities/main.bicep
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/main.bicep
rename to modules/ManagedIdentity/userAssignedIdentities/main.bicep
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/modules/ManagedIdentity/userAssignedIdentities/version.json
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
rename to modules/ManagedIdentity/userAssignedIdentities/version.json
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep b/modules/ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
rename to modules/ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.test/common/main.test.bicep b/modules/ManagedServices/registrationDefinitions/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.test/common/main.test.bicep
rename to modules/ManagedServices/registrationDefinitions/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg/main.test.bicep b/modules/ManagedServices/registrationDefinitions/.test/rg/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg/main.test.bicep
rename to modules/ManagedServices/registrationDefinitions/.test/rg/main.test.bicep
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/readme.md b/modules/ManagedServices/registrationDefinitions/README.md
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/readme.md
rename to modules/ManagedServices/registrationDefinitions/README.md
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/main.bicep b/modules/ManagedServices/registrationDefinitions/main.bicep
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/main.bicep
rename to modules/ManagedServices/registrationDefinitions/main.bicep
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/version.json b/modules/ManagedServices/registrationDefinitions/version.json
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/version.json
rename to modules/ManagedServices/registrationDefinitions/version.json
diff --git a/modules/Microsoft.Management/managementGroups/.test/common/main.test.bicep b/modules/Management/managementGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/.test/common/main.test.bicep
rename to modules/Management/managementGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Management/managementGroups/.test/min/main.test.bicep b/modules/Management/managementGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/.test/min/main.test.bicep
rename to modules/Management/managementGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Management/managementGroups/readme.md b/modules/Management/managementGroups/README.md
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/readme.md
rename to modules/Management/managementGroups/README.md
diff --git a/modules/Microsoft.Management/managementGroups/main.bicep b/modules/Management/managementGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/main.bicep
rename to modules/Management/managementGroups/main.bicep
diff --git a/modules/Microsoft.Management/managementGroups/version.json b/modules/Management/managementGroups/version.json
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/version.json
rename to modules/Management/managementGroups/version.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/main.test.bicep b/modules/NetApp/netAppAccounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.test/min/main.test.bicep
rename to modules/NetApp/netAppAccounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep b/modules/NetApp/netAppAccounts/.test/nfs3/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep
rename to modules/NetApp/netAppAccounts/.test/nfs3/dependencies.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/main.test.bicep b/modules/NetApp/netAppAccounts/.test/nfs3/main.test.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/main.test.bicep
rename to modules/NetApp/netAppAccounts/.test/nfs3/main.test.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep b/modules/NetApp/netAppAccounts/.test/nfs41/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep
rename to modules/NetApp/netAppAccounts/.test/nfs41/dependencies.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/main.test.bicep b/modules/NetApp/netAppAccounts/.test/nfs41/main.test.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/main.test.bicep
rename to modules/NetApp/netAppAccounts/.test/nfs41/main.test.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/readme.md b/modules/NetApp/netAppAccounts/README.md
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/readme.md
rename to modules/NetApp/netAppAccounts/README.md
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
rename to modules/NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/modules/NetApp/netAppAccounts/capacityPools/README.md
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
rename to modules/NetApp/netAppAccounts/capacityPools/README.md
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/main.bicep b/modules/NetApp/netAppAccounts/capacityPools/main.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/main.bicep
rename to modules/NetApp/netAppAccounts/capacityPools/main.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/modules/NetApp/netAppAccounts/capacityPools/version.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
rename to modules/NetApp/netAppAccounts/capacityPools/version.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
rename to modules/NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/modules/NetApp/netAppAccounts/capacityPools/volumes/README.md
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
rename to modules/NetApp/netAppAccounts/capacityPools/volumes/README.md
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/main.bicep b/modules/NetApp/netAppAccounts/capacityPools/volumes/main.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/main.bicep
rename to modules/NetApp/netAppAccounts/capacityPools/volumes/main.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/modules/NetApp/netAppAccounts/capacityPools/volumes/version.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
rename to modules/NetApp/netAppAccounts/capacityPools/volumes/version.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/main.bicep b/modules/NetApp/netAppAccounts/main.bicep
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/main.bicep
rename to modules/NetApp/netAppAccounts/main.bicep
diff --git a/modules/Microsoft.NetApp/netAppAccounts/version.json b/modules/NetApp/netAppAccounts/version.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/version.json
rename to modules/NetApp/netAppAccounts/version.json
diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep
rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/readme.md b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/readme.md
rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/README.md
diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep
rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep
diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/version.json b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/version.json
rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/version.json
diff --git a/modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/applicationGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Network/applicationGateways/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep b/modules/Network/applicationGateways/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep
rename to modules/Network/applicationGateways/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/main.test.bicep b/modules/Network/applicationGateways/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/.test/common/main.test.bicep
rename to modules/Network/applicationGateways/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/applicationGateways/readme.md b/modules/Network/applicationGateways/README.md
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/readme.md
rename to modules/Network/applicationGateways/README.md
diff --git a/modules/Microsoft.Network/applicationGateways/main.bicep b/modules/Network/applicationGateways/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/main.bicep
rename to modules/Network/applicationGateways/main.bicep
diff --git a/modules/Microsoft.Network/applicationGateways/version.json b/modules/Network/applicationGateways/version.json
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/version.json
rename to modules/Network/applicationGateways/version.json
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.test/common/dependencies.bicep b/modules/Network/applicationSecurityGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/.test/common/dependencies.bicep
rename to modules/Network/applicationSecurityGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.test/common/main.test.bicep b/modules/Network/applicationSecurityGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/.test/common/main.test.bicep
rename to modules/Network/applicationSecurityGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/readme.md b/modules/Network/applicationSecurityGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/readme.md
rename to modules/Network/applicationSecurityGroups/README.md
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/main.bicep b/modules/Network/applicationSecurityGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/main.bicep
rename to modules/Network/applicationSecurityGroups/main.bicep
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/version.json b/modules/Network/applicationSecurityGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/version.json
rename to modules/Network/applicationSecurityGroups/version.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep b/modules/Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
rename to modules/Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep b/modules/Network/azureFirewalls/.test/addpip/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/addpip/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/addpip/main.test.bicep b/modules/Network/azureFirewalls/.test/addpip/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/addpip/main.test.bicep
rename to modules/Network/azureFirewalls/.test/addpip/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep b/modules/Network/azureFirewalls/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/common/main.test.bicep b/modules/Network/azureFirewalls/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/common/main.test.bicep
rename to modules/Network/azureFirewalls/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep b/modules/Network/azureFirewalls/.test/custompip/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/custompip/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/custompip/main.test.bicep b/modules/Network/azureFirewalls/.test/custompip/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/custompip/main.test.bicep
rename to modules/Network/azureFirewalls/.test/custompip/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubcommon/dependencies.bicep b/modules/Network/azureFirewalls/.test/hubcommon/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/hubcommon/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/hubcommon/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubcommon/main.test.bicep b/modules/Network/azureFirewalls/.test/hubcommon/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/hubcommon/main.test.bicep
rename to modules/Network/azureFirewalls/.test/hubcommon/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubmin/dependencies.bicep b/modules/Network/azureFirewalls/.test/hubmin/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/hubmin/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/hubmin/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubmin/main.test.bicep b/modules/Network/azureFirewalls/.test/hubmin/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/hubmin/main.test.bicep
rename to modules/Network/azureFirewalls/.test/hubmin/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep b/modules/Network/azureFirewalls/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep
rename to modules/Network/azureFirewalls/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/.test/min/main.test.bicep b/modules/Network/azureFirewalls/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.test/min/main.test.bicep
rename to modules/Network/azureFirewalls/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/readme.md b/modules/Network/azureFirewalls/README.md
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/readme.md
rename to modules/Network/azureFirewalls/README.md
diff --git a/modules/Microsoft.Network/azureFirewalls/main.bicep b/modules/Network/azureFirewalls/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/main.bicep
rename to modules/Network/azureFirewalls/main.bicep
diff --git a/modules/Microsoft.Network/azureFirewalls/version.json b/modules/Network/azureFirewalls/version.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/version.json
rename to modules/Network/azureFirewalls/version.json
diff --git a/modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep b/modules/Network/bastionHosts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep
rename to modules/Network/bastionHosts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep b/modules/Network/bastionHosts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep
rename to modules/Network/bastionHosts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/common/main.test.bicep b/modules/Network/bastionHosts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/common/main.test.bicep
rename to modules/Network/bastionHosts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep b/modules/Network/bastionHosts/.test/custompip/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep
rename to modules/Network/bastionHosts/.test/custompip/dependencies.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/custompip/main.test.bicep b/modules/Network/bastionHosts/.test/custompip/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/custompip/main.test.bicep
rename to modules/Network/bastionHosts/.test/custompip/main.test.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep b/modules/Network/bastionHosts/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep
rename to modules/Network/bastionHosts/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/.test/min/main.test.bicep b/modules/Network/bastionHosts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.test/min/main.test.bicep
rename to modules/Network/bastionHosts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/readme.md b/modules/Network/bastionHosts/README.md
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/readme.md
rename to modules/Network/bastionHosts/README.md
diff --git a/modules/Microsoft.Network/bastionHosts/main.bicep b/modules/Network/bastionHosts/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/main.bicep
rename to modules/Network/bastionHosts/main.bicep
diff --git a/modules/Microsoft.Network/bastionHosts/version.json b/modules/Network/bastionHosts/version.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/version.json
rename to modules/Network/bastionHosts/version.json
diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Network/connections/.test/vnet2vnet/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep
rename to modules/Network/connections/.test/vnet2vnet/dependencies.bicep
diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/main.test.bicep b/modules/Network/connections/.test/vnet2vnet/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/connections/.test/vnet2vnet/main.test.bicep
rename to modules/Network/connections/.test/vnet2vnet/main.test.bicep
diff --git a/modules/Microsoft.Network/connections/readme.md b/modules/Network/connections/README.md
similarity index 100%
rename from modules/Microsoft.Network/connections/readme.md
rename to modules/Network/connections/README.md
diff --git a/modules/Microsoft.Network/connections/main.bicep b/modules/Network/connections/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/connections/main.bicep
rename to modules/Network/connections/main.bicep
diff --git a/modules/Microsoft.Network/connections/version.json b/modules/Network/connections/version.json
similarity index 100%
rename from modules/Microsoft.Network/connections/version.json
rename to modules/Network/connections/version.json
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep b/modules/Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
rename to modules/Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/common/dependencies.bicep b/modules/Network/ddosProtectionPlans/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.test/common/dependencies.bicep
rename to modules/Network/ddosProtectionPlans/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/common/main.test.bicep b/modules/Network/ddosProtectionPlans/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.test/common/main.test.bicep
rename to modules/Network/ddosProtectionPlans/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/min/main.test.bicep b/modules/Network/ddosProtectionPlans/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.test/min/main.test.bicep
rename to modules/Network/ddosProtectionPlans/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/readme.md b/modules/Network/ddosProtectionPlans/README.md
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/readme.md
rename to modules/Network/ddosProtectionPlans/README.md
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/main.bicep b/modules/Network/ddosProtectionPlans/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/main.bicep
rename to modules/Network/ddosProtectionPlans/main.bicep
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/version.json b/modules/Network/ddosProtectionPlans/version.json
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/version.json
rename to modules/Network/ddosProtectionPlans/version.json
diff --git a/modules/Microsoft.Network/dnsResolvers/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsResolvers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsResolvers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsResolvers/.test/common/dependencies.bicep b/modules/Network/dnsResolvers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/.test/common/dependencies.bicep
rename to modules/Network/dnsResolvers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/dnsResolvers/.test/common/main.test.bicep b/modules/Network/dnsResolvers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/.test/common/main.test.bicep
rename to modules/Network/dnsResolvers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/dnsResolvers/readme.md b/modules/Network/dnsResolvers/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/readme.md
rename to modules/Network/dnsResolvers/README.md
diff --git a/modules/Microsoft.Network/dnsResolvers/main.bicep b/modules/Network/dnsResolvers/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/main.bicep
rename to modules/Network/dnsResolvers/main.bicep
diff --git a/modules/Microsoft.Network/dnsResolvers/version.json b/modules/Network/dnsResolvers/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsResolvers/version.json
rename to modules/Network/dnsResolvers/version.json
diff --git a/modules/Microsoft.Network/dnsZones/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/.test/common/dependencies.bicep b/modules/Network/dnsZones/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/.test/common/dependencies.bicep
rename to modules/Network/dnsZones/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/dnsZones/.test/common/main.test.bicep b/modules/Network/dnsZones/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/.test/common/main.test.bicep
rename to modules/Network/dnsZones/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/dnsZones/.test/min/main.test.bicep b/modules/Network/dnsZones/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/.test/min/main.test.bicep
rename to modules/Network/dnsZones/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/dnsZones/A/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/A/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/A/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/A/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/A/readme.md b/modules/Network/dnsZones/A/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/A/readme.md
rename to modules/Network/dnsZones/A/README.md
diff --git a/modules/Microsoft.Network/dnsZones/A/main.bicep b/modules/Network/dnsZones/A/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/A/main.bicep
rename to modules/Network/dnsZones/A/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/A/version.json b/modules/Network/dnsZones/A/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/A/version.json
rename to modules/Network/dnsZones/A/version.json
diff --git a/modules/Microsoft.Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/AAAA/readme.md b/modules/Network/dnsZones/AAAA/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/AAAA/readme.md
rename to modules/Network/dnsZones/AAAA/README.md
diff --git a/modules/Microsoft.Network/dnsZones/AAAA/main.bicep b/modules/Network/dnsZones/AAAA/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/AAAA/main.bicep
rename to modules/Network/dnsZones/AAAA/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/AAAA/version.json b/modules/Network/dnsZones/AAAA/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/AAAA/version.json
rename to modules/Network/dnsZones/AAAA/version.json
diff --git a/modules/Microsoft.Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/CAA/readme.md b/modules/Network/dnsZones/CAA/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CAA/readme.md
rename to modules/Network/dnsZones/CAA/README.md
diff --git a/modules/Microsoft.Network/dnsZones/CAA/main.bicep b/modules/Network/dnsZones/CAA/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CAA/main.bicep
rename to modules/Network/dnsZones/CAA/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/CAA/version.json b/modules/Network/dnsZones/CAA/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CAA/version.json
rename to modules/Network/dnsZones/CAA/version.json
diff --git a/modules/Microsoft.Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/CNAME/readme.md b/modules/Network/dnsZones/CNAME/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CNAME/readme.md
rename to modules/Network/dnsZones/CNAME/README.md
diff --git a/modules/Microsoft.Network/dnsZones/CNAME/main.bicep b/modules/Network/dnsZones/CNAME/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CNAME/main.bicep
rename to modules/Network/dnsZones/CNAME/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/CNAME/version.json b/modules/Network/dnsZones/CNAME/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/CNAME/version.json
rename to modules/Network/dnsZones/CNAME/version.json
diff --git a/modules/Microsoft.Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/MX/readme.md b/modules/Network/dnsZones/MX/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/MX/readme.md
rename to modules/Network/dnsZones/MX/README.md
diff --git a/modules/Microsoft.Network/dnsZones/MX/main.bicep b/modules/Network/dnsZones/MX/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/MX/main.bicep
rename to modules/Network/dnsZones/MX/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/MX/version.json b/modules/Network/dnsZones/MX/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/MX/version.json
rename to modules/Network/dnsZones/MX/version.json
diff --git a/modules/Microsoft.Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/NS/readme.md b/modules/Network/dnsZones/NS/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/NS/readme.md
rename to modules/Network/dnsZones/NS/README.md
diff --git a/modules/Microsoft.Network/dnsZones/NS/main.bicep b/modules/Network/dnsZones/NS/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/NS/main.bicep
rename to modules/Network/dnsZones/NS/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/NS/version.json b/modules/Network/dnsZones/NS/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/NS/version.json
rename to modules/Network/dnsZones/NS/version.json
diff --git a/modules/Microsoft.Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/PTR/readme.md b/modules/Network/dnsZones/PTR/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/PTR/readme.md
rename to modules/Network/dnsZones/PTR/README.md
diff --git a/modules/Microsoft.Network/dnsZones/PTR/main.bicep b/modules/Network/dnsZones/PTR/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/PTR/main.bicep
rename to modules/Network/dnsZones/PTR/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/PTR/version.json b/modules/Network/dnsZones/PTR/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/PTR/version.json
rename to modules/Network/dnsZones/PTR/version.json
diff --git a/modules/Microsoft.Network/dnsZones/readme.md b/modules/Network/dnsZones/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/readme.md
rename to modules/Network/dnsZones/README.md
diff --git a/modules/Microsoft.Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/SOA/readme.md b/modules/Network/dnsZones/SOA/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SOA/readme.md
rename to modules/Network/dnsZones/SOA/README.md
diff --git a/modules/Microsoft.Network/dnsZones/SOA/main.bicep b/modules/Network/dnsZones/SOA/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SOA/main.bicep
rename to modules/Network/dnsZones/SOA/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/SOA/version.json b/modules/Network/dnsZones/SOA/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SOA/version.json
rename to modules/Network/dnsZones/SOA/version.json
diff --git a/modules/Microsoft.Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/SRV/readme.md b/modules/Network/dnsZones/SRV/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SRV/readme.md
rename to modules/Network/dnsZones/SRV/README.md
diff --git a/modules/Microsoft.Network/dnsZones/SRV/main.bicep b/modules/Network/dnsZones/SRV/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SRV/main.bicep
rename to modules/Network/dnsZones/SRV/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/SRV/version.json b/modules/Network/dnsZones/SRV/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/SRV/version.json
rename to modules/Network/dnsZones/SRV/version.json
diff --git a/modules/Microsoft.Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep
rename to modules/Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/dnsZones/TXT/readme.md b/modules/Network/dnsZones/TXT/README.md
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/TXT/readme.md
rename to modules/Network/dnsZones/TXT/README.md
diff --git a/modules/Microsoft.Network/dnsZones/TXT/main.bicep b/modules/Network/dnsZones/TXT/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/TXT/main.bicep
rename to modules/Network/dnsZones/TXT/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/TXT/version.json b/modules/Network/dnsZones/TXT/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/TXT/version.json
rename to modules/Network/dnsZones/TXT/version.json
diff --git a/modules/Microsoft.Network/dnsZones/main.bicep b/modules/Network/dnsZones/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/main.bicep
rename to modules/Network/dnsZones/main.bicep
diff --git a/modules/Microsoft.Network/dnsZones/version.json b/modules/Network/dnsZones/version.json
similarity index 100%
rename from modules/Microsoft.Network/dnsZones/version.json
rename to modules/Network/dnsZones/version.json
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep b/modules/Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
rename to modules/Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/common/dependencies.bicep b/modules/Network/expressRouteCircuits/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.test/common/dependencies.bicep
rename to modules/Network/expressRouteCircuits/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/common/main.test.bicep b/modules/Network/expressRouteCircuits/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.test/common/main.test.bicep
rename to modules/Network/expressRouteCircuits/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/min/main.test.bicep b/modules/Network/expressRouteCircuits/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.test/min/main.test.bicep
rename to modules/Network/expressRouteCircuits/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/expressRouteCircuits/readme.md b/modules/Network/expressRouteCircuits/README.md
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/readme.md
rename to modules/Network/expressRouteCircuits/README.md
diff --git a/modules/Microsoft.Network/expressRouteCircuits/main.bicep b/modules/Network/expressRouteCircuits/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/main.bicep
rename to modules/Network/expressRouteCircuits/main.bicep
diff --git a/modules/Microsoft.Network/expressRouteCircuits/version.json b/modules/Network/expressRouteCircuits/version.json
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/version.json
rename to modules/Network/expressRouteCircuits/version.json
diff --git a/modules/Microsoft.Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep b/modules/Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep
rename to modules/Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/expressRouteGateway/.test/common/dependencies.bicep b/modules/Network/expressRouteGateway/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/.test/common/dependencies.bicep
rename to modules/Network/expressRouteGateway/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/expressRouteGateway/.test/common/main.test.bicep b/modules/Network/expressRouteGateway/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/.test/common/main.test.bicep
rename to modules/Network/expressRouteGateway/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/expressRouteGateway/readme.md b/modules/Network/expressRouteGateway/README.md
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/readme.md
rename to modules/Network/expressRouteGateway/README.md
diff --git a/modules/Microsoft.Network/expressRouteGateway/main.bicep b/modules/Network/expressRouteGateway/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/main.bicep
rename to modules/Network/expressRouteGateway/main.bicep
diff --git a/modules/Microsoft.Network/expressRouteGateway/version.json b/modules/Network/expressRouteGateway/version.json
similarity index 100%
rename from modules/Microsoft.Network/expressRouteGateway/version.json
rename to modules/Network/expressRouteGateway/version.json
diff --git a/modules/Microsoft.Network/firewallPolicies/.test/common/main.test.bicep b/modules/Network/firewallPolicies/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.test/common/main.test.bicep
rename to modules/Network/firewallPolicies/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/firewallPolicies/.test/min/main.test.bicep b/modules/Network/firewallPolicies/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.test/min/main.test.bicep
rename to modules/Network/firewallPolicies/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/firewallPolicies/readme.md b/modules/Network/firewallPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/readme.md
rename to modules/Network/firewallPolicies/README.md
diff --git a/modules/Microsoft.Network/firewallPolicies/main.bicep b/modules/Network/firewallPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/main.bicep
rename to modules/Network/firewallPolicies/main.bicep
diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/modules/Network/firewallPolicies/ruleCollectionGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
rename to modules/Network/firewallPolicies/ruleCollectionGroups/README.md
diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/main.bicep b/modules/Network/firewallPolicies/ruleCollectionGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/main.bicep
rename to modules/Network/firewallPolicies/ruleCollectionGroups/main.bicep
diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/modules/Network/firewallPolicies/ruleCollectionGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
rename to modules/Network/firewallPolicies/ruleCollectionGroups/version.json
diff --git a/modules/Microsoft.Network/firewallPolicies/version.json b/modules/Network/firewallPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/version.json
rename to modules/Network/firewallPolicies/version.json
diff --git a/modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep b/modules/Network/frontDoors/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep
rename to modules/Network/frontDoors/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/frontDoors/.test/common/dependencies.bicep b/modules/Network/frontDoors/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.test/common/dependencies.bicep
rename to modules/Network/frontDoors/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/frontDoors/.test/common/main.test.bicep b/modules/Network/frontDoors/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.test/common/main.test.bicep
rename to modules/Network/frontDoors/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/frontDoors/.test/min/main.test.bicep b/modules/Network/frontDoors/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.test/min/main.test.bicep
rename to modules/Network/frontDoors/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/frontDoors/readme.md b/modules/Network/frontDoors/README.md
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/readme.md
rename to modules/Network/frontDoors/README.md
diff --git a/modules/Microsoft.Network/frontDoors/main.bicep b/modules/Network/frontDoors/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/main.bicep
rename to modules/Network/frontDoors/main.bicep
diff --git a/modules/Microsoft.Network/frontDoors/version.json b/modules/Network/frontDoors/version.json
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/version.json
rename to modules/Network/frontDoors/version.json
diff --git a/modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/ipGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Network/ipGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/ipGroups/.test/common/dependencies.bicep b/modules/Network/ipGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.test/common/dependencies.bicep
rename to modules/Network/ipGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/ipGroups/.test/common/main.test.bicep b/modules/Network/ipGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.test/common/main.test.bicep
rename to modules/Network/ipGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/ipGroups/.test/min/main.test.bicep b/modules/Network/ipGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.test/min/main.test.bicep
rename to modules/Network/ipGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/ipGroups/readme.md b/modules/Network/ipGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/readme.md
rename to modules/Network/ipGroups/README.md
diff --git a/modules/Microsoft.Network/ipGroups/main.bicep b/modules/Network/ipGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/main.bicep
rename to modules/Network/ipGroups/main.bicep
diff --git a/modules/Microsoft.Network/ipGroups/version.json b/modules/Network/ipGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/version.json
rename to modules/Network/ipGroups/version.json
diff --git a/modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep b/modules/Network/loadBalancers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep
rename to modules/Network/loadBalancers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/common/dependencies.bicep b/modules/Network/loadBalancers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/common/dependencies.bicep
rename to modules/Network/loadBalancers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/common/main.test.bicep b/modules/Network/loadBalancers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/common/main.test.bicep
rename to modules/Network/loadBalancers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep b/modules/Network/loadBalancers/.test/internal/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep
rename to modules/Network/loadBalancers/.test/internal/dependencies.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/internal/main.test.bicep b/modules/Network/loadBalancers/.test/internal/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/internal/main.test.bicep
rename to modules/Network/loadBalancers/.test/internal/main.test.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/min/dependencies.bicep b/modules/Network/loadBalancers/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/min/dependencies.bicep
rename to modules/Network/loadBalancers/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/.test/min/main.test.bicep b/modules/Network/loadBalancers/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.test/min/main.test.bicep
rename to modules/Network/loadBalancers/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/readme.md b/modules/Network/loadBalancers/README.md
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/readme.md
rename to modules/Network/loadBalancers/README.md
diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/modules/Network/loadBalancers/backendAddressPools/README.md
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
rename to modules/Network/loadBalancers/backendAddressPools/README.md
diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/main.bicep b/modules/Network/loadBalancers/backendAddressPools/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/main.bicep
rename to modules/Network/loadBalancers/backendAddressPools/main.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/modules/Network/loadBalancers/backendAddressPools/version.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json
rename to modules/Network/loadBalancers/backendAddressPools/version.json
diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/modules/Network/loadBalancers/inboundNatRules/README.md
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
rename to modules/Network/loadBalancers/inboundNatRules/README.md
diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/main.bicep b/modules/Network/loadBalancers/inboundNatRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/main.bicep
rename to modules/Network/loadBalancers/inboundNatRules/main.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/modules/Network/loadBalancers/inboundNatRules/version.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json
rename to modules/Network/loadBalancers/inboundNatRules/version.json
diff --git a/modules/Microsoft.Network/loadBalancers/main.bicep b/modules/Network/loadBalancers/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/main.bicep
rename to modules/Network/loadBalancers/main.bicep
diff --git a/modules/Microsoft.Network/loadBalancers/version.json b/modules/Network/loadBalancers/version.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/version.json
rename to modules/Network/loadBalancers/version.json
diff --git a/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/common/dependencies.bicep b/modules/Network/localNetworkGateways/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.test/common/dependencies.bicep
rename to modules/Network/localNetworkGateways/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/common/main.test.bicep b/modules/Network/localNetworkGateways/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.test/common/main.test.bicep
rename to modules/Network/localNetworkGateways/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/min/main.test.bicep b/modules/Network/localNetworkGateways/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.test/min/main.test.bicep
rename to modules/Network/localNetworkGateways/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/localNetworkGateways/readme.md b/modules/Network/localNetworkGateways/README.md
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/readme.md
rename to modules/Network/localNetworkGateways/README.md
diff --git a/modules/Microsoft.Network/localNetworkGateways/main.bicep b/modules/Network/localNetworkGateways/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/main.bicep
rename to modules/Network/localNetworkGateways/main.bicep
diff --git a/modules/Microsoft.Network/localNetworkGateways/version.json b/modules/Network/localNetworkGateways/version.json
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/version.json
rename to modules/Network/localNetworkGateways/version.json
diff --git a/modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/natGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Network/natGateways/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/natGateways/.test/common/dependencies.bicep b/modules/Network/natGateways/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/natGateways/.test/common/dependencies.bicep
rename to modules/Network/natGateways/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/natGateways/.test/common/main.test.bicep b/modules/Network/natGateways/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/natGateways/.test/common/main.test.bicep
rename to modules/Network/natGateways/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/natGateways/readme.md b/modules/Network/natGateways/README.md
similarity index 100%
rename from modules/Microsoft.Network/natGateways/readme.md
rename to modules/Network/natGateways/README.md
diff --git a/modules/Microsoft.Network/natGateways/main.bicep b/modules/Network/natGateways/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/natGateways/main.bicep
rename to modules/Network/natGateways/main.bicep
diff --git a/modules/Microsoft.Network/natGateways/version.json b/modules/Network/natGateways/version.json
similarity index 100%
rename from modules/Microsoft.Network/natGateways/version.json
rename to modules/Network/natGateways/version.json
diff --git a/modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep b/modules/Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
rename to modules/Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep b/modules/Network/networkInterfaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep
rename to modules/Network/networkInterfaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/.test/common/main.test.bicep b/modules/Network/networkInterfaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.test/common/main.test.bicep
rename to modules/Network/networkInterfaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep b/modules/Network/networkInterfaces/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep
rename to modules/Network/networkInterfaces/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/.test/min/main.test.bicep b/modules/Network/networkInterfaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.test/min/main.test.bicep
rename to modules/Network/networkInterfaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/readme.md b/modules/Network/networkInterfaces/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/readme.md
rename to modules/Network/networkInterfaces/README.md
diff --git a/modules/Microsoft.Network/networkInterfaces/main.bicep b/modules/Network/networkInterfaces/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/main.bicep
rename to modules/Network/networkInterfaces/main.bicep
diff --git a/modules/Microsoft.Network/networkInterfaces/version.json b/modules/Network/networkInterfaces/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/version.json
rename to modules/Network/networkInterfaces/version.json
diff --git a/modules/Microsoft.Network/networkManagers/.bicep/nested_roleAssignments.bicep b/modules/Network/networkManagers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/.bicep/nested_roleAssignments.bicep
rename to modules/Network/networkManagers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/networkManagers/.test/common/dependencies.bicep b/modules/Network/networkManagers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/.test/common/dependencies.bicep
rename to modules/Network/networkManagers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/networkManagers/.test/common/main.test.bicep b/modules/Network/networkManagers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/.test/common/main.test.bicep
rename to modules/Network/networkManagers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/networkManagers/readme.md b/modules/Network/networkManagers/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/readme.md
rename to modules/Network/networkManagers/README.md
diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/readme.md b/modules/Network/networkManagers/connectivityConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/readme.md
rename to modules/Network/networkManagers/connectivityConfigurations/README.md
diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/main.bicep b/modules/Network/networkManagers/connectivityConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/main.bicep
rename to modules/Network/networkManagers/connectivityConfigurations/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/version.json b/modules/Network/networkManagers/connectivityConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/version.json
rename to modules/Network/networkManagers/connectivityConfigurations/version.json
diff --git a/modules/Microsoft.Network/networkManagers/main.bicep b/modules/Network/networkManagers/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/main.bicep
rename to modules/Network/networkManagers/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/readme.md b/modules/Network/networkManagers/networkGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/readme.md
rename to modules/Network/networkManagers/networkGroups/README.md
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/main.bicep b/modules/Network/networkManagers/networkGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/main.bicep
rename to modules/Network/networkManagers/networkGroups/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/readme.md b/modules/Network/networkManagers/networkGroups/staticMembers/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/readme.md
rename to modules/Network/networkManagers/networkGroups/staticMembers/README.md
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/main.bicep b/modules/Network/networkManagers/networkGroups/staticMembers/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/main.bicep
rename to modules/Network/networkManagers/networkGroups/staticMembers/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/version.json b/modules/Network/networkManagers/networkGroups/staticMembers/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/version.json
rename to modules/Network/networkManagers/networkGroups/staticMembers/version.json
diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/version.json b/modules/Network/networkManagers/networkGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/networkGroups/version.json
rename to modules/Network/networkManagers/networkGroups/version.json
diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/readme.md b/modules/Network/networkManagers/scopeConnections/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/scopeConnections/readme.md
rename to modules/Network/networkManagers/scopeConnections/README.md
diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/main.bicep b/modules/Network/networkManagers/scopeConnections/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/scopeConnections/main.bicep
rename to modules/Network/networkManagers/scopeConnections/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/version.json b/modules/Network/networkManagers/scopeConnections/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/scopeConnections/version.json
rename to modules/Network/networkManagers/scopeConnections/version.json
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/readme.md
rename to modules/Network/networkManagers/securityAdminConfigurations/README.md
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/main.bicep
rename to modules/Network/networkManagers/securityAdminConfigurations/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/readme.md
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/README.md
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/readme.md
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/README.md
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json
rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json
diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/version.json b/modules/Network/networkManagers/securityAdminConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/version.json
rename to modules/Network/networkManagers/securityAdminConfigurations/version.json
diff --git a/modules/Microsoft.Network/networkManagers/version.json b/modules/Network/networkManagers/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkManagers/version.json
rename to modules/Network/networkManagers/version.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/common/dependencies.bicep b/modules/Network/networkSecurityGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.test/common/dependencies.bicep
rename to modules/Network/networkSecurityGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/common/main.test.bicep b/modules/Network/networkSecurityGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.test/common/main.test.bicep
rename to modules/Network/networkSecurityGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/min/main.test.bicep b/modules/Network/networkSecurityGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.test/min/main.test.bicep
rename to modules/Network/networkSecurityGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/readme.md b/modules/Network/networkSecurityGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/readme.md
rename to modules/Network/networkSecurityGroups/README.md
diff --git a/modules/Microsoft.Network/networkSecurityGroups/main.bicep b/modules/Network/networkSecurityGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/main.bicep
rename to modules/Network/networkSecurityGroups/main.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md b/modules/Network/networkSecurityGroups/securityRules/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
rename to modules/Network/networkSecurityGroups/securityRules/README.md
diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/main.bicep b/modules/Network/networkSecurityGroups/securityRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/main.bicep
rename to modules/Network/networkSecurityGroups/securityRules/main.bicep
diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json b/modules/Network/networkSecurityGroups/securityRules/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json
rename to modules/Network/networkSecurityGroups/securityRules/version.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/version.json b/modules/Network/networkSecurityGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/version.json
rename to modules/Network/networkSecurityGroups/version.json
diff --git a/modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep b/modules/Network/networkWatchers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep
rename to modules/Network/networkWatchers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep b/modules/Network/networkWatchers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep
rename to modules/Network/networkWatchers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/.test/common/main.test.bicep b/modules/Network/networkWatchers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.test/common/main.test.bicep
rename to modules/Network/networkWatchers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/.test/min/main.test.bicep b/modules/Network/networkWatchers/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.test/min/main.test.bicep
rename to modules/Network/networkWatchers/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/readme.md b/modules/Network/networkWatchers/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/readme.md
rename to modules/Network/networkWatchers/README.md
diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/modules/Network/networkWatchers/connectionMonitors/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
rename to modules/Network/networkWatchers/connectionMonitors/README.md
diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/main.bicep b/modules/Network/networkWatchers/connectionMonitors/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/main.bicep
rename to modules/Network/networkWatchers/connectionMonitors/main.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/modules/Network/networkWatchers/connectionMonitors/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json
rename to modules/Network/networkWatchers/connectionMonitors/version.json
diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/readme.md b/modules/Network/networkWatchers/flowLogs/README.md
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/flowLogs/readme.md
rename to modules/Network/networkWatchers/flowLogs/README.md
diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/main.bicep b/modules/Network/networkWatchers/flowLogs/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/flowLogs/main.bicep
rename to modules/Network/networkWatchers/flowLogs/main.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/version.json b/modules/Network/networkWatchers/flowLogs/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/flowLogs/version.json
rename to modules/Network/networkWatchers/flowLogs/version.json
diff --git a/modules/Microsoft.Network/networkWatchers/main.bicep b/modules/Network/networkWatchers/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/main.bicep
rename to modules/Network/networkWatchers/main.bicep
diff --git a/modules/Microsoft.Network/networkWatchers/version.json b/modules/Network/networkWatchers/version.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/version.json
rename to modules/Network/networkWatchers/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep b/modules/Network/privateDnsZones/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep
rename to modules/Network/privateDnsZones/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/main.test.bicep b/modules/Network/privateDnsZones/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.test/common/main.test.bicep
rename to modules/Network/privateDnsZones/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/main.test.bicep b/modules/Network/privateDnsZones/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.test/min/main.test.bicep
rename to modules/Network/privateDnsZones/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/A/readme.md b/modules/Network/privateDnsZones/A/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/A/readme.md
rename to modules/Network/privateDnsZones/A/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/A/main.bicep b/modules/Network/privateDnsZones/A/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/A/main.bicep
rename to modules/Network/privateDnsZones/A/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/A/version.json b/modules/Network/privateDnsZones/A/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/A/version.json
rename to modules/Network/privateDnsZones/A/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/readme.md b/modules/Network/privateDnsZones/AAAA/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/AAAA/readme.md
rename to modules/Network/privateDnsZones/AAAA/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/main.bicep b/modules/Network/privateDnsZones/AAAA/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/AAAA/main.bicep
rename to modules/Network/privateDnsZones/AAAA/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/version.json b/modules/Network/privateDnsZones/AAAA/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/AAAA/version.json
rename to modules/Network/privateDnsZones/AAAA/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/readme.md b/modules/Network/privateDnsZones/CNAME/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/CNAME/readme.md
rename to modules/Network/privateDnsZones/CNAME/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/main.bicep b/modules/Network/privateDnsZones/CNAME/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/CNAME/main.bicep
rename to modules/Network/privateDnsZones/CNAME/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/version.json b/modules/Network/privateDnsZones/CNAME/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/CNAME/version.json
rename to modules/Network/privateDnsZones/CNAME/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/MX/readme.md b/modules/Network/privateDnsZones/MX/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/MX/readme.md
rename to modules/Network/privateDnsZones/MX/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/MX/main.bicep b/modules/Network/privateDnsZones/MX/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/MX/main.bicep
rename to modules/Network/privateDnsZones/MX/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/MX/version.json b/modules/Network/privateDnsZones/MX/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/MX/version.json
rename to modules/Network/privateDnsZones/MX/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/readme.md b/modules/Network/privateDnsZones/PTR/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/PTR/readme.md
rename to modules/Network/privateDnsZones/PTR/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/main.bicep b/modules/Network/privateDnsZones/PTR/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/PTR/main.bicep
rename to modules/Network/privateDnsZones/PTR/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/version.json b/modules/Network/privateDnsZones/PTR/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/PTR/version.json
rename to modules/Network/privateDnsZones/PTR/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/readme.md b/modules/Network/privateDnsZones/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/readme.md
rename to modules/Network/privateDnsZones/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/readme.md b/modules/Network/privateDnsZones/SOA/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SOA/readme.md
rename to modules/Network/privateDnsZones/SOA/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/main.bicep b/modules/Network/privateDnsZones/SOA/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SOA/main.bicep
rename to modules/Network/privateDnsZones/SOA/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/version.json b/modules/Network/privateDnsZones/SOA/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SOA/version.json
rename to modules/Network/privateDnsZones/SOA/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/readme.md b/modules/Network/privateDnsZones/SRV/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SRV/readme.md
rename to modules/Network/privateDnsZones/SRV/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/main.bicep b/modules/Network/privateDnsZones/SRV/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SRV/main.bicep
rename to modules/Network/privateDnsZones/SRV/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/version.json b/modules/Network/privateDnsZones/SRV/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/SRV/version.json
rename to modules/Network/privateDnsZones/SRV/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/readme.md b/modules/Network/privateDnsZones/TXT/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/TXT/readme.md
rename to modules/Network/privateDnsZones/TXT/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/main.bicep b/modules/Network/privateDnsZones/TXT/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/TXT/main.bicep
rename to modules/Network/privateDnsZones/TXT/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/version.json b/modules/Network/privateDnsZones/TXT/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/TXT/version.json
rename to modules/Network/privateDnsZones/TXT/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/main.bicep b/modules/Network/privateDnsZones/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/main.bicep
rename to modules/Network/privateDnsZones/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/version.json b/modules/Network/privateDnsZones/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/version.json
rename to modules/Network/privateDnsZones/version.json
diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/modules/Network/privateDnsZones/virtualNetworkLinks/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
rename to modules/Network/privateDnsZones/virtualNetworkLinks/README.md
diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/main.bicep b/modules/Network/privateDnsZones/virtualNetworkLinks/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/main.bicep
rename to modules/Network/privateDnsZones/virtualNetworkLinks/main.bicep
diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/modules/Network/privateDnsZones/virtualNetworkLinks/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
rename to modules/Network/privateDnsZones/virtualNetworkLinks/version.json
diff --git a/modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep b/modules/Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep b/modules/Network/privateEndpoints/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep
rename to modules/Network/privateEndpoints/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/.test/common/main.test.bicep b/modules/Network/privateEndpoints/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.test/common/main.test.bicep
rename to modules/Network/privateEndpoints/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep b/modules/Network/privateEndpoints/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep
rename to modules/Network/privateEndpoints/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/.test/min/main.test.bicep b/modules/Network/privateEndpoints/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.test/min/main.test.bicep
rename to modules/Network/privateEndpoints/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/readme.md b/modules/Network/privateEndpoints/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/readme.md
rename to modules/Network/privateEndpoints/README.md
diff --git a/modules/Microsoft.Network/privateEndpoints/main.bicep b/modules/Network/privateEndpoints/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/main.bicep
rename to modules/Network/privateEndpoints/main.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/modules/Network/privateEndpoints/privateDnsZoneGroups/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
rename to modules/Network/privateEndpoints/privateDnsZoneGroups/README.md
diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/main.bicep b/modules/Network/privateEndpoints/privateDnsZoneGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/main.bicep
rename to modules/Network/privateEndpoints/privateDnsZoneGroups/main.bicep
diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/modules/Network/privateEndpoints/privateDnsZoneGroups/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
rename to modules/Network/privateEndpoints/privateDnsZoneGroups/version.json
diff --git a/modules/Microsoft.Network/privateEndpoints/version.json b/modules/Network/privateEndpoints/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/version.json
rename to modules/Network/privateEndpoints/version.json
diff --git a/modules/Microsoft.Network/privateLinkServices/.bicep/nested_roleAssignments.bicep b/modules/Network/privateLinkServices/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/.bicep/nested_roleAssignments.bicep
rename to modules/Network/privateLinkServices/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep b/modules/Network/privateLinkServices/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep
rename to modules/Network/privateLinkServices/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/.test/common/main.test.bicep b/modules/Network/privateLinkServices/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/.test/common/main.test.bicep
rename to modules/Network/privateLinkServices/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep b/modules/Network/privateLinkServices/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep
rename to modules/Network/privateLinkServices/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/.test/min/main.test.bicep b/modules/Network/privateLinkServices/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/.test/min/main.test.bicep
rename to modules/Network/privateLinkServices/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/readme.md b/modules/Network/privateLinkServices/README.md
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/readme.md
rename to modules/Network/privateLinkServices/README.md
diff --git a/modules/Microsoft.Network/privateLinkServices/main.bicep b/modules/Network/privateLinkServices/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/main.bicep
rename to modules/Network/privateLinkServices/main.bicep
diff --git a/modules/Microsoft.Network/privateLinkServices/version.json b/modules/Network/privateLinkServices/version.json
similarity index 100%
rename from modules/Microsoft.Network/privateLinkServices/version.json
rename to modules/Network/privateLinkServices/version.json
diff --git a/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep b/modules/Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
rename to modules/Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep b/modules/Network/publicIPAddresses/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep
rename to modules/Network/publicIPAddresses/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/main.test.bicep b/modules/Network/publicIPAddresses/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.test/common/main.test.bicep
rename to modules/Network/publicIPAddresses/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/main.test.bicep b/modules/Network/publicIPAddresses/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.test/min/main.test.bicep
rename to modules/Network/publicIPAddresses/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/publicIPAddresses/readme.md b/modules/Network/publicIPAddresses/README.md
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/readme.md
rename to modules/Network/publicIPAddresses/README.md
diff --git a/modules/Microsoft.Network/publicIPAddresses/main.bicep b/modules/Network/publicIPAddresses/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/main.bicep
rename to modules/Network/publicIPAddresses/main.bicep
diff --git a/modules/Microsoft.Network/publicIPAddresses/version.json b/modules/Network/publicIPAddresses/version.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/version.json
rename to modules/Network/publicIPAddresses/version.json
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep b/modules/Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
rename to modules/Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/common/dependencies.bicep b/modules/Network/publicIPPrefixes/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.test/common/dependencies.bicep
rename to modules/Network/publicIPPrefixes/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/common/main.test.bicep b/modules/Network/publicIPPrefixes/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.test/common/main.test.bicep
rename to modules/Network/publicIPPrefixes/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/min/main.test.bicep b/modules/Network/publicIPPrefixes/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.test/min/main.test.bicep
rename to modules/Network/publicIPPrefixes/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/publicIPPrefixes/readme.md b/modules/Network/publicIPPrefixes/README.md
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/readme.md
rename to modules/Network/publicIPPrefixes/README.md
diff --git a/modules/Microsoft.Network/publicIPPrefixes/main.bicep b/modules/Network/publicIPPrefixes/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/main.bicep
rename to modules/Network/publicIPPrefixes/main.bicep
diff --git a/modules/Microsoft.Network/publicIPPrefixes/version.json b/modules/Network/publicIPPrefixes/version.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/version.json
rename to modules/Network/publicIPPrefixes/version.json
diff --git a/modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep b/modules/Network/routeTables/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep
rename to modules/Network/routeTables/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/routeTables/.test/common/dependencies.bicep b/modules/Network/routeTables/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.test/common/dependencies.bicep
rename to modules/Network/routeTables/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/routeTables/.test/common/main.test.bicep b/modules/Network/routeTables/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.test/common/main.test.bicep
rename to modules/Network/routeTables/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/routeTables/.test/min/main.test.bicep b/modules/Network/routeTables/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.test/min/main.test.bicep
rename to modules/Network/routeTables/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/routeTables/readme.md b/modules/Network/routeTables/README.md
similarity index 100%
rename from modules/Microsoft.Network/routeTables/readme.md
rename to modules/Network/routeTables/README.md
diff --git a/modules/Microsoft.Network/routeTables/main.bicep b/modules/Network/routeTables/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/routeTables/main.bicep
rename to modules/Network/routeTables/main.bicep
diff --git a/modules/Microsoft.Network/routeTables/version.json b/modules/Network/routeTables/version.json
similarity index 100%
rename from modules/Microsoft.Network/routeTables/version.json
rename to modules/Network/routeTables/version.json
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep b/modules/Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
rename to modules/Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/common/dependencies.bicep b/modules/Network/trafficmanagerprofiles/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/common/dependencies.bicep
rename to modules/Network/trafficmanagerprofiles/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/common/main.test.bicep b/modules/Network/trafficmanagerprofiles/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/common/main.test.bicep
rename to modules/Network/trafficmanagerprofiles/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/min/main.test.bicep b/modules/Network/trafficmanagerprofiles/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/min/main.test.bicep
rename to modules/Network/trafficmanagerprofiles/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/readme.md b/modules/Network/trafficmanagerprofiles/README.md
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/readme.md
rename to modules/Network/trafficmanagerprofiles/README.md
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/main.bicep b/modules/Network/trafficmanagerprofiles/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/main.bicep
rename to modules/Network/trafficmanagerprofiles/main.bicep
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/version.json b/modules/Network/trafficmanagerprofiles/version.json
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/version.json
rename to modules/Network/trafficmanagerprofiles/version.json
diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Network/virtualHubs/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep
rename to modules/Network/virtualHubs/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/main.test.bicep b/modules/Network/virtualHubs/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.test/common/main.test.bicep
rename to modules/Network/virtualHubs/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep b/modules/Network/virtualHubs/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep
rename to modules/Network/virtualHubs/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/main.test.bicep b/modules/Network/virtualHubs/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.test/min/main.test.bicep
rename to modules/Network/virtualHubs/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Network/virtualHubs/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/readme.md
rename to modules/Network/virtualHubs/README.md
diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md b/modules/Network/virtualHubs/hubRouteTables/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
rename to modules/Network/virtualHubs/hubRouteTables/README.md
diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/main.bicep b/modules/Network/virtualHubs/hubRouteTables/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/main.bicep
rename to modules/Network/virtualHubs/hubRouteTables/main.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json b/modules/Network/virtualHubs/hubRouteTables/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json
rename to modules/Network/virtualHubs/hubRouteTables/version.json
diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md b/modules/Network/virtualHubs/hubVirtualNetworkConnections/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/README.md
diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/main.bicep b/modules/Network/virtualHubs/hubVirtualNetworkConnections/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/main.bicep
rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/main.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json b/modules/Network/virtualHubs/hubVirtualNetworkConnections/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/version.json
diff --git a/modules/Microsoft.Network/virtualHubs/main.bicep b/modules/Network/virtualHubs/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/main.bicep
rename to modules/Network/virtualHubs/main.bicep
diff --git a/modules/Microsoft.Network/virtualHubs/version.json b/modules/Network/virtualHubs/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/version.json
rename to modules/Network/virtualHubs/version.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep
rename to modules/Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep
rename to modules/Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep
rename to modules/Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep
rename to modules/Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/vpn/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep
rename to modules/Network/virtualNetworkGateways/.test/vpn/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/vpn/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/main.test.bicep
rename to modules/Network/virtualNetworkGateways/.test/vpn/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/readme.md b/modules/Network/virtualNetworkGateways/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/readme.md
rename to modules/Network/virtualNetworkGateways/README.md
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/main.bicep b/modules/Network/virtualNetworkGateways/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/main.bicep
rename to modules/Network/virtualNetworkGateways/main.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/readme.md b/modules/Network/virtualNetworkGateways/natRules/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/readme.md
rename to modules/Network/virtualNetworkGateways/natRules/README.md
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/main.bicep b/modules/Network/virtualNetworkGateways/natRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/main.bicep
rename to modules/Network/virtualNetworkGateways/natRules/main.bicep
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/version.json b/modules/Network/virtualNetworkGateways/natRules/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/version.json
rename to modules/Network/virtualNetworkGateways/natRules/version.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/version.json b/modules/Network/virtualNetworkGateways/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/version.json
rename to modules/Network/virtualNetworkGateways/version.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
rename to modules/Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/.test/common/dependencies.bicep b/modules/Network/virtualNetworks/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.test/common/dependencies.bicep
rename to modules/Network/virtualNetworks/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/.test/common/main.test.bicep b/modules/Network/virtualNetworks/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.test/common/main.test.bicep
rename to modules/Network/virtualNetworks/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/.test/min/main.test.bicep b/modules/Network/virtualNetworks/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.test/min/main.test.bicep
rename to modules/Network/virtualNetworks/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep b/modules/Network/virtualNetworks/.test/vnetPeering/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep
rename to modules/Network/virtualNetworks/.test/vnetPeering/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/main.test.bicep b/modules/Network/virtualNetworks/.test/vnetPeering/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/main.test.bicep
rename to modules/Network/virtualNetworks/.test/vnetPeering/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/readme.md b/modules/Network/virtualNetworks/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/readme.md
rename to modules/Network/virtualNetworks/README.md
diff --git a/modules/Microsoft.Network/virtualNetworks/main.bicep b/modules/Network/virtualNetworks/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/main.bicep
rename to modules/Network/virtualNetworks/main.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
rename to modules/Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/readme.md b/modules/Network/virtualNetworks/subnets/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/subnets/readme.md
rename to modules/Network/virtualNetworks/subnets/README.md
diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/main.bicep b/modules/Network/virtualNetworks/subnets/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/subnets/main.bicep
rename to modules/Network/virtualNetworks/subnets/main.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/version.json b/modules/Network/virtualNetworks/subnets/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/subnets/version.json
rename to modules/Network/virtualNetworks/subnets/version.json
diff --git a/modules/Microsoft.Network/virtualNetworks/version.json b/modules/Network/virtualNetworks/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/version.json
rename to modules/Network/virtualNetworks/version.json
diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/modules/Network/virtualNetworks/virtualNetworkPeerings/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
rename to modules/Network/virtualNetworks/virtualNetworkPeerings/README.md
diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/main.bicep b/modules/Network/virtualNetworks/virtualNetworkPeerings/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/main.bicep
rename to modules/Network/virtualNetworks/virtualNetworkPeerings/main.bicep
diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/modules/Network/virtualNetworks/virtualNetworkPeerings/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
rename to modules/Network/virtualNetworks/virtualNetworkPeerings/version.json
diff --git a/modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualWans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep
rename to modules/Network/virtualWans/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/virtualWans/.test/common/dependencies.bicep b/modules/Network/virtualWans/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.test/common/dependencies.bicep
rename to modules/Network/virtualWans/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/virtualWans/.test/common/main.test.bicep b/modules/Network/virtualWans/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.test/common/main.test.bicep
rename to modules/Network/virtualWans/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualWans/.test/min/main.test.bicep b/modules/Network/virtualWans/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.test/min/main.test.bicep
rename to modules/Network/virtualWans/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/virtualWans/readme.md b/modules/Network/virtualWans/README.md
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/readme.md
rename to modules/Network/virtualWans/README.md
diff --git a/modules/Microsoft.Network/virtualWans/main.bicep b/modules/Network/virtualWans/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/main.bicep
rename to modules/Network/virtualWans/main.bicep
diff --git a/modules/Microsoft.Network/virtualWans/version.json b/modules/Network/virtualWans/version.json
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/version.json
rename to modules/Network/virtualWans/version.json
diff --git a/modules/Microsoft.Network/vpnGateways/.test/common/dependencies.bicep b/modules/Network/vpnGateways/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.test/common/dependencies.bicep
rename to modules/Network/vpnGateways/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/.test/common/main.test.bicep b/modules/Network/vpnGateways/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.test/common/main.test.bicep
rename to modules/Network/vpnGateways/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/.test/min/dependencies.bicep b/modules/Network/vpnGateways/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.test/min/dependencies.bicep
rename to modules/Network/vpnGateways/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/.test/min/main.test.bicep b/modules/Network/vpnGateways/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.test/min/main.test.bicep
rename to modules/Network/vpnGateways/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/readme.md b/modules/Network/vpnGateways/README.md
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/readme.md
rename to modules/Network/vpnGateways/README.md
diff --git a/modules/Microsoft.Network/vpnGateways/connections/readme.md b/modules/Network/vpnGateways/connections/README.md
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/connections/readme.md
rename to modules/Network/vpnGateways/connections/README.md
diff --git a/modules/Microsoft.Network/vpnGateways/connections/main.bicep b/modules/Network/vpnGateways/connections/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/connections/main.bicep
rename to modules/Network/vpnGateways/connections/main.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/connections/version.json b/modules/Network/vpnGateways/connections/version.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/connections/version.json
rename to modules/Network/vpnGateways/connections/version.json
diff --git a/modules/Microsoft.Network/vpnGateways/main.bicep b/modules/Network/vpnGateways/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/main.bicep
rename to modules/Network/vpnGateways/main.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/natRules/readme.md b/modules/Network/vpnGateways/natRules/README.md
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/natRules/readme.md
rename to modules/Network/vpnGateways/natRules/README.md
diff --git a/modules/Microsoft.Network/vpnGateways/natRules/main.bicep b/modules/Network/vpnGateways/natRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/natRules/main.bicep
rename to modules/Network/vpnGateways/natRules/main.bicep
diff --git a/modules/Microsoft.Network/vpnGateways/natRules/version.json b/modules/Network/vpnGateways/natRules/version.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/natRules/version.json
rename to modules/Network/vpnGateways/natRules/version.json
diff --git a/modules/Microsoft.Network/vpnGateways/version.json b/modules/Network/vpnGateways/version.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/version.json
rename to modules/Network/vpnGateways/version.json
diff --git a/modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep b/modules/Network/vpnSites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep
rename to modules/Network/vpnSites/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Network/vpnSites/.test/common/dependencies.bicep b/modules/Network/vpnSites/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.test/common/dependencies.bicep
rename to modules/Network/vpnSites/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Network/vpnSites/.test/common/main.test.bicep b/modules/Network/vpnSites/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.test/common/main.test.bicep
rename to modules/Network/vpnSites/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Network/vpnSites/.test/min/dependencies.bicep b/modules/Network/vpnSites/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.test/min/dependencies.bicep
rename to modules/Network/vpnSites/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Network/vpnSites/.test/min/main.test.bicep b/modules/Network/vpnSites/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.test/min/main.test.bicep
rename to modules/Network/vpnSites/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Network/vpnSites/readme.md b/modules/Network/vpnSites/README.md
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/readme.md
rename to modules/Network/vpnSites/README.md
diff --git a/modules/Microsoft.Network/vpnSites/main.bicep b/modules/Network/vpnSites/main.bicep
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/main.bicep
rename to modules/Network/vpnSites/main.bicep
diff --git a/modules/Microsoft.Network/vpnSites/version.json b/modules/Network/vpnSites/version.json
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/version.json
rename to modules/Network/vpnSites/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep b/modules/OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/adv/dependencies.bicep b/modules/OperationalInsights/workspaces/.test/adv/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.test/adv/dependencies.bicep
rename to modules/OperationalInsights/workspaces/.test/adv/dependencies.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/adv/main.test.bicep b/modules/OperationalInsights/workspaces/.test/adv/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.test/adv/main.test.bicep
rename to modules/OperationalInsights/workspaces/.test/adv/main.test.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/common/dependencies.bicep b/modules/OperationalInsights/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.test/common/dependencies.bicep
rename to modules/OperationalInsights/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/common/main.test.bicep b/modules/OperationalInsights/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.test/common/main.test.bicep
rename to modules/OperationalInsights/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/min/main.test.bicep b/modules/OperationalInsights/workspaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.test/min/main.test.bicep
rename to modules/OperationalInsights/workspaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/readme.md b/modules/OperationalInsights/workspaces/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/readme.md
rename to modules/OperationalInsights/workspaces/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/readme.md b/modules/OperationalInsights/workspaces/dataExports/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/readme.md
rename to modules/OperationalInsights/workspaces/dataExports/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/main.bicep b/modules/OperationalInsights/workspaces/dataExports/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/main.bicep
rename to modules/OperationalInsights/workspaces/dataExports/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/version.json b/modules/OperationalInsights/workspaces/dataExports/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/version.json
rename to modules/OperationalInsights/workspaces/dataExports/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md b/modules/OperationalInsights/workspaces/dataSources/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
rename to modules/OperationalInsights/workspaces/dataSources/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/main.bicep b/modules/OperationalInsights/workspaces/dataSources/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/main.bicep
rename to modules/OperationalInsights/workspaces/dataSources/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/modules/OperationalInsights/workspaces/dataSources/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json
rename to modules/OperationalInsights/workspaces/dataSources/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md b/modules/OperationalInsights/workspaces/linkedServices/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
rename to modules/OperationalInsights/workspaces/linkedServices/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/main.bicep b/modules/OperationalInsights/workspaces/linkedServices/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/main.bicep
rename to modules/OperationalInsights/workspaces/linkedServices/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/modules/OperationalInsights/workspaces/linkedServices/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
rename to modules/OperationalInsights/workspaces/linkedServices/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/readme.md b/modules/OperationalInsights/workspaces/linkedStorageAccounts/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/readme.md
rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/main.bicep b/modules/OperationalInsights/workspaces/linkedStorageAccounts/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/main.bicep
rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/version.json b/modules/OperationalInsights/workspaces/linkedStorageAccounts/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/version.json
rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/main.bicep b/modules/OperationalInsights/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/main.bicep
rename to modules/OperationalInsights/workspaces/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md b/modules/OperationalInsights/workspaces/savedSearches/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
rename to modules/OperationalInsights/workspaces/savedSearches/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/main.bicep b/modules/OperationalInsights/workspaces/savedSearches/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/main.bicep
rename to modules/OperationalInsights/workspaces/savedSearches/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/modules/OperationalInsights/workspaces/savedSearches/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
rename to modules/OperationalInsights/workspaces/savedSearches/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md b/modules/OperationalInsights/workspaces/storageInsightConfigs/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
rename to modules/OperationalInsights/workspaces/storageInsightConfigs/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/main.bicep b/modules/OperationalInsights/workspaces/storageInsightConfigs/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/main.bicep
rename to modules/OperationalInsights/workspaces/storageInsightConfigs/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/modules/OperationalInsights/workspaces/storageInsightConfigs/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
rename to modules/OperationalInsights/workspaces/storageInsightConfigs/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/readme.md b/modules/OperationalInsights/workspaces/tables/README.md
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/tables/readme.md
rename to modules/OperationalInsights/workspaces/tables/README.md
diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/main.bicep b/modules/OperationalInsights/workspaces/tables/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/tables/main.bicep
rename to modules/OperationalInsights/workspaces/tables/main.bicep
diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/version.json b/modules/OperationalInsights/workspaces/tables/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/tables/version.json
rename to modules/OperationalInsights/workspaces/tables/version.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/version.json b/modules/OperationalInsights/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/version.json
rename to modules/OperationalInsights/workspaces/version.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/min/dependencies.bicep b/modules/OperationsManagement/solutions/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/min/dependencies.bicep
rename to modules/OperationsManagement/solutions/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/min/main.test.bicep b/modules/OperationsManagement/solutions/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/min/main.test.bicep
rename to modules/OperationsManagement/solutions/.test/min/main.test.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/ms/dependencies.bicep b/modules/OperationsManagement/solutions/.test/ms/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/ms/dependencies.bicep
rename to modules/OperationsManagement/solutions/.test/ms/dependencies.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/ms/main.test.bicep b/modules/OperationsManagement/solutions/.test/ms/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/ms/main.test.bicep
rename to modules/OperationsManagement/solutions/.test/ms/main.test.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/nonms/dependencies.bicep b/modules/OperationsManagement/solutions/.test/nonms/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/nonms/dependencies.bicep
rename to modules/OperationsManagement/solutions/.test/nonms/dependencies.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/nonms/main.test.bicep b/modules/OperationsManagement/solutions/.test/nonms/main.test.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.test/nonms/main.test.bicep
rename to modules/OperationsManagement/solutions/.test/nonms/main.test.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/readme.md b/modules/OperationsManagement/solutions/README.md
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/readme.md
rename to modules/OperationsManagement/solutions/README.md
diff --git a/modules/Microsoft.OperationsManagement/solutions/main.bicep b/modules/OperationsManagement/solutions/main.bicep
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/main.bicep
rename to modules/OperationsManagement/solutions/main.bicep
diff --git a/modules/Microsoft.OperationsManagement/solutions/version.json b/modules/OperationsManagement/solutions/version.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/version.json
rename to modules/OperationsManagement/solutions/version.json
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/mg.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/mg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/mg.common/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/mg.common/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/mg.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/mg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/mg.min/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/mg.min/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/rg.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/rg.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/rg.common/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/rg.common/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/rg.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/rg.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/rg.min/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/rg.min/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/sub.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/sub.common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/sub.common/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/sub.common/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/sub.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/sub.min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/.test/sub.min/main.test.bicep
rename to modules/PolicyInsights/remediations/.test/sub.min/main.test.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/readme.md b/modules/PolicyInsights/remediations/README.md
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/readme.md
rename to modules/PolicyInsights/remediations/README.md
diff --git a/modules/Microsoft.PolicyInsights/remediations/main.bicep b/modules/PolicyInsights/remediations/main.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/main.bicep
rename to modules/PolicyInsights/remediations/main.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/readme.md b/modules/PolicyInsights/remediations/managementGroup/README.md
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/readme.md
rename to modules/PolicyInsights/remediations/managementGroup/README.md
diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/main.bicep b/modules/PolicyInsights/remediations/managementGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/main.bicep
rename to modules/PolicyInsights/remediations/managementGroup/main.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/version.json b/modules/PolicyInsights/remediations/managementGroup/version.json
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/version.json
rename to modules/PolicyInsights/remediations/managementGroup/version.json
diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/readme.md b/modules/PolicyInsights/remediations/resourceGroup/README.md
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/readme.md
rename to modules/PolicyInsights/remediations/resourceGroup/README.md
diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/main.bicep b/modules/PolicyInsights/remediations/resourceGroup/main.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/main.bicep
rename to modules/PolicyInsights/remediations/resourceGroup/main.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/version.json b/modules/PolicyInsights/remediations/resourceGroup/version.json
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/version.json
rename to modules/PolicyInsights/remediations/resourceGroup/version.json
diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/readme.md b/modules/PolicyInsights/remediations/subscription/README.md
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/subscription/readme.md
rename to modules/PolicyInsights/remediations/subscription/README.md
diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/main.bicep b/modules/PolicyInsights/remediations/subscription/main.bicep
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/subscription/main.bicep
rename to modules/PolicyInsights/remediations/subscription/main.bicep
diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/version.json b/modules/PolicyInsights/remediations/subscription/version.json
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/subscription/version.json
rename to modules/PolicyInsights/remediations/subscription/version.json
diff --git a/modules/Microsoft.PolicyInsights/remediations/version.json b/modules/PolicyInsights/remediations/version.json
similarity index 100%
rename from modules/Microsoft.PolicyInsights/remediations/version.json
rename to modules/PolicyInsights/remediations/version.json
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep b/modules/PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep
rename to modules/PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/common/dependencies.bicep b/modules/PowerBIDedicated/capacities/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/.test/common/dependencies.bicep
rename to modules/PowerBIDedicated/capacities/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/common/main.test.bicep b/modules/PowerBIDedicated/capacities/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/.test/common/main.test.bicep
rename to modules/PowerBIDedicated/capacities/.test/common/main.test.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/min/dependencies.bicep b/modules/PowerBIDedicated/capacities/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/.test/min/dependencies.bicep
rename to modules/PowerBIDedicated/capacities/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/min/main.test.bicep b/modules/PowerBIDedicated/capacities/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/.test/min/main.test.bicep
rename to modules/PowerBIDedicated/capacities/.test/min/main.test.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/readme.md b/modules/PowerBIDedicated/capacities/README.md
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/readme.md
rename to modules/PowerBIDedicated/capacities/README.md
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/main.bicep b/modules/PowerBIDedicated/capacities/main.bicep
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/main.bicep
rename to modules/PowerBIDedicated/capacities/main.bicep
diff --git a/modules/Microsoft.PowerBIDedicated/capacities/version.json b/modules/PowerBIDedicated/capacities/version.json
similarity index 100%
rename from modules/Microsoft.PowerBIDedicated/capacities/version.json
rename to modules/PowerBIDedicated/capacities/version.json
diff --git a/modules/Microsoft.Purview/accounts/.bicep/nested_roleAssignments.bicep b/modules/Purview/accounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Purview/accounts/.bicep/nested_roleAssignments.bicep
rename to modules/Purview/accounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Purview/accounts/.test/common/dependencies.bicep b/modules/Purview/accounts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Purview/accounts/.test/common/dependencies.bicep
rename to modules/Purview/accounts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Purview/accounts/.test/common/main.test.bicep b/modules/Purview/accounts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Purview/accounts/.test/common/main.test.bicep
rename to modules/Purview/accounts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Purview/accounts/.test/min/main.test.bicep b/modules/Purview/accounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Purview/accounts/.test/min/main.test.bicep
rename to modules/Purview/accounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Purview/accounts/readme.md b/modules/Purview/accounts/README.md
similarity index 100%
rename from modules/Microsoft.Purview/accounts/readme.md
rename to modules/Purview/accounts/README.md
diff --git a/modules/Microsoft.Purview/accounts/main.bicep b/modules/Purview/accounts/main.bicep
similarity index 100%
rename from modules/Microsoft.Purview/accounts/main.bicep
rename to modules/Purview/accounts/main.bicep
diff --git a/modules/Microsoft.Purview/accounts/version.json b/modules/Purview/accounts/version.json
similarity index 100%
rename from modules/Microsoft.Purview/accounts/version.json
rename to modules/Purview/accounts/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep b/modules/RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
rename to modules/RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep b/modules/RecoveryServices/vaults/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep
rename to modules/RecoveryServices/vaults/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/common/main.test.bicep b/modules/RecoveryServices/vaults/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.test/common/main.test.bicep
rename to modules/RecoveryServices/vaults/.test/common/main.test.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/dr/main.test.bicep b/modules/RecoveryServices/vaults/.test/dr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.test/dr/main.test.bicep
rename to modules/RecoveryServices/vaults/.test/dr/main.test.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/min/main.test.bicep b/modules/RecoveryServices/vaults/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.test/min/main.test.bicep
rename to modules/RecoveryServices/vaults/.test/min/main.test.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/readme.md b/modules/RecoveryServices/vaults/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/readme.md
rename to modules/RecoveryServices/vaults/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/modules/RecoveryServices/vaults/backupConfig/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
rename to modules/RecoveryServices/vaults/backupConfig/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/main.bicep b/modules/RecoveryServices/vaults/backupConfig/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/main.bicep
rename to modules/RecoveryServices/vaults/backupConfig/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/modules/RecoveryServices/vaults/backupConfig/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json
rename to modules/RecoveryServices/vaults/backupConfig/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md b/modules/RecoveryServices/vaults/backupPolicies/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
rename to modules/RecoveryServices/vaults/backupPolicies/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/main.bicep b/modules/RecoveryServices/vaults/backupPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/main.bicep
rename to modules/RecoveryServices/vaults/backupPolicies/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/modules/RecoveryServices/vaults/backupPolicies/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
rename to modules/RecoveryServices/vaults/backupPolicies/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md b/modules/RecoveryServices/vaults/backupStorageConfig/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
rename to modules/RecoveryServices/vaults/backupStorageConfig/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/main.bicep b/modules/RecoveryServices/vaults/backupStorageConfig/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/main.bicep
rename to modules/RecoveryServices/vaults/backupStorageConfig/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/modules/RecoveryServices/vaults/backupStorageConfig/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
rename to modules/RecoveryServices/vaults/backupStorageConfig/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/main.bicep b/modules/RecoveryServices/vaults/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/main.bicep
rename to modules/RecoveryServices/vaults/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md b/modules/RecoveryServices/vaults/protectionContainers/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
rename to modules/RecoveryServices/vaults/protectionContainers/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/main.bicep b/modules/RecoveryServices/vaults/protectionContainers/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/main.bicep
rename to modules/RecoveryServices/vaults/protectionContainers/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep
rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/modules/RecoveryServices/vaults/protectionContainers/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
rename to modules/RecoveryServices/vaults/protectionContainers/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/readme.md b/modules/RecoveryServices/vaults/replicationAlertSettings/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/readme.md
rename to modules/RecoveryServices/vaults/replicationAlertSettings/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/main.bicep b/modules/RecoveryServices/vaults/replicationAlertSettings/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/main.bicep
rename to modules/RecoveryServices/vaults/replicationAlertSettings/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/version.json b/modules/RecoveryServices/vaults/replicationAlertSettings/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/version.json
rename to modules/RecoveryServices/vaults/replicationAlertSettings/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
rename to modules/RecoveryServices/vaults/replicationFabrics/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/main.bicep
rename to modules/RecoveryServices/vaults/replicationFabrics/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json b/modules/RecoveryServices/vaults/replicationFabrics/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
rename to modules/RecoveryServices/vaults/replicationFabrics/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md b/modules/RecoveryServices/vaults/replicationPolicies/README.md
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
rename to modules/RecoveryServices/vaults/replicationPolicies/README.md
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/main.bicep b/modules/RecoveryServices/vaults/replicationPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/main.bicep
rename to modules/RecoveryServices/vaults/replicationPolicies/main.bicep
diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json b/modules/RecoveryServices/vaults/replicationPolicies/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
rename to modules/RecoveryServices/vaults/replicationPolicies/version.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/version.json b/modules/RecoveryServices/vaults/version.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/version.json
rename to modules/RecoveryServices/vaults/version.json
diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/cli/dependencies.bicep b/modules/Resources/deploymentScripts/.test/cli/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.test/cli/dependencies.bicep
rename to modules/Resources/deploymentScripts/.test/cli/dependencies.bicep
diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/cli/main.test.bicep b/modules/Resources/deploymentScripts/.test/cli/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.test/cli/main.test.bicep
rename to modules/Resources/deploymentScripts/.test/cli/main.test.bicep
diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/ps/dependencies.bicep b/modules/Resources/deploymentScripts/.test/ps/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.test/ps/dependencies.bicep
rename to modules/Resources/deploymentScripts/.test/ps/dependencies.bicep
diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/ps/main.test.bicep b/modules/Resources/deploymentScripts/.test/ps/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.test/ps/main.test.bicep
rename to modules/Resources/deploymentScripts/.test/ps/main.test.bicep
diff --git a/modules/Microsoft.Resources/deploymentScripts/readme.md b/modules/Resources/deploymentScripts/README.md
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/readme.md
rename to modules/Resources/deploymentScripts/README.md
diff --git a/modules/Microsoft.Resources/deploymentScripts/main.bicep b/modules/Resources/deploymentScripts/main.bicep
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/main.bicep
rename to modules/Resources/deploymentScripts/main.bicep
diff --git a/modules/Microsoft.Resources/deploymentScripts/version.json b/modules/Resources/deploymentScripts/version.json
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/version.json
rename to modules/Resources/deploymentScripts/version.json
diff --git a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep b/modules/Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Resources/resourceGroups/.test/common/dependencies.bicep b/modules/Resources/resourceGroups/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.test/common/dependencies.bicep
rename to modules/Resources/resourceGroups/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Resources/resourceGroups/.test/common/main.test.bicep b/modules/Resources/resourceGroups/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.test/common/main.test.bicep
rename to modules/Resources/resourceGroups/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Resources/resourceGroups/.test/min/main.test.bicep b/modules/Resources/resourceGroups/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.test/min/main.test.bicep
rename to modules/Resources/resourceGroups/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Resources/resourceGroups/readme.md b/modules/Resources/resourceGroups/README.md
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/readme.md
rename to modules/Resources/resourceGroups/README.md
diff --git a/modules/Microsoft.Resources/resourceGroups/main.bicep b/modules/Resources/resourceGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/main.bicep
rename to modules/Resources/resourceGroups/main.bicep
diff --git a/modules/Microsoft.Resources/resourceGroups/version.json b/modules/Resources/resourceGroups/version.json
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/version.json
rename to modules/Resources/resourceGroups/version.json
diff --git a/modules/Microsoft.Resources/tags/.test/min/main.test.bicep b/modules/Resources/tags/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/.test/min/main.test.bicep
rename to modules/Resources/tags/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Resources/tags/.test/rg/main.test.bicep b/modules/Resources/tags/.test/rg/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/.test/rg/main.test.bicep
rename to modules/Resources/tags/.test/rg/main.test.bicep
diff --git a/modules/Microsoft.Resources/tags/.test/sub/main.test.bicep b/modules/Resources/tags/.test/sub/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/.test/sub/main.test.bicep
rename to modules/Resources/tags/.test/sub/main.test.bicep
diff --git a/modules/Microsoft.Resources/tags/readme.md b/modules/Resources/tags/README.md
similarity index 100%
rename from modules/Microsoft.Resources/tags/readme.md
rename to modules/Resources/tags/README.md
diff --git a/modules/Microsoft.Resources/tags/main.bicep b/modules/Resources/tags/main.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/main.bicep
rename to modules/Resources/tags/main.bicep
diff --git a/modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep b/modules/Resources/tags/resourceGroups/.bicep/readTags.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
rename to modules/Resources/tags/resourceGroups/.bicep/readTags.bicep
diff --git a/modules/Microsoft.Resources/tags/resourceGroups/readme.md b/modules/Resources/tags/resourceGroups/README.md
similarity index 100%
rename from modules/Microsoft.Resources/tags/resourceGroups/readme.md
rename to modules/Resources/tags/resourceGroups/README.md
diff --git a/modules/Microsoft.Resources/tags/resourceGroups/main.bicep b/modules/Resources/tags/resourceGroups/main.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/resourceGroups/main.bicep
rename to modules/Resources/tags/resourceGroups/main.bicep
diff --git a/modules/Microsoft.Resources/tags/resourceGroups/version.json b/modules/Resources/tags/resourceGroups/version.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/resourceGroups/version.json
rename to modules/Resources/tags/resourceGroups/version.json
diff --git a/modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep b/modules/Resources/tags/subscriptions/.bicep/readTags.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
rename to modules/Resources/tags/subscriptions/.bicep/readTags.bicep
diff --git a/modules/Microsoft.Resources/tags/subscriptions/readme.md b/modules/Resources/tags/subscriptions/README.md
similarity index 100%
rename from modules/Microsoft.Resources/tags/subscriptions/readme.md
rename to modules/Resources/tags/subscriptions/README.md
diff --git a/modules/Microsoft.Resources/tags/subscriptions/main.bicep b/modules/Resources/tags/subscriptions/main.bicep
similarity index 100%
rename from modules/Microsoft.Resources/tags/subscriptions/main.bicep
rename to modules/Resources/tags/subscriptions/main.bicep
diff --git a/modules/Microsoft.Resources/tags/subscriptions/version.json b/modules/Resources/tags/subscriptions/version.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/subscriptions/version.json
rename to modules/Resources/tags/subscriptions/version.json
diff --git a/modules/Microsoft.Resources/tags/version.json b/modules/Resources/tags/version.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/version.json
rename to modules/Resources/tags/version.json
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep b/modules/Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
rename to modules/Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.test/common/dependencies.bicep b/modules/Security/azureSecurityCenter/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/.test/common/dependencies.bicep
rename to modules/Security/azureSecurityCenter/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.test/common/main.test.bicep b/modules/Security/azureSecurityCenter/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/.test/common/main.test.bicep
rename to modules/Security/azureSecurityCenter/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Security/azureSecurityCenter/readme.md b/modules/Security/azureSecurityCenter/README.md
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/readme.md
rename to modules/Security/azureSecurityCenter/README.md
diff --git a/modules/Microsoft.Security/azureSecurityCenter/main.bicep b/modules/Security/azureSecurityCenter/main.bicep
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/main.bicep
rename to modules/Security/azureSecurityCenter/main.bicep
diff --git a/modules/Microsoft.Security/azureSecurityCenter/version.json b/modules/Security/azureSecurityCenter/version.json
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/version.json
rename to modules/Security/azureSecurityCenter/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
rename to modules/ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep b/modules/ServiceBus/namespaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep
rename to modules/ServiceBus/namespaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/common/main.test.bicep b/modules/ServiceBus/namespaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/common/main.test.bicep
rename to modules/ServiceBus/namespaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep b/modules/ServiceBus/namespaces/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep
rename to modules/ServiceBus/namespaces/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/encr/main.test.bicep b/modules/ServiceBus/namespaces/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/encr/main.test.bicep
rename to modules/ServiceBus/namespaces/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/min/main.test.bicep b/modules/ServiceBus/namespaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/min/main.test.bicep
rename to modules/ServiceBus/namespaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep b/modules/ServiceBus/namespaces/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep
rename to modules/ServiceBus/namespaces/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/pe/main.test.bicep b/modules/ServiceBus/namespaces/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.test/pe/main.test.bicep
rename to modules/ServiceBus/namespaces/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/readme.md b/modules/ServiceBus/namespaces/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/readme.md
rename to modules/ServiceBus/namespaces/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md b/modules/ServiceBus/namespaces/authorizationRules/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
rename to modules/ServiceBus/namespaces/authorizationRules/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/authorizationRules/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/main.bicep
rename to modules/ServiceBus/namespaces/authorizationRules/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/modules/ServiceBus/namespaces/authorizationRules/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
rename to modules/ServiceBus/namespaces/authorizationRules/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep
rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/main.bicep b/modules/ServiceBus/namespaces/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/main.bicep
rename to modules/ServiceBus/namespaces/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md b/modules/ServiceBus/namespaces/migrationConfigurations/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
rename to modules/ServiceBus/namespaces/migrationConfigurations/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/main.bicep b/modules/ServiceBus/namespaces/migrationConfigurations/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/main.bicep
rename to modules/ServiceBus/namespaces/migrationConfigurations/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/modules/ServiceBus/namespaces/migrationConfigurations/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
rename to modules/ServiceBus/namespaces/migrationConfigurations/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md b/modules/ServiceBus/namespaces/networkRuleSets/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md
rename to modules/ServiceBus/namespaces/networkRuleSets/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/main.bicep b/modules/ServiceBus/namespaces/networkRuleSets/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/main.bicep
rename to modules/ServiceBus/namespaces/networkRuleSets/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/version.json b/modules/ServiceBus/namespaces/networkRuleSets/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/version.json
rename to modules/ServiceBus/namespaces/networkRuleSets/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
rename to modules/ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/readme.md b/modules/ServiceBus/namespaces/queues/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/readme.md
rename to modules/ServiceBus/namespaces/queues/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md b/modules/ServiceBus/namespaces/queues/authorizationRules/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
rename to modules/ServiceBus/namespaces/queues/authorizationRules/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/queues/authorizationRules/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/main.bicep
rename to modules/ServiceBus/namespaces/queues/authorizationRules/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/modules/ServiceBus/namespaces/queues/authorizationRules/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
rename to modules/ServiceBus/namespaces/queues/authorizationRules/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/main.bicep b/modules/ServiceBus/namespaces/queues/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/main.bicep
rename to modules/ServiceBus/namespaces/queues/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/version.json b/modules/ServiceBus/namespaces/queues/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/queues/version.json
rename to modules/ServiceBus/namespaces/queues/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
rename to modules/ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/readme.md b/modules/ServiceBus/namespaces/topics/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/readme.md
rename to modules/ServiceBus/namespaces/topics/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md b/modules/ServiceBus/namespaces/topics/authorizationRules/README.md
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
rename to modules/ServiceBus/namespaces/topics/authorizationRules/README.md
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/topics/authorizationRules/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/main.bicep
rename to modules/ServiceBus/namespaces/topics/authorizationRules/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json b/modules/ServiceBus/namespaces/topics/authorizationRules/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
rename to modules/ServiceBus/namespaces/topics/authorizationRules/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/main.bicep b/modules/ServiceBus/namespaces/topics/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/main.bicep
rename to modules/ServiceBus/namespaces/topics/main.bicep
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/version.json b/modules/ServiceBus/namespaces/topics/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/topics/version.json
rename to modules/ServiceBus/namespaces/topics/version.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/version.json b/modules/ServiceBus/namespaces/version.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/version.json
rename to modules/ServiceBus/namespaces/version.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep b/modules/ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
rename to modules/ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/cert/main.test.bicep b/modules/ServiceFabric/clusters/.test/cert/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.test/cert/main.test.bicep
rename to modules/ServiceFabric/clusters/.test/cert/main.test.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep b/modules/ServiceFabric/clusters/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep
rename to modules/ServiceFabric/clusters/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/main.test.bicep b/modules/ServiceFabric/clusters/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.test/common/main.test.bicep
rename to modules/ServiceFabric/clusters/.test/common/main.test.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/main.test.bicep b/modules/ServiceFabric/clusters/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.test/min/main.test.bicep
rename to modules/ServiceFabric/clusters/.test/min/main.test.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/ServiceFabric/clusters/README.md
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/readme.md
rename to modules/ServiceFabric/clusters/README.md
diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md b/modules/ServiceFabric/clusters/applicationTypes/README.md
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
rename to modules/ServiceFabric/clusters/applicationTypes/README.md
diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/main.bicep b/modules/ServiceFabric/clusters/applicationTypes/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/main.bicep
rename to modules/ServiceFabric/clusters/applicationTypes/main.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/modules/ServiceFabric/clusters/applicationTypes/version.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
rename to modules/ServiceFabric/clusters/applicationTypes/version.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/main.bicep b/modules/ServiceFabric/clusters/main.bicep
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/main.bicep
rename to modules/ServiceFabric/clusters/main.bicep
diff --git a/modules/Microsoft.ServiceFabric/clusters/version.json b/modules/ServiceFabric/clusters/version.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/version.json
rename to modules/ServiceFabric/clusters/version.json
diff --git a/modules/Microsoft.SignalRService/signalR/.bicep/nested_roleAssignments.bicep b/modules/SignalRService/signalR/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/.bicep/nested_roleAssignments.bicep
rename to modules/SignalRService/signalR/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.SignalRService/signalR/.test/common/dependencies.bicep b/modules/SignalRService/signalR/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/.test/common/dependencies.bicep
rename to modules/SignalRService/signalR/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.SignalRService/signalR/.test/common/main.test.bicep b/modules/SignalRService/signalR/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/.test/common/main.test.bicep
rename to modules/SignalRService/signalR/.test/common/main.test.bicep
diff --git a/modules/Microsoft.SignalRService/signalR/.test/min/main.test.bicep b/modules/SignalRService/signalR/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/.test/min/main.test.bicep
rename to modules/SignalRService/signalR/.test/min/main.test.bicep
diff --git a/modules/Microsoft.SignalRService/signalR/readme.md b/modules/SignalRService/signalR/README.md
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/readme.md
rename to modules/SignalRService/signalR/README.md
diff --git a/modules/Microsoft.SignalRService/signalR/main.bicep b/modules/SignalRService/signalR/main.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/main.bicep
rename to modules/SignalRService/signalR/main.bicep
diff --git a/modules/Microsoft.SignalRService/signalR/version.json b/modules/SignalRService/signalR/version.json
similarity index 100%
rename from modules/Microsoft.SignalRService/signalR/version.json
rename to modules/SignalRService/signalR/version.json
diff --git a/modules/Microsoft.SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep b/modules/SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep
rename to modules/SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep b/modules/SignalRService/webPubSub/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep
rename to modules/SignalRService/webPubSub/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/common/main.test.bicep b/modules/SignalRService/webPubSub/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.test/common/main.test.bicep
rename to modules/SignalRService/webPubSub/.test/common/main.test.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/min/main.test.bicep b/modules/SignalRService/webPubSub/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.test/min/main.test.bicep
rename to modules/SignalRService/webPubSub/.test/min/main.test.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep b/modules/SignalRService/webPubSub/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep
rename to modules/SignalRService/webPubSub/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/pe/main.test.bicep b/modules/SignalRService/webPubSub/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/.test/pe/main.test.bicep
rename to modules/SignalRService/webPubSub/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/readme.md b/modules/SignalRService/webPubSub/README.md
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/readme.md
rename to modules/SignalRService/webPubSub/README.md
diff --git a/modules/Microsoft.SignalRService/webPubSub/main.bicep b/modules/SignalRService/webPubSub/main.bicep
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/main.bicep
rename to modules/SignalRService/webPubSub/main.bicep
diff --git a/modules/Microsoft.SignalRService/webPubSub/version.json b/modules/SignalRService/webPubSub/version.json
similarity index 100%
rename from modules/Microsoft.SignalRService/webPubSub/version.json
rename to modules/SignalRService/webPubSub/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep b/modules/Sql/managedInstances/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep
rename to modules/Sql/managedInstances/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep b/modules/Sql/managedInstances/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep
rename to modules/Sql/managedInstances/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/main.test.bicep b/modules/Sql/managedInstances/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.test/common/main.test.bicep
rename to modules/Sql/managedInstances/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep b/modules/Sql/managedInstances/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep
rename to modules/Sql/managedInstances/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/main.test.bicep b/modules/Sql/managedInstances/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.test/min/main.test.bicep
rename to modules/Sql/managedInstances/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/readme.md b/modules/Sql/managedInstances/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/readme.md
rename to modules/Sql/managedInstances/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/administrators/readme.md b/modules/Sql/managedInstances/administrators/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/administrators/readme.md
rename to modules/Sql/managedInstances/administrators/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/administrators/main.bicep b/modules/Sql/managedInstances/administrators/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/administrators/main.bicep
rename to modules/Sql/managedInstances/administrators/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/administrators/version.json b/modules/Sql/managedInstances/administrators/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/administrators/version.json
rename to modules/Sql/managedInstances/administrators/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/databases/readme.md b/modules/Sql/managedInstances/databases/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/readme.md
rename to modules/Sql/managedInstances/databases/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep
rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep
rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/databases/main.bicep b/modules/Sql/managedInstances/databases/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/main.bicep
rename to modules/Sql/managedInstances/databases/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/databases/version.json b/modules/Sql/managedInstances/databases/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/databases/version.json
rename to modules/Sql/managedInstances/databases/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md b/modules/Sql/managedInstances/encryptionProtector/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
rename to modules/Sql/managedInstances/encryptionProtector/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/main.bicep b/modules/Sql/managedInstances/encryptionProtector/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/main.bicep
rename to modules/Sql/managedInstances/encryptionProtector/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/modules/Sql/managedInstances/encryptionProtector/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json
rename to modules/Sql/managedInstances/encryptionProtector/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/keys/readme.md b/modules/Sql/managedInstances/keys/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/keys/readme.md
rename to modules/Sql/managedInstances/keys/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/keys/main.bicep b/modules/Sql/managedInstances/keys/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/keys/main.bicep
rename to modules/Sql/managedInstances/keys/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/keys/version.json b/modules/Sql/managedInstances/keys/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/keys/version.json
rename to modules/Sql/managedInstances/keys/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/main.bicep b/modules/Sql/managedInstances/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/main.bicep
rename to modules/Sql/managedInstances/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md b/modules/Sql/managedInstances/securityAlertPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
rename to modules/Sql/managedInstances/securityAlertPolicies/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/main.bicep b/modules/Sql/managedInstances/securityAlertPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/main.bicep
rename to modules/Sql/managedInstances/securityAlertPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/modules/Sql/managedInstances/securityAlertPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
rename to modules/Sql/managedInstances/securityAlertPolicies/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/version.json b/modules/Sql/managedInstances/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/version.json
rename to modules/Sql/managedInstances/version.json
diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md b/modules/Sql/managedInstances/vulnerabilityAssessments/README.md
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
rename to modules/Sql/managedInstances/vulnerabilityAssessments/README.md
diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/main.bicep b/modules/Sql/managedInstances/vulnerabilityAssessments/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/main.bicep
rename to modules/Sql/managedInstances/vulnerabilityAssessments/main.bicep
diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/modules/Sql/managedInstances/vulnerabilityAssessments/version.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
rename to modules/Sql/managedInstances/vulnerabilityAssessments/version.json
diff --git a/modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep b/modules/Sql/servers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep
rename to modules/Sql/servers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/admin/dependencies.bicep b/modules/Sql/servers/.test/admin/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/admin/dependencies.bicep
rename to modules/Sql/servers/.test/admin/dependencies.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/admin/main.test.bicep b/modules/Sql/servers/.test/admin/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/admin/main.test.bicep
rename to modules/Sql/servers/.test/admin/main.test.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/common/dependencies.bicep b/modules/Sql/servers/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/common/dependencies.bicep
rename to modules/Sql/servers/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/common/main.test.bicep b/modules/Sql/servers/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/common/main.test.bicep
rename to modules/Sql/servers/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep b/modules/Sql/servers/.test/pe/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep
rename to modules/Sql/servers/.test/pe/dependencies.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/pe/main.test.bicep b/modules/Sql/servers/.test/pe/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/pe/main.test.bicep
rename to modules/Sql/servers/.test/pe/main.test.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/secondary/dependencies.bicep b/modules/Sql/servers/.test/secondary/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/secondary/dependencies.bicep
rename to modules/Sql/servers/.test/secondary/dependencies.bicep
diff --git a/modules/Microsoft.Sql/servers/.test/secondary/main.test.bicep b/modules/Sql/servers/.test/secondary/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/.test/secondary/main.test.bicep
rename to modules/Sql/servers/.test/secondary/main.test.bicep
diff --git a/modules/Microsoft.Sql/servers/readme.md b/modules/Sql/servers/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/readme.md
rename to modules/Sql/servers/README.md
diff --git a/modules/Microsoft.Sql/servers/databases/readme.md b/modules/Sql/servers/databases/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/readme.md
rename to modules/Sql/servers/databases/README.md
diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/readme.md b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/readme.md
rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/README.md
diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep
rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/version.json b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/version.json
rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/version.json
diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/readme.md b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/readme.md
rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/README.md
diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep
rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/version.json b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/version.json
rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/version.json
diff --git a/modules/Microsoft.Sql/servers/databases/main.bicep b/modules/Sql/servers/databases/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/main.bicep
rename to modules/Sql/servers/databases/main.bicep
diff --git a/modules/Microsoft.Sql/servers/databases/version.json b/modules/Sql/servers/databases/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/databases/version.json
rename to modules/Sql/servers/databases/version.json
diff --git a/modules/Microsoft.Sql/servers/elasticPools/readme.md b/modules/Sql/servers/elasticPools/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/elasticPools/readme.md
rename to modules/Sql/servers/elasticPools/README.md
diff --git a/modules/Microsoft.Sql/servers/elasticPools/main.bicep b/modules/Sql/servers/elasticPools/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/elasticPools/main.bicep
rename to modules/Sql/servers/elasticPools/main.bicep
diff --git a/modules/Microsoft.Sql/servers/elasticPools/version.json b/modules/Sql/servers/elasticPools/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/elasticPools/version.json
rename to modules/Sql/servers/elasticPools/version.json
diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/readme.md b/modules/Sql/servers/encryptionProtector/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/encryptionProtector/readme.md
rename to modules/Sql/servers/encryptionProtector/README.md
diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/main.bicep b/modules/Sql/servers/encryptionProtector/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/encryptionProtector/main.bicep
rename to modules/Sql/servers/encryptionProtector/main.bicep
diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/version.json b/modules/Sql/servers/encryptionProtector/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/encryptionProtector/version.json
rename to modules/Sql/servers/encryptionProtector/version.json
diff --git a/modules/Microsoft.Sql/servers/firewallRules/readme.md b/modules/Sql/servers/firewallRules/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/firewallRules/readme.md
rename to modules/Sql/servers/firewallRules/README.md
diff --git a/modules/Microsoft.Sql/servers/firewallRules/main.bicep b/modules/Sql/servers/firewallRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/firewallRules/main.bicep
rename to modules/Sql/servers/firewallRules/main.bicep
diff --git a/modules/Microsoft.Sql/servers/firewallRules/version.json b/modules/Sql/servers/firewallRules/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/firewallRules/version.json
rename to modules/Sql/servers/firewallRules/version.json
diff --git a/modules/Microsoft.Sql/servers/keys/readme.md b/modules/Sql/servers/keys/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/keys/readme.md
rename to modules/Sql/servers/keys/README.md
diff --git a/modules/Microsoft.Sql/servers/keys/main.bicep b/modules/Sql/servers/keys/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/keys/main.bicep
rename to modules/Sql/servers/keys/main.bicep
diff --git a/modules/Microsoft.Sql/servers/keys/version.json b/modules/Sql/servers/keys/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/keys/version.json
rename to modules/Sql/servers/keys/version.json
diff --git a/modules/Microsoft.Sql/servers/main.bicep b/modules/Sql/servers/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/main.bicep
rename to modules/Sql/servers/main.bicep
diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md b/modules/Sql/servers/securityAlertPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md
rename to modules/Sql/servers/securityAlertPolicies/README.md
diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/main.bicep b/modules/Sql/servers/securityAlertPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/securityAlertPolicies/main.bicep
rename to modules/Sql/servers/securityAlertPolicies/main.bicep
diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/version.json b/modules/Sql/servers/securityAlertPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/securityAlertPolicies/version.json
rename to modules/Sql/servers/securityAlertPolicies/version.json
diff --git a/modules/Microsoft.Sql/servers/version.json b/modules/Sql/servers/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/version.json
rename to modules/Sql/servers/version.json
diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/readme.md b/modules/Sql/servers/virtualNetworkRules/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/virtualNetworkRules/readme.md
rename to modules/Sql/servers/virtualNetworkRules/README.md
diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/main.bicep b/modules/Sql/servers/virtualNetworkRules/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/virtualNetworkRules/main.bicep
rename to modules/Sql/servers/virtualNetworkRules/main.bicep
diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/version.json b/modules/Sql/servers/virtualNetworkRules/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/virtualNetworkRules/version.json
rename to modules/Sql/servers/virtualNetworkRules/version.json
diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md b/modules/Sql/servers/vulnerabilityAssessments/README.md
similarity index 100%
rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
rename to modules/Sql/servers/vulnerabilityAssessments/README.md
diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/main.bicep b/modules/Sql/servers/vulnerabilityAssessments/main.bicep
similarity index 100%
rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/main.bicep
rename to modules/Sql/servers/vulnerabilityAssessments/main.bicep
diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json b/modules/Sql/servers/vulnerabilityAssessments/version.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
rename to modules/Sql/servers/vulnerabilityAssessments/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep b/modules/Storage/storageAccounts/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep
rename to modules/Storage/storageAccounts/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/common/main.test.bicep b/modules/Storage/storageAccounts/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/common/main.test.bicep
rename to modules/Storage/storageAccounts/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep b/modules/Storage/storageAccounts/.test/encr/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep
rename to modules/Storage/storageAccounts/.test/encr/dependencies.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/encr/main.test.bicep b/modules/Storage/storageAccounts/.test/encr/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/encr/main.test.bicep
rename to modules/Storage/storageAccounts/.test/encr/main.test.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/min/main.test.bicep b/modules/Storage/storageAccounts/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/min/main.test.bicep
rename to modules/Storage/storageAccounts/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/nfs/dependencies.bicep b/modules/Storage/storageAccounts/.test/nfs/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/nfs/dependencies.bicep
rename to modules/Storage/storageAccounts/.test/nfs/dependencies.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/nfs/main.test.bicep b/modules/Storage/storageAccounts/.test/nfs/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/nfs/main.test.bicep
rename to modules/Storage/storageAccounts/.test/nfs/main.test.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/.test/v1/main.test.bicep b/modules/Storage/storageAccounts/.test/v1/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.test/v1/main.test.bicep
rename to modules/Storage/storageAccounts/.test/v1/main.test.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/readme.md b/modules/Storage/storageAccounts/README.md
similarity index 97%
rename from modules/Microsoft.Storage/storageAccounts/readme.md
rename to modules/Storage/storageAccounts/README.md
index 60b2f7b9ff..7672f13903 100644
--- a/modules/Microsoft.Storage/storageAccounts/readme.md
+++ b/modules/Storage/storageAccounts/README.md
@@ -59,7 +59,7 @@ This module is used to deploy a storage account, with the ability to deploy 1 or
 | `allowedCopyScope` | string | `''` | `['', AAD, PrivateLink]` | Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the same VNet. |
 | `allowSharedKeyAccess` | bool | `True` |  | Indicates whether the storage account permits requests to be authorized with the account access key via Shared Key. If false, then all requests, including shared access signatures, must be authorized with Azure Active Directory (Azure AD). The default value is null, which is equivalent to true. |
 | `azureFilesIdentityBasedAuthentication` | object | `{object}` |  | Provides the identity based authentication settings for Azure Files. |
-| `blobServices` | _[blobServices](blobServices/readme.md)_ object | `{object}` |  | Blob service and containers to deploy. |
+| `blobServices` | _[blobServices](blobServices/README.md)_ object | `{object}` |  | Blob service and containers to deploy. |
 | `cMKKeyName` | string | `''` |  | The name of the customer managed key to use for encryption. Cannot be deployed together with the parameter 'systemAssignedIdentity' enabled. |
 | `cMKKeyVersion` | string | `''` |  | The version of the customer managed key to reference for encryption. If not provided, latest is used. |
 | `customDomainName` | string | `''` |  | Sets the custom domain name assigned to the storage account. Name is the CNAME source. |
@@ -76,11 +76,11 @@ This module is used to deploy a storage account, with the ability to deploy 1 or
 | `enableDefaultTelemetry` | bool | `True` |  | Enable telemetry via a Globally Unique Identifier (GUID). |
 | `enableNfsV3` | bool | `False` |  | If true, enables NFS 3.0 support for the storage account. Requires enableHierarchicalNamespace to be true. |
 | `enableSftp` | bool | `False` |  | If true, enables Secure File Transfer Protocol for the storage account. Requires enableHierarchicalNamespace to be true. |
-| `fileServices` | _[fileServices](fileServices/readme.md)_ object | `{object}` |  | File service and shares to deploy. |
+| `fileServices` | _[fileServices](fileServices/README.md)_ object | `{object}` |  | File service and shares to deploy. |
 | `isLocalUserEnabled` | bool | `False` |  | Enables local users feature, if set to true. |
 | `kind` | string | `'StorageV2'` | `[BlobStorage, BlockBlobStorage, FileStorage, Storage, StorageV2]` | Type of Storage Account to create. |
 | `largeFileSharesState` | string | `'Disabled'` | `[Disabled, Enabled]` | Allow large file shares if sets to 'Enabled'. It cannot be disabled once it is enabled. Only supported on locally redundant and zone redundant file shares. It cannot be set on FileStorage storage accounts (storage accounts for premium file shares). |
-| `localUsers` | _[localUsers](localUsers/readme.md)_ array | `[]` |  | Local users to deploy for SFTP authentication. |
+| `localUsers` | _[localUsers](localUsers/README.md)_ array | `[]` |  | Local users to deploy for SFTP authentication. |
 | `location` | string | `[resourceGroup().location]` |  | Location for all resources. |
 | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. |
 | `managementPolicyRules` | array | `[]` |  | The Storage Account ManagementPolicies Rules. |
@@ -88,14 +88,14 @@ This module is used to deploy a storage account, with the ability to deploy 1 or
 | `networkAcls` | object | `{object}` |  | Networks ACLs, this value contains IPs to whitelist and/or Subnet information. For security reasons, it is recommended to set the DefaultAction Deny. |
 | `privateEndpoints` | array | `[]` |  | Configuration details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible. |
 | `publicNetworkAccess` | string | `''` | `['', Disabled, Enabled]` | Whether or not public network access is allowed for this resource. For security reasons it should be disabled. If not specified, it will be disabled by default if private endpoints are set and networkAcls are not set. |
-| `queueServices` | _[queueServices](queueServices/readme.md)_ object | `{object}` |  | Queue service and queues to create. |
+| `queueServices` | _[queueServices](queueServices/README.md)_ object | `{object}` |  | Queue service and queues to create. |
 | `requireInfrastructureEncryption` | bool | `True` |  | A Boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest. For security reasons, it is recommended to set it to true. |
 | `roleAssignments` | array | `[]` |  | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. |
 | `sasExpirationPeriod` | string | `''` |  | The SAS expiration period. DD.HH:MM:SS. |
 | `skuName` | string | `'Standard_GRS'` | `[Premium_LRS, Premium_ZRS, Standard_GRS, Standard_GZRS, Standard_LRS, Standard_RAGRS, Standard_RAGZRS, Standard_ZRS]` | Storage Account Sku Name. |
 | `supportsHttpsTrafficOnly` | bool | `True` |  | Allows HTTPS traffic only to storage service if sets to true. |
 | `systemAssignedIdentity` | bool | `False` |  | Enables system assigned managed identity on the resource. |
-| `tableServices` | _[tableServices](tableServices/readme.md)_ object | `{object}` |  | Table service and tables to create. |
+| `tableServices` | _[tableServices](tableServices/README.md)_ object | `{object}` |  | Table service and tables to create. |
 | `tags` | object | `{object}` |  | Tags of the resource. |
 | `userAssignedIdentities` | object | `{object}` |  | The ID(s) to assign to the resource. |
 
@@ -406,11 +406,7 @@ The hierarchical namespace of the storage account (see parameter `enableHierarch
 
 ## Cross-referenced modules
 
-This section gives you an overview of all local-referenced module files (i.e., other CARML modules that are referenced in this module) and all remote-referenced files (i.e., Bicep modules that are referenced from a Bicep Registry or Template Specs).
-
-| Reference | Type |
-| :-- | :-- |
-| `Microsoft.Network/privateEndpoints` | Local reference |
+_None_
 
 ## Deployment examples
 
@@ -426,7 +422,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
+module storageAccounts './Storage/storageAccounts/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-ssacom'
   params: {
     // Required parameters
@@ -889,7 +885,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
+module storageAccounts './Storage/storageAccounts/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-ssaencr'
   params: {
     // Required parameters
@@ -1056,7 +1052,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
+module storageAccounts './Storage/storageAccounts/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-ssamin'
   params: {
     // Required parameters
@@ -1105,7 +1101,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
+module storageAccounts './Storage/storageAccounts/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-ssanfs'
   params: {
     // Required parameters
@@ -1250,7 +1246,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
 <summary>via Bicep module</summary>
 
 ```bicep
-module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = {
+module storageAccounts './Storage/storageAccounts/main.bicep' = {
   name: '${uniqueString(deployment().name, location)}-test-ssav1'
   params: {
     // Required parameters
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/readme.md b/modules/Storage/storageAccounts/blobServices/README.md
similarity index 98%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
rename to modules/Storage/storageAccounts/blobServices/README.md
index bc7eb99d25..6eb3349748 100644
--- a/modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
+++ b/modules/Storage/storageAccounts/blobServices/README.md
@@ -37,7 +37,7 @@ This module can be used to deploy a blob service into a storage account.
 | `containerDeleteRetentionPolicyAllowPermanentDelete` | bool | `False` |  | This property when set to true allows deletion of the soft deleted blob versions and snapshots. This property cannot be used blob restore policy. This property only applies to blob service and does not apply to containers or file share. |
 | `containerDeleteRetentionPolicyDays` | int | `7` |  | Indicates the number of days that the deleted item should be retained. |
 | `containerDeleteRetentionPolicyEnabled` | bool | `True` |  | The blob service properties for container soft delete. Indicates whether DeleteRetentionPolicy is enabled. |
-| `containers` | _[containers](containers/readme.md)_ array | `[]` |  | Blob containers to create. |
+| `containers` | _[containers](containers/README.md)_ array | `[]` |  | Blob containers to create. |
 | `corsRules` | array | `[]` |  | Specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service. |
 | `defaultServiceVersion` | string | `''` |  | Indicates the default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions. |
 | `deleteRetentionPolicyDays` | int | `7` |  | Indicates the number of days that the deleted blob should be retained. |
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
rename to modules/Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md b/modules/Storage/storageAccounts/blobServices/containers/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
rename to modules/Storage/storageAccounts/blobServices/containers/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep
rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/main.bicep b/modules/Storage/storageAccounts/blobServices/containers/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/main.bicep
rename to modules/Storage/storageAccounts/blobServices/containers/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/modules/Storage/storageAccounts/blobServices/containers/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
rename to modules/Storage/storageAccounts/blobServices/containers/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/main.bicep b/modules/Storage/storageAccounts/blobServices/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/main.bicep
rename to modules/Storage/storageAccounts/blobServices/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/version.json b/modules/Storage/storageAccounts/blobServices/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/blobServices/version.json
rename to modules/Storage/storageAccounts/blobServices/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/readme.md b/modules/Storage/storageAccounts/fileServices/README.md
similarity index 98%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
rename to modules/Storage/storageAccounts/fileServices/README.md
index 81d88f5caa..871de36e69 100644
--- a/modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
+++ b/modules/Storage/storageAccounts/fileServices/README.md
@@ -42,7 +42,7 @@ This module can be used to deploy a file share service into a storage account.
 | `name` | string | `'default'` |  | The name of the file service. |
 | `protocolSettings` | object | `{object}` |  | Protocol settings for file service. |
 | `shareDeleteRetentionPolicy` | object | `{object}` |  | The service properties for soft delete. |
-| `shares` | _[shares](shares/readme.md)_ array | `[]` |  | File shares to create. |
+| `shares` | _[shares](shares/README.md)_ array | `[]` |  | File shares to create. |
 
 
 ## Outputs
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/main.bicep b/modules/Storage/storageAccounts/fileServices/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/main.bicep
rename to modules/Storage/storageAccounts/fileServices/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
rename to modules/Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md b/modules/Storage/storageAccounts/fileServices/shares/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
rename to modules/Storage/storageAccounts/fileServices/shares/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/main.bicep b/modules/Storage/storageAccounts/fileServices/shares/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/main.bicep
rename to modules/Storage/storageAccounts/fileServices/shares/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/modules/Storage/storageAccounts/fileServices/shares/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
rename to modules/Storage/storageAccounts/fileServices/shares/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/version.json b/modules/Storage/storageAccounts/fileServices/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/fileServices/version.json
rename to modules/Storage/storageAccounts/fileServices/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/readme.md b/modules/Storage/storageAccounts/localUsers/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/localUsers/readme.md
rename to modules/Storage/storageAccounts/localUsers/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/main.bicep b/modules/Storage/storageAccounts/localUsers/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/localUsers/main.bicep
rename to modules/Storage/storageAccounts/localUsers/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/version.json b/modules/Storage/storageAccounts/localUsers/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/localUsers/version.json
rename to modules/Storage/storageAccounts/localUsers/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep
similarity index 99%
rename from modules/Microsoft.Storage/storageAccounts/main.bicep
rename to modules/Storage/storageAccounts/main.bicep
index bf7a2d1fa0..e152357fa9 100644
--- a/modules/Microsoft.Storage/storageAccounts/main.bicep
+++ b/modules/Storage/storageAccounts/main.bicep
@@ -345,7 +345,7 @@ module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f
   }
 }]
 
-module storageAccount_privateEndpoints '../../Microsoft.Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
+module storageAccount_privateEndpoints '../../Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
   name: '${uniqueString(deployment().name, location)}-StorageAccount-PrivateEndpoint-${index}'
   params: {
     groupIds: [
diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md b/modules/Storage/storageAccounts/managementPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
rename to modules/Storage/storageAccounts/managementPolicies/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/main.bicep b/modules/Storage/storageAccounts/managementPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/main.bicep
rename to modules/Storage/storageAccounts/managementPolicies/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/modules/Storage/storageAccounts/managementPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json
rename to modules/Storage/storageAccounts/managementPolicies/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/readme.md b/modules/Storage/storageAccounts/queueServices/README.md
similarity index 98%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
rename to modules/Storage/storageAccounts/queueServices/README.md
index f52d046715..120a745c41 100644
--- a/modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
+++ b/modules/Storage/storageAccounts/queueServices/README.md
@@ -39,7 +39,7 @@ This module can be used to deploy a file share service into a storage account.
 | `diagnosticStorageAccountId` | string | `''` |  | Resource ID of the diagnostic storage account. |
 | `diagnosticWorkspaceId` | string | `''` |  | Resource ID of a log analytics workspace. |
 | `enableDefaultTelemetry` | bool | `True` |  | Enable telemetry via a Globally Unique Identifier (GUID). |
-| `queues` | _[queues](queues/readme.md)_ array | `[]` |  | Queues to create. |
+| `queues` | _[queues](queues/README.md)_ array | `[]` |  | Queues to create. |
 
 
 ## Outputs
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/main.bicep b/modules/Storage/storageAccounts/queueServices/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/main.bicep
rename to modules/Storage/storageAccounts/queueServices/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
rename to modules/Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md b/modules/Storage/storageAccounts/queueServices/queues/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
rename to modules/Storage/storageAccounts/queueServices/queues/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/main.bicep b/modules/Storage/storageAccounts/queueServices/queues/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/main.bicep
rename to modules/Storage/storageAccounts/queueServices/queues/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/modules/Storage/storageAccounts/queueServices/queues/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
rename to modules/Storage/storageAccounts/queueServices/queues/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/version.json b/modules/Storage/storageAccounts/queueServices/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/queueServices/version.json
rename to modules/Storage/storageAccounts/queueServices/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/readme.md b/modules/Storage/storageAccounts/tableServices/README.md
similarity index 97%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
rename to modules/Storage/storageAccounts/tableServices/README.md
index 80cd29627b..0e70e1add7 100644
--- a/modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
+++ b/modules/Storage/storageAccounts/tableServices/README.md
@@ -38,7 +38,7 @@ This module deploys a storage account table service
 | `diagnosticStorageAccountId` | string | `''` |  | Resource ID of the diagnostic storage account. |
 | `diagnosticWorkspaceId` | string | `''` |  | Resource ID of a log analytics workspace. |
 | `enableDefaultTelemetry` | bool | `True` |  | Enable telemetry via a Globally Unique Identifier (GUID). |
-| `tables` | _[tables](tables/readme.md)_ array | `[]` |  | tables to create. |
+| `tables` | _[tables](tables/README.md)_ array | `[]` |  | tables to create. |
 
 
 ## Outputs
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/main.bicep b/modules/Storage/storageAccounts/tableServices/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/main.bicep
rename to modules/Storage/storageAccounts/tableServices/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md b/modules/Storage/storageAccounts/tableServices/tables/README.md
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
rename to modules/Storage/storageAccounts/tableServices/tables/README.md
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/main.bicep b/modules/Storage/storageAccounts/tableServices/tables/main.bicep
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/main.bicep
rename to modules/Storage/storageAccounts/tableServices/tables/main.bicep
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/modules/Storage/storageAccounts/tableServices/tables/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
rename to modules/Storage/storageAccounts/tableServices/tables/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/version.json b/modules/Storage/storageAccounts/tableServices/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/tableServices/version.json
rename to modules/Storage/storageAccounts/tableServices/version.json
diff --git a/modules/Microsoft.Storage/storageAccounts/version.json b/modules/Storage/storageAccounts/version.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/version.json
rename to modules/Storage/storageAccounts/version.json
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep b/modules/Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
rename to modules/Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep b/modules/Synapse/privateLinkHubs/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep
rename to modules/Synapse/privateLinkHubs/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/main.test.bicep b/modules/Synapse/privateLinkHubs/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.test/common/main.test.bicep
rename to modules/Synapse/privateLinkHubs/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/min/main.test.bicep b/modules/Synapse/privateLinkHubs/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.test/min/main.test.bicep
rename to modules/Synapse/privateLinkHubs/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/readme.md b/modules/Synapse/privateLinkHubs/README.md
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/readme.md
rename to modules/Synapse/privateLinkHubs/README.md
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/main.bicep b/modules/Synapse/privateLinkHubs/main.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/main.bicep
rename to modules/Synapse/privateLinkHubs/main.bicep
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/version.json b/modules/Synapse/privateLinkHubs/version.json
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/version.json
rename to modules/Synapse/privateLinkHubs/version.json
diff --git a/modules/Microsoft.Synapse/workspaces/.bicep/nested_cmkRbac.bicep b/modules/Synapse/workspaces/.bicep/nested_cmkRbac.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.bicep/nested_cmkRbac.bicep
rename to modules/Synapse/workspaces/.bicep/nested_cmkRbac.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Synapse/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Synapse/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep b/modules/Synapse/workspaces/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep
rename to modules/Synapse/workspaces/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/common/main.test.bicep b/modules/Synapse/workspaces/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/common/main.test.bicep
rename to modules/Synapse/workspaces/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwsai/dependencies.bicep b/modules/Synapse/workspaces/.test/encrwsai/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/encrwsai/dependencies.bicep
rename to modules/Synapse/workspaces/.test/encrwsai/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwsai/main.test.bicep b/modules/Synapse/workspaces/.test/encrwsai/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/encrwsai/main.test.bicep
rename to modules/Synapse/workspaces/.test/encrwsai/main.test.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwuai/dependencies.bicep b/modules/Synapse/workspaces/.test/encrwuai/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/encrwuai/dependencies.bicep
rename to modules/Synapse/workspaces/.test/encrwuai/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwuai/main.test.bicep b/modules/Synapse/workspaces/.test/encrwuai/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/encrwuai/main.test.bicep
rename to modules/Synapse/workspaces/.test/encrwuai/main.test.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/managedvnet/dependencies.bicep b/modules/Synapse/workspaces/.test/managedvnet/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/managedvnet/dependencies.bicep
rename to modules/Synapse/workspaces/.test/managedvnet/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/managedvnet/main.test.bicep b/modules/Synapse/workspaces/.test/managedvnet/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/managedvnet/main.test.bicep
rename to modules/Synapse/workspaces/.test/managedvnet/main.test.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/min/dependencies.bicep b/modules/Synapse/workspaces/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/min/dependencies.bicep
rename to modules/Synapse/workspaces/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/.test/min/main.test.bicep b/modules/Synapse/workspaces/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/.test/min/main.test.bicep
rename to modules/Synapse/workspaces/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/readme.md b/modules/Synapse/workspaces/README.md
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/readme.md
rename to modules/Synapse/workspaces/README.md
diff --git a/modules/Microsoft.Synapse/workspaces/keys/readme.md b/modules/Synapse/workspaces/keys/README.md
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/keys/readme.md
rename to modules/Synapse/workspaces/keys/README.md
diff --git a/modules/Microsoft.Synapse/workspaces/keys/main.bicep b/modules/Synapse/workspaces/keys/main.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/keys/main.bicep
rename to modules/Synapse/workspaces/keys/main.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/keys/version.json b/modules/Synapse/workspaces/keys/version.json
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/keys/version.json
rename to modules/Synapse/workspaces/keys/version.json
diff --git a/modules/Microsoft.Synapse/workspaces/main.bicep b/modules/Synapse/workspaces/main.bicep
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/main.bicep
rename to modules/Synapse/workspaces/main.bicep
diff --git a/modules/Microsoft.Synapse/workspaces/version.json b/modules/Synapse/workspaces/version.json
similarity index 100%
rename from modules/Microsoft.Synapse/workspaces/version.json
rename to modules/Synapse/workspaces/version.json
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep b/modules/VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
rename to modules/VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep b/modules/VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep
rename to modules/VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/main.test.bicep b/modules/VirtualMachineImages/imageTemplates/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/main.test.bicep
rename to modules/VirtualMachineImages/imageTemplates/.test/common/main.test.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep b/modules/VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep
rename to modules/VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/main.test.bicep b/modules/VirtualMachineImages/imageTemplates/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/main.test.bicep
rename to modules/VirtualMachineImages/imageTemplates/.test/min/main.test.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md b/modules/VirtualMachineImages/imageTemplates/README.md
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md
rename to modules/VirtualMachineImages/imageTemplates/README.md
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/main.bicep b/modules/VirtualMachineImages/imageTemplates/main.bicep
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/main.bicep
rename to modules/VirtualMachineImages/imageTemplates/main.bicep
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/version.json b/modules/VirtualMachineImages/imageTemplates/version.json
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/version.json
rename to modules/VirtualMachineImages/imageTemplates/version.json
diff --git a/modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep b/modules/Web/connections/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep
rename to modules/Web/connections/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/connections/.test/common/dependencies.bicep b/modules/Web/connections/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/connections/.test/common/dependencies.bicep
rename to modules/Web/connections/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Web/connections/.test/common/main.test.bicep b/modules/Web/connections/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/connections/.test/common/main.test.bicep
rename to modules/Web/connections/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Web/connections/readme.md b/modules/Web/connections/README.md
similarity index 100%
rename from modules/Microsoft.Web/connections/readme.md
rename to modules/Web/connections/README.md
diff --git a/modules/Microsoft.Web/connections/main.bicep b/modules/Web/connections/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/connections/main.bicep
rename to modules/Web/connections/main.bicep
diff --git a/modules/Microsoft.Web/connections/version.json b/modules/Web/connections/version.json
similarity index 100%
rename from modules/Microsoft.Web/connections/version.json
rename to modules/Web/connections/version.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep b/modules/Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
rename to modules/Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep b/modules/Web/hostingEnvironments/.test/asev2/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep
rename to modules/Web/hostingEnvironments/.test/asev2/dependencies.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/main.test.bicep b/modules/Web/hostingEnvironments/.test/asev2/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.test/asev2/main.test.bicep
rename to modules/Web/hostingEnvironments/.test/asev2/main.test.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep b/modules/Web/hostingEnvironments/.test/asev3/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep
rename to modules/Web/hostingEnvironments/.test/asev3/dependencies.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/main.test.bicep b/modules/Web/hostingEnvironments/.test/asev3/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.test/asev3/main.test.bicep
rename to modules/Web/hostingEnvironments/.test/asev3/main.test.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/readme.md b/modules/Web/hostingEnvironments/README.md
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/readme.md
rename to modules/Web/hostingEnvironments/README.md
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/readme.md b/modules/Web/hostingEnvironments/configurations-customdnssuffix/README.md
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/readme.md
rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/README.md
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/main.bicep b/modules/Web/hostingEnvironments/configurations-customdnssuffix/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/main.bicep
rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/main.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/version.json b/modules/Web/hostingEnvironments/configurations-customdnssuffix/version.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/version.json
rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/version.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/readme.md b/modules/Web/hostingEnvironments/configurations-networking/README.md
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/readme.md
rename to modules/Web/hostingEnvironments/configurations-networking/README.md
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/main.bicep b/modules/Web/hostingEnvironments/configurations-networking/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/main.bicep
rename to modules/Web/hostingEnvironments/configurations-networking/main.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/version.json b/modules/Web/hostingEnvironments/configurations-networking/version.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/version.json
rename to modules/Web/hostingEnvironments/configurations-networking/version.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/main.bicep b/modules/Web/hostingEnvironments/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/main.bicep
rename to modules/Web/hostingEnvironments/main.bicep
diff --git a/modules/Microsoft.Web/hostingEnvironments/version.json b/modules/Web/hostingEnvironments/version.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/version.json
rename to modules/Web/hostingEnvironments/version.json
diff --git a/modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep b/modules/Web/serverfarms/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep
rename to modules/Web/serverfarms/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/serverfarms/.test/common/dependencies.bicep b/modules/Web/serverfarms/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/.test/common/dependencies.bicep
rename to modules/Web/serverfarms/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Web/serverfarms/.test/common/main.test.bicep b/modules/Web/serverfarms/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/.test/common/main.test.bicep
rename to modules/Web/serverfarms/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Web/serverfarms/readme.md b/modules/Web/serverfarms/README.md
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/readme.md
rename to modules/Web/serverfarms/README.md
diff --git a/modules/Microsoft.Web/serverfarms/main.bicep b/modules/Web/serverfarms/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/main.bicep
rename to modules/Web/serverfarms/main.bicep
diff --git a/modules/Microsoft.Web/serverfarms/version.json b/modules/Web/serverfarms/version.json
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/version.json
rename to modules/Web/serverfarms/version.json
diff --git a/modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep b/modules/Web/sites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep
rename to modules/Web/sites/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep b/modules/Web/sites/.test/functionAppCommon/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep
rename to modules/Web/sites/.test/functionAppCommon/dependencies.bicep
diff --git a/modules/Microsoft.Web/sites/.test/functionAppCommon/main.test.bicep b/modules/Web/sites/.test/functionAppCommon/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/functionAppCommon/main.test.bicep
rename to modules/Web/sites/.test/functionAppCommon/main.test.bicep
diff --git a/modules/Microsoft.Web/sites/.test/functionAppMin/dependencies.bicep b/modules/Web/sites/.test/functionAppMin/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/functionAppMin/dependencies.bicep
rename to modules/Web/sites/.test/functionAppMin/dependencies.bicep
diff --git a/modules/Microsoft.Web/sites/.test/functionAppMin/main.test.bicep b/modules/Web/sites/.test/functionAppMin/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/functionAppMin/main.test.bicep
rename to modules/Web/sites/.test/functionAppMin/main.test.bicep
diff --git a/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep b/modules/Web/sites/.test/webAppCommon/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep
rename to modules/Web/sites/.test/webAppCommon/dependencies.bicep
diff --git a/modules/Microsoft.Web/sites/.test/webAppCommon/main.test.bicep b/modules/Web/sites/.test/webAppCommon/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/webAppCommon/main.test.bicep
rename to modules/Web/sites/.test/webAppCommon/main.test.bicep
diff --git a/modules/Microsoft.Web/sites/.test/webAppMin/dependencies.bicep b/modules/Web/sites/.test/webAppMin/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/webAppMin/dependencies.bicep
rename to modules/Web/sites/.test/webAppMin/dependencies.bicep
diff --git a/modules/Microsoft.Web/sites/.test/webAppMin/main.test.bicep b/modules/Web/sites/.test/webAppMin/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/.test/webAppMin/main.test.bicep
rename to modules/Web/sites/.test/webAppMin/main.test.bicep
diff --git a/modules/Microsoft.Web/sites/readme.md b/modules/Web/sites/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/readme.md
rename to modules/Web/sites/README.md
diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/readme.md b/modules/Web/sites/basicPublishingCredentialsPolicies/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/readme.md
rename to modules/Web/sites/basicPublishingCredentialsPolicies/README.md
diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/main.bicep b/modules/Web/sites/basicPublishingCredentialsPolicies/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/main.bicep
rename to modules/Web/sites/basicPublishingCredentialsPolicies/main.bicep
diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/version.json b/modules/Web/sites/basicPublishingCredentialsPolicies/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/version.json
rename to modules/Web/sites/basicPublishingCredentialsPolicies/version.json
diff --git a/modules/Microsoft.Web/sites/config-appsettings/readme.md b/modules/Web/sites/config-appsettings/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/config-appsettings/readme.md
rename to modules/Web/sites/config-appsettings/README.md
diff --git a/modules/Microsoft.Web/sites/config-appsettings/main.bicep b/modules/Web/sites/config-appsettings/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/config-appsettings/main.bicep
rename to modules/Web/sites/config-appsettings/main.bicep
diff --git a/modules/Microsoft.Web/sites/config-appsettings/version.json b/modules/Web/sites/config-appsettings/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/config-appsettings/version.json
rename to modules/Web/sites/config-appsettings/version.json
diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/readme.md b/modules/Web/sites/config-authsettingsv2/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/config-authsettingsv2/readme.md
rename to modules/Web/sites/config-authsettingsv2/README.md
diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/main.bicep b/modules/Web/sites/config-authsettingsv2/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/config-authsettingsv2/main.bicep
rename to modules/Web/sites/config-authsettingsv2/main.bicep
diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/version.json b/modules/Web/sites/config-authsettingsv2/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/config-authsettingsv2/version.json
rename to modules/Web/sites/config-authsettingsv2/version.json
diff --git a/modules/Microsoft.Web/sites/main.bicep b/modules/Web/sites/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/main.bicep
rename to modules/Web/sites/main.bicep
diff --git a/modules/Microsoft.Web/sites/slots/.bicep/nested_roleAssignments.bicep b/modules/Web/sites/slots/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/.bicep/nested_roleAssignments.bicep
rename to modules/Web/sites/slots/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/sites/slots/readme.md b/modules/Web/sites/slots/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/readme.md
rename to modules/Web/sites/slots/README.md
diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/readme.md b/modules/Web/sites/slots/config-appsettings/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-appsettings/readme.md
rename to modules/Web/sites/slots/config-appsettings/README.md
diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/main.bicep b/modules/Web/sites/slots/config-appsettings/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-appsettings/main.bicep
rename to modules/Web/sites/slots/config-appsettings/main.bicep
diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/version.json b/modules/Web/sites/slots/config-appsettings/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-appsettings/version.json
rename to modules/Web/sites/slots/config-appsettings/version.json
diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/readme.md b/modules/Web/sites/slots/config-authsettingsv2/README.md
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/readme.md
rename to modules/Web/sites/slots/config-authsettingsv2/README.md
diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/main.bicep b/modules/Web/sites/slots/config-authsettingsv2/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/main.bicep
rename to modules/Web/sites/slots/config-authsettingsv2/main.bicep
diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/version.json b/modules/Web/sites/slots/config-authsettingsv2/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/version.json
rename to modules/Web/sites/slots/config-authsettingsv2/version.json
diff --git a/modules/Microsoft.Web/sites/slots/main.bicep b/modules/Web/sites/slots/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/main.bicep
rename to modules/Web/sites/slots/main.bicep
diff --git a/modules/Microsoft.Web/sites/slots/version.json b/modules/Web/sites/slots/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/slots/version.json
rename to modules/Web/sites/slots/version.json
diff --git a/modules/Microsoft.Web/sites/version.json b/modules/Web/sites/version.json
similarity index 100%
rename from modules/Microsoft.Web/sites/version.json
rename to modules/Web/sites/version.json
diff --git a/modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep b/modules/Web/staticSites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep
rename to modules/Web/staticSites/.bicep/nested_roleAssignments.bicep
diff --git a/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep b/modules/Web/staticSites/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep
rename to modules/Web/staticSites/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Web/staticSites/.test/common/main.test.bicep b/modules/Web/staticSites/.test/common/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.test/common/main.test.bicep
rename to modules/Web/staticSites/.test/common/main.test.bicep
diff --git a/modules/Microsoft.Web/staticSites/.test/min/main.test.bicep b/modules/Web/staticSites/.test/min/main.test.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.test/min/main.test.bicep
rename to modules/Web/staticSites/.test/min/main.test.bicep
diff --git a/modules/Microsoft.Web/staticSites/readme.md b/modules/Web/staticSites/README.md
similarity index 100%
rename from modules/Microsoft.Web/staticSites/readme.md
rename to modules/Web/staticSites/README.md
diff --git a/modules/Microsoft.Web/staticSites/config/readme.md b/modules/Web/staticSites/config/README.md
similarity index 100%
rename from modules/Microsoft.Web/staticSites/config/readme.md
rename to modules/Web/staticSites/config/README.md
diff --git a/modules/Microsoft.Web/staticSites/config/main.bicep b/modules/Web/staticSites/config/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/config/main.bicep
rename to modules/Web/staticSites/config/main.bicep
diff --git a/modules/Microsoft.Web/staticSites/config/version.json b/modules/Web/staticSites/config/version.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/config/version.json
rename to modules/Web/staticSites/config/version.json
diff --git a/modules/Microsoft.Web/staticSites/customDomains/readme.md b/modules/Web/staticSites/customDomains/README.md
similarity index 100%
rename from modules/Microsoft.Web/staticSites/customDomains/readme.md
rename to modules/Web/staticSites/customDomains/README.md
diff --git a/modules/Microsoft.Web/staticSites/customDomains/main.bicep b/modules/Web/staticSites/customDomains/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/customDomains/main.bicep
rename to modules/Web/staticSites/customDomains/main.bicep
diff --git a/modules/Microsoft.Web/staticSites/customDomains/version.json b/modules/Web/staticSites/customDomains/version.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/customDomains/version.json
rename to modules/Web/staticSites/customDomains/version.json
diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/readme.md b/modules/Web/staticSites/linkedBackends/README.md
similarity index 100%
rename from modules/Microsoft.Web/staticSites/linkedBackends/readme.md
rename to modules/Web/staticSites/linkedBackends/README.md
diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/main.bicep b/modules/Web/staticSites/linkedBackends/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/linkedBackends/main.bicep
rename to modules/Web/staticSites/linkedBackends/main.bicep
diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/version.json b/modules/Web/staticSites/linkedBackends/version.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/linkedBackends/version.json
rename to modules/Web/staticSites/linkedBackends/version.json
diff --git a/modules/Microsoft.Web/staticSites/main.bicep b/modules/Web/staticSites/main.bicep
similarity index 100%
rename from modules/Microsoft.Web/staticSites/main.bicep
rename to modules/Web/staticSites/main.bicep
diff --git a/modules/Microsoft.Web/staticSites/version.json b/modules/Web/staticSites/version.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/version.json
rename to modules/Web/staticSites/version.json
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1
index 964a09d349..e69d2cdb11 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1
@@ -19,7 +19,7 @@ Optional. Publish an absolute latest version.
 Note: This version may include breaking changes and is not recommended for production environments
 
 .EXAMPLE
-Get-ModulesMissingFromPrivateBicepRegistry -TemplateFilePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
+Get-ModulesMissingFromPrivateBicepRegistry -TemplateFilePath 'C:\ResourceModules\modules\Compute\virtualMachines\main.bicep' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
 Check if either the Virtual Machine module or any of its children (e.g. 'extension') is missing in the Container Registry 'adpsxxazacrx001' of Resource Group 'artifacts-rg'
 
@@ -27,21 +27,21 @@ Returns for example:
 Name                           Value
 ----                           -----
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep
 Version                        0.4
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep
 Version                        0.6.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\main.bicep
 Version                        0.6
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\Compute\virtualMachines\main.bicep
 #>
 function Get-ModulesMissingFromPrivateBicepRegistry {
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1
index 5e083d255f..a806e70bd2 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1
@@ -16,7 +16,7 @@ Optional. Publish an absolute latest version.
 Note: This version may include breaking changes and is not recommended for production environments
 
 .EXAMPLE
-Get-ModulesMissingFromTemplateSpecsRG -TemplateFilePath 'C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep' -TemplateSpecsRGName 'artifacts-rg'
+Get-ModulesMissingFromTemplateSpecsRG -TemplateFilePath 'C:\ResourceModules\modules\KeyVault\vaults\main.bicep' -TemplateSpecsRGName 'artifacts-rg'
 
 Check if either the Key Vault module or any of its children (e.g. 'secret') is missing in the Resource Group 'artifacts-rg'
 
@@ -24,37 +24,37 @@ Returns for example:
 Name                           Value
 ----                           -----
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep
 Version                        0.4
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep
 Version                        0.4
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep
 Version                        0.4
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep
 Version                        0.5.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\main.bicep
 Version                        0.5
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\main.bicep
 Version                        0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\main.bicep
 Version                        latest
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\main.bicep
 #>
 function Get-ModulesMissingFromTemplateSpecsRG {
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1
index 4cd086850b..88d46e800f 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1
@@ -24,7 +24,7 @@ Example: 'Artifacts'.
 Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
 
 .EXAMPLE
-Get-ModulesMissingFromUniversalArtifactsFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+Get-ModulesMissingFromUniversalArtifactsFeed -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
 
 Check if either the Key Vault module or any of its children (e.g. 'secret') is missing in artifacts feed 'Artifacts' of Azure DevOps project 'https://dev.azure.com/fabrikam/IaC'
 
@@ -32,13 +32,13 @@ Returns for example:
 Name                           Value
 ----                           -----
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep
 Version                        0.4.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep
 Version                        0.5.0
-TemplateFilePath               C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep
+TemplateFilePath               C:\ResourceModules\modules\KeyVault\vaults\main.bicep
 #>
 function Get-ModulesMissingFromUniversalArtifactsFeed {
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
index 1a9e12c63a..84eaa96abb 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
@@ -79,9 +79,9 @@ This function will search the current directory and all parent directories for a
 Mandatory. Path to the folder/file that should be searched
 
 .EXAMPLE
-Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep"
+Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep"
 
-    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables
+    Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
@@ -126,9 +126,9 @@ Find the closest main.bicep/json file to the changed files in the module folder
 Mandatory. Path to the main/parent module folder.
 
 .EXAMPLE
-Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\"
+Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\"
 
-C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep
+C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep
 
 Gets the closest main.bicep/json file to the changed files in the module folder structure.
 Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables'
@@ -179,15 +179,15 @@ Mandatory. Path to a main.bicep/json file.
 Optional. If true, the function will recurse up the folder structure to find the closest main.bicep/json file.
 
 .EXAMPLE
-Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep' -Recurse
+Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep' -Recurse
 
-    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices
+    Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
 la---          05.12.2021    22:45           1427 main.bicep
 
-    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts
+    Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
@@ -268,7 +268,7 @@ The file needs to be in the same folder as the template file itself.
 Mandatory. Path to a main.bicep/json file.
 
 .EXAMPLE
-Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep'
+Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep'
 
 0.3
 
@@ -307,7 +307,7 @@ Patch version number is calculated based on the git commit count on the branch.
 Mandatory. Path to a main.bicep/json file.
 
 .EXAMPLE
-Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep'
+Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep'
 
 0.3.630
 
@@ -351,15 +351,15 @@ Optional. Publish an absolute latest version.
 Note: This version may include breaking changes and is not recommended for production environments
 
 .EXAMPLE
-Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep'
+Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\main.bicep'
 
 Name               Value
 ----               -----
-TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\shares\main.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\fileServices\shares\main.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\main.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\fileServices\main.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\main.bicep
 Version            0.3.848-prerelease
 
 Generates a hashtable with template file paths to publish and their new versions.
diff --git a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1
index 6150ae8623..b401fe5d27 100644
--- a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1
+++ b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1
@@ -9,9 +9,9 @@ Convert the given template file path into a valid Container Registry repository
 Mandatory. The template file path to convert
 
 .EXAMPLE
-Get-PrivateRegistryRepositoryName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Get-PrivateRegistryRepositoryName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep'
 
-Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/microsoft.keyvault.vaults'
+Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/keyvault.vaults'
 #>
 function Get-PrivateRegistryRepositoryName {
 
diff --git a/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1 b/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1
index 21d80d4224..1ae806f51d 100644
--- a/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1
+++ b/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1
@@ -9,9 +9,9 @@ Convert the given template file path into a valid Template Specs repository name
 Mandatory. The template file path to convert
 
 .EXAMPLE
-Get-TemplateSpecsName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Get-TemplateSpecsName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep'
 
-Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults'
+Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults'
 #>
 function Get-TemplateSpecsName {
 
diff --git a/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1 b/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1
index 339a1b48fc..94b80ca56f 100644
--- a/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1
+++ b/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1
@@ -10,9 +10,9 @@ Must be lowercase alphanumerics, dashes, dots or underscores, under 256 characte
 Mandatory. The template file path to convert
 
 .EXAMPLE
-Get-UniversalArtifactsName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Get-UniversalArtifactsName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep'
 
-Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults'
+Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults'
 #>
 function Get-UniversalArtifactsName {
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 3c652c24ec..5054f1161c 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -7,7 +7,7 @@ Publish a new version of a given module to a private bicep registry
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
-Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Example: 'C:\modules\KeyVault\vaults\main.bicep'
 
 .PARAMETER ModuleVersion
 Mandatory. Version of the module to publish, following SemVer convention.
@@ -26,7 +26,7 @@ Optional. The location of the resourceGroup the private bicep registry is deploy
 Example: 'West Europe'
 
 .EXAMPLE
-Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
 Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called 'adpsxxazacrx001' in resource group 'artifacts-rg'.
 #>
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1
index c91c8a8339..219faa7c77 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1
@@ -8,7 +8,7 @@ The template spec is set up if not already existing.
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
-Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Example: 'C:\modules\KeyVault\vaults\main.bicep'
 
 .PARAMETER ModuleVersion
 Mandatory. Version of the module to publish, following SemVer convention.
@@ -27,7 +27,7 @@ Mandatory. The description of the parent template spec.
 Example: 'iacs key vault'
 
 .EXAMPLE
-Publish-ModuleToTemplateSpecsRG -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
+Publish-ModuleToTemplateSpecsRG -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
 
 Try to publish the KeyVault module with version 3.0.0-alpha to a template spec in resource group 'artifacts-rg'.
 #>
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1
index 5cd722e5f5..bbb1c79684 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1
@@ -38,7 +38,7 @@ Publish a new version of a given module to an Azure DevOps artifact feed as a un
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
-Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep'
+Example: 'C:\modules\KeyVault\vaults\main.bicep'
 
 .PARAMETER ModuleVersion
 Mandatory. Version of the module to publish, following SemVer convention.
@@ -60,7 +60,7 @@ Example: 'Artifacts'.
 Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
 
 .EXAMPLE
-Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
 
 Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called 'Artifacts' under the project 'IaC'.
 #>
diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1
index 5d31bcc9a2..7a92f41eff 100644
--- a/utilities/pipelines/staticValidation/module.tests.ps1
+++ b/utilities/pipelines/staticValidation/module.tests.ps1
@@ -43,6 +43,15 @@ Describe 'File/folder tests' -Tag 'Modules' {
 
     Context 'General module folder tests' {
 
+        $moduleFolderTestCases = [System.Collections.ArrayList] @()
+        foreach ($moduleFolderPath in $moduleFolderPaths) {
+            $moduleFolderTestCases += @{
+                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
+                moduleFolderPath = $moduleFolderPath
+                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
+            }
+        }
+
         It '[<moduleFolderName>] Module should contain a [` main.json ` / ` main.bicep `] file.' -TestCases $moduleFolderTestCases {
 
             param( [string] $moduleFolderPath )
@@ -52,14 +61,18 @@ Describe 'File/folder tests' -Tag 'Modules' {
                 ($hasARM -or $hasBicep) | Should -Be $true
         }
 
-        It '[<moduleFolderName>] Module should contain a [` readme.md `] file.' -TestCases $moduleFolderTestCases {
+        It '[<moduleFolderName>] Module should contain a [` README.md `] file.' -TestCases $moduleFolderTestCases {
 
             param(
                 [string] $moduleFolderPath
             )
 
-            $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath 'readme.md')
+            $readMeFilePath = Join-Path -Path $moduleFolderPath 'README.md'
+            $pathExisting = Test-Path $readMeFilePath
             $pathExisting | Should -Be $true
+
+            $file = Get-Item -Path $readMeFilePath
+            $file.Name | Should -BeExactly 'README.md'
         }
 
         It '[<moduleFolderName>] Module should contain a [` .test `] folder.' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) {
@@ -158,7 +171,7 @@ Describe 'Pipeline tests' -Tag 'Pipeline' {
             )
 
             $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows'
-            $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower()
+            $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower()
             $workflowPath = Join-Path $workflowsFolderName $workflowFileName
             Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist."
         }
@@ -178,7 +191,7 @@ Describe 'Pipeline tests' -Tag 'Pipeline' {
             }
 
             $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows'
-            $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower()
+            $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower()
             $workflowFilePath = Join-Path $workflowsFolderName $workflowFileName
             $workflowContent = Get-Content -Path $workflowFilePath
 
@@ -227,7 +240,7 @@ Describe 'Pipeline tests' -Tag 'Pipeline' {
             )
 
             $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines'
-            $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower()
+            $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower()
             $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName
             Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist."
         }
@@ -247,7 +260,7 @@ Describe 'Pipeline tests' -Tag 'Pipeline' {
             }
 
             $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines'
-            $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower()
+            $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower()
             $pipelineFilePath = Join-Path $pipelinesFolderName $pipelineFileName
             $pipelineContent = Get-Content -Path $pipelineFilePath
 
@@ -333,15 +346,15 @@ Describe 'Readme tests' -Tag 'Readme' {
                 moduleFolderPath       = $moduleFolderPath
                 templateContent        = $templateContent
                 templateFilePath       = $templateFilePath
-                readMeFilePath         = Join-Path -Path $moduleFolderPath 'readme.md'
-                readMeContent          = Get-Content (Join-Path -Path $moduleFolderPath 'readme.md')
+                readMeFilePath         = Join-Path -Path $moduleFolderPath 'README.md'
+                readMeContent          = Get-Content (Join-Path -Path $moduleFolderPath 'README.md')
                 isTopLevelModule       = $resourceTypeIdentifier.Split('/').Count -eq 2 # <provider>/<resourceType>
                 resourceTypeIdentifier = $resourceTypeIdentifier
                 templateReferences     = $crossReferencedModuleList[$resourceTypeIdentifier]
             }
         }
 
-        It '[<moduleFolderName>] `Readme.md` file should not be empty.' -TestCases $readmeFolderTestCases {
+        It '[<moduleFolderName>] `README.md` file should not be empty.' -TestCases $readmeFolderTestCases {
 
             param(
                 [string] $moduleFolderName,
@@ -350,7 +363,7 @@ Describe 'Readme tests' -Tag 'Readme' {
             $readMeContent | Should -Not -Be $null
         }
 
-        It '[<moduleFolderName>] `Readme.md` file should contain these sections in order: Navigation, Resource Types, Parameters, Outputs, Cross-referenced modules, Deployment examples.' -TestCases $readmeFolderTestCases {
+        It '[<moduleFolderName>] `README.md` file should contain these sections in order: Navigation, Resource Types, Parameters, Outputs, Cross-referenced modules, Deployment examples.' -TestCases $readmeFolderTestCases {
 
             param(
                 [string] $moduleFolderName,
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index f3313bb667..958a7106a2 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -181,11 +181,11 @@ function Set-ParametersSection {
             # Check for local readme references
             if ($folderNames -and $parameter.name -in $folderNames -and $parameter.type -in @('object', 'array')) {
                 if ($folderNames -contains $parameter.name) {
-                    $type = '_[{0}]({0}/readme.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name }), $parameter.type
+                    $type = '_[{0}]({0}/README.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name }), $parameter.type
                 }
             } elseif ($folderNames -and $parameter.name -like '*Obj' -and $parameter.name.TrimEnd('Obj') -in $folderNames -and $parameter.type -in @('object', 'array')) {
                 if ($folderNames -contains $parameter.name.TrimEnd('Obj')) {
-                    $type = '_[{0}]({0}/readme.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name.TrimEnd('Obj') }), $parameter.type
+                    $type = '_[{0}]({0}/README.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name.TrimEnd('Obj') }), $parameter.type
                 }
             } else {
                 $type = $parameter.type
@@ -928,6 +928,8 @@ function Set-DeploymentExamplesSection {
         '   >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.',
         ''
     )
+    # Get module relative path to provide to module references in Deployment Examples
+    $moduleRelative = $moduleRoot.Replace('\', '/').split('modules/')[1]
 
     # Get resource type and make first letter upper case. Requires manual handling as ToTitleCase lowercases everything but the first letter
     $providerNamespace = ($fullModuleIdentifier.Split('/')[0] -split '\.' | ForEach-Object { $_.Substring(0, 1).ToUpper() + $_.Substring(1) }) -join '.'
@@ -991,7 +993,7 @@ function Set-DeploymentExamplesSection {
 
             # [3/6] Format header, remove scope property & any empty line
             $rawBicepExample = $rawBicepExampleString -split '\n'
-            $rawBicepExample[0] = "module $resourceType './$FullModuleIdentifier/main.bicep' = {"
+            $rawBicepExample[0] = "module $resourceType './$moduleRelative/main.bicep' = {"
             $rawBicepExample = $rawBicepExample | Where-Object { $_ -notmatch 'scope: *' } | Where-Object { -not [String]::IsNullOrEmpty($_) }
 
             # [4/6] Extract param block
@@ -1380,7 +1382,7 @@ Optional. The template file content to process. If not provided, the template fi
 Using this property is useful if you already compiled the bicep template before invoking this function and want to avoid re-compiling it.
 
 .PARAMETER ReadMeFilePath
-Optional. The path to the readme to update. If not provided assumes a 'readme.md' file in the same folder as the template
+Optional. The path to the readme to update. If not provided assumes a 'README.md' file in the same folder as the template
 
 .PARAMETER SectionsToRefresh
 Optional. The sections to update. By default it refreshes all that are supported.
@@ -1389,7 +1391,7 @@ Currently supports: 'Resource Types', 'Parameters', 'Outputs', 'Template referen
 .EXAMPLE
 Set-ModuleReadMe -TemplateFilePath 'C:\main.bicep'
 
-Update the readme in path 'C:\readme.md' based on the bicep template in path 'C:\main.bicep'
+Update the readme in path 'C:\README.md' based on the bicep template in path 'C:\main.bicep'
 
 .EXAMPLE
 Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/main.bicep' -SectionsToRefresh @('Parameters', 'Outputs')
@@ -1428,7 +1430,7 @@ function Set-ModuleReadMe {
         [hashtable] $TemplateFileContent,
 
         [Parameter(Mandatory = $false)]
-        [string] $ReadMeFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) 'readme.md'),
+        [string] $ReadMeFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) 'README.md'),
 
         [Parameter(Mandatory = $false)]
         [ValidateSet(
@@ -1475,7 +1477,11 @@ function Set-ModuleReadMe {
     }
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
-    $fullModuleIdentifier = 'Microsoft.{0}' -f $moduleRoot.Replace('\', '/').split('/Microsoft.')[1]
+    $moduleRelative = $moduleRoot.Replace('\', '/').split('modules/')[1]
+    $splitHyphens = $moduleRelative.split('-')
+    $splitHyphens = $splitHyphens | ForEach-Object { $_.substring(0, 1).toupper() + $_.substring(1) }
+    $splitHyphens = $splitHyphens -join ''
+    $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '')
 
     # Check readme
     if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) {
diff --git a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
index 6861fb539d..aa7e2d2354 100644
--- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
+++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
@@ -72,12 +72,12 @@ function Get-ResourceModuleName {
         [string] $Path
     )
 
-    if (-not (Test-Path "$Path/readme.md")) {
-        Write-Warning "No [readme.md] found in folder [$Path]"
+    if (-not (Test-Path "$Path/README.md")) {
+        Write-Warning "No [README.md] found in folder [$Path]"
         return ''
     }
 
-    $moduleReadMeContent = Get-Content -Path "$Path/readme.md"
+    $moduleReadMeContent = Get-Content -Path "$Path/README.md"
     $moduleName = $moduleReadMeContent[0].TrimStart('# ').Split('`')[0].Trim()
 
     if (-not [String]::IsNullOrEmpty($moduleName)) {
diff --git a/utilities/tools/platform/Set-ReadMeModuleTable.ps1 b/utilities/tools/platform/Set-ReadMeModuleTable.ps1
index 6210f26fae..f2968f085e 100644
--- a/utilities/tools/platform/Set-ReadMeModuleTable.ps1
+++ b/utilities/tools/platform/Set-ReadMeModuleTable.ps1
@@ -29,9 +29,9 @@ Mandatory. The set of columns to add to the table in the order you expect them i
 Available are 'Name', 'ProviderNamespace', 'ResourceType', 'TemplateType', 'Deploy' & 'Status'
 
 .EXAMPLE
-Set-ReadMeModuleTable -FilePath 'C:\readme.md' -ModulesPath 'C:\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','Status')
+Set-ReadMeModuleTable -FilePath 'C:\README.md' -ModulesPath 'C:\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','Status')
 
-Update the defined table section in the 'readme.md' file with a table that has the columns 'Name' & 'Status'
+Update the defined table section in the 'README.md' file with a table that has the columns 'Name' & 'Status'
 #>
 function Set-ReadMeModuleTable {