From 4befede76b295bf0891cc4b8a9cdeae11639853c Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Mon, 6 Jun 2022 23:38:54 +0200
Subject: [PATCH 01/16] Renamed `arm` to `modules` (#1)

---
 .../modulePipelines/ms.aad.domainservices.yml |   6 +-
 .../ms.analysisservices.servers.yml           |   6 +-
 .../ms.apimanagement.service.yml              |   6 +-
 ...s.appconfiguration.configurationstores.yml |   6 +-
 .../ms.authorization.policyassignments.yml    |   6 +-
 .../ms.authorization.policydefinitions.yml    |   6 +-
 .../ms.authorization.policyexemptions.yml     |   6 +-
 .../ms.authorization.policysetdefinitions.yml |   6 +-
 .../ms.authorization.roleassignments.yml      |   6 +-
 .../ms.authorization.roledefinitions.yml      |   6 +-
 .../ms.automation.automationaccounts.yml      |   6 +-
 .../ms.batch.batchaccounts.yml                |   6 +-
 .../ms.cognitiveservices.accounts.yml         |   6 +-
 .../ms.compute.availabilitysets.yml           |   6 +-
 .../ms.compute.diskencryptionsets.yml         |   6 +-
 .../modulePipelines/ms.compute.disks.yml      |   6 +-
 .../modulePipelines/ms.compute.galleries.yml  |   6 +-
 .../modulePipelines/ms.compute.images.yml     |   6 +-
 .../ms.compute.proximityplacementgroups.yml   |   6 +-
 .../ms.compute.virtualmachines.yml            |   6 +-
 .../ms.compute.virtualmachinescalesets.yml    |   6 +-
 .../ms.consumption.budgets.yml                |   6 +-
 .../ms.containerinstance.containergroups.yml  |   6 +-
 .../ms.containerregistry.registries.yml       |   6 +-
 .../ms.containerservice.managedclusters.yml   |   6 +-
 .../ms.databricks.workspaces.yml              |   6 +-
 .../ms.datafactory.factories.yml              |   6 +-
 ...esktopvirtualization.applicationgroups.yml |   6 +-
 .../ms.desktopvirtualization.hostpools.yml    |   6 +-
 .../ms.desktopvirtualization.scalingplans.yml |   6 +-
 .../ms.desktopvirtualization.workspaces.yml   |   6 +-
 .../ms.documentdb.databaseaccounts.yml        |   6 +-
 .../ms.eventgrid.systemtopics.yml             |   6 +-
 .../modulePipelines/ms.eventgrid.topics.yml   |   6 +-
 .../ms.eventhub.namespaces.yml                |   6 +-
 .../ms.healthbot.healthbots.yml               |   6 +-
 .../ms.insights.actiongroups.yml              |   6 +-
 .../ms.insights.activitylogalerts.yml         |   6 +-
 .../ms.insights.components.yml                |   6 +-
 .../ms.insights.diagnosticsettings.yml        |   6 +-
 .../ms.insights.metricalerts.yml              |   6 +-
 .../ms.insights.privatelinkscopes.yml         |   6 +-
 .../ms.insights.scheduledqueryrules.yml       |   6 +-
 .../modulePipelines/ms.keyvault.vaults.yml    |   6 +-
 .../ms.kubernetesconfiguration.extensions.yml |   6 +-
 ...rnetesconfiguration.fluxconfigurations.yml |   6 +-
 .../modulePipelines/ms.logic.workflows.yml    |   6 +-
 .../ms.machinelearningservices.workspaces.yml |   6 +-
 ...managedidentity.userassignedidentities.yml |   6 +-
 ...anagedservices.registrationdefinitions.yml |   6 +-
 .../ms.management.managementgroups.yml        |   6 +-
 .../ms.netapp.netappaccounts.yml              |   6 +-
 .../ms.network.applicationgateways.yml        |   6 +-
 .../ms.network.applicationsecuritygroups.yml  |   6 +-
 .../ms.network.azurefirewalls.yml             |   6 +-
 .../ms.network.bastionhosts.yml               |   6 +-
 .../ms.network.connections.yml                |   6 +-
 .../ms.network.ddosprotectionplans.yml        |   6 +-
 .../ms.network.expressroutecircuits.yml       |   6 +-
 .../ms.network.firewallpolicies.yml           |   6 +-
 .../modulePipelines/ms.network.frontdoors.yml |   6 +-
 .../modulePipelines/ms.network.ipgroups.yml   |   6 +-
 .../ms.network.loadbalancers.yml              |   6 +-
 .../ms.network.localnetworkgateways.yml       |   6 +-
 .../ms.network.natgateways.yml                |   6 +-
 .../ms.network.networkinterfaces.yml          |   6 +-
 .../ms.network.networksecuritygroups.yml      |   6 +-
 .../ms.network.networkwatchers.yml            |   6 +-
 .../ms.network.privatednszones.yml            |   6 +-
 .../ms.network.privateendpoints.yml           |   6 +-
 .../ms.network.publicipaddresses.yml          |   6 +-
 .../ms.network.publicipprefixes.yml           |   6 +-
 .../ms.network.routetables.yml                |   6 +-
 .../ms.network.trafficmanagerprofiles.yml     |   6 +-
 .../ms.network.virtualhubs.yml                |   6 +-
 .../ms.network.virtualnetworkgateways.yml     |   6 +-
 .../ms.network.virtualnetworks.yml            |   6 +-
 .../ms.network.virtualwans.yml                |   6 +-
 .../ms.network.vpngateways.yml                |   6 +-
 .../modulePipelines/ms.network.vpnsites.yml   |   6 +-
 .../ms.operationalinsights.workspaces.yml     |   6 +-
 .../ms.recoveryservices.vaults.yml            |   6 +-
 .../ms.resources.deploymentscripts.yml        |   7 +-
 .../ms.resources.resourcegroups.yml           |   6 +-
 .../modulePipelines/ms.resources.tags.yml     |   6 +-
 .../ms.security.azuresecuritycenter.yml       |   6 +-
 .../ms.servicebus.namespaces.yml              |   6 +-
 .../ms.servicefabric.clusters.yml             |   6 +-
 .../ms.sql.managedinstances.yml               |   6 +-
 .../modulePipelines/ms.sql.servers.yml        |   6 +-
 .../ms.storage.storageaccounts.yml            |   6 +-
 .../ms.synapse.privatelinkhubs.yml            |   6 +-
 ...ms.virtualmachineimages.imagetemplates.yml |   6 +-
 .../modulePipelines/ms.web.connections.yml    |   6 +-
 .../ms.web.hostingenvironments.yml            |   6 +-
 .../modulePipelines/ms.web.serverfarms.yml    |   6 +-
 .azuredevops/modulePipelines/ms.web.sites.yml |   6 +-
 .../modulePipelines/ms.web.staticsites.yml    |   6 +-
 .../pipelineTemplates/jobs.publishModule.yml  |   8 +-
 .../jobs.validateModulePester.yml             |  18 +-
 .../platform.dependencies.yml                 |   2 +-
 .../platform.updateReadMe.yml                 |  10 +-
 .../templates/publishModule/action.yml        |  30 +--
 .../validateModuleDeployment/action.yml       |  24 +--
 .../templates/validateModulePester/action.yml |  16 +-
 .github/workflows/ms.aad.domainservices.yml   |   6 +-
 .../workflows/ms.analysisservices.servers.yml |   6 +-
 .../workflows/ms.apimanagement.service.yml    |   6 +-
 ...s.appconfiguration.configurationstores.yml |   6 +-
 .../ms.authorization.policyassignments.yml    |   6 +-
 .../ms.authorization.policydefinitions.yml    |   6 +-
 .../ms.authorization.policyexemptions.yml     |   6 +-
 .../ms.authorization.policysetdefinitions.yml |   6 +-
 .../ms.authorization.roleassignments.yml      |   6 +-
 .../ms.authorization.roledefinitions.yml      |   6 +-
 .../ms.automation.automationaccounts.yml      |   6 +-
 .github/workflows/ms.batch.batchaccounts.yml  |   6 +-
 .../ms.cognitiveservices.accounts.yml         |   6 +-
 .../workflows/ms.compute.availabilitysets.yml |   6 +-
 .../ms.compute.diskencryptionsets.yml         |   6 +-
 .github/workflows/ms.compute.disks.yml        |   6 +-
 .github/workflows/ms.compute.galleries.yml    |   6 +-
 .github/workflows/ms.compute.images.yml       |   6 +-
 .../ms.compute.proximityplacementgroups.yml   |   6 +-
 .../workflows/ms.compute.virtualmachines.yml  |   6 +-
 .../ms.compute.virtualmachinescalesets.yml    |   6 +-
 .github/workflows/ms.consumption.budgets.yml  |   6 +-
 .../ms.containerinstance.containergroups.yml  |   6 +-
 .../ms.containerregistry.registries.yml       |   6 +-
 .../ms.containerservice.managedclusters.yml   |   6 +-
 .../workflows/ms.databricks.workspaces.yml    |   6 +-
 .../workflows/ms.datafactory.factories.yml    |   6 +-
 ...esktopvirtualization.applicationgroups.yml |   6 +-
 .../ms.desktopvirtualization.hostpools.yml    |   6 +-
 .../ms.desktopvirtualization.scalingplans.yml |   6 +-
 .../ms.desktopvirtualization.workspaces.yml   |   6 +-
 .../ms.documentdb.databaseaccounts.yml        |   6 +-
 .../workflows/ms.eventgrid.systemtopics.yml   |   6 +-
 .github/workflows/ms.eventgrid.topics.yml     |   6 +-
 .github/workflows/ms.eventhub.namespaces.yml  |   6 +-
 .github/workflows/ms.healthbot.healthbots.yml |   6 +-
 .../workflows/ms.insights.actiongroups.yml    |   6 +-
 .../ms.insights.activitylogalerts.yml         |   6 +-
 .github/workflows/ms.insights.components.yml  |   6 +-
 .../ms.insights.diagnosticsettings.yml        |   6 +-
 .../workflows/ms.insights.metricalerts.yml    |   6 +-
 .../ms.insights.privatelinkscopes.yml         |   6 +-
 .../ms.insights.scheduledqueryrules.yml       |   6 +-
 .github/workflows/ms.keyvault.vaults.yml      |   6 +-
 .../ms.kubernetesconfiguration.extensions.yml |   6 +-
 ...rnetesconfiguration.fluxconfigurations.yml |   6 +-
 .github/workflows/ms.logic.workflows.yml      |   6 +-
 .../ms.machinelearningservices.workspaces.yml |   6 +-
 ...managedidentity.userassignedidentities.yml |   6 +-
 ...anagedservices.registrationdefinitions.yml |   6 +-
 .../ms.management.managementgroups.yml        |   6 +-
 .../workflows/ms.netapp.netappaccounts.yml    |   6 +-
 .../ms.network.applicationgateways.yml        |   6 +-
 .../ms.network.applicationsecuritygroups.yml  |   6 +-
 .../workflows/ms.network.azurefirewalls.yml   |   6 +-
 .github/workflows/ms.network.bastionhosts.yml |   6 +-
 .github/workflows/ms.network.connections.yml  |   6 +-
 .../ms.network.ddosprotectionplans.yml        |   6 +-
 .../ms.network.expressroutecircuits.yml       |   6 +-
 .../workflows/ms.network.firewallpolicies.yml |   6 +-
 .github/workflows/ms.network.frontdoors.yml   |   6 +-
 .github/workflows/ms.network.ipgroups.yml     |   6 +-
 .../workflows/ms.network.loadbalancers.yml    |   6 +-
 .../ms.network.localnetworkgateways.yml       |   6 +-
 .github/workflows/ms.network.natgateways.yml  |   6 +-
 .../ms.network.networkinterfaces.yml          |   6 +-
 .../ms.network.networksecuritygroups.yml      |   6 +-
 .../workflows/ms.network.networkwatchers.yml  |   6 +-
 .../workflows/ms.network.privatednszones.yml  |   6 +-
 .../workflows/ms.network.privateendpoints.yml |   6 +-
 .../ms.network.publicipaddresses.yml          |   6 +-
 .../workflows/ms.network.publicipprefixes.yml |   6 +-
 .github/workflows/ms.network.routetables.yml  |   6 +-
 .../ms.network.trafficmanagerprofiles.yml     |   6 +-
 .github/workflows/ms.network.virtualhubs.yml  |   6 +-
 .../ms.network.virtualnetworkgateways.yml     |   6 +-
 .../workflows/ms.network.virtualnetworks.yml  |   6 +-
 .github/workflows/ms.network.virtualwans.yml  |   6 +-
 .github/workflows/ms.network.vpngateways.yml  |   6 +-
 .github/workflows/ms.network.vpnsites.yml     |   6 +-
 .../ms.operationalinsights.workspaces.yml     |   6 +-
 .../workflows/ms.recoveryservices.vaults.yml  |   6 +-
 .../ms.resources.deploymentscripts.yml        |   6 +-
 .../workflows/ms.resources.resourcegroups.yml |   6 +-
 .github/workflows/ms.resources.tags.yml       |   6 +-
 .../ms.security.azuresecuritycenter.yml       |   6 +-
 .../workflows/ms.servicebus.namespaces.yml    |   6 +-
 .../workflows/ms.servicefabric.clusters.yml   |   6 +-
 .github/workflows/ms.sql.managedinstances.yml |   6 +-
 .github/workflows/ms.sql.servers.yml          |   6 +-
 .../workflows/ms.storage.storageaccounts.yml  |   6 +-
 .../workflows/ms.synapse.privatelinkhubs.yml  |   6 +-
 ...ms.virtualmachineimages.imagetemplates.yml |   6 +-
 .github/workflows/ms.web.connections.yml      |   6 +-
 .../workflows/ms.web.hostingenvironments.yml  |   6 +-
 .github/workflows/ms.web.serverfarms.yml      |   6 +-
 .github/workflows/ms.web.sites.yml            |   6 +-
 .github/workflows/ms.web.staticsites.yml      |   6 +-
 .github/workflows/platform.dependencies.yml   |  62 +++---
 .github/workflows/platform.updateReadMe.yml   |  10 +-
 README.md                                     | 196 +++++++++---------
 arm/README.md                                 | 104 ----------
 .../.bicep/nested_rbac.bicep                  |   6 +-
 .../virtualMachinesMultiple/deploy.bicep      |   2 +-
 .../deploy.bicep                              |   2 +-
 ...g started - Get module cross-references.md |   2 +-
 ...board module library and CI environment.md |  20 +-
 docs/wiki/Solution creation.md                |  16 +-
 ...ent - GitHub ReadMe module table update.md |   2 +-
 .../The CI environment - Pipeline design.md   |   4 +-
 .../The CI environment - Static validation.md |   6 +-
 docs/wiki/The library - Module design.md      |   6 +-
 docs/wiki/The library - Module usage.md       |  32 +--
 docs/wiki/Upgrade from 0.3.1 to 0.4.0.md      |   6 +-
 .../.global/global.module.tests.ps1           |  24 +--
 {arm => modules}/.global/shared/helper.psm1   |   0
 .../DomainServices/.bicep/nested_rbac.bicep   |   0
 .../.parameters/parameters.json               |   0
 .../Microsoft.AAD/DomainServices/deploy.bicep |   0
 .../Microsoft.AAD/DomainServices/readme.md    |   0
 .../Microsoft.AAD/DomainServices/version.json |   0
 .../servers/.bicep/nested_rbac.bicep          |   0
 .../servers/.parameters/max.parameters.json   |   0
 .../servers/.parameters/min.parameters.json   |   0
 .../servers/.parameters/parameters.json       |   0
 .../servers/deploy.bicep                      |   0
 .../servers/readme.md                         |   0
 .../servers/version.json                      |   0
 .../.bicep/nested_authorizationServers.bicep  |   0
 .../service/.bicep/nested_rbac.bicep          |   0
 .../service/.parameters/max.parameters.json   |   0
 .../service/.parameters/min.parameters.json   |   0
 .../service/.parameters/parameters.json       |   0
 .../service/apiVersionSets/deploy.bicep       |   0
 .../service/apiVersionSets/readme.md          |   0
 .../service/apiVersionSets/version.json       |   0
 .../service/apis/deploy.bicep                 |   0
 .../service/apis/policies/deploy.bicep        |   0
 .../service/apis/policies/readme.md           |   0
 .../service/apis/policies/version.json        |   0
 .../service/apis/readme.md                    |   0
 .../service/apis/version.json                 |   0
 .../service/authorizationServers/deploy.bicep |   0
 .../service/authorizationServers/readme.md    |   0
 .../service/authorizationServers/version.json |   0
 .../service/backends/deploy.bicep             |   0
 .../service/backends/readme.md                |   0
 .../service/backends/version.json             |   0
 .../service/caches/deploy.bicep               |   0
 .../service/caches/readme.md                  |   0
 .../service/caches/version.json               |   0
 .../service/deploy.bicep                      |   0
 .../service/identityProviders/deploy.bicep    |   0
 .../service/identityProviders/readme.md       |   0
 .../service/identityProviders/version.json    |   0
 .../service/namedValues/deploy.bicep          |   0
 .../service/namedValues/readme.md             |   0
 .../service/namedValues/version.json          |   0
 .../service/policies/deploy.bicep             |   0
 .../service/policies/readme.md                |   0
 .../service/policies/version.json             |   0
 .../service/portalsettings/deploy.bicep       |   0
 .../service/portalsettings/readme.md          |   0
 .../service/portalsettings/version.json       |   0
 .../service/products/apis/deploy.bicep        |   0
 .../service/products/apis/readme.md           |   0
 .../service/products/apis/version.json        |   0
 .../service/products/deploy.bicep             |   0
 .../service/products/groups/deploy.bicep      |   0
 .../service/products/groups/readme.md         |   0
 .../service/products/groups/version.json      |   0
 .../service/products/readme.md                |   0
 .../service/products/version.json             |   0
 .../Microsoft.ApiManagement/service/readme.md |   0
 .../service/subscriptions/deploy.bicep        |   0
 .../service/subscriptions/readme.md           |   0
 .../service/subscriptions/version.json        |   0
 .../service/version.json                      |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../configurationStores/deploy.bicep          |   0
 .../configurationStores/readme.md             |   0
 .../configurationStores/version.json          |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyAssignments/deploy.bicep            |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyAssignments/readme.md               |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../policyAssignments/resourceGroup/readme.md |   0
 .../resourceGroup/version.json                |   0
 .../subscription/deploy.bicep                 |   0
 .../policyAssignments/subscription/readme.md  |   0
 .../subscription/version.json                 |   0
 .../policyAssignments/version.json            |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyDefinitions/deploy.bicep            |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyDefinitions/readme.md               |   2 +-
 .../subscription/deploy.bicep                 |   0
 .../policyDefinitions/subscription/readme.md  |   0
 .../subscription/version.json                 |   0
 .../policyDefinitions/version.json            |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyExemptions/deploy.bicep             |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyExemptions/readme.md                |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../policyExemptions/resourceGroup/readme.md  |   0
 .../resourceGroup/version.json                |   0
 .../subscription/deploy.bicep                 |   0
 .../policyExemptions/subscription/readme.md   |   0
 .../subscription/version.json                 |   0
 .../policyExemptions/version.json             |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policySetDefinitions/deploy.bicep         |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policySetDefinitions/readme.md            |   2 +-
 .../subscription/deploy.bicep                 |   0
 .../subscription/readme.md                    |   0
 .../subscription/version.json                 |   0
 .../policySetDefinitions/version.json         |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../roleAssignments/deploy.bicep              |   0
 .../managementGroup/deploy.bicep              |   0
 .../roleAssignments/managementGroup/readme.md |   0
 .../managementGroup/version.json              |   0
 .../roleAssignments/readme.md                 |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../roleAssignments/resourceGroup/readme.md   |   0
 .../resourceGroup/version.json                |   0
 .../roleAssignments/subscription/deploy.bicep |   0
 .../roleAssignments/subscription/readme.md    |   0
 .../roleAssignments/subscription/version.json |   0
 .../roleAssignments/version.json              |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../roleDefinitions/deploy.bicep              |   0
 .../managementGroup/deploy.bicep              |   0
 .../roleDefinitions/managementGroup/readme.md |   0
 .../managementGroup/version.json              |   0
 .../roleDefinitions/readme.md                 |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../roleDefinitions/resourceGroup/readme.md   |   0
 .../resourceGroup/version.json                |   0
 .../roleDefinitions/subscription/deploy.bicep |   0
 .../roleDefinitions/subscription/readme.md    |   0
 .../roleDefinitions/subscription/version.json |   0
 .../roleDefinitions/version.json              |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.bicep/nested_solution.bicep              |   0
 .../.parameters/encr.parameters.json          |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../automationAccounts/deploy.bicep           |   0
 .../jobSchedules/deploy.bicep                 |   0
 .../automationAccounts/jobSchedules/readme.md |   0
 .../jobSchedules/version.json                 |   0
 .../automationAccounts/modules/deploy.bicep   |   0
 .../automationAccounts/modules/readme.md      |   0
 .../automationAccounts/modules/version.json   |   0
 .../automationAccounts/readme.md              |   0
 .../automationAccounts/runbooks/deploy.bicep  |   0
 .../automationAccounts/runbooks/readme.md     |   0
 .../automationAccounts/runbooks/version.json  |   0
 .../automationAccounts/schedules/deploy.bicep |   0
 .../automationAccounts/schedules/readme.md    |   0
 .../automationAccounts/schedules/version.json |   0
 .../softwareUpdateConfigurations/deploy.bicep |   0
 .../softwareUpdateConfigurations/readme.md    |   0
 .../softwareUpdateConfigurations/version.json |   0
 .../automationAccounts/variables/deploy.bicep |   0
 .../automationAccounts/variables/readme.md    |   0
 .../automationAccounts/variables/version.json |   0
 .../automationAccounts/version.json           |   0
 .../.parameters/min.parameters.json           |   0
 .../batchAccounts/.parameters/parameters.json |   0
 .../batchAccounts/deploy.bicep                |   0
 .../Microsoft.Batch/batchAccounts/readme.md   |   0
 .../batchAccounts/version.json                |   0
 .../accounts/.bicep/nested_rbac.bicep         |   0
 .../accounts/.parameters/parameters.json      |   0
 .../.parameters/speech.parameters.json        |   0
 .../accounts/deploy.bicep                     |   0
 .../accounts/readme.md                        |   0
 .../accounts/version.json                     |   0
 .../availabilitySets/.bicep/nested_rbac.bicep |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../availabilitySets/deploy.bicep             |   0
 .../availabilitySets/readme.md                |   0
 .../availabilitySets/version.json             |   0
 .../.bicep/nested_kvAccessPolicy.bicep        |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../diskEncryptionSets/deploy.bicep           |   0
 .../diskEncryptionSets/readme.md              |   0
 .../diskEncryptionSets/version.json           |   0
 .../disks/.bicep/nested_rbac.bicep            |   0
 .../disks/.parameters/image.parameters.json   |   0
 .../disks/.parameters/import.parameters.json  |   0
 .../disks/.parameters/min.parameters.json     |   0
 .../disks/.parameters/parameters.json         |   0
 .../Microsoft.Compute/disks/deploy.bicep      |   0
 .../Microsoft.Compute/disks/readme.md         |   0
 .../Microsoft.Compute/disks/version.json      |   0
 .../galleries/.bicep/nested_rbac.bicep        |   0
 .../.parameters/images.parameters.json        |   0
 .../galleries/.parameters/parameters.json     |   0
 .../Microsoft.Compute/galleries/deploy.bicep  |   0
 .../galleries/images/.bicep/nested_rbac.bicep |   0
 .../galleries/images/deploy.bicep             |   0
 .../galleries/images/readme.md                |   0
 .../galleries/images/version.json             |   0
 .../Microsoft.Compute/galleries/readme.md     |   0
 .../Microsoft.Compute/galleries/version.json  |   0
 .../images/.bicep/nested_rbac.bicep           |   0
 .../images/.parameters/parameters.json        |   0
 .../Microsoft.Compute/images/deploy.bicep     |   0
 .../Microsoft.Compute/images/readme.md        |   0
 .../Microsoft.Compute/images/version.json     |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../proximityPlacementGroups/deploy.bicep     |   0
 .../proximityPlacementGroups/readme.md        |   0
 .../proximityPlacementGroups/version.json     |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/linux.min.parameters.json     |   0
 .../.parameters/linux.parameters.json         |   0
 .../.parameters/windows.min.parameters.json   |   0
 .../.parameters/windows.parameters.json       |   0
 .../virtualMachineScaleSets/deploy.bicep      |   0
 .../extensions/deploy.bicep                   |   0
 .../extensions/readme.md                      |   0
 .../extensions/version.json                   |   0
 .../virtualMachineScaleSets/readme.md         |   0
 .../virtualMachineScaleSets/version.json      |   0
 .../.bicep/nested_networkInterface.bicep      |   0
 .../virtualMachines/.bicep/nested_rbac.bicep  |   0
 .../.parameters/linux.autmg.parameters.json   |   0
 .../.parameters/linux.min.parameters.json     |   0
 .../.parameters/linux.parameters.json         |   0
 .../.parameters/windows.autmg.parameters.json |   0
 .../.parameters/windows.min.parameters.json   |   0
 .../.parameters/windows.parameters.json       |   0
 .../virtualMachines/deploy.bicep              |   0
 .../virtualMachines/extensions/deploy.bicep   |   0
 .../virtualMachines/extensions/readme.md      |   0
 .../virtualMachines/extensions/version.json   |   0
 .../virtualMachines/readme.md                 |   0
 .../virtualMachines/version.json              |   0
 .../budgets/.parameters/parameters.json       |   0
 .../budgets/deploy.bicep                      |   0
 .../Microsoft.Consumption/budgets/readme.md   |   0
 .../budgets/version.json                      |   0
 .../.parameters/parameters.json               |   0
 .../containerGroups/deploy.bicep              |   0
 .../containerGroups/readme.md                 |   0
 .../containerGroups/version.json              |   0
 .../registries/.bicep/nested_rbac.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../registries/.parameters/parameters.json    |   0
 .../registries/deploy.bicep                   |   0
 .../registries/readme.md                      |   0
 .../registries/replications/deploy.bicep      |   0
 .../registries/replications/readme.md         |   0
 .../registries/replications/version.json      |   0
 .../registries/version.json                   |   0
 .../registries/webhooks/deploy.bicep          |   0
 .../registries/webhooks/readme.md             |   0
 .../registries/webhooks/version.json          |   0
 .../managedClusters/.bicep/nested_rbac.bicep  |   0
 .../.parameters/azure.parameters.json         |   0
 .../.parameters/kubenet.parameters.json       |   0
 .../managedClusters/agentPools/deploy.bicep   |   0
 .../managedClusters/agentPools/readme.md      |   0
 .../managedClusters/agentPools/version.json   |   0
 .../managedClusters/deploy.bicep              |   0
 .../managedClusters/readme.md                 |   0
 .../managedClusters/version.json              |   0
 .../factories/.bicep/nested_rbac.bicep        |   0
 .../factories/.parameters/parameters.json     |   0
 .../factories/deploy.bicep                    |   0
 .../factories/integrationRuntime/deploy.bicep |   0
 .../factories/integrationRuntime/readme.md    |   0
 .../factories/integrationRuntime/version.json |   0
 .../managedVirtualNetwork/deploy.bicep        |   0
 .../factories/managedVirtualNetwork/readme.md |   0
 .../managedVirtualNetwork/version.json        |   0
 .../Microsoft.DataFactory/factories/readme.md |   0
 .../factories/version.json                    |   0
 .../workspaces/.bicep/nested_rbac.bicep       |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/deploy.bicep                   |   0
 .../Microsoft.Databricks/workspaces/readme.md |   0
 .../workspaces/version.json                   |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../applications/deploy.bicep                 |   0
 .../applicationgroups/applications/readme.md  |   0
 .../applications/version.json                 |   0
 .../applicationgroups/deploy.bicep            |   0
 .../applicationgroups/readme.md               |   0
 .../applicationgroups/version.json            |   0
 .../hostpools/.bicep/nested_rbac.bicep        |   0
 .../hostpools/.parameters/parameters.json     |   0
 .../hostpools/deploy.bicep                    |   0
 .../hostpools/readme.md                       |   0
 .../hostpools/version.json                    |   0
 .../scalingplans/.bicep/nested_rbac.bicep     |   0
 .../.parameters/min.parameters.json           |   0
 .../scalingplans/deploy.bicep                 |   0
 .../scalingplans/readme.md                    |   0
 .../scalingplans/version.json                 |   0
 .../workspaces/.bicep/nested_rbac.bicep       |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/version.json                   |   0
 .../databaseAccounts/.bicep/nested_rbac.bicep |   0
 .../.parameters/mongodb.parameters.json       |   0
 .../.parameters/plain.parameters.json         |   0
 .../.parameters/sqldb.parameters.json         |   0
 .../databaseAccounts/deploy.bicep             |   0
 .../mongodbDatabases/collections/deploy.bicep |   0
 .../mongodbDatabases/collections/readme.md    |   0
 .../mongodbDatabases/collections/version.json |   0
 .../mongodbDatabases/deploy.bicep             |   0
 .../mongodbDatabases/readme.md                |   0
 .../mongodbDatabases/version.json             |   0
 .../databaseAccounts/readme.md                |   0
 .../sqlDatabases/containers/deploy.bicep      |   0
 .../sqlDatabases/containers/readme.md         |   0
 .../sqlDatabases/containers/version.json      |   0
 .../sqlDatabases/deploy.bicep                 |   0
 .../databaseAccounts/sqlDatabases/readme.md   |   0
 .../sqlDatabases/version.json                 |   0
 .../databaseAccounts/version.json             |   0
 .../systemTopics/.bicep/nested_rbac.bicep     |   0
 .../.parameters/min.parameters.json           |   0
 .../systemTopics/.parameters/parameters.json  |   0
 .../systemTopics/deploy.bicep                 |   0
 .../systemTopics/readme.md                    |   0
 .../systemTopics/version.json                 |   0
 .../topics/.bicep/nested_rbac.bicep           |   0
 .../topics/.parameters/parameters.json        |   0
 .../Microsoft.EventGrid/topics/deploy.bicep   |   0
 .../Microsoft.EventGrid/topics/readme.md      |   0
 .../Microsoft.EventGrid/topics/version.json   |   0
 .../namespaces/.bicep/nested_rbac.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../namespaces/.parameters/parameters.json    |   0
 .../authorizationRules/deploy.bicep           |   0
 .../namespaces/authorizationRules/readme.md   |   0
 .../authorizationRules/version.json           |   0
 .../namespaces/deploy.bicep                   |   0
 .../disasterRecoveryConfigs/deploy.bicep      |   0
 .../disasterRecoveryConfigs/readme.md         |   0
 .../disasterRecoveryConfigs/version.json      |   0
 .../eventhubs/.bicep/nested_rbac.bicep        |   0
 .../eventhubs/authorizationRules/deploy.bicep |   0
 .../eventhubs/authorizationRules/readme.md    |   0
 .../eventhubs/authorizationRules/version.json |   0
 .../eventhubs/consumergroups/deploy.bicep     |   0
 .../eventhubs/consumergroups/readme.md        |   0
 .../eventhubs/consumergroups/version.json     |   0
 .../namespaces/eventhubs/deploy.bicep         |   0
 .../namespaces/eventhubs/readme.md            |   0
 .../namespaces/eventhubs/version.json         |   0
 .../namespaces/networkRuleSets/deploy.bicep   |   0
 .../namespaces/networkRuleSets/readme.md      |   0
 .../namespaces/networkRuleSets/version.json   |   0
 .../Microsoft.EventHub/namespaces/readme.md   |   0
 .../namespaces/version.json                   |   0
 .../healthBots/.bicep/nested_rbac.bicep       |   0
 .../healthBots/.parameters/parameters.json    |   0
 .../healthBots/deploy.bicep                   |   0
 .../Microsoft.HealthBot/healthBots/readme.md  |   0
 .../healthBots/version.json                   |   0
 .../actionGroups/.bicep/nested_rbac.bicep     |   0
 .../actionGroups/.parameters/parameters.json  |   0
 .../actionGroups/deploy.bicep                 |   0
 .../Microsoft.Insights/actionGroups/readme.md |   0
 .../actionGroups/version.json                 |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../activityLogAlerts/deploy.bicep            |   0
 .../activityLogAlerts/readme.md               |   0
 .../activityLogAlerts/version.json            |   0
 .../components/.bicep/nested_rbac.bicep       |   0
 .../components/.parameters/parameters.json    |   0
 .../components/deploy.bicep                   |   0
 .../Microsoft.Insights/components/readme.md   |   0
 .../components/version.json                   |   0
 .../.parameters/parameters.json               |   0
 .../diagnosticSettings/deploy.bicep           |   0
 .../diagnosticSettings/readme.md              |   0
 .../diagnosticSettings/version.json           |   0
 .../metricAlerts/.bicep/nested_rbac.bicep     |   0
 .../metricAlerts/.parameters/parameters.json  |   0
 .../metricAlerts/deploy.bicep                 |   0
 .../Microsoft.Insights/metricAlerts/readme.md |   0
 .../metricAlerts/version.json                 |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../privateLinkScopes/deploy.bicep            |   0
 .../privateLinkScopes/readme.md               |   0
 .../scopedResources/deploy.bicep              |   0
 .../scopedResources/readme.md                 |   0
 .../scopedResources/version.json              |   0
 .../privateLinkScopes/version.json            |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../scheduledQueryRules/deploy.bicep          |   0
 .../scheduledQueryRules/readme.md             |   0
 .../scheduledQueryRules/version.json          |   0
 .../vaults/.bicep/nested_rbac.bicep           |   0
 .../vaults/.parameters/min.parameters.json    |   0
 .../vaults/.parameters/parameters.json        |   0
 .../vaults/accessPolicies/deploy.bicep        |   0
 .../vaults/accessPolicies/readme.md           |   0
 .../vaults/accessPolicies/version.json        |   0
 .../Microsoft.KeyVault/vaults/deploy.bicep    |   0
 .../vaults/keys/.bicep/nested_rbac.bicep      |   0
 .../vaults/keys/deploy.bicep                  |   0
 .../Microsoft.KeyVault/vaults/keys/readme.md  |   0
 .../vaults/keys/version.json                  |   0
 .../Microsoft.KeyVault/vaults/readme.md       |   0
 .../vaults/secrets/.bicep/nested_rbac.bicep   |   0
 .../vaults/secrets/deploy.bicep               |   0
 .../vaults/secrets/readme.md                  |   0
 .../vaults/secrets/version.json               |   0
 .../Microsoft.KeyVault/vaults/version.json    |   0
 .../.parameters/min.parameters.json           |   0
 .../extensions/.parameters/parameters.json    |   0
 .../extensions/deploy.bicep                   |   0
 .../extensions/readme.md                      |   0
 .../extensions/version.json                   |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../fluxConfigurations/deploy.bicep           |   0
 .../fluxConfigurations/readme.md              |   0
 .../fluxConfigurations/version.json           |   0
 .../workflows/.bicep/nested_rbac.bicep        |   0
 .../workflows/.parameters/parameters.json     |   0
 .../Microsoft.Logic/workflows/deploy.bicep    |   0
 .../Microsoft.Logic/workflows/readme.md       |   0
 .../Microsoft.Logic/workflows/version.json    |   0
 .../workspaces/.bicep/nested_rbac.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/computes/deploy.bicep          |   0
 .../workspaces/computes/readme.md             |   0
 .../workspaces/computes/version.json          |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/version.json                   |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../userAssignedIdentities/deploy.bicep       |   0
 .../userAssignedIdentities/readme.md          |   0
 .../userAssignedIdentities/version.json       |   0
 .../nested_registrationAssignment.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/rg.parameters.json            |   0
 .../registrationDefinitions/deploy.bicep      |   0
 .../registrationDefinitions/readme.md         |   0
 .../registrationDefinitions/version.json      |   0
 .../managementGroups/.bicep/nested_rbac.bicep |   0
 .../.parameters/parameters.json               |   0
 .../managementGroups/deploy.bicep             |   0
 .../managementGroups/readme.md                |   0
 .../managementGroups/version.json             |   0
 .../netAppAccounts/.bicep/nested_rbac.bicep   |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/nfs3.parameters.json          |   0
 .../.parameters/nfs41.parameters.json         |   0
 .../capacityPools/.bicep/nested_rbac.bicep    |   0
 .../netAppAccounts/capacityPools/deploy.bicep |   0
 .../netAppAccounts/capacityPools/readme.md    |   0
 .../netAppAccounts/capacityPools/version.json |   0
 .../volumes/.bicep/nested_rbac.bicep          |   0
 .../capacityPools/volumes/deploy.bicep        |   0
 .../capacityPools/volumes/readme.md           |   0
 .../capacityPools/volumes/version.json        |   0
 .../netAppAccounts/deploy.bicep               |   0
 .../Microsoft.NetApp/netAppAccounts/readme.md |   0
 .../netAppAccounts/version.json               |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../applicationGateways/deploy.bicep          |   0
 .../applicationGateways/readme.md             |   0
 .../applicationGateways/version.json          |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../applicationSecurityGroups/deploy.bicep    |   0
 .../applicationSecurityGroups/readme.md       |   0
 .../applicationSecurityGroups/version.json    |   0
 .../.bicep/nested_publicIPAddress.bicep       |   0
 .../.bicep/nested_publicIPAddress_rbac.bicep  |   0
 .../azureFirewalls/.bicep/nested_rbac.bicep   |   0
 .../.parameters/addpip.parameters.json        |   0
 .../.parameters/custompip.parameters.json     |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../azureFirewalls/deploy.bicep               |   0
 .../azureFirewalls/readme.md                  |   0
 .../azureFirewalls/version.json               |   0
 .../bastionHosts/.bicep/nested_rbac.bicep     |   0
 .../.parameters/min.parameters.json           |   0
 .../bastionHosts/.parameters/parameters.json  |   0
 .../bastionHosts/deploy.bicep                 |   0
 .../Microsoft.Network/bastionHosts/readme.md  |   0
 .../bastionHosts/version.json                 |   0
 .../.parameters/vnet2vnet.parameters.json     |   0
 .../connections/deploy.bicep                  |   0
 .../Microsoft.Network/connections/readme.md   |   0
 .../connections/version.json                  |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../ddosProtectionPlans/deploy.bicep          |   0
 .../ddosProtectionPlans/readme.md             |   0
 .../ddosProtectionPlans/version.json          |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../expressRouteCircuits/deploy.bicep         |   0
 .../expressRouteCircuits/readme.md            |   0
 .../expressRouteCircuits/version.json         |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../firewallPolicies/deploy.bicep             |   0
 .../firewallPolicies/readme.md                |   0
 .../ruleCollectionGroups/deploy.bicep         |   0
 .../ruleCollectionGroups/readme.md            |   0
 .../ruleCollectionGroups/version.json         |   0
 .../firewallPolicies/version.json             |   0
 .../frontDoors/.bicep/nested_rbac.bicep       |   0
 .../frontDoors/.parameters/parameters.json    |   0
 .../Microsoft.Network/frontDoors/deploy.bicep |   0
 .../Microsoft.Network/frontDoors/readme.md    |   0
 .../Microsoft.Network/frontDoors/version.json |   0
 .../ipGroups/.bicep/nested_rbac.bicep         |   0
 .../ipGroups/.parameters/parameters.json      |   0
 .../Microsoft.Network/ipGroups/deploy.bicep   |   0
 .../Microsoft.Network/ipGroups/readme.md      |   0
 .../Microsoft.Network/ipGroups/version.json   |   0
 .../loadBalancers/.bicep/nested_rbac.bicep    |   0
 .../.parameters/internal.parameters.json      |   0
 .../.parameters/min.parameters.json           |   0
 .../loadBalancers/.parameters/parameters.json |   0
 .../backendAddressPools/deploy.bicep          |   0
 .../backendAddressPools/readme.md             |   0
 .../backendAddressPools/version.json          |   0
 .../loadBalancers/deploy.bicep                |   0
 .../inboundNatRules/deploy.bicep              |   0
 .../loadBalancers/inboundNatRules/readme.md   |   0
 .../inboundNatRules/version.json              |   0
 .../Microsoft.Network/loadBalancers/readme.md |   0
 .../loadBalancers/version.json                |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../localNetworkGateways/deploy.bicep         |   0
 .../localNetworkGateways/readme.md            |   0
 .../localNetworkGateways/version.json         |   0
 .../natGateways/.bicep/nested_rbac.bicep      |   0
 .../natGateways/.parameters/parameters.json   |   0
 .../natGateways/deploy.bicep                  |   0
 .../Microsoft.Network/natGateways/readme.md   |   0
 .../natGateways/version.json                  |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../networkInterfaces/deploy.bicep            |   0
 .../networkInterfaces/readme.md               |   0
 .../networkInterfaces/version.json            |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../networkSecurityGroups/deploy.bicep        |   0
 .../networkSecurityGroups/readme.md           |   0
 .../securityRules/deploy.bicep                |   0
 .../securityRules/readme.md                   |   0
 .../securityRules/version.json                |   0
 .../networkSecurityGroups/version.json        |   0
 .../networkWatchers/.bicep/nested_rbac.bicep  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../connectionMonitors/deploy.bicep           |   0
 .../connectionMonitors/readme.md              |   0
 .../connectionMonitors/version.json           |   0
 .../networkWatchers/deploy.bicep              |   0
 .../networkWatchers/flowLogs/deploy.bicep     |   0
 .../networkWatchers/flowLogs/readme.md        |   0
 .../networkWatchers/flowLogs/version.json     |   0
 .../networkWatchers/readme.md                 |   0
 .../networkWatchers/version.json              |   0
 .../privateDnsZones/.bicep/nested_rbac.bicep  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../A/.bicep/nested_rbac.bicep                |   0
 .../privateDnsZones/A/deploy.bicep            |   0
 .../privateDnsZones/A/readme.md               |   0
 .../privateDnsZones/A/version.json            |   0
 .../AAAA/.bicep/nested_rbac.bicep             |   0
 .../privateDnsZones/AAAA/deploy.bicep         |   0
 .../privateDnsZones/AAAA/readme.md            |   0
 .../privateDnsZones/AAAA/version.json         |   0
 .../CNAME/.bicep/nested_rbac.bicep            |   0
 .../privateDnsZones/CNAME/deploy.bicep        |   0
 .../privateDnsZones/CNAME/readme.md           |   0
 .../privateDnsZones/CNAME/version.json        |   0
 .../MX/.bicep/nested_rbac.bicep               |   0
 .../privateDnsZones/MX/deploy.bicep           |   0
 .../privateDnsZones/MX/readme.md              |   0
 .../privateDnsZones/MX/version.json           |   0
 .../PTR/.bicep/nested_rbac.bicep              |   0
 .../privateDnsZones/PTR/deploy.bicep          |   0
 .../privateDnsZones/PTR/readme.md             |   0
 .../privateDnsZones/PTR/version.json          |   0
 .../SOA/.bicep/nested_rbac.bicep              |   0
 .../privateDnsZones/SOA/deploy.bicep          |   0
 .../privateDnsZones/SOA/readme.md             |   0
 .../privateDnsZones/SOA/version.json          |   0
 .../SRV/.bicep/nested_rbac.bicep              |   0
 .../privateDnsZones/SRV/deploy.bicep          |   0
 .../privateDnsZones/SRV/readme.md             |   0
 .../privateDnsZones/SRV/version.json          |   0
 .../TXT/.bicep/nested_rbac.bicep              |   0
 .../privateDnsZones/TXT/deploy.bicep          |   0
 .../privateDnsZones/TXT/readme.md             |   0
 .../privateDnsZones/TXT/version.json          |   0
 .../privateDnsZones/deploy.bicep              |   0
 .../privateDnsZones/readme.md                 |   0
 .../privateDnsZones/version.json              |   0
 .../virtualNetworkLinks/deploy.bicep          |   0
 .../virtualNetworkLinks/readme.md             |   0
 .../virtualNetworkLinks/version.json          |   0
 .../privateEndpoints/.bicep/nested_rbac.bicep |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../privateEndpoints/deploy.bicep             |   0
 .../privateDnsZoneGroups/deploy.bicep         |   0
 .../privateDnsZoneGroups/readme.md            |   0
 .../privateDnsZoneGroups/version.json         |   0
 .../privateEndpoints/readme.md                |   0
 .../privateEndpoints/version.json             |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../publicIPAddresses/deploy.bicep            |   0
 .../publicIPAddresses/readme.md               |   0
 .../publicIPAddresses/version.json            |   0
 .../publicIPPrefixes/.bicep/nested_rbac.bicep |   0
 .../.parameters/parameters.json               |   0
 .../publicIPPrefixes/deploy.bicep             |   0
 .../publicIPPrefixes/readme.md                |   0
 .../publicIPPrefixes/version.json             |   0
 .../routeTables/.bicep/nested_rbac.bicep      |   0
 .../routeTables/.parameters/parameters.json   |   0
 .../routeTables/deploy.bicep                  |   0
 .../Microsoft.Network/routeTables/readme.md   |   0
 .../routeTables/version.json                  |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/parameters.json               |   0
 .../trafficmanagerprofiles/deploy.bicep       |   0
 .../trafficmanagerprofiles/readme.md          |   0
 .../trafficmanagerprofiles/version.json       |   0
 .../.parameters/min.parameters.json           |   0
 .../virtualHubs/.parameters/parameters.json   |   0
 .../virtualHubs/deploy.bicep                  |   0
 .../virtualHubs/hubRouteTables/deploy.bicep   |   0
 .../virtualHubs/hubRouteTables/readme.md      |   0
 .../virtualHubs/hubRouteTables/version.json   |   0
 .../hubVirtualNetworkConnections/deploy.bicep |   0
 .../hubVirtualNetworkConnections/readme.md    |   0
 .../hubVirtualNetworkConnections/version.json |   0
 .../Microsoft.Network/virtualHubs/readme.md   |   0
 .../virtualHubs/version.json                  |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/expressRoute.parameters.json  |   0
 .../.parameters/vpn.parameters.json           |   0
 .../virtualNetworkGateways/deploy.bicep       |   0
 .../virtualNetworkGateways/readme.md          |   0
 .../virtualNetworkGateways/version.json       |   0
 .../virtualNetworks/.bicep/nested_rbac.bicep  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/vnetPeering.parameters.json   |   0
 .../virtualNetworks/deploy.bicep              |   0
 .../virtualNetworks/readme.md                 |   0
 .../subnets/.bicep/nested_rbac.bicep          |   0
 .../virtualNetworks/subnets/deploy.bicep      |   0
 .../virtualNetworks/subnets/readme.md         |   0
 .../virtualNetworks/subnets/version.json      |   0
 .../virtualNetworks/version.json              |   0
 .../virtualNetworkPeerings/deploy.bicep       |   0
 .../virtualNetworkPeerings/readme.md          |   0
 .../virtualNetworkPeerings/version.json       |   0
 .../virtualWans/.bicep/nested_rbac.bicep      |   0
 .../.parameters/min.parameters.json           |   0
 .../virtualWans/.parameters/parameters.json   |   0
 .../virtualWans/deploy.bicep                  |   0
 .../Microsoft.Network/virtualWans/readme.md   |   0
 .../virtualWans/version.json                  |   0
 .../.parameters/min.parameters.json           |   0
 .../vpnGateways/.parameters/parameters.json   |   0
 .../vpnGateways/connections/deploy.bicep      |   0
 .../vpnGateways/connections/readme.md         |   0
 .../vpnGateways/connections/version.json      |   0
 .../vpnGateways/deploy.bicep                  |   0
 .../vpnGateways/natRules/deploy.bicep         |   0
 .../vpnGateways/natRules/readme.md            |   0
 .../vpnGateways/natRules/version.json         |   0
 .../Microsoft.Network/vpnGateways/readme.md   |   0
 .../vpnGateways/version.json                  |   0
 .../vpnSites/.bicep/nested_rbac.bicep         |   0
 .../vpnSites/.parameters/min.parameters.json  |   0
 .../vpnSites/.parameters/parameters.json      |   0
 .../Microsoft.Network/vpnSites/deploy.bicep   |   0
 .../Microsoft.Network/vpnSites/readme.md      |   0
 .../Microsoft.Network/vpnSites/version.json   |   0
 .../workspaces/.bicep/nested_rbac.bicep       |   0
 .../workspaces/.bicep/nested_solutions.bicep  |   0
 .../.parameters/min.parameters.json           |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/dataSources/deploy.bicep       |   0
 .../workspaces/dataSources/readme.md          |   0
 .../workspaces/dataSources/version.json       |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/linkedServices/deploy.bicep    |   0
 .../workspaces/linkedServices/readme.md       |   0
 .../workspaces/linkedServices/version.json    |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/savedSearches/deploy.bicep     |   0
 .../workspaces/savedSearches/readme.md        |   0
 .../workspaces/savedSearches/version.json     |   0
 .../storageInsightConfigs/deploy.bicep        |   0
 .../storageInsightConfigs/readme.md           |   0
 .../storageInsightConfigs/version.json        |   0
 .../workspaces/version.json                   |   0
 .../vaults/.bicep/nested_rbac.bicep           |   0
 .../vaults/.parameters/dr.parameters.json     |   0
 .../vaults/.parameters/min.parameters.json    |   0
 .../vaults/.parameters/parameters.json        |   0
 .../vaults/backupConfig/deploy.bicep          |   0
 .../vaults/backupConfig/readme.md             |   0
 .../vaults/backupConfig/version.json          |   0
 .../vaults/backupPolicies/deploy.bicep        |   0
 .../vaults/backupPolicies/readme.md           |   0
 .../vaults/backupPolicies/version.json        |   0
 .../vaults/backupStorageConfig/deploy.bicep   |   0
 .../vaults/backupStorageConfig/readme.md      |   0
 .../vaults/backupStorageConfig/version.json   |   0
 .../vaults/deploy.bicep                       |   0
 .../vaults/protectionContainers/deploy.bicep  |   0
 .../protectedItems/deploy.bicep               |   0
 .../protectedItems/readme.md                  |   0
 .../protectedItems/version.json               |   0
 .../vaults/protectionContainers/readme.md     |   0
 .../vaults/protectionContainers/version.json  |   0
 .../vaults/readme.md                          |   0
 .../vaults/replicationFabrics/deploy.bicep    |   0
 .../vaults/replicationFabrics/readme.md       |   0
 .../deploy.bicep                              |   0
 .../replicationProtectionContainers/readme.md |   0
 .../deploy.bicep                              |   0
 .../readme.md                                 |   0
 .../version.json                              |   0
 .../version.json                              |   0
 .../vaults/replicationFabrics/version.json    |   0
 .../vaults/replicationPolicies/deploy.bicep   |   0
 .../vaults/replicationPolicies/readme.md      |   0
 .../vaults/replicationPolicies/version.json   |   0
 .../vaults/version.json                       |   0
 .../.parameters/cli.parameters.json           |   0
 .../.parameters/ps.parameters.json            |   0
 .../deploymentScripts/deploy.bicep            |   0
 .../deploymentScripts/readme.md               |   0
 .../deploymentScripts/version.json            |   0
 .../resourceGroups/.bicep/nested_lock.bicep   |   0
 .../resourceGroups/.bicep/nested_rbac.bicep   |   0
 .../.parameters/parameters.json               |   0
 .../resourceGroups/deploy.bicep               |   0
 .../resourceGroups/readme.md                  |   0
 .../resourceGroups/version.json               |   0
 .../tags/.parameters/min.parameters.json      |   0
 .../tags/.parameters/rg.parameters.json       |   0
 .../tags/.parameters/sub.parameters.json      |   0
 .../Microsoft.Resources/tags/deploy.bicep     |   0
 .../Microsoft.Resources/tags/readme.md        |   0
 .../tags/resourceGroups/.bicep/readTags.bicep |   0
 .../tags/resourceGroups/deploy.bicep          |   0
 .../tags/resourceGroups/readme.md             |   0
 .../tags/resourceGroups/version.json          |   0
 .../tags/subscriptions/.bicep/readTags.bicep  |   0
 .../tags/subscriptions/deploy.bicep           |   0
 .../tags/subscriptions/readme.md              |   0
 .../tags/subscriptions/version.json           |   0
 .../Microsoft.Resources/tags/version.json     |   0
 .../.bicep/nested_iotSecuritySolutions.bicep  |   0
 .../.parameters/parameters.json               |   0
 .../azureSecurityCenter/deploy.bicep          |   0
 .../azureSecurityCenter/readme.md             |   0
 .../azureSecurityCenter/version.json          |   0
 .../namespaces/.bicep/nested_rbac.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../namespaces/.parameters/parameters.json    |   0
 .../authorizationRules/deploy.bicep           |   0
 .../namespaces/authorizationRules/readme.md   |   0
 .../authorizationRules/version.json           |   0
 .../namespaces/deploy.bicep                   |   0
 .../disasterRecoveryConfigs/deploy.bicep      |   0
 .../disasterRecoveryConfigs/readme.md         |   0
 .../disasterRecoveryConfigs/version.json      |   0
 .../namespaces/ipFilterRules/deploy.bicep     |   0
 .../namespaces/ipFilterRules/readme.md        |   0
 .../namespaces/ipFilterRules/version.json     |   0
 .../migrationConfigurations/deploy.bicep      |   0
 .../migrationConfigurations/readme.md         |   0
 .../migrationConfigurations/version.json      |   0
 .../queues/.bicep/nested_rbac.bicep           |   0
 .../queues/authorizationRules/deploy.bicep    |   0
 .../queues/authorizationRules/readme.md       |   0
 .../queues/authorizationRules/version.json    |   0
 .../namespaces/queues/deploy.bicep            |   0
 .../namespaces/queues/readme.md               |   0
 .../namespaces/queues/version.json            |   0
 .../Microsoft.ServiceBus/namespaces/readme.md |   0
 .../topics/.bicep/nested_rbac.bicep           |   0
 .../topics/authorizationRules/deploy.bicep    |   0
 .../topics/authorizationRules/readme.md       |   0
 .../topics/authorizationRules/version.json    |   0
 .../namespaces/topics/deploy.bicep            |   0
 .../namespaces/topics/readme.md               |   0
 .../namespaces/topics/version.json            |   0
 .../namespaces/version.json                   |   0
 .../virtualNetworkRules/deploy.bicep          |   0
 .../namespaces/virtualNetworkRules/readme.md  |   0
 .../virtualNetworkRules/version.json          |   0
 .../clusters/.bicep/nested_rbac.bicep         |   0
 .../clusters/.parameters/cert.parameters.json |   0
 .../clusters/.parameters/full.parameters.json |   0
 .../clusters/.parameters/min.parameters.json  |   0
 .../clusters/applicationTypes/deploy.bicep    |   0
 .../clusters/applicationTypes/readme.md       |   0
 .../clusters/applicationTypes/version.json    |   0
 .../clusters/deploy.bicep                     |   0
 .../clusters/readme.md                        |   0
 .../clusters/version.json                     |   0
 .../managedInstances/.bicep/nested_rbac.bicep |   0
 .../.parameters/parameters.json               |   0
 .../administrators/deploy.bicep               |   0
 .../managedInstances/administrators/readme.md |   0
 .../administrators/version.json               |   0
 .../deploy.bicep                              |   0
 .../backupLongTermRetentionPolicies/readme.md |   0
 .../version.json                              |   0
 .../deploy.bicep                              |   0
 .../readme.md                                 |   0
 .../version.json                              |   0
 .../managedInstances/databases/deploy.bicep   |   0
 .../managedInstances/databases/readme.md      |   0
 .../managedInstances/databases/version.json   |   0
 .../managedInstances/deploy.bicep             |   0
 .../encryptionProtector/deploy.bicep          |   0
 .../encryptionProtector/readme.md             |   0
 .../encryptionProtector/version.json          |   0
 .../managedInstances/keys/deploy.bicep        |   0
 .../managedInstances/keys/readme.md           |   0
 .../managedInstances/keys/version.json        |   0
 .../Microsoft.Sql/managedInstances/readme.md  |   0
 .../securityAlertPolicies/deploy.bicep        |   0
 .../securityAlertPolicies/readme.md           |   0
 .../securityAlertPolicies/version.json        |   0
 .../managedInstances/version.json             |   0
 .../vulnerabilityAssessments/deploy.bicep     |   0
 .../vulnerabilityAssessments/readme.md        |   0
 .../vulnerabilityAssessments/version.json     |   0
 .../servers/.bicep/nested_rbac.bicep          |   0
 .../servers/.parameters/admin.parameters.json |   0
 .../servers/.parameters/parameters.json       |   0
 .../servers/databases/deploy.bicep            |   0
 .../Microsoft.Sql/servers/databases/readme.md |   0
 .../servers/databases/version.json            |   0
 .../Microsoft.Sql/servers/deploy.bicep        |   0
 .../servers/firewallRules/deploy.bicep        |   0
 .../servers/firewallRules/readme.md           |   0
 .../servers/firewallRules/version.json        |   0
 .../Microsoft.Sql/servers/readme.md           |   0
 .../securityAlertPolicies/deploy.bicep        |   0
 .../servers/securityAlertPolicies/readme.md   |   0
 .../securityAlertPolicies/version.json        |   0
 .../Microsoft.Sql/servers/version.json        |   0
 .../vulnerabilityAssessments/deploy.bicep     |   0
 .../vulnerabilityAssessments/readme.md        |   0
 .../vulnerabilityAssessments/version.json     |   0
 .../storageAccounts/.bicep/nested_rbac.bicep  |   0
 .../.parameters/encr.parameters.json          |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/nfs.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/v1.parameters.json            |   0
 .../containers/.bicep/nested_rbac.bicep       |   0
 .../blobServices/containers/deploy.bicep      |   0
 .../immutabilityPolicies/deploy.bicep         |   0
 .../containers/immutabilityPolicies/readme.md |   0
 .../immutabilityPolicies/version.json         |   0
 .../blobServices/containers/readme.md         |   0
 .../blobServices/containers/version.json      |   0
 .../storageAccounts/blobServices/deploy.bicep |   0
 .../storageAccounts/blobServices/readme.md    |   0
 .../storageAccounts/blobServices/version.json |   0
 .../storageAccounts/deploy.bicep              |   0
 .../storageAccounts/fileServices/deploy.bicep |   0
 .../storageAccounts/fileServices/readme.md    |   0
 .../shares/.bicep/nested_rbac.bicep           |   0
 .../fileServices/shares/deploy.bicep          |   0
 .../fileServices/shares/readme.md             |   0
 .../fileServices/shares/version.json          |   0
 .../storageAccounts/fileServices/version.json |   0
 .../managementPolicies/deploy.bicep           |   0
 .../managementPolicies/readme.md              |   0
 .../managementPolicies/version.json           |   0
 .../queueServices/deploy.bicep                |   0
 .../queues/.bicep/nested_rbac.bicep           |   0
 .../queueServices/queues/deploy.bicep         |   0
 .../queueServices/queues/readme.md            |   0
 .../queueServices/queues/version.json         |   0
 .../storageAccounts/queueServices/readme.md   |   0
 .../queueServices/version.json                |   0
 .../storageAccounts/readme.md                 |   0
 .../tableServices/deploy.bicep                |   0
 .../storageAccounts/tableServices/readme.md   |   0
 .../tableServices/tables/deploy.bicep         |   0
 .../tableServices/tables/readme.md            |   0
 .../tableServices/tables/version.json         |   0
 .../tableServices/version.json                |   0
 .../storageAccounts/version.json              |   0
 .../privateLinkHubs/.bicep/nested_rbac.bicep  |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../privateLinkHubs/deploy.bicep              |   0
 .../privateLinkHubs/readme.md                 |   0
 .../privateLinkHubs/version.json              |   0
 .../imageTemplates/.bicep/nested_rbac.bicep   |   0
 .../.parameters/parameters.json               |   0
 .../imageTemplates/deploy.bicep               |   0
 .../imageTemplates/readme.md                  |   0
 .../imageTemplates/version.json               |   0
 .../connections/.bicep/nested_rbac.bicep      |   0
 .../connections/.parameters/parameters.json   |   0
 .../Microsoft.Web/connections/deploy.bicep    |   0
 .../Microsoft.Web/connections/readme.md       |   0
 .../Microsoft.Web/connections/version.json    |   0
 .../.bicep/nested_rbac.bicep                  |   0
 .../.parameters/asev2.parameters.json         |   0
 .../.parameters/asev3.parameters.json         |   0
 .../hostingEnvironments/deploy.bicep          |   0
 .../hostingEnvironments/readme.md             |   0
 .../hostingEnvironments/version.json          |   0
 .../serverfarms/.bicep/nested_rbac.bicep      |   0
 .../serverfarms/.parameters/parameters.json   |   0
 .../Microsoft.Web/serverfarms/deploy.bicep    |   0
 .../Microsoft.Web/serverfarms/readme.md       |   0
 .../Microsoft.Web/serverfarms/version.json    |   0
 .../sites/.bicep/nested_rbac.bicep            |   0
 .../sites/.parameters/fa.min.parameters.json  |   0
 .../sites/.parameters/fa.parameters.json      |   0
 .../sites/.parameters/wa.min.parameters.json  |   0
 .../sites/.parameters/wa.parameters.json      |   0
 .../sites/config-appsettings/deploy.bicep     |   0
 .../sites/config-appsettings/readme.md        |   0
 .../sites/config-appsettings/version.json     |   0
 .../sites/config-authsettingsv2/deploy.bicep  |   0
 .../sites/config-authsettingsv2/readme.md     |   0
 .../sites/config-authsettingsv2/version.json  |   0
 .../Microsoft.Web/sites/deploy.bicep          |   0
 .../Microsoft.Web/sites/readme.md             |   0
 .../Microsoft.Web/sites/version.json          |   0
 .../staticSites/.bicep/nested_rbac.bicep      |   0
 .../.parameters/min.parameters.json           |   0
 .../staticSites/.parameters/parameters.json   |   0
 .../Microsoft.Web/staticSites/deploy.bicep    |   0
 .../Microsoft.Web/staticSites/readme.md       |   0
 .../Microsoft.Web/staticSites/version.json    |   0
 modules/README.md                             | 104 ++++++++++
 .../resourcePublish/Get-ModulesToPublish.ps1  |  34 +--
 .../Publish-ModuleToPrivateBicepRegistry.ps1  |   8 +-
 .../Publish-ModuleToTemplateSpec.ps1          |   6 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1 |   8 +-
 .../Initialize-DeploymentRemoval.ps1          |   4 +-
 .../Get-ModuleParameterFiles.ps1              |   2 +-
 utilities/tools/ConvertTo-ARMTemplate.ps1     |  24 +--
 utilities/tools/Get-LinkedLocalModuleList.ps1 |   8 +-
 utilities/tools/Get-LinkedModuleList.ps1      |   4 +-
 utilities/tools/Set-ModuleReadMe.ps1          |   6 +-
 utilities/tools/Set-ReadMeModuleTable.ps1     |   2 +-
 utilities/tools/Test-ModuleLocally.ps1        |   2 +-
 .../helper/Get-ModulesAsMarkdownTable.ps1     |  18 +-
 .../tests/ConvertTo-ARMTemplate.Tests.ps1     |  28 +--
 1238 files changed, 1027 insertions(+), 1028 deletions(-)
 delete mode 100644 arm/README.md
 rename {arm => modules}/.global/global.module.tests.ps1 (98%)
 rename {arm => modules}/.global/shared/helper.psm1 (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/readme.md (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/version.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/readme.md (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/max.parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/version.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/readme.md (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.bicep/nested_solution.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/readme.md (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/image.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/import.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/disks/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/disks/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.parameters/images.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/images/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/images/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/images/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/images/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/images/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/version.json (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/readme.md (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/version.json (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/readme.md (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/version.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/readme.md (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/version.json (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/readme.md (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/components/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/components/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/components/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/components/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/components/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/version.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/readme.md (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/version.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/readme.md (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/version.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/version.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/readme.md (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/version.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/version.json (100%)
 rename {arm => modules}/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/version.json (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/version.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/version.json (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/version.json (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/version.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/version.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/version.json (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/version.json (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/version.json (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/readme.md (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.parameters/admin.parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/readme.md (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/version.json (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/readme.md (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/version.json (100%)
 rename {arm => modules}/Microsoft.Web/connections/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Web/connections/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/version.json (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/fa.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/fa.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/wa.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/wa.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/version.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/version.json (100%)
 create mode 100644 modules/README.md

diff --git a/.azuredevops/modulePipelines/ms.aad.domainservices.yml b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
index c02fe1a3fa..236f4c10b9 100644
--- a/.azuredevops/modulePipelines/ms.aad.domainservices.yml
+++ b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.aad.domainservices.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.AAD/DomainServices/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AAD/DomainServices/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AAD/DomainServices'
+    value: '/modules/Microsoft.AAD/DomainServices'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index b53d702a14..ce6ee21d4a 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.AnalysisServices/servers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AnalysisServices/servers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AnalysisServices/servers'
+    value: '/modules/Microsoft.AnalysisServices/servers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index 890f212a89..900e34efb8 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.apimanagement.service.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ApiManagement/service/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ApiManagement/service/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ApiManagement/service'
+    value: '/modules/Microsoft.ApiManagement/service'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
index 8350f6f95f..d3897c373e 100644
--- a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
+++ b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.AppConfiguration/configurationStores/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AppConfiguration/configurationStores/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AppConfiguration/configurationStores'
+    value: '/modules/Microsoft.AppConfiguration/configurationStores'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index 967137339f..15079be522 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/policyAssignments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyAssignments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyAssignments'
+    value: '/modules/Microsoft.Authorization/policyAssignments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index 1e41b0cf37..9a1b75b8fb 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/policyDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyDefinitions'
+    value: '/modules/Microsoft.Authorization/policyDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index 039a963645..7584b91824 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/policyExemptions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyExemptions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyExemptions'
+    value: '/modules/Microsoft.Authorization/policyExemptions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index 6c35dab6ac..06a86f2cb2 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/policySetDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policySetDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policySetDefinitions'
+    value: '/modules/Microsoft.Authorization/policySetDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index f56e0fab07..0af98000fe 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/roleAssignments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/roleAssignments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/roleAssignments'
+    value: '/modules/Microsoft.Authorization/roleAssignments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index 4d097a5a28..f19836c1c2 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Authorization/roleDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/roleDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/roleDefinitions'
+    value: '/modules/Microsoft.Authorization/roleDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index 6def36bfb8..7b42bbbef8 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Automation/automationAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Automation/automationAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Automation/automationAccounts'
+    value: '/modules/Microsoft.Automation/automationAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index 696c5c11cf..d0bd209361 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Batch/batchAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Batch/batchAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Batch/batchAccounts'
+    value: '/modules/Microsoft.Batch/batchAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index 651f718237..592e654d59 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.CognitiveServices/accounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.CognitiveServices/accounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.CognitiveServices/accounts'
+    value: '/modules/Microsoft.CognitiveServices/accounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index ced557d6f4..ef1551c37b 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/availabilitySets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/availabilitySets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/availabilitySets'
+    value: '/modules/Microsoft.Compute/availabilitySets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 687771b964..7ecb0f1bd8 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/diskEncryptionSets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/diskEncryptionSets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/diskEncryptionSets'
+    value: '/modules/Microsoft.Compute/diskEncryptionSets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.disks.yml b/.azuredevops/modulePipelines/ms.compute.disks.yml
index 0ccabc18d4..0e3ff91eec 100644
--- a/.azuredevops/modulePipelines/ms.compute.disks.yml
+++ b/.azuredevops/modulePipelines/ms.compute.disks.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.disks.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/disks/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/disks/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/disks'
+    value: '/modules/Microsoft.Compute/disks'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index b3d9d717bf..791e403c4a 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.galleries.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/galleries/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/galleries/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/galleries'
+    value: '/modules/Microsoft.Compute/galleries'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index d17925e8d3..39b94684eb 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.images.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/images/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/images/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/images'
+    value: '/modules/Microsoft.Compute/images'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index cbaa9ea1a0..b030c5eef6 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/proximityPlacementGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/proximityPlacementGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/proximityPlacementGroups'
+    value: '/modules/Microsoft.Compute/proximityPlacementGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index bff51adb88..160c623055 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/virtualMachines/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/virtualMachines/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/virtualMachines'
+    value: '/modules/Microsoft.Compute/virtualMachines'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 5dac586912..aef66271f1 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Compute/virtualMachineScaleSets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/virtualMachineScaleSets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/virtualMachineScaleSets'
+    value: '/modules/Microsoft.Compute/virtualMachineScaleSets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index 219513d6a8..92a07a4dd5 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.consumption.budgets.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Consumption/budgets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Consumption/budgets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Consumption/budgets'
+    value: '/modules/Microsoft.Consumption/budgets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index ec49b3c6ce..137f70ae03 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ContainerInstance/containerGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerInstance/containerGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerInstance/containerGroups'
+    value: '/modules/Microsoft.ContainerInstance/containerGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index 0d0719059b..ac701403e1 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerregistry.registries.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ContainerRegistry/registries/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerRegistry/registries/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerRegistry/registries'
+    value: '/modules/Microsoft.ContainerRegistry/registries'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index afbfad4d2b..a75cff7286 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ContainerService/managedClusters/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerService/managedClusters/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerService/managedClusters'
+    value: '/modules/Microsoft.ContainerService/managedClusters'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index 36777fe42d..a89c2d33a6 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.databricks.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Databricks/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Databricks/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Databricks/workspaces'
+    value: '/modules/Microsoft.Databricks/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index 8f13a4a1fb..7c044a3814 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.datafactory.factories.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DataFactory/factories/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DataFactory/factories/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DataFactory/factories'
+    value: '/modules/Microsoft.DataFactory/factories'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index ea1a3d9f62..6d076ae6cc 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/applicationgroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/applicationgroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/applicationgroups'
+    value: '/modules/Microsoft.DesktopVirtualization/applicationgroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index 2a8c19e784..f437a1d73a 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/hostpools/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/hostpools/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/hostpools'
+    value: '/modules/Microsoft.DesktopVirtualization/hostpools'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
index bca677f92b..cd080ccb98 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/scalingplans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/scalingplans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/scalingplans'
+    value: '/modules/Microsoft.DesktopVirtualization/scalingplans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index 23d24d24b5..3e930cd58d 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/workspaces'
+    value: '/modules/Microsoft.DesktopVirtualization/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index 5b319ed878..3910dd0c2a 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.DocumentDB/databaseAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DocumentDB/databaseAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DocumentDB/databaseAccounts'
+    value: '/modules/Microsoft.DocumentDB/databaseAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
index 7eb88f59d0..da4078f60f 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.EventGrid/systemTopics/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventGrid/systemTopics/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventGrid/systemTopics'
+    value: '/modules/Microsoft.EventGrid/systemTopics'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index 695b8277bd..c0e7be4e5f 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventgrid.topics.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.EventGrid/topics/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventGrid/topics/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventGrid/topics'
+    value: '/modules/Microsoft.EventGrid/topics'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index 1218276a34..9a60c7498a 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.EventHub/namespaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventHub/namespaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventHub/namespaces'
+    value: '/modules/Microsoft.EventHub/namespaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index e6a37c0988..673e6a5eb8 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.HealthBot/healthBots/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.HealthBot/healthBots/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.HealthBot/healthBots'
+    value: '/modules/Microsoft.HealthBot/healthBots'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index 379e82a877..b894558301 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.actiongroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/actionGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/actionGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/actionGroups'
+    value: '/modules/Microsoft.Insights/actionGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index 8d4c6bd01a..10cd330ad8 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/activityLogAlerts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/activityLogAlerts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/activityLogAlerts'
+    value: '/modules/Microsoft.Insights/activityLogAlerts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index 09c67aefc8..47419126f2 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.components.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/components/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/components/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/components'
+    value: '/modules/Microsoft.Insights/components'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index b0850b947a..5a84db3dc8 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/diagnosticSettings/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/diagnosticSettings/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/diagnosticSettings'
+    value: '/modules/Microsoft.Insights/diagnosticSettings'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index 50d8d342c7..d4db291692 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.metricalerts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/metricAlerts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/metricAlerts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/metricAlerts'
+    value: '/modules/Microsoft.Insights/metricAlerts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index 9f3170f52f..e2c7519737 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/privateLinkScopes/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/privateLinkScopes/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/privateLinkScopes'
+    value: '/modules/Microsoft.Insights/privateLinkScopes'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index 7c09a7ca28..afedabd407 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Insights/scheduledQueryRules/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/scheduledQueryRules/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/scheduledQueryRules'
+    value: '/modules/Microsoft.Insights/scheduledQueryRules'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index 8c3b531f95..f3432b66e9 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.keyvault.vaults.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.KeyVault/vaults/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KeyVault/vaults/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KeyVault/vaults'
+    value: '/modules/Microsoft.KeyVault/vaults'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
index cc977eaa62..8407732f59 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.KubernetesConfiguration/extensions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KubernetesConfiguration/extensions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KubernetesConfiguration/extensions'
+    value: '/modules/Microsoft.KubernetesConfiguration/extensions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
index 9d21bee8cd..a4491232c1 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KubernetesConfiguration/fluxConfigurations'
+    value: '/modules/Microsoft.KubernetesConfiguration/fluxConfigurations'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 3fb2b7be5f..170c560d4a 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.logic.workflows.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Logic/workflows/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Logic/workflows/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Logic/workflows'
+    value: '/modules/Microsoft.Logic/workflows'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index 6f5d0a1cc8..595f4352c0 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.MachineLearningServices/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.MachineLearningServices/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.MachineLearningServices/workspaces'
+    value: '/modules/Microsoft.MachineLearningServices/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index 88b09b383e..44c05c48ed 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ManagedIdentity/userAssignedIdentities/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ManagedIdentity/userAssignedIdentities/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ManagedIdentity/userAssignedIdentities'
+    value: '/modules/Microsoft.ManagedIdentity/userAssignedIdentities'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index 5c5d9d1c4d..43cfd49957 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ManagedServices/registrationDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ManagedServices/registrationDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ManagedServices/registrationDefinitions'
+    value: '/modules/Microsoft.ManagedServices/registrationDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 615ab227ee..58e384cdde 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.management.managementgroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Management/managementGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Management/managementGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Management/managementGroups'
+    value: '/modules/Microsoft.Management/managementGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index d0756d5c19..c98b1261bd 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.NetApp/netAppAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.NetApp/netAppAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.NetApp/netAppAccounts'
+    value: '/modules/Microsoft.NetApp/netAppAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index 11d414aaf6..b83417d884 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.applicationgateways.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/applicationGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/applicationGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/applicationGateways'
+    value: '/modules/Microsoft.Network/applicationGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index d937443a98..4f4cc079b1 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/applicationSecurityGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/applicationSecurityGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/applicationSecurityGroups'
+    value: '/modules/Microsoft.Network/applicationSecurityGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index c8ab5e6758..bc02ee4c2b 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/azureFirewalls/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/azureFirewalls/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/azureFirewalls'
+    value: '/modules/Microsoft.Network/azureFirewalls'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index 4aa3213912..ddbf0e180c 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.bastionhosts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/bastionHosts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/bastionHosts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/bastionHosts'
+    value: '/modules/Microsoft.Network/bastionHosts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index 6b4cc11764..faa70f1463 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.connections.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/connections/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/connections/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/connections'
+    value: '/modules/Microsoft.Network/connections'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index b7ef751770..2fb4be3067 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/ddosProtectionPlans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/ddosProtectionPlans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/ddosProtectionPlans'
+    value: '/modules/Microsoft.Network/ddosProtectionPlans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index 51f4921c27..63ee223979 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/expressRouteCircuits/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/expressRouteCircuits/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/expressRouteCircuits'
+    value: '/modules/Microsoft.Network/expressRouteCircuits'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 1025c854d8..a319964021 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/firewallpolicies/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/firewallpolicies/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/firewallpolicies'
+    value: '/modules/Microsoft.Network/firewallpolicies'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.frontdoors.yml b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
index aec0e387fd..151972563a 100644
--- a/.azuredevops/modulePipelines/ms.network.frontdoors.yml
+++ b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.frontdoors.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/frontDoors/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/frontDoors/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/frontDoors'
+    value: '/modules/Microsoft.Network/frontDoors'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index e89f72c24e..eda767042b 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.ipgroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/ipGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/ipGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/ipGroups'
+    value: '/modules/Microsoft.Network/ipGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index 120694c31a..5dd76d164a 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.loadbalancers.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/loadBalancers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/loadBalancers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/loadBalancers'
+    value: '/modules/Microsoft.Network/loadBalancers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index 84f45e752d..c0424e13fb 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/localNetworkGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/localNetworkGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/localNetworkGateways'
+    value: '/modules/Microsoft.Network/localNetworkGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index b2f9f8a1b8..facf8d9aae 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.natgateways.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/natGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/natGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/natGateways'
+    value: '/modules/Microsoft.Network/natGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
index b4c77b7569..ef82be23c0 100644
--- a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/networkInterfaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkInterfaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkInterfaces'
+    value: '/modules/Microsoft.Network/networkInterfaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index 5ffdc7ec21..08f202adbd 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/networkSecurityGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkSecurityGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkSecurityGroups'
+    value: '/modules/Microsoft.Network/networkSecurityGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index 826a30bbf6..158d73652d 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networkwatchers.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/networkWatchers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkWatchers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkWatchers'
+    value: '/modules/Microsoft.Network/networkWatchers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index d27438d5cc..9a8f8795fd 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.privatednszones.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/privateDnsZones/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/privateDnsZones/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/privateDnsZones'
+    value: '/modules/Microsoft.Network/privateDnsZones'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index b83d1b1a99..be32b8f46a 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.privateendpoints.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/privateEndpoints/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/privateEndpoints/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/privateEndpoints'
+    value: '/modules/Microsoft.Network/privateEndpoints'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index 16ecbb04b7..6c338cbdb1 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/publicIPAddresses/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/publicIPAddresses/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/publicIPAddresses'
+    value: '/modules/Microsoft.Network/publicIPAddresses'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index 0b26d934ae..976d8b651c 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/publicIPPrefixes/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/publicIPPrefixes/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/publicIPPrefixes'
+    value: '/modules/Microsoft.Network/publicIPPrefixes'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index bbe6fc2ea4..908cc68b92 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.routetables.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/routeTables/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/routeTables/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/routeTables'
+    value: '/modules/Microsoft.Network/routeTables'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index b945593f93..dbeaa31206 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/trafficmanagerprofiles/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/trafficmanagerprofiles/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/trafficmanagerprofiles'
+    value: '/modules/Microsoft.Network/trafficmanagerprofiles'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
index 1ee1fa014c..f5ab7acb73 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualhubs.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/virtualHubs/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualHubs/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualHubs'
+    value: '/modules/Microsoft.Network/virtualHubs'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index 8e5dd86bae..a322b85850 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/virtualNetworkGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualNetworkGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualNetworkGateways'
+    value: '/modules/Microsoft.Network/virtualNetworkGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index a64315fd44..32d9bc4209 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/virtualNetworks/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualNetworks/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualNetworks'
+    value: '/modules/Microsoft.Network/virtualNetworks'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index 4641306f77..d62dd5fc8c 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualwans.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/virtualWans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualWans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualWans'
+    value: '/modules/Microsoft.Network/virtualWans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.vpngateways.yml b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
index 3ad60dfcc1..818ebc036d 100644
--- a/.azuredevops/modulePipelines/ms.network.vpngateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.vpngateways.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/vpnGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/vpnGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/vpnGateways'
+    value: '/modules/Microsoft.Network/vpnGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.vpnsites.yml b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
index db7f94f23b..5449c99b5a 100644
--- a/.azuredevops/modulePipelines/ms.network.vpnsites.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.vpnsites.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Network/vpnSites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/vpnSites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/vpnSites'
+    value: '/modules/Microsoft.Network/vpnSites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index ccc86d3434..fcec076d70 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.OperationalInsights/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.OperationalInsights/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.OperationalInsights/workspaces'
+    value: '/modules/Microsoft.OperationalInsights/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index c2f152f702..8164e2ab1d 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.RecoveryServices/vaults/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.RecoveryServices/vaults/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.RecoveryServices/vaults'
+    value: '/modules/Microsoft.RecoveryServices/vaults'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index e8e7958d4a..5a29f6e2c0 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Resources/deploymentScripts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/deploymentScripts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/deploymentScripts'
+    value: '/modules/Microsoft.Resources/deploymentScripts'
 
 stages:
   - stage: Validation
@@ -48,7 +48,6 @@ stages:
             - path: $(modulePath)/.parameters/cli.parameters.json
             - path: $(modulePath)/.parameters/ps.parameters.json
 
-
   - stage: Publishing
     displayName: Publishing
     condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index aa30667d78..a94695a0eb 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Resources/resourceGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/resourceGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/resourceGroups'
+    value: '/modules/Microsoft.Resources/resourceGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.resources.tags.yml b/.azuredevops/modulePipelines/ms.resources.tags.yml
index 1191adfdc1..ba3fcf7047 100644
--- a/.azuredevops/modulePipelines/ms.resources.tags.yml
+++ b/.azuredevops/modulePipelines/ms.resources.tags.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.tags.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Resources/tags/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/tags/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/tags'
+    value: '/modules/Microsoft.Resources/tags'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index 5ebbe28dec..08a5c75a6d 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Security/azureSecurityCenter/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Security/azureSecurityCenter/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Security/azureSecurityCenter'
+    value: '/modules/Microsoft.Security/azureSecurityCenter'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index 9705d56759..574fd1bbe8 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.ServiceBus/namespaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ServiceBus/namespaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ServiceBus/namespaces'
+    value: '/modules/Microsoft.ServiceBus/namespaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 044ed42793..f9633ce267 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/Microsoft.ServiceFabric/clusters/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ServiceFabric/clusters/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ServiceFabric/clusters'
+    value: '/modules/Microsoft.ServiceFabric/clusters'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index fc218e771e..b3d457192d 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.sql.managedinstances.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Sql/managedInstances/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Sql/managedInstances/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Sql/managedInstances'
+    value: '/modules/Microsoft.Sql/managedInstances'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index d73e2796a1..2608c83867 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.sql.servers.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Sql/servers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Sql/servers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Sql/servers'
+    value: '/modules/Microsoft.Sql/servers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index fc84e2cfaf..bfe022586e 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Storage/storageAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Storage/storageAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Storage/storageAccounts'
+    value: '/modules/Microsoft.Storage/storageAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index cd4e58b8b7..5fbaf98a93 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Synapse/privateLinkHubs/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Synapse/privateLinkHubs/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Synapse/privateLinkHubs'
+    value: '/modules/Microsoft.Synapse/privateLinkHubs'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 7eb6002e95..09146106dd 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.VirtualMachineImages/imageTemplates/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.VirtualMachineImages/imageTemplates/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.VirtualMachineImages/imageTemplates'
+    value: '/modules/Microsoft.VirtualMachineImages/imageTemplates'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index ec6b0e1ec8..3d6fe8ada7 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.connections.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Web/connections/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/connections/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/connections'
+    value: '/modules/Microsoft.Web/connections'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index 6e610dde73..f97119972c 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Web/hostingEnvironments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/hostingEnvironments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/hostingEnvironments'
+    value: '/modules/Microsoft.Web/hostingEnvironments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index 309a23b009..8f2377a66e 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.serverfarms.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Web/serverfarms/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/serverfarms/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/serverfarms'
+    value: '/modules/Microsoft.Web/serverfarms'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index dbdd9e2079..64bf5be9a4 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.sites.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Web/sites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/sites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/sites'
+    value: '/modules/Microsoft.Web/sites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.staticsites.yml b/.azuredevops/modulePipelines/ms.web.staticsites.yml
index f7e912c9e3..16646b5501 100644
--- a/.azuredevops/modulePipelines/ms.web.staticsites.yml
+++ b/.azuredevops/modulePipelines/ms.web.staticsites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.staticsites.yml'
       - '/.azuredevops/pipelineTemplates/module.*.yml'
-      - '/arm/Microsoft.Web/staticSites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/staticSites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/staticSites'
+    value: '/modules/Microsoft.Web/staticSites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/pipelineTemplates/jobs.publishModule.yml b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
index b4b6db816c..bf1218a34a 100644
--- a/.azuredevops/pipelineTemplates/jobs.publishModule.yml
+++ b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
@@ -176,7 +176,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
@@ -235,7 +235,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
@@ -294,7 +294,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
@@ -310,4 +310,4 @@ jobs:
 
               Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
               Write-Host "##[endgroup]"
-            }
\ No newline at end of file
+            }
diff --git a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
index db5b2e2671..a635f36da4 100644
--- a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+++ b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
@@ -2,7 +2,7 @@
 ## VALIDATION PIPELINE                                 ##
 #########################################################
 ##
-## This pipeline template contains the logic to validate a given module's ARM template using the provided parameter file(s)
+## This pipeline template contains the logic to validate a given module using the provided parameter file(s)
 ##
 ## Enabled levels of validation
 ## - Resource-Group-Level
@@ -30,8 +30,8 @@
 ##   | defaultJobTimeoutInMinutes      | 120                                  | The timeout for the job in this pipeline                                                                  | 120                                    |
 ##   | checkoutRepositories            | ''                                   | An optional list of repositories to check out at the beginning of this job in addition to the source      | 'Components'                           |
 ##   | modulePath                      | '$(modulePath)'                      | The path to the module to deploy. E.g. [c:/KeyVault]                                                      | 'c:/KeyVault'                          |
-##   | location                        | '$(location)'                 | The location to validate with                                                                             | 'France Central'                       |
-##   | resourceGroupName               | '$(resourceGroupName)'        | The resourcegroup to validate into. Required only for Resource-Group-Level validations                    | 'validation-rg'                        |
+##   | location                        | '$(location)'                        | The location to validate with                                                                             | 'France Central'                       |
+##   | resourceGroupName               | '$(resourceGroupName)'               | The resourcegroup to validate into. Required only for Resource-Group-Level validations                    | 'validation-rg'                        |
 ##   | subscriptionId                  | '$(ARM_SUBSCRIPTION_ID)'             | The id of the subscription to validate with when using a Management group service connection              | 'aed7c000-6387-412e-bed0-24dfddf4bbc6' |
 ##   | managementGroupId               | '$(ARM_MGMTGROUP_ID)'                | The id of the management group to validate with. Required only for Management-Group-Level validations     | '477c9620-cb01-454f-9ebc-fc6b1df48c14' |
 ##   | parametersRepository            | '$(Build.Repository.Name)'           | The respository with the parameter files. Defaults to the triggering repository                           | 'Solutions'                            |
@@ -164,7 +164,7 @@ jobs:
             # --------------------- #
             Invoke-Pester -Configuration @{
               Run        = @{
-                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'arm' '.global' 'global.module.tests.ps1') -Data @{
+                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'modules' '.global' 'global.module.tests.ps1') -Data @{
                   moduleFolderPaths = $moduleFolderPaths
                   enforcedTokenList = $enforcedTokenList
                 }
@@ -174,7 +174,7 @@ jobs:
               }
               TestResult = @{
                 TestSuiteName = 'Global Module Tests'
-                OutputPath    = 'arm/.global/global-testResults.xml'
+                OutputPath    = 'modules/.global/global-testResults.xml'
                 OutputFormat  = 'NUnitXml'
                 Enabled       = $true
               }
@@ -191,7 +191,7 @@ jobs:
           testResultsFormat: NUnit
           testResultsFiles: global-testResults.xml
           failTaskOnFailedTests: true
-          searchFolder: 'arm/.global'
+          searchFolder: 'modules/.global'
         continueOnError: false
         condition: succeededOrFailed()
 
@@ -273,7 +273,7 @@ jobs:
             # --------------------- #
             Invoke-Pester -Configuration @{
               Run        = @{
-                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'arm' '.global' 'global.module.tests.ps1') -Data @{
+                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'modules' '.global' 'global.module.tests.ps1') -Data @{
                   moduleFolderPaths = $moduleFolderPaths
                 }
               }
@@ -282,7 +282,7 @@ jobs:
               }
               TestResult = @{
                 TestSuiteName = 'Global Module API Tests'
-                OutputPath    = 'arm/.global/api-testResults.xml'
+                OutputPath    = 'modules/.global/api-testResults.xml'
                 OutputFormat  = 'NUnitXml'
                 Enabled       = $true
               }
@@ -299,6 +299,6 @@ jobs:
           testResultsFormat: NUnit
           testResultsFiles: api-testResults.xml
           failTaskOnFailedTests: true
-          searchFolder: 'arm/.global'
+          searchFolder: 'modules/.global'
         continueOnError: false
         condition: succeededOrFailed()
diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml
index 5022693228..ad77e607b0 100644
--- a/.azuredevops/platformPipelines/platform.dependencies.yml
+++ b/.azuredevops/platformPipelines/platform.dependencies.yml
@@ -30,7 +30,7 @@ variables:
   - name: dependencyPath
     value: 'utilities/pipelines/dependencies'
   - name: modulesPath
-    value: 'arm'
+    value: 'modules'
   - name: defaultResourceGroupName
     value: 'validation-rg'
 
diff --git a/.azuredevops/platformPipelines/platform.updateReadMe.yml b/.azuredevops/platformPipelines/platform.updateReadMe.yml
index d2eb068bf0..928e74bbd2 100644
--- a/.azuredevops/platformPipelines/platform.updateReadMe.yml
+++ b/.azuredevops/platformPipelines/platform.updateReadMe.yml
@@ -9,8 +9,8 @@ trigger:
       - main
   paths:
     include:
-      - 'arm/**/deploy.bicep'
-      - 'arm/**/deploy.json'
+      - 'modules/**/deploy.bicep'
+      - 'modules/**/deploy.json'
 
 variables:
   - template: '../../global.variables.yml'
@@ -39,7 +39,7 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' 'utilities' 'tools' 'Set-ReadMeModuleTable.ps1')
 
             $functionInput = @{
-              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'arm'
+              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'modules'
               FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'README.md'
               Organization   = '$(System.CollectionUri)'.Split('/')[3]
               RepositoryName = '$(Build.Repository.Name)'
@@ -63,8 +63,8 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' 'utilities' 'tools' 'Set-ReadMeModuleTable.ps1')
 
             $functionInput = @{
-              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'arm'
-              FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'arm/README.md'
+              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'modules'
+              FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'modules/README.md'
               Organization   = '$(System.CollectionUri)'.Split('/')[3]
               RepositoryName = '$(Build.Repository.Name)'
               ColumnsInOrder = @('Name', 'ProviderNamespace','ResourceType')
diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index cb3a327922..c88cdfcd03 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -12,19 +12,19 @@
 ## ACTION PARAMETERS                         ##
 ##-------------------------------------------##
 ##
-##   |=======================================================================================================================================================================================================|
-##   | Parameter                | Required | Default | Description                                                                                      | Example                                            |
-##   |--------------------------|----------|---------|--------------------------------------------------------------------------------------------------|----------------------------------------------------|
-##   | templateFilePath         | true     | ''      | The path to the template file to publish                                                         | 'arm/Microsoft.ApiManagement/service/deploy.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'       |
-##   | templateSpecsDoPublish   | false    | 'false' | Flag to indicate whether or not to publish to template specs                                     | 'true'                                             |
-##   | bicepRegistryName        | false    | ''      | Required to publish to private bicep registry. Name of the container registry to publish to      | 'myacr'                                            |
-##   | bicepRegistryRgName      | false    | ''      | Required to publish to private bicep registry. Name of the container registry resource group     | 'artifacts-rg'                                     |
-##   | bicepRegistryRgLocation  | false    | ''      | Required to publish to private bicep registry. Location of the container registry resource group | 'WestEurope'                                       |
-##   | bicepRegistryDoPublish   | false    | 'false' | Flag to indicate whether or not to publish to the private bicep registry                         | 'true'                                             |
-##   |=======================================================================================================================================================================================================|
+##   |===========================================================================================================================================================================================================|
+##   | Parameter                | Required | Default | Description                                                                                      | Example                                                |
+##   |--------------------------|----------|---------|--------------------------------------------------------------------------------------------------|--------------------------------------------------------|
+##   | templateFilePath         | true     | ''      | The path to the template file to publish                                                         | 'modules/Microsoft.ApiManagement/service/deploy.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'           |
+##   | templateSpecsDoPublish   | false    | 'false' | Flag to indicate whether or not to publish to template specs                                     | 'true'                                                 |
+##   | bicepRegistryName        | false    | ''      | Required to publish to private bicep registry. Name of the container registry to publish to      | 'myacr'                                                |
+##   | bicepRegistryRgName      | false    | ''      | Required to publish to private bicep registry. Name of the container registry resource group     | 'artifacts-rg'                                         |
+##   | bicepRegistryRgLocation  | false    | ''      | Required to publish to private bicep registry. Location of the container registry resource group | 'WestEurope'                                           |
+##   | bicepRegistryDoPublish   | false    | 'false' | Flag to indicate whether or not to publish to the private bicep registry                         | 'true'                                                 |
+##   |===========================================================================================================================================================================================================|
 ##
 ##---------------------------------------------##
 name: 'Publishing'
@@ -116,7 +116,7 @@ runs:
 
           # Publish the modified child resources
           foreach ($ModuleToPublish in $ModulesToPublish) {
-            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
             Write-Output "::group::$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
             $functionInput = @{
@@ -160,7 +160,7 @@ runs:
 
           # Publish the modified child resources
           foreach ($ModuleToPublish in $ModulesToPublish) {
-            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
             Write-Output "::group::$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
             $functionInput = @{
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 7d23efa771..9addde2a80 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -11,18 +11,18 @@
 ## ACTION PARAMETERS                         ##
 ##-------------------------------------------##
 ##
-##   |============================================================================================================================================================================|
-##   | Parameter                 | Required | Default | Description                                           | Example                                                           |
-##   |---------------------------|----------|---------|-------------------------------------------------------|-------------------------------------------------------------------|
-##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment              | 'arm/Microsoft.ApiManagement/service/deploy.bicep'                |
-##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'arm/Microsoft.ApiManagement/service/.parameters/parameters.json' |
-##   | location                  | true     | ''      | The location to use for deployment                    | 'WestEurope'                                                      |
-##   | resourceGroupName         | false    | ''      | The resource group to deploy to                       | 'validation-rg'                                                   |
-##   | subscriptionId            | false    | ''      | The subscriptionId to deploy to                       | '1a97b80a-4dda-4f50-ab53-349e29344654'                            |
-##   | managementGroupId         | false    | ''      | The managementGroupId to deploy to                    | '1a97b80a-4dda-4f50-ab53-349e29344654'                            |
-##   | customParameterFileTokens | false    | ''      | Additional parameter file token pairs in json format. | '{"tokenName":"tokenValue"}'                                      |
-##   | removeDeployment          | false    | 'true'  | Set "true" to set module up for removal               | 'true'                                                            |
-##   |============================================================================================================================================================================|
+##   |================================================================================================================================================================================|
+##   | Parameter                 | Required | Default | Description                                           | Example                                                               |
+##   |---------------------------|----------|---------|-------------------------------------------------------|-----------------------------------------------------------------------|
+##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment   | 'modules/Microsoft.ApiManagement/service/deploy.bicep'                |
+##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'modules/Microsoft.ApiManagement/service/.parameters/parameters.json' |
+##   | location                  | true     | ''      | The location to use for deployment                    | 'WestEurope'                                                          |
+##   | resourceGroupName         | false    | ''      | The resource group to deploy to                       | 'validation-rg'                                                       |
+##   | subscriptionId            | false    | ''      | The subscriptionId to deploy to                       | '1a97b80a-4dda-4f50-ab53-349e29344654'                                |
+##   | managementGroupId         | false    | ''      | The managementGroupId to deploy to                    | '1a97b80a-4dda-4f50-ab53-349e29344654'                                |
+##   | customParameterFileTokens | false    | ''      | Additional parameter file token pairs in json format. | '{"tokenName":"tokenValue"}'                                          |
+##   | removeDeployment          | false    | 'true'  | Set "true" to set module up for removal               | 'true'                                                                |
+##   |================================================================================================================================================================================|
 ##
 #########################################################
 ##
diff --git a/.github/actions/templates/validateModulePester/action.yml b/.github/actions/templates/validateModulePester/action.yml
index b4a3b17b7d..2a3ecba620 100644
--- a/.github/actions/templates/validateModulePester/action.yml
+++ b/.github/actions/templates/validateModulePester/action.yml
@@ -3,7 +3,7 @@
 #########################################################
 ##
 ## This composite action contains the logic to validate a module using a set of Pester tests
-## The tests are implemented in file 'arm/.global/global.module.tests.ps1'
+## The tests are implemented in file 'modules/.global/global.module.tests.ps1'
 ##
 #########################################################
 ##
@@ -14,7 +14,7 @@
 ##   |===========================================================================================================|
 ##   | Parameter  | Required | Default | Description                     | Example                               |
 ##   |------------|----------|---------|---------------------------------|---------------------------------------|
-##   | modulePath | true     | ''      | The path to the module's folder | 'arm/Microsoft.ApiManagement/service' |
+##   | modulePath | true     | ''      | The path to the module's folder | 'modules/Microsoft.ApiManagement/service' |
 ##   |===========================================================================================================|
 ##
 ##---------------------------------------------##
@@ -97,7 +97,7 @@ runs:
           # --------------------- #
           Invoke-Pester -Configuration @{
             Run        = @{
-              Container = New-PesterContainer -Path 'arm/.global/global.module.tests.ps1' -Data @{
+              Container = New-PesterContainer -Path 'modules/.global/global.module.tests.ps1' -Data @{
                 moduleFolderPaths = $moduleFolderPaths
                 enforcedTokenList = $enforcedTokenList
               }
@@ -107,7 +107,7 @@ runs:
             }
             TestResult = @{
               TestSuiteName = 'Global Module Tests'
-              OutputPath    = 'arm/.global/global-testResults.xml'
+              OutputPath    = 'modules/.global/global-testResults.xml'
               OutputFormat  = 'JUnitXml'
               Enabled       = $true
             }
@@ -122,7 +122,7 @@ runs:
       uses: EnricoMi/publish-unit-test-result-action@v1
       if: always() && !contains('cancelled,skipped', steps.pester_run_step.outcome)
       with:
-        files: arm/.global/global-testResults.xml
+        files: modules/.global/global-testResults.xml
 
     # [Module Pester Test] task(s)
     #-----------------------------
@@ -150,7 +150,7 @@ runs:
           # --------------------- #
           Invoke-Pester -Configuration @{
             Run        = @{
-              Container = New-PesterContainer -Path 'arm/.global/global.module.tests.ps1' -Data @{
+              Container = New-PesterContainer -Path 'modules/.global/global.module.tests.ps1' -Data @{
                 moduleFolderPaths = $moduleFolderPaths
               }
             }
@@ -159,7 +159,7 @@ runs:
             }
             TestResult = @{
               TestSuiteName = 'Global Module API Tests'
-              OutputPath    = 'arm/.global/api-testResults.xml'
+              OutputPath    = 'modules/.global/api-testResults.xml'
               OutputFormat  = 'JUnitXml'
               Enabled       = $true
             }
@@ -174,4 +174,4 @@ runs:
       uses: EnricoMi/publish-unit-test-result-action@v1
       if: always() && !contains('cancelled,skipped', steps.pester_api_run_step.outcome)
       with:
-        files: arm/.global/api-testResults.xml
+        files: modules/.global/api-testResults.xml
diff --git a/.github/workflows/ms.aad.domainservices.yml b/.github/workflows/ms.aad.domainservices.yml
index 229590b5e4..9c7dc030c4 100644
--- a/.github/workflows/ms.aad.domainservices.yml
+++ b/.github/workflows/ms.aad.domainservices.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.aad.domainservices.yml'
-      - 'arm/Microsoft.AAD/DomainServices/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AAD/DomainServices/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AAD/DomainServices'
+  modulePath: 'modules/Microsoft.AAD/DomainServices'
   workflowPath: '.github/workflows/ms.aad.domainservices.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index 4330ec663a..d89e4b0956 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.analysisservices.servers.yml'
-      - 'arm/Microsoft.AnalysisServices/servers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AnalysisServices/servers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AnalysisServices/servers'
+  modulePath: 'modules/Microsoft.AnalysisServices/servers'
   workflowPath: '.github/workflows/ms.analysisservices.servers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index b3078cda39..b04a8a7374 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.apimanagement.service.yml'
-      - 'arm/Microsoft.ApiManagement/service/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ApiManagement/service/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ApiManagement/service'
+  modulePath: 'modules/Microsoft.ApiManagement/service'
   workflowPath: '.github/workflows/ms.apimanagement.service.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.appconfiguration.configurationstores.yml b/.github/workflows/ms.appconfiguration.configurationstores.yml
index 2a6e3997f9..73bc29e477 100644
--- a/.github/workflows/ms.appconfiguration.configurationstores.yml
+++ b/.github/workflows/ms.appconfiguration.configurationstores.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.appconfiguration.configurationstores.yml'
-      - 'arm/Microsoft.AppConfiguration/configurationStores/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AppConfiguration/configurationStores/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AppConfiguration/configurationStores'
+  modulePath: 'modules/Microsoft.AppConfiguration/configurationStores'
   workflowPath: '.github/workflows/ms.appconfiguration.configurationstores.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index ebb21af4a3..e1710d9ae2 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policyassignments.yml'
-      - 'arm/Microsoft.Authorization/policyAssignments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyAssignments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyAssignments'
+  modulePath: 'modules/Microsoft.Authorization/policyAssignments'
   workflowPath: '.github/workflows/ms.authorization.policyassignments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index e02a09c206..f3f6b3eee5 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policydefinitions.yml'
-      - 'arm/Microsoft.Authorization/policyDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/policyDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policydefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index cbacdd34c7..64d0f4c63e 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policyexemptions.yml'
-      - 'arm/Microsoft.Authorization/policyExemptions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyExemptions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyExemptions'
+  modulePath: 'modules/Microsoft.Authorization/policyExemptions'
   workflowPath: '.github/workflows/ms.authorization.policyexemptions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 5fee8e7ebf..38a3a40b79 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policysetdefinitions.yml'
-      - 'arm/Microsoft.Authorization/policySetDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policySetDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policySetDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/policySetDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policysetdefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index e7e8c53828..8d0f8a65c9 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.roleassignments.yml'
-      - 'arm/Microsoft.Authorization/roleAssignments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/roleAssignments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/roleAssignments'
+  modulePath: 'modules/Microsoft.Authorization/roleAssignments'
   workflowPath: '.github/workflows/ms.authorization.roleassignments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index 95a3a5cc1d..dfc4ff4114 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.roledefinitions.yml'
-      - 'arm/Microsoft.Authorization/roleDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/roleDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/roleDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/roleDefinitions'
   workflowPath: '.github/workflows/ms.authorization.roledefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index e2a3cc2bc9..223913b69a 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -20,15 +20,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.automation.automationaccounts.yml'
-      - 'arm/Microsoft.Automation/automationAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Automation/automationAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Automation/automationAccounts'
+  modulePath: 'modules/Microsoft.Automation/automationAccounts'
   workflowPath: '.github/workflows/ms.automation.automationaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index bdab22a0fb..99438c8f5e 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.batch.batchaccounts.yml'
-      - 'arm/Microsoft.Batch/batchAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Batch/batchAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Batch/batchAccounts'
+  modulePath: 'modules/Microsoft.Batch/batchAccounts'
   workflowPath: '.github/workflows/ms.batch.batchaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index f320fd876d..5ea5e69477 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.cognitiveservices.accounts.yml'
-      - 'arm/Microsoft.CognitiveServices/accounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.CognitiveServices/accounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.CognitiveServices/accounts'
+  modulePath: 'modules/Microsoft.CognitiveServices/accounts'
   workflowPath: '.github/workflows/ms.cognitiveservices.accounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index a873271346..24ee9e6810 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.availabilitysets.yml'
-      - 'arm/Microsoft.Compute/availabilitySets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/availabilitySets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/availabilitySets'
+  modulePath: 'modules/Microsoft.Compute/availabilitySets'
   workflowPath: '.github/workflows/ms.compute.availabilitysets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index 4249bc2d92..2ec3d0070a 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.diskencryptionsets.yml'
-      - 'arm/Microsoft.Compute/diskEncryptionSets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/diskEncryptionSets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/diskEncryptionSets'
+  modulePath: 'modules/Microsoft.Compute/diskEncryptionSets'
   workflowPath: '.github/workflows/ms.compute.diskencryptionsets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.disks.yml b/.github/workflows/ms.compute.disks.yml
index 8495ead6ae..b7e448c3f8 100644
--- a/.github/workflows/ms.compute.disks.yml
+++ b/.github/workflows/ms.compute.disks.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.disks.yml'
-      - 'arm/Microsoft.Compute/disks/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/disks/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/disks'
+  modulePath: 'modules/Microsoft.Compute/disks'
   workflowPath: '.github/workflows/ms.compute.disks.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index 3e341e0474..d1253419b2 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.galleries.yml'
-      - 'arm/Microsoft.Compute/galleries/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/galleries/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/galleries'
+  modulePath: 'modules/Microsoft.Compute/galleries'
   workflowPath: '.github/workflows/ms.compute.galleries.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index 1e6aefa800..429badf603 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.images.yml'
-      - 'arm/Microsoft.Compute/images/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/images/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/images'
+  modulePath: 'modules/Microsoft.Compute/images'
   workflowPath: '.github/workflows/ms.compute.images.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index 8dd426e6f6..039369a56c 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.proximityplacementgroups.yml'
-      - 'arm/Microsoft.Compute/proximityPlacementGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/proximityPlacementGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/proximityPlacementGroups'
+  modulePath: 'modules/Microsoft.Compute/proximityPlacementGroups'
   workflowPath: '.github/workflows/ms.compute.proximityplacementgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index bb336d8917..607ff5ae93 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.virtualmachines.yml'
-      - 'arm/Microsoft.Compute/virtualMachines/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/virtualMachines/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/virtualMachines'
+  modulePath: 'modules/Microsoft.Compute/virtualMachines'
   workflowPath: '.github/workflows/ms.compute.virtualmachines.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index 3cc180a270..7a5bfa94cd 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.virtualmachinescalesets.yml'
-      - 'arm/Microsoft.Compute/virtualMachineScaleSets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/virtualMachineScaleSets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/virtualMachineScaleSets'
+  modulePath: 'modules/Microsoft.Compute/virtualMachineScaleSets'
   workflowPath: '.github/workflows/ms.compute.virtualmachinescalesets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index 1050a427d8..0dcc0234b2 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.consumption.budgets.yml'
-      - 'arm/Microsoft.Consumption/budgets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Consumption/budgets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Consumption/budgets'
+  modulePath: 'modules/Microsoft.Consumption/budgets'
   workflowPath: '.github/workflows/ms.consumption.budgets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index b742a184d5..ca09181a94 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerinstance.containergroups.yml'
-      - 'arm/Microsoft.ContainerInstance/containerGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerInstance/containerGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerInstance/containerGroups'
+  modulePath: 'modules/Microsoft.ContainerInstance/containerGroups'
   workflowPath: '.github/workflows/ms.containerinstance.containergroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index afbf8879e1..85bc59ab19 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerregistry.registries.yml'
-      - 'arm/Microsoft.ContainerRegistry/registries/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerRegistry/registries/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerRegistry/registries'
+  modulePath: 'modules/Microsoft.ContainerRegistry/registries'
   workflowPath: '.github/workflows/ms.containerregistry.registries.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 2198f54e26..a8ecaa5331 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerservice.managedclusters.yml'
-      - 'arm/Microsoft.ContainerService/managedClusters/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerService/managedClusters/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerService/managedClusters'
+  modulePath: 'modules/Microsoft.ContainerService/managedClusters'
   workflowPath: '.github/workflows/ms.containerservice.managedclusters.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index b8cbfab40b..74cabd195b 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.databricks.workspaces.yml'
-      - 'arm/Microsoft.Databricks/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Databricks/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Databricks/workspaces'
+  modulePath: 'modules/Microsoft.Databricks/workspaces'
   workflowPath: '.github/workflows/ms.databricks.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index 5c29c4ee5d..1ae1fbb5ee 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.datafactory.factories.yml'
-      - 'arm/Microsoft.DataFactory/factories/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DataFactory/factories/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DataFactory/factories'
+  modulePath: 'modules/Microsoft.DataFactory/factories'
   workflowPath: '.github/workflows/ms.datafactory.factories.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index 33ce312ca1..08233297a9 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
-      - 'arm/Microsoft.DesktopVirtualization/applicationgroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/applicationgroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/applicationgroups'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/applicationgroups'
   workflowPath: '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index 32848ee2b7..e9467fc5f2 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.hostpools.yml'
-      - 'arm/Microsoft.DesktopVirtualization/hostpools/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/hostpools/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/hostpools'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/hostpools'
   workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
index fab5ecae6b..2be99b6d5c 100644
--- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml
+++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
-      - 'arm/Microsoft.DesktopVirtualization/scalingplans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/scalingplans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/scalingplans'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/scalingplans'
   workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index 7cfaa3e7be..c5598aa7af 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.workspaces.yml'
-      - 'arm/Microsoft.DesktopVirtualization/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/workspaces'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/workspaces'
   workflowPath: '.github/workflows/ms.desktopvirtualization.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index c61a97e61d..bf98c479d8 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.documentdb.databaseaccounts.yml'
-      - 'arm/Microsoft.DocumentDB/databaseAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DocumentDB/databaseAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DocumentDB/databaseAccounts'
+  modulePath: 'modules/Microsoft.DocumentDB/databaseAccounts'
   workflowPath: '.github/workflows/ms.documentdb.databaseaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventgrid.systemtopics.yml b/.github/workflows/ms.eventgrid.systemtopics.yml
index 27a694db1f..f4f5ab3a06 100644
--- a/.github/workflows/ms.eventgrid.systemtopics.yml
+++ b/.github/workflows/ms.eventgrid.systemtopics.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventgrid.systemtopics.yml'
-      - 'arm/Microsoft.EventGrid/systemTopics/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventGrid/systemTopics/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventGrid/systemTopics'
+  modulePath: 'modules/Microsoft.EventGrid/systemTopics'
   workflowPath: '.github/workflows/ms.eventgrid.systemtopics.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index 84cc1e4c19..16a7384c71 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventgrid.topics.yml'
-      - 'arm/Microsoft.EventGrid/topics/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventGrid/topics/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventGrid/topics'
+  modulePath: 'modules/Microsoft.EventGrid/topics'
   workflowPath: '.github/workflows/ms.eventgrid.topics.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index a7582951bc..1a75f805fe 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventhub.namespaces.yml'
-      - 'arm/Microsoft.EventHub/namespaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventHub/namespaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventHub/namespaces'
+  modulePath: 'modules/Microsoft.EventHub/namespaces'
   workflowPath: '.github/workflows/ms.eventhub.namespaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index 59e4f32200..43530361a9 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.healthbot.healthbots.yml'
-      - 'arm/Microsoft.HealthBot/healthBots/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.HealthBot/healthBots/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.HealthBot/healthBots'
+  modulePath: 'modules/Microsoft.HealthBot/healthBots'
   workflowPath: '.github/workflows/ms.healthbot.healthbots.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index b9758fd8aa..d388901c80 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.actiongroups.yml'
-      - 'arm/Microsoft.Insights/actionGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/actionGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/actionGroups'
+  modulePath: 'modules/Microsoft.Insights/actionGroups'
   workflowPath: '.github/workflows/ms.insights.actiongroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index 3f1f01f514..97e287c8fd 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.activitylogalerts.yml'
-      - 'arm/Microsoft.Insights/activityLogAlerts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/activityLogAlerts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/activityLogAlerts'
+  modulePath: 'modules/Microsoft.Insights/activityLogAlerts'
   workflowPath: '.github/workflows/ms.insights.activitylogalerts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index ed559d1c8e..ad8569778e 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.components.yml'
-      - 'arm/Microsoft.Insights/components/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/components/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/components'
+  modulePath: 'modules/Microsoft.Insights/components'
   workflowPath: '.github/workflows/ms.insights.components.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index b49863642c..556e6d95af 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.diagnosticsettings.yml'
-      - 'arm/Microsoft.Insights/diagnosticsettings/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/diagnosticsettings/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/diagnosticSettings'
+  modulePath: 'modules/Microsoft.Insights/diagnosticSettings'
   workflowPath: '.github/workflows/ms.insights.diagnosticsettings.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index 7f4e64a2b7..c238711b06 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.metricalerts.yml'
-      - 'arm/Microsoft.Insights/metricAlerts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/metricAlerts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/metricAlerts'
+  modulePath: 'modules/Microsoft.Insights/metricAlerts'
   workflowPath: '.github/workflows/ms.insights.metricalerts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index 35e362059b..c342b41a94 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.privatelinkscopes.yml'
-      - 'arm/Microsoft.Insights/privateLinkScopes/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/privateLinkScopes/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/privateLinkScopes'
+  modulePath: 'modules/Microsoft.Insights/privateLinkScopes'
   workflowPath: '.github/workflows/ms.insights.privatelinkscopes.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index 3ac293149b..f94d3e3fe9 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.scheduledqueryrules.yml'
-      - 'arm/Microsoft.Insights/scheduledQueryRules/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/scheduledQueryRules/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/scheduledQueryRules'
+  modulePath: 'modules/Microsoft.Insights/scheduledQueryRules'
   workflowPath: '.github/workflows/ms.insights.scheduledqueryrules.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index a428a0e48a..1067ceab94 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.keyvault.vaults.yml'
-      - 'arm/Microsoft.KeyVault/vaults/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KeyVault/vaults/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KeyVault/vaults'
+  modulePath: 'modules/Microsoft.KeyVault/vaults'
   workflowPath: '.github/workflows/ms.keyvault.vaults.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.kubernetesconfiguration.extensions.yml b/.github/workflows/ms.kubernetesconfiguration.extensions.yml
index cb6c3b7664..03163a781c 100644
--- a/.github/workflows/ms.kubernetesconfiguration.extensions.yml
+++ b/.github/workflows/ms.kubernetesconfiguration.extensions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.kubernetesconfiguration.extensions.yml'
-      - 'arm/Microsoft.KubernetesConfiguration/extensions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KubernetesConfiguration/extensions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KubernetesConfiguration/extensions'
+  modulePath: 'modules/Microsoft.KubernetesConfiguration/extensions'
   workflowPath: '.github/workflows/ms.kubernetesconfiguration.extensions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml b/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
index 47ec3b2fc6..9d6e7ae21c 100644
--- a/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml'
-      - 'arm/Microsoft.KubernetesConfiguration/fluxConfigurations/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KubernetesConfiguration/fluxConfigurations/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KubernetesConfiguration/fluxConfigurations'
+  modulePath: 'modules/Microsoft.KubernetesConfiguration/fluxConfigurations'
   workflowPath: '.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 03e09b6410..19a4d65ea3 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.logic.workflows.yml'
-      - 'arm/Microsoft.Logic/workflows/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Logic/workflows/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Logic/workflows'
+  modulePath: 'modules/Microsoft.Logic/workflows'
   workflowPath: '.github/workflows/ms.logic.workflows.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index aab2efcaeb..5df607c47b 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.machinelearningservices.workspaces.yml'
-      - 'arm/Microsoft.MachineLearningServices/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.MachineLearningServices/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.MachineLearningServices/workspaces'
+  modulePath: 'modules/Microsoft.MachineLearningServices/workspaces'
   workflowPath: '.github/workflows/ms.machinelearningservices.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index e85f71f65a..d0c233a4c4 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.managedidentity.userassignedidentities.yml'
-      - 'arm/Microsoft.ManagedIdentity/userAssignedIdentities/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ManagedIdentity/userAssignedIdentities/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ManagedIdentity/userAssignedIdentities'
+  modulePath: 'modules/Microsoft.ManagedIdentity/userAssignedIdentities'
   workflowPath: '.github/workflows/ms.managedidentity.userassignedidentities.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index 174cdf5a4d..9825845d2a 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.managedservices.registrationdefinitions.yml'
-      - 'arm/Microsoft.ManagedServices/registrationDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ManagedServices/registrationDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ManagedServices/registrationDefinitions'
+  modulePath: 'modules/Microsoft.ManagedServices/registrationDefinitions'
   workflowPath: '.github/workflows/ms.managedservices.registrationdefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index 00860c6205..ff7edf7a55 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.management.managementgroups.yml'
-      - 'arm/Microsoft.Management/managementGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Management/managementGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Management/managementGroups'
+  modulePath: 'modules/Microsoft.Management/managementGroups'
   workflowPath: '.github/workflows/ms.management.managementgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index 0aa8dc46b1..0c1aa8555b 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.netapp.netappaccounts.yml'
-      - 'arm/Microsoft.NetApp/netAppAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.NetApp/netAppAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.NetApp/netAppAccounts'
+  modulePath: 'modules/Microsoft.NetApp/netAppAccounts'
   workflowPath: '.github/workflows/ms.netapp.netappaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index 4e8aa732e5..930f387bce 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.applicationgateways.yml'
-      - 'arm/Microsoft.Network/applicationGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/applicationGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/applicationGateways'
+  modulePath: 'modules/Microsoft.Network/applicationGateways'
   workflowPath: '.github/workflows/ms.network.applicationgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index a4f3df798d..49f9bb3071 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.applicationsecuritygroups.yml'
-      - 'arm/Microsoft.Network/applicationSecurityGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/applicationSecurityGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/applicationSecurityGroups'
+  modulePath: 'modules/Microsoft.Network/applicationSecurityGroups'
   workflowPath: '.github/workflows/ms.network.applicationsecuritygroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index 93bffd1e5b..2de448b7af 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.azurefirewalls.yml'
-      - 'arm/Microsoft.Network/azureFirewalls/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/azureFirewalls/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/azureFirewalls'
+  modulePath: 'modules/Microsoft.Network/azureFirewalls'
   workflowPath: '.github/workflows/ms.network.azurefirewalls.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index 4737fe021a..7bb3d48b6a 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.bastionhosts.yml'
-      - 'arm/Microsoft.Network/bastionHosts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/bastionHosts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/bastionHosts'
+  modulePath: 'modules/Microsoft.Network/bastionHosts'
   workflowPath: '.github/workflows/ms.network.bastionhosts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index e37af7123d..76bb4cd9bd 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.connections.yml'
-      - 'arm/Microsoft.Network/connections/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/connections/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/connections'
+  modulePath: 'modules/Microsoft.Network/connections'
   workflowPath: '.github/workflows/ms.network.connections.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index 0f83af3940..4582c415a7 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.ddosprotectionplans.yml'
-      - 'arm/Microsoft.Network/ddosProtectionPlans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/ddosProtectionPlans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/ddosProtectionPlans'
+  modulePath: 'modules/Microsoft.Network/ddosProtectionPlans'
   workflowPath: '.github/workflows/ms.network.ddosprotectionplans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index a8bc58510a..4f1d1c87f1 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.expressroutecircuits.yml'
-      - 'arm/Microsoft.Network/expressRouteCircuits/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/expressRouteCircuits/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/expressRouteCircuits'
+  modulePath: 'modules/Microsoft.Network/expressRouteCircuits'
   workflowPath: '.github/workflows/ms.network.expressroutecircuits.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index 6137b0212f..fab9e32a34 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.firewallpolicies.yml'
-      - 'arm/Microsoft.Network/firewallPolicies/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/firewallPolicies/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/firewallPolicies'
+  modulePath: 'modules/Microsoft.Network/firewallPolicies'
   workflowPath: '.github/workflows/ms.network.firewallpolicies.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.frontdoors.yml b/.github/workflows/ms.network.frontdoors.yml
index 5e511cae0b..65d1960ddc 100644
--- a/.github/workflows/ms.network.frontdoors.yml
+++ b/.github/workflows/ms.network.frontdoors.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.frontdoors.yml'
-      - 'arm/Microsoft.Network/frontDoors/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/frontDoors/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/frontDoors'
+  modulePath: 'modules/Microsoft.Network/frontDoors'
   workflowPath: '.github/workflows/ms.network.frontdoors.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index 3a13b6d30b..c2e71a6c59 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.ipgroups.yml'
-      - 'arm/Microsoft.Network/ipGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/ipGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/ipGroups'
+  modulePath: 'modules/Microsoft.Network/ipGroups'
   workflowPath: '.github/workflows/ms.network.ipgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index 3d23e74394..6eb3b3acf4 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.loadbalancers.yml'
-      - 'arm/Microsoft.Network/loadBalancers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/loadBalancers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/loadBalancers'
+  modulePath: 'modules/Microsoft.Network/loadBalancers'
   workflowPath: '.github/workflows/ms.network.loadbalancers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index be05683a4b..704d6dc29c 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.localnetworkgateways.yml'
-      - 'arm/Microsoft.Network/localNetworkGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/localNetworkGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/localNetworkGateways'
+  modulePath: 'modules/Microsoft.Network/localNetworkGateways'
   workflowPath: '.github/workflows/ms.network.localnetworkgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index ebdd539815..fd3b0b0f4c 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.natgateways.yml'
-      - 'arm/Microsoft.Network/natGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/natGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/natGateways'
+  modulePath: 'modules/Microsoft.Network/natGateways'
   workflowPath: '.github/workflows/ms.network.natgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networkinterfaces.yml b/.github/workflows/ms.network.networkinterfaces.yml
index feda3575e3..3351651662 100644
--- a/.github/workflows/ms.network.networkinterfaces.yml
+++ b/.github/workflows/ms.network.networkinterfaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networkinterfaces.yml'
-      - 'arm/Microsoft.Network/networkInterfaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkInterfaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkInterfaces'
+  modulePath: 'modules/Microsoft.Network/networkInterfaces'
   workflowPath: '.github/workflows/ms.network.networkinterfaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index 186a49f9c6..ec4143097d 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networksecuritygroups.yml'
-      - 'arm/Microsoft.Network/networkSecurityGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkSecurityGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkSecurityGroups'
+  modulePath: 'modules/Microsoft.Network/networkSecurityGroups'
   workflowPath: '.github/workflows/ms.network.networksecuritygroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 3728a63e58..1f1773ba2e 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networkwatchers.yml'
-      - 'arm/Microsoft.Network/networkWatchers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkWatchers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkWatchers'
+  modulePath: 'modules/Microsoft.Network/networkWatchers'
   workflowPath: '.github/workflows/ms.network.networkwatchers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index 3afa12980f..5186987b00 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.privatednszones.yml'
-      - 'arm/Microsoft.Network/privateDnsZones/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/privateDnsZones/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/privateDnsZones'
+  modulePath: 'modules/Microsoft.Network/privateDnsZones'
   workflowPath: '.github/workflows/ms.network.privatednszones.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index 06132ed4a2..b7fed464dd 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.privateendpoints.yml'
-      - 'arm/Microsoft.Network/privateEndpoints/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/privateEndpoints/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/privateEndpoints'
+  modulePath: 'modules/Microsoft.Network/privateEndpoints'
   workflowPath: '.github/workflows/ms.network.privateendpoints.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index ff2e212f7b..b1e9fbcc11 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.publicipaddresses.yml'
-      - 'arm/Microsoft.Network/publicIPAddresses/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/publicIPAddresses/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/publicIPAddresses'
+  modulePath: 'modules/Microsoft.Network/publicIPAddresses'
   workflowPath: '.github/workflows/ms.network.publicipaddresses.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 7ee726e778..714bc5bdb2 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.publicipprefixes.yml'
-      - 'arm/Microsoft.Network/publicIPPrefixes/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/publicIPPrefixes/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/publicIPPrefixes'
+  modulePath: 'modules/Microsoft.Network/publicIPPrefixes'
   workflowPath: '.github/workflows/ms.network.publicipprefixes.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index c64d0c4b61..9f4bb512c4 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.routetables.yml'
-      - 'arm/Microsoft.Network/routeTables/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/routeTables/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/routeTables'
+  modulePath: 'modules/Microsoft.Network/routeTables'
   workflowPath: '.github/workflows/ms.network.routetables.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index 38e8f66a8c..d1a0a6b561 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.trafficmanagerprofiles.yml'
-      - 'arm/Microsoft.Network/trafficmanagerprofiles/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/trafficmanagerprofiles/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/trafficmanagerprofiles'
+  modulePath: 'modules/Microsoft.Network/trafficmanagerprofiles'
   workflowPath: '.github/workflows/ms.network.trafficmanagerprofiles.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualhubs.yml b/.github/workflows/ms.network.virtualhubs.yml
index cf5d3d8db7..9e2221dff4 100644
--- a/.github/workflows/ms.network.virtualhubs.yml
+++ b/.github/workflows/ms.network.virtualhubs.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualhubs.yml'
-      - 'arm/Microsoft.Network/virtualHubs/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualHubs/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualHubs'
+  modulePath: 'modules/Microsoft.Network/virtualHubs'
   workflowPath: '.github/workflows/ms.network.virtualhubs.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index d0ad36a1fa..a96f19b58f 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualnetworkgateways.yml'
-      - 'arm/Microsoft.Network/virtualNetworkGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualNetworkGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualNetworkGateways'
+  modulePath: 'modules/Microsoft.Network/virtualNetworkGateways'
   workflowPath: '.github/workflows/ms.network.virtualnetworkgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index b1445fc3ce..8ffde5c19e 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualnetworks.yml'
-      - 'arm/Microsoft.Network/virtualNetworks/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualNetworks/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualNetworks'
+  modulePath: 'modules/Microsoft.Network/virtualNetworks'
   workflowPath: '.github/workflows/ms.network.virtualnetworks.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index af84aa61d6..911e6fe50a 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualwans.yml'
-      - 'arm/Microsoft.Network/virtualWans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualWans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualWans'
+  modulePath: 'modules/Microsoft.Network/virtualWans'
   workflowPath: '.github/workflows/ms.network.virtualwans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.vpngateways.yml b/.github/workflows/ms.network.vpngateways.yml
index a478903089..2fb8cc1797 100644
--- a/.github/workflows/ms.network.vpngateways.yml
+++ b/.github/workflows/ms.network.vpngateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.vpngateways.yml'
-      - 'arm/Microsoft.Network/vpnGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/vpnGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/vpnGateways'
+  modulePath: 'modules/Microsoft.Network/vpnGateways'
   workflowPath: '.github/workflows/ms.network.vpngateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.vpnsites.yml b/.github/workflows/ms.network.vpnsites.yml
index fb0f8c8d3f..b72ddae6e1 100644
--- a/.github/workflows/ms.network.vpnsites.yml
+++ b/.github/workflows/ms.network.vpnsites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.vpnsites.yml'
-      - 'arm/Microsoft.Network/vpnSites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/vpnSites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/vpnSites'
+  modulePath: 'modules/Microsoft.Network/vpnSites'
   workflowPath: '.github/workflows/ms.network.vpnsites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index 9ddfc177f5..fd0c3c685a 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.operationalinsights.workspaces.yml'
-      - 'arm/Microsoft.OperationalInsights/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.OperationalInsights/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.OperationalInsights/workspaces'
+  modulePath: 'modules/Microsoft.OperationalInsights/workspaces'
   workflowPath: '.github/workflows/ms.operationalinsights.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index 15e09441c3..275e0498de 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.recoveryservices.vaults.yml'
-      - 'arm/Microsoft.RecoveryServices/vaults/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.RecoveryServices/vaults/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.RecoveryServices/vaults'
+  modulePath: 'modules/Microsoft.RecoveryServices/vaults'
   workflowPath: '.github/workflows/ms.recoveryservices.vaults.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 967b05e4b9..32b6b0f767 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.deploymentscripts.yml'
-      - 'arm/Microsoft.Resources/deploymentScripts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/deploymentScripts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/deploymentScripts'
+  modulePath: 'modules/Microsoft.Resources/deploymentScripts'
   workflowPath: '.github/workflows/ms.resources.deploymentscripts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index 392cd5740b..60de42f8b8 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.resourcegroups.yml'
-      - 'arm/Microsoft.Resources/resourceGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/resourceGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/resourceGroups'
+  modulePath: 'modules/Microsoft.Resources/resourceGroups'
   workflowPath: '.github/workflows/ms.resources.resourcegroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.tags.yml b/.github/workflows/ms.resources.tags.yml
index c35776cb2d..fb54367126 100644
--- a/.github/workflows/ms.resources.tags.yml
+++ b/.github/workflows/ms.resources.tags.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.tags.yml'
-      - 'arm/Microsoft.Resources/tags/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/tags/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/tags'
+  modulePath: 'modules/Microsoft.Resources/tags'
   workflowPath: '.github/workflows/ms.resources.tags.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index 0eab54dc73..bca0ebedff 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.security.azuresecuritycenter.yml'
-      - 'arm/Microsoft.Security/azureSecurityCenter/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Security/azureSecurityCenter/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Security/azureSecurityCenter'
+  modulePath: 'modules/Microsoft.Security/azureSecurityCenter'
   workflowPath: '.github/workflows/ms.security.azuresecuritycenter.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index e290a78302..fb84ab7ccd 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.servicebus.namespaces.yml'
-      - 'arm/Microsoft.ServiceBus/namespaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ServiceBus/namespaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ServiceBus/namespaces'
+  modulePath: 'modules/Microsoft.ServiceBus/namespaces'
   workflowPath: '.github/workflows/ms.servicebus.namespaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.servicefabric.clusters.yml b/.github/workflows/ms.servicefabric.clusters.yml
index d53258695c..9895c4f192 100644
--- a/.github/workflows/ms.servicefabric.clusters.yml
+++ b/.github/workflows/ms.servicefabric.clusters.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.servicefabric.clusters.yml'
-      - 'arm/Microsoft.ServiceFabric/clusters/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ServiceFabric/clusters/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ServiceFabric/clusters'
+  modulePath: 'modules/Microsoft.ServiceFabric/clusters'
   workflowPath: '.github/workflows/ms.servicefabric.clusters.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index 70cacaaaaf..e3c6df7041 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.sql.managedinstances.yml'
-      - 'arm/Microsoft.Sql/managedInstances/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Sql/managedInstances/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Sql/managedInstances'
+  modulePath: 'modules/Microsoft.Sql/managedInstances'
   workflowPath: '.github/workflows/ms.sql.managedinstances.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index c2b15642ee..61623e9bfb 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.sql.servers.yml'
-      - 'arm/Microsoft.Sql/servers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Sql/servers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Sql/servers'
+  modulePath: 'modules/Microsoft.Sql/servers'
   workflowPath: '.github/workflows/ms.sql.servers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 25ca93d427..dfd7c811fc 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.storage.storageaccounts.yml'
-      - 'arm/Microsoft.Storage/storageAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Storage/storageAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Storage/storageAccounts'
+  modulePath: 'modules/Microsoft.Storage/storageAccounts'
   workflowPath: '.github/workflows/ms.storage.storageaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 7c70983ae5..d0287ac8d3 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.synapse.privatelinkhubs.yml'
-      - 'arm/Microsoft.Synapse/privateLinkHubs/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Synapse/privateLinkHubs/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Synapse/privateLinkHubs'
+  modulePath: 'modules/Microsoft.Synapse/privateLinkHubs'
   workflowPath: '.github/workflows/ms.synapse.privatelinkhubs.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index 1a586bcf64..7d1c122891 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.virtualmachineimages.imagetemplates.yml'
-      - 'arm/Microsoft.VirtualMachineImages/imageTemplates/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.VirtualMachineImages/imageTemplates/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.VirtualMachineImages/imageTemplates'
+  modulePath: 'modules/Microsoft.VirtualMachineImages/imageTemplates'
   workflowPath: '.github/workflows/ms.virtualmachineimages.imagetemplates.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index e32df8e3c9..24a5452946 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.connections.yml'
-      - 'arm/Microsoft.Web/connections/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/connections/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/connections'
+  modulePath: 'modules/Microsoft.Web/connections'
   workflowPath: '.github/workflows/ms.web.connections.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index 0d926983ec..cc7f884c27 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.hostingenvironments.yml'
-      - 'arm/Microsoft.Web/hostingEnvironments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/hostingEnvironments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/hostingEnvironments'
+  modulePath: 'modules/Microsoft.Web/hostingEnvironments'
   workflowPath: '.github/workflows/ms.web.hostingenvironments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 1ba700cf21..d0d6a3a41d 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.serverfarms.yml'
-      - 'arm/Microsoft.Web/serverfarms/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/serverfarms/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/serverfarms'
+  modulePath: 'modules/Microsoft.Web/serverfarms'
   workflowPath: '.github/workflows/ms.web.serverfarms.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index a83b5659d2..5f69a15df6 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.sites.yml'
-      - 'arm/Microsoft.Web/sites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/sites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/sites'
+  modulePath: 'modules/Microsoft.Web/sites'
   workflowPath: '.github/workflows/ms.web.sites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.staticsites.yml b/.github/workflows/ms.web.staticsites.yml
index bc0920919b..b387de58ae 100644
--- a/.github/workflows/ms.web.staticsites.yml
+++ b/.github/workflows/ms.web.staticsites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.staticsites.yml'
-      - 'arm/Microsoft.Web/staticSites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/staticSites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/staticSites'
+  modulePath: 'modules/Microsoft.Web/staticSites'
   workflowPath: '.github/workflows/ms.web.staticsites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml
index bb5d050edf..a54bae5ead 100644
--- a/.github/workflows/platform.dependencies.yml
+++ b/.github/workflows/platform.dependencies.yml
@@ -53,7 +53,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -81,7 +81,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -112,7 +112,7 @@ jobs:
         id: deploy_msi
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -151,7 +151,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -179,7 +179,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -207,7 +207,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -235,7 +235,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -264,7 +264,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -293,7 +293,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -401,7 +401,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -435,7 +435,7 @@ jobs:
         id: deploy_imgt
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -598,7 +598,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -626,7 +626,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -654,7 +654,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -683,7 +683,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -720,7 +720,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -751,7 +751,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -789,7 +789,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -819,7 +819,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -849,7 +849,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -879,7 +879,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -910,7 +910,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -943,7 +943,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1123,7 +1123,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1245,7 +1245,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1273,7 +1273,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/subscription/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/subscription/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1314,7 +1314,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1344,7 +1344,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1372,7 +1372,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1402,7 +1402,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1430,7 +1430,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
diff --git a/.github/workflows/platform.updateReadMe.yml b/.github/workflows/platform.updateReadMe.yml
index 829dd17ae6..9e3d0dfcf2 100644
--- a/.github/workflows/platform.updateReadMe.yml
+++ b/.github/workflows/platform.updateReadMe.yml
@@ -10,8 +10,8 @@ on:
     branches:
       - main
     paths:
-      - 'arm/**/deploy.bicep'
-      - 'arm/**/deploy.json'
+      - 'modules/**/deploy.bicep'
+      - 'modules/**/deploy.json'
 
 env:
   pipelinePrincipalGitUserName: 'CARMLPipelinePrincipal'
@@ -34,7 +34,7 @@ jobs:
           . "$env:GITHUB_WORKSPACE/utilities/tools/Set-ReadMeModuleTable.ps1"
 
           $functionInput = @{
-            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'arm'
+            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'modules'
             FilePath       = Join-Path $env:GITHUB_WORKSPACE 'README.md'
             Organization   = ($env:GITHUB_REPOSITORY).split('/')[0]
             RepositoryName = ($env:GITHUB_REPOSITORY).split('/')[1]
@@ -55,8 +55,8 @@ jobs:
           . "$env:GITHUB_WORKSPACE/utilities/tools/Set-ReadMeModuleTable.ps1"
 
           $functionInput = @{
-            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'arm'
-            FilePath       = Join-Path $env:GITHUB_WORKSPACE 'arm/README.md'
+            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'modules'
+            FilePath       = Join-Path $env:GITHUB_WORKSPACE 'modules/README.md'
             Organization   = ($env:GITHUB_REPOSITORY).split('/')[0]
             RepositoryName = ($env:GITHUB_REPOSITORY).split('/')[1]
             ColumnsInOrder = @('Name', 'ProviderNamespace','ResourceType')
diff --git a/README.md b/README.md
index 407176a7d7..534d417430 100644
--- a/README.md
+++ b/README.md
@@ -29,104 +29,104 @@ The CI environment supports both ARM and Bicep and can be leveraged using GitHub
 
 | Name | Status |
 | - | - |
-| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) | [!['Insights: ActionGroups'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActionGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.actiongroups.yml) |
-| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) | [!['Insights: ActivityLogAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActivityLogAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.activitylogalerts.yml) |
-| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) | [!['Insights: DiagnosticSettings'](https://github.com/Azure/ResourceModules/workflows/Insights:%20DiagnosticSettings/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.diagnosticsettings.yml) |
-| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) | [!['AnalysisServices: Servers'](https://github.com/Azure/ResourceModules/workflows/AnalysisServices:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.analysisservices.servers.yml) |
-| [API Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) | [!['Web: Connections'](https://github.com/Azure/ResourceModules/workflows/Web:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.connections.yml) |
-| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) | [!['ApiManagement: Service'](https://github.com/Azure/ResourceModules/workflows/ApiManagement:%20Service/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.apimanagement.service.yml) |
-| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) | [!['AppConfiguration: ConfigurationStores'](https://github.com/Azure/ResourceModules/workflows/AppConfiguration:%20ConfigurationStores/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.appconfiguration.configurationstores.yml) |
-| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) | [!['Web: HostingEnvironments'](https://github.com/Azure/ResourceModules/workflows/Web:%20HostingEnvironments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.hostingenvironments.yml) |
-| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) | [!['Web: Serverfarms'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfarms/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfarms.yml) |
-| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) | [!['Insights: Components'](https://github.com/Azure/ResourceModules/workflows/Insights:%20Components/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.components.yml) |
-| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) | [!['Network: ApplicationSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationsecuritygroups.yml) |
-| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) | [!['Automation: AutomationAccounts'](https://github.com/Azure/ResourceModules/workflows/Automation:%20AutomationAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.automation.automationaccounts.yml) |
-| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) | [!['Compute: AvailabilitySets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20AvailabilitySets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.availabilitysets.yml) |
-| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) | [!['DesktopVirtualization: ApplicationGroups'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20ApplicationGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.applicationgroups.yml) |
-| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) | [!['DesktopVirtualization: HostPools'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20HostPools/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.hostpools.yml) |
-| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) | [!['DesktopVirtualization: Scalingplans'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Scalingplans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.scalingplans.yml) |
-| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) | [!['DesktopVirtualization: Workspaces'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.workspaces.yml) |
-| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) | [!['AAD: DomainServices'](https://github.com/Azure/ResourceModules/workflows/AAD:%20DomainServices/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.aad.domainservices.yml) |
-| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) | [!['Compute: Galleries'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Galleries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.galleries.yml) |
-| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) | [!['Databricks: Workspaces'](https://github.com/Azure/ResourceModules/workflows/Databricks:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.databricks.workspaces.yml) |
-| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) | [!['Network: AzureFirewalls'](https://github.com/Azure/ResourceModules/workflows/Network:%20AzureFirewalls/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.azurefirewalls.yml) |
-| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) | [!['HealthBot: HealthBots'](https://github.com/Azure/ResourceModules/workflows/HealthBot:%20HealthBots/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.healthbot.healthbots.yml) |
-| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) | [!['ContainerService: ManagedClusters'](https://github.com/Azure/ResourceModules/workflows/ContainerService:%20ManagedClusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerservice.managedclusters.yml) |
-| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) | [!['Insights: PrivateLinkScopes'](https://github.com/Azure/ResourceModules/workflows/Insights:%20PrivateLinkScopes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.privatelinkscopes.yml) |
-| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) | [!['NetApp: NetAppAccounts'](https://github.com/Azure/ResourceModules/workflows/NetApp:%20NetAppAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.netapp.netappaccounts.yml) |
-| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) | [!['Security: AzureSecurityCenter'](https://github.com/Azure/ResourceModules/workflows/Security:%20AzureSecurityCenter/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.security.azuresecuritycenter.yml) |
-| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) | [!['Synapse: PrivateLinkHubs'](https://github.com/Azure/ResourceModules/workflows/Synapse:%20PrivateLinkHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.synapse.privatelinkhubs.yml) |
-| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) | [!['Network: BastionHosts'](https://github.com/Azure/ResourceModules/workflows/Network:%20BastionHosts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.bastionhosts.yml) |
-| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) | [!['Batch: BatchAccounts'](https://github.com/Azure/ResourceModules/workflows/Batch:%20BatchAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.batch.batchaccounts.yml) |
-| [Budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) | [!['Consumption: Budgets'](https://github.com/Azure/ResourceModules/workflows/Consumption:%20Budgets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.consumption.budgets.yml) |
-| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) | [!['CognitiveServices: Accounts'](https://github.com/Azure/ResourceModules/workflows/CognitiveServices:%20Accounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.cognitiveservices.accounts.yml) |
-| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) | [!['Compute: Disks'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Disks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.disks.yml) |
-| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) | [!['ContainerInstance: ContainerGroups'](https://github.com/Azure/ResourceModules/workflows/ContainerInstance:%20ContainerGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerinstance.containergroups.yml) |
-| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) | [!['ContainerRegistry: Registries'](https://github.com/Azure/ResourceModules/workflows/ContainerRegistry:%20Registries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerregistry.registries.yml) |
-| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) | [!['DataFactory: Factories'](https://github.com/Azure/ResourceModules/workflows/DataFactory:%20Factories/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.datafactory.factories.yml) |
-| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) | [!['Network: DdosProtectionPlans'](https://github.com/Azure/ResourceModules/workflows/Network:%20DdosProtectionPlans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ddosprotectionplans.yml) |
-| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) | [!['Resources: DeploymentScripts'](https://github.com/Azure/ResourceModules/workflows/Resources:%20DeploymentScripts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.deploymentscripts.yml) |
-| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) | [!['Compute: DiskEncryptionSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20DiskEncryptionSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.diskencryptionsets.yml) |
-| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) | [!['DocumentDB: DatabaseAccounts'](https://github.com/Azure/ResourceModules/workflows/DocumentDB:%20DatabaseAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.documentdb.databaseaccounts.yml) |
-| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) | [!['EventGrid: System Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20System%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.systemtopics.yml) |
-| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) | [!['EventGrid: Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.topics.yml) |
-| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) | [!['EventHub: Namespaces'](https://github.com/Azure/ResourceModules/workflows/EventHub:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventhub.namespaces.yml) |
-| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) | [!['Network: ExpressRouteCircuits'](https://github.com/Azure/ResourceModules/workflows/Network:%20ExpressRouteCircuits/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.expressroutecircuits.yml) |
-| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) | [!['Network: FirewallPolicies'](https://github.com/Azure/ResourceModules/workflows/Network:%20FirewallPolicies/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.firewallpolicies.yml) |
-| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) | [!['Network: Frontdoors'](https://github.com/Azure/ResourceModules/workflows/Network:%20Frontdoors/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.frontdoors.yml) |
-| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) | [!['VirtualMachineImages: ImageTemplates'](https://github.com/Azure/ResourceModules/workflows/VirtualMachineImages:%20ImageTemplates/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.virtualmachineimages.imagetemplates.yml) |
-| [Images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) | [!['Compute: Images'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Images/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.images.yml) |
-| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) | [!['Network: IpGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20IpGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ipgroups.yml) |
-| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) | [!['KeyVault: Vaults'](https://github.com/Azure/ResourceModules/workflows/KeyVault:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.keyvault.vaults.yml) |
-| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) | [!['KubernetesConfiguration: Extensions'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20Extensions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.extensions.yml) |
-| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) | [!['KubernetesConfiguration: FluxConfigurations'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20FluxConfigurations/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml) |
-| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) | [!['Network: LoadBalancers'](https://github.com/Azure/ResourceModules/workflows/Network:%20LoadBalancers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.loadbalancers.yml) |
-| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) | [!['Network: LocalNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20LocalNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.localnetworkgateways.yml) |
-| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) | [!['OperationalInsights: Workspaces'](https://github.com/Azure/ResourceModules/workflows/OperationalInsights:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationalinsights.workspaces.yml) |
-| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) | [!['Logic: Workflows'](https://github.com/Azure/ResourceModules/workflows/Logic:%20Workflows/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.logic.workflows.yml) |
-| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) | [!['MachineLearningServices: Workspaces'](https://github.com/Azure/ResourceModules/workflows/MachineLearningServices:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.machinelearningservices.workspaces.yml) |
-| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) | [!['Management: ManagementGroups'](https://github.com/Azure/ResourceModules/workflows/Management:%20ManagementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.management.managementgroups.yml) |
-| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) | [!['Insights: MetricAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20MetricAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.metricalerts.yml) |
-| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) | [!['Network: NatGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20NatGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.natgateways.yml) |
-| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) | [!['Network: ApplicationGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationgateways.yml) |
-| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) | [!['Network: NetworkInterfaces'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkInterfaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkinterfaces.yml) |
-| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) | [!['Network: NetworkSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networksecuritygroups.yml) |
-| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) | [!['Network: NetworkWatchers'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkWatchers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkwatchers.yml) |
-| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) | [!['Authorization: PolicyAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyassignments.yml) |
-| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) | [!['Authorization: PolicyDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policydefinitions.yml) |
-| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) | [!['Authorization: PolicyExemptions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyExemptions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyexemptions.yml) |
-| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) | [!['Authorization: PolicySetDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicySetDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policysetdefinitions.yml) |
-| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) | [!['Network: PrivateDnsZones'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateDnsZones/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privatednszones.yml) |
-| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) | [!['Network: PrivateEndpoints'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateEndpoints/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privateendpoints.yml) |
-| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) | [!['Compute: ProximityPlacementGroups'](https://github.com/Azure/ResourceModules/workflows/Compute:%20ProximityPlacementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.proximityplacementgroups.yml) |
-| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) | [!['Network: PublicIpAddresses'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpAddresses/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipaddresses.yml) |
-| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) | [!['Network: PublicIpPrefixes'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpPrefixes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipprefixes.yml) |
-| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) | [!['RecoveryServices: Vaults'](https://github.com/Azure/ResourceModules/workflows/RecoveryServices:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.recoveryservices.vaults.yml) |
-| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) | [!['ManagedServices: RegistrationDefinitions'](https://github.com/Azure/ResourceModules/workflows/ManagedServices:%20RegistrationDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedservices.registrationdefinitions.yml) |
-| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) | [!['Resources: ResourceGroups'](https://github.com/Azure/ResourceModules/workflows/Resources:%20ResourceGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.resourcegroups.yml) |
-| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) | [!['Resources: Tags'](https://github.com/Azure/ResourceModules/workflows/Resources:%20Tags/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.tags.yml) |
-| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) | [!['Authorization: RoleAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roleassignments.yml) |
-| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) | [!['Authorization: RoleDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roledefinitions.yml) |
-| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) | [!['Network: RouteTables'](https://github.com/Azure/ResourceModules/workflows/Network:%20RouteTables/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.routetables.yml) |
-| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) | [!['Insights: ScheduledQueryRules'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ScheduledQueryRules/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.scheduledqueryrules.yml) |
-| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) | [!['ServiceBus: Namespaces'](https://github.com/Azure/ResourceModules/workflows/ServiceBus:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicebus.namespaces.yml) |
-| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) | [!['Service Fabric: Clusters'](https://github.com/Azure/ResourceModules/workflows/Service%20Fabric:%20Clusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicefabric.clusters.yml) |
-| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) | [!['Sql: ManagedInstances'](https://github.com/Azure/ResourceModules/workflows/Sql:%20ManagedInstances/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.managedinstances.yml) |
-| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) | [!['Sql: Servers'](https://github.com/Azure/ResourceModules/workflows/Sql:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.servers.yml) |
-| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) | [!['Web: StaticSites'](https://github.com/Azure/ResourceModules/workflows/Web:%20StaticSites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.staticsites.yml) |
-| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) | [!['Storage: StorageAccounts'](https://github.com/Azure/ResourceModules/workflows/Storage:%20StorageAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.storage.storageaccounts.yml) |
-| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) | [!['Network: TrafficManagerProfiles'](https://github.com/Azure/ResourceModules/workflows/Network:%20TrafficManagerProfiles/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.trafficmanagerprofiles.yml) |
-| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) | [!['ManagedIdentity: UserAssignedIdentities'](https://github.com/Azure/ResourceModules/workflows/ManagedIdentity:%20UserAssignedIdentities/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedidentity.userassignedidentities.yml) |
-| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) | [!['Network: VirtualHubs'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualhubs.yml) |
-| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) | [!['Compute: VirtualMachineScaleSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachineScaleSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachinescalesets.yml) |
-| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) | [!['Compute: VirtualMachines'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachines/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachines.yml) |
-| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) | [!['Network: Connections'](https://github.com/Azure/ResourceModules/workflows/Network:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.connections.yml) |
-| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) | [!['Network: VirtualNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworkgateways.yml) |
-| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) | [!['Network: VirtualNetworks'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworks.yml) |
-| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) | [!['Network: VirtualWans'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualWans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualwans.yml) |
-| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) | [!['Network: VPNGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPNGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpngateways.yml) |
-| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) | [!['Network: VPN Sites'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPN%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpnsites.yml) |
-| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) | [!['Web: Sites'](https://github.com/Azure/ResourceModules/workflows/Web:%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.sites.yml) |
+| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) | [!['Insights: ActionGroups'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActionGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.actiongroups.yml) |
+| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) | [!['Insights: ActivityLogAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActivityLogAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.activitylogalerts.yml) |
+| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) | [!['Insights: DiagnosticSettings'](https://github.com/Azure/ResourceModules/workflows/Insights:%20DiagnosticSettings/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.diagnosticsettings.yml) |
+| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) | [!['AnalysisServices: Servers'](https://github.com/Azure/ResourceModules/workflows/AnalysisServices:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.analysisservices.servers.yml) |
+| [API Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) | [!['Web: Connections'](https://github.com/Azure/ResourceModules/workflows/Web:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.connections.yml) |
+| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | [!['ApiManagement: Service'](https://github.com/Azure/ResourceModules/workflows/ApiManagement:%20Service/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.apimanagement.service.yml) |
+| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | [!['AppConfiguration: ConfigurationStores'](https://github.com/Azure/ResourceModules/workflows/AppConfiguration:%20ConfigurationStores/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.appconfiguration.configurationstores.yml) |
+| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) | [!['Web: HostingEnvironments'](https://github.com/Azure/ResourceModules/workflows/Web:%20HostingEnvironments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.hostingenvironments.yml) |
+| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfmoduless) | [!['Web: Serverfmoduless'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfmoduless/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfmoduless.yml) |
+| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) | [!['Insights: Components'](https://github.com/Azure/ResourceModules/workflows/Insights:%20Components/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.components.yml) |
+| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) | [!['Network: ApplicationSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationsecuritygroups.yml) |
+| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) | [!['Automation: AutomationAccounts'](https://github.com/Azure/ResourceModules/workflows/Automation:%20AutomationAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.automation.automationaccounts.yml) |
+| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) | [!['Compute: AvailabilitySets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20AvailabilitySets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.availabilitysets.yml) |
+| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) | [!['DesktopVirtualization: ApplicationGroups'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20ApplicationGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.applicationgroups.yml) |
+| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) | [!['DesktopVirtualization: HostPools'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20HostPools/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.hostpools.yml) |
+| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) | [!['DesktopVirtualization: Scalingplans'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Scalingplans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.scalingplans.yml) |
+| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) | [!['DesktopVirtualization: Workspaces'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.workspaces.yml) |
+| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) | [!['AAD: DomainServices'](https://github.com/Azure/ResourceModules/workflows/AAD:%20DomainServices/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.aad.domainservices.yml) |
+| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) | [!['Compute: Galleries'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Galleries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.galleries.yml) |
+| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) | [!['Databricks: Workspaces'](https://github.com/Azure/ResourceModules/workflows/Databricks:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.databricks.workspaces.yml) |
+| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) | [!['Network: AzureFirewalls'](https://github.com/Azure/ResourceModules/workflows/Network:%20AzureFirewalls/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.azurefirewalls.yml) |
+| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) | [!['HealthBot: HealthBots'](https://github.com/Azure/ResourceModules/workflows/HealthBot:%20HealthBots/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.healthbot.healthbots.yml) |
+| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) | [!['ContainerService: ManagedClusters'](https://github.com/Azure/ResourceModules/workflows/ContainerService:%20ManagedClusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerservice.managedclusters.yml) |
+| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) | [!['Insights: PrivateLinkScopes'](https://github.com/Azure/ResourceModules/workflows/Insights:%20PrivateLinkScopes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.privatelinkscopes.yml) |
+| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) | [!['NetApp: NetAppAccounts'](https://github.com/Azure/ResourceModules/workflows/NetApp:%20NetAppAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.netapp.netappaccounts.yml) |
+| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) | [!['Security: AzureSecurityCenter'](https://github.com/Azure/ResourceModules/workflows/Security:%20AzureSecurityCenter/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.security.azuresecuritycenter.yml) |
+| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) | [!['Synapse: PrivateLinkHubs'](https://github.com/Azure/ResourceModules/workflows/Synapse:%20PrivateLinkHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.synapse.privatelinkhubs.yml) |
+| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) | [!['Network: BastionHosts'](https://github.com/Azure/ResourceModules/workflows/Network:%20BastionHosts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.bastionhosts.yml) |
+| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) | [!['Batch: BatchAccounts'](https://github.com/Azure/ResourceModules/workflows/Batch:%20BatchAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.batch.batchaccounts.yml) |
+| [Budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) | [!['Consumption: Budgets'](https://github.com/Azure/ResourceModules/workflows/Consumption:%20Budgets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.consumption.budgets.yml) |
+| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) | [!['CognitiveServices: Accounts'](https://github.com/Azure/ResourceModules/workflows/CognitiveServices:%20Accounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.cognitiveservices.accounts.yml) |
+| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) | [!['Compute: Disks'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Disks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.disks.yml) |
+| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) | [!['ContainerInstance: ContainerGroups'](https://github.com/Azure/ResourceModules/workflows/ContainerInstance:%20ContainerGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerinstance.containergroups.yml) |
+| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) | [!['ContainerRegistry: Registries'](https://github.com/Azure/ResourceModules/workflows/ContainerRegistry:%20Registries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerregistry.registries.yml) |
+| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) | [!['DataFactory: Factories'](https://github.com/Azure/ResourceModules/workflows/DataFactory:%20Factories/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.datafactory.factories.yml) |
+| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) | [!['Network: DdosProtectionPlans'](https://github.com/Azure/ResourceModules/workflows/Network:%20DdosProtectionPlans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ddosprotectionplans.yml) |
+| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) | [!['Resources: DeploymentScripts'](https://github.com/Azure/ResourceModules/workflows/Resources:%20DeploymentScripts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.deploymentscripts.yml) |
+| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) | [!['Compute: DiskEncryptionSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20DiskEncryptionSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.diskencryptionsets.yml) |
+| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) | [!['DocumentDB: DatabaseAccounts'](https://github.com/Azure/ResourceModules/workflows/DocumentDB:%20DatabaseAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.documentdb.databaseaccounts.yml) |
+| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) | [!['EventGrid: System Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20System%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.systemtopics.yml) |
+| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) | [!['EventGrid: Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.topics.yml) |
+| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) | [!['EventHub: Namespaces'](https://github.com/Azure/ResourceModules/workflows/EventHub:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventhub.namespaces.yml) |
+| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) | [!['Network: ExpressRouteCircuits'](https://github.com/Azure/ResourceModules/workflows/Network:%20ExpressRouteCircuits/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.expressroutecircuits.yml) |
+| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) | [!['Network: FirewallPolicies'](https://github.com/Azure/ResourceModules/workflows/Network:%20FirewallPolicies/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.firewallpolicies.yml) |
+| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) | [!['Network: Frontdoors'](https://github.com/Azure/ResourceModules/workflows/Network:%20Frontdoors/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.frontdoors.yml) |
+| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) | [!['VirtualMachineImages: ImageTemplates'](https://github.com/Azure/ResourceModules/workflows/VirtualMachineImages:%20ImageTemplates/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.virtualmachineimages.imagetemplates.yml) |
+| [Images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) | [!['Compute: Images'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Images/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.images.yml) |
+| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) | [!['Network: IpGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20IpGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ipgroups.yml) |
+| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) | [!['KeyVault: Vaults'](https://github.com/Azure/ResourceModules/workflows/KeyVault:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.keyvault.vaults.yml) |
+| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) | [!['KubernetesConfiguration: Extensions'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20Extensions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.extensions.yml) |
+| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) | [!['KubernetesConfiguration: FluxConfigurations'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20FluxConfigurations/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml) |
+| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) | [!['Network: LoadBalancers'](https://github.com/Azure/ResourceModules/workflows/Network:%20LoadBalancers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.loadbalancers.yml) |
+| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) | [!['Network: LocalNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20LocalNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.localnetworkgateways.yml) |
+| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) | [!['OperationalInsights: Workspaces'](https://github.com/Azure/ResourceModules/workflows/OperationalInsights:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationalinsights.workspaces.yml) |
+| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) | [!['Logic: Workflows'](https://github.com/Azure/ResourceModules/workflows/Logic:%20Workflows/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.logic.workflows.yml) |
+| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) | [!['MachineLearningServices: Workspaces'](https://github.com/Azure/ResourceModules/workflows/MachineLearningServices:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.machinelearningservices.workspaces.yml) |
+| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) | [!['Management: ManagementGroups'](https://github.com/Azure/ResourceModules/workflows/Management:%20ManagementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.management.managementgroups.yml) |
+| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) | [!['Insights: MetricAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20MetricAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.metricalerts.yml) |
+| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) | [!['Network: NatGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20NatGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.natgateways.yml) |
+| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) | [!['Network: ApplicationGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationgateways.yml) |
+| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) | [!['Network: NetworkInterfaces'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkInterfaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkinterfaces.yml) |
+| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) | [!['Network: NetworkSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networksecuritygroups.yml) |
+| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) | [!['Network: NetworkWatchers'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkWatchers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkwatchers.yml) |
+| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) | [!['Authorization: PolicyAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyassignments.yml) |
+| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) | [!['Authorization: PolicyDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policydefinitions.yml) |
+| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) | [!['Authorization: PolicyExemptions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyExemptions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyexemptions.yml) |
+| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) | [!['Authorization: PolicySetDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicySetDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policysetdefinitions.yml) |
+| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) | [!['Network: PrivateDnsZones'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateDnsZones/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privatednszones.yml) |
+| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) | [!['Network: PrivateEndpoints'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateEndpoints/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privateendpoints.yml) |
+| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) | [!['Compute: ProximityPlacementGroups'](https://github.com/Azure/ResourceModules/workflows/Compute:%20ProximityPlacementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.proximityplacementgroups.yml) |
+| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) | [!['Network: PublicIpAddresses'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpAddresses/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipaddresses.yml) |
+| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) | [!['Network: PublicIpPrefixes'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpPrefixes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipprefixes.yml) |
+| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) | [!['RecoveryServices: Vaults'](https://github.com/Azure/ResourceModules/workflows/RecoveryServices:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.recoveryservices.vaults.yml) |
+| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) | [!['ManagedServices: RegistrationDefinitions'](https://github.com/Azure/ResourceModules/workflows/ManagedServices:%20RegistrationDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedservices.registrationdefinitions.yml) |
+| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) | [!['Resources: ResourceGroups'](https://github.com/Azure/ResourceModules/workflows/Resources:%20ResourceGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.resourcegroups.yml) |
+| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) | [!['Resources: Tags'](https://github.com/Azure/ResourceModules/workflows/Resources:%20Tags/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.tags.yml) |
+| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) | [!['Authorization: RoleAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roleassignments.yml) |
+| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) | [!['Authorization: RoleDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roledefinitions.yml) |
+| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) | [!['Network: RouteTables'](https://github.com/Azure/ResourceModules/workflows/Network:%20RouteTables/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.routetables.yml) |
+| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) | [!['Insights: ScheduledQueryRules'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ScheduledQueryRules/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.scheduledqueryrules.yml) |
+| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) | [!['ServiceBus: Namespaces'](https://github.com/Azure/ResourceModules/workflows/ServiceBus:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicebus.namespaces.yml) |
+| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) | [!['Service Fabric: Clusters'](https://github.com/Azure/ResourceModules/workflows/Service%20Fabric:%20Clusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicefabric.clusters.yml) |
+| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) | [!['Sql: ManagedInstances'](https://github.com/Azure/ResourceModules/workflows/Sql:%20ManagedInstances/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.managedinstances.yml) |
+| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) | [!['Sql: Servers'](https://github.com/Azure/ResourceModules/workflows/Sql:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.servers.yml) |
+| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) | [!['Web: StaticSites'](https://github.com/Azure/ResourceModules/workflows/Web:%20StaticSites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.staticsites.yml) |
+| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) | [!['Storage: StorageAccounts'](https://github.com/Azure/ResourceModules/workflows/Storage:%20StorageAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.storage.storageaccounts.yml) |
+| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) | [!['Network: TrafficManagerProfiles'](https://github.com/Azure/ResourceModules/workflows/Network:%20TrafficManagerProfiles/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.trafficmanagerprofiles.yml) |
+| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) | [!['ManagedIdentity: UserAssignedIdentities'](https://github.com/Azure/ResourceModules/workflows/ManagedIdentity:%20UserAssignedIdentities/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedidentity.userassignedidentities.yml) |
+| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) | [!['Network: VirtualHubs'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualhubs.yml) |
+| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) | [!['Compute: VirtualMachineScaleSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachineScaleSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachinescalesets.yml) |
+| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) | [!['Compute: VirtualMachines'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachines/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachines.yml) |
+| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) | [!['Network: Connections'](https://github.com/Azure/ResourceModules/workflows/Network:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.connections.yml) |
+| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) | [!['Network: VirtualNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworkgateways.yml) |
+| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) | [!['Network: VirtualNetworks'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworks.yml) |
+| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) | [!['Network: VirtualWans'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualWans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualwans.yml) |
+| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) | [!['Network: VPNGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPNGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpngateways.yml) |
+| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) | [!['Network: VPN Sites'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPN%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpnsites.yml) |
+| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) | [!['Web: Sites'](https://github.com/Azure/ResourceModules/workflows/Web:%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.sites.yml) |
 
 ## Tooling
 
diff --git a/arm/README.md b/arm/README.md
deleted file mode 100644
index fd8a96cd63..0000000000
--- a/arm/README.md
+++ /dev/null
@@ -1,104 +0,0 @@
-In this section you can find useful information regarding the Modules that are contained in this repository.
-
-## Available Resource Modules
-
-| Name | Provider namespace | Resource Type |
-| - | - | - |
-| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) | `MS.AAD` | [DomainServices](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) |
-| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) | `MS.AnalysisServices` | [servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) |
-| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) | `MS.ApiManagement` | [service](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) |
-| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) | `MS.AppConfiguration` | [configurationStores](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) |
-| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) | `MS.Authorization` | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) |
-| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) |  | [policyDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) |
-| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) |  | [policyExemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) |
-| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) |  | [policySetDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) |
-| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) |  | [roleAssignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) |
-| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) |  | [roleDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) |
-| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) | `MS.Automation` | [automationAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) |
-| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) | `MS.Batch` | [batchAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) |
-| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) | `MS.CognitiveServices` | [accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) |
-| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) | `MS.Compute` | [availabilitySets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) |
-| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) |  | [diskEncryptionSets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) |
-| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) |  | [disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) |
-| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) |  | [galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) |
-| [Images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) |  | [images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) |
-| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) |  | [proximityPlacementGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) |
-| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) |  | [virtualMachines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) |
-| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) |  | [virtualMachineScaleSets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) |
-| [Budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) | `MS.Consumption` | [budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) |
-| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) | `MS.ContainerInstance` | [containerGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) |
-| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) | `MS.ContainerRegistry` | [registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) |
-| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) | `MS.ContainerService` | [managedClusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) |
-| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) | `MS.Databricks` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) |
-| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) | `MS.DataFactory` | [factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) |
-| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) | `MS.DesktopVirtualization` | [applicationgroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) |
-| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) |  | [hostpools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) |
-| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) |  | [scalingplans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) |
-| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) |  | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) |
-| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) | `MS.DocumentDB` | [databaseAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) |
-| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) | `MS.EventGrid` | [systemTopics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) |
-| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) |  | [topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) |
-| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) | `MS.EventHub` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) |
-| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) | `MS.HealthBot` | [healthBots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) |
-| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) | `MS.Insights` | [actionGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) |
-| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) |  | [activityLogAlerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) |
-| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) |  | [components](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) |
-| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) |  | [diagnosticSettings](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) |
-| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) |  | [metricAlerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) |
-| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) |  | [privateLinkScopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) |
-| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) |  | [scheduledQueryRules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) |
-| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) | `MS.KeyVault` | [vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) |
-| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) | `MS.KubernetesConfiguration` | [extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) |
-| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) |  | [fluxConfigurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) |
-| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) | `MS.Logic` | [workflows](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) |
-| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) | `MS.achineLearningServices` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) |
-| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) | `MS.anagedIdentity` | [userAssignedIdentities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) |
-| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) | `MS.anagedServices` | [registrationDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) |
-| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) | `MS.anagement` | [managementGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) |
-| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) | `MS.NetApp` | [netAppAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) |
-| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) | `MS.Network` | [applicationGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) |
-| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) |  | [applicationSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) |
-| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) |  | [azureFirewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) |
-| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) |  | [bastionHosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) |
-| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) |  | [connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) |
-| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) |  | [ddosProtectionPlans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) |
-| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) |  | [expressRouteCircuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) |
-| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) |  | [firewallPolicies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) |
-| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) |  | [frontDoors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) |
-| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) |  | [ipGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) |
-| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) |  | [loadBalancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) |
-| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) |  | [localNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) |
-| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) |  | [natGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) |
-| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) |  | [networkInterfaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) |
-| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) |  | [networkSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) |
-| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) |  | [networkWatchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) |
-| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) |  | [privateDnsZones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) |
-| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) |  | [privateEndpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) |
-| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) |  | [publicIPAddresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) |
-| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) |  | [publicIPPrefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) |
-| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) |  | [routeTables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) |
-| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) |  | [trafficmanagerprofiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) |
-| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) |  | [virtualHubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) |
-| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) |  | [virtualNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) |
-| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) |  | [virtualNetworks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) |
-| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) |  | [virtualWans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) |
-| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) |  | [vpnGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) |
-| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) |  | [vpnSites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) |
-| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) | `MS.OperationalInsights` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) |
-| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) | `MS.RecoveryServices` | [vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) |
-| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) | `MS.Resources` | [deploymentScripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) |
-| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) |  | [resourceGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) |
-| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) |  | [tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) |
-| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) | `MS.Security` | [azureSecurityCenter](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) |
-| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) | `MS.ServiceBus` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) |
-| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) | `MS.ServiceFabric` | [clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) |
-| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) | `MS.Sql` | [managedInstances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) |
-| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) |  | [servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) |
-| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) | `MS.Storage` | [storageAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) |
-| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) | `MS.Synapse` | [privateLinkHubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) |
-| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) | `MS.VirtualMachineImages` | [imageTemplates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) |
-| [API Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) | `MS.Web` | [connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) |
-| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) |  | [hostingEnvironments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) |
-| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) |  | [serverfarms](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) |
-| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) |  | [sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) |
-| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) |  | [staticSites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) |
diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep
index e9139f12a1..eab4087e91 100644
--- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep
+++ b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep
@@ -291,7 +291,7 @@ var builtInRoleNames = {
   'Azure Maps Contributor': '/providers/Microsoft.Authorization/roleDefinitions/dba33070-676a-4fb0-87fa-064dc56ff7fb'
 }
 
-module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) {
+module roleAssignments_mg '../../../../modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) {
   name: 'roleAssignments_mg-${guid(deployment().name, location, principalId)}'
   scope: managementGroup(managementGroupId)
   params: {
@@ -301,7 +301,7 @@ module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignmen
   }
 }]
 
-module roleAssignments_sub '../../../../arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(subscriptionId) && empty(resourceGroupName)) {
+module roleAssignments_sub '../../../../modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(subscriptionId) && empty(resourceGroupName)) {
   name: 'roleAssignments_sub-${guid(deployment().name, location, principalId)}'
   scope: subscription(subscriptionId)
   params: {
@@ -311,7 +311,7 @@ module roleAssignments_sub '../../../../arm/Microsoft.Authorization/roleAssignme
   }
 }]
 
-module roleAssignments_rg '../../../../arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) {
+module roleAssignments_rg '../../../../modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) {
   name: 'roleAssignments_rg-${guid(deployment().name, location, principalId)}'
   scope: resourceGroup(subscriptionId, resourceGroupName)
   params: {
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep b/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
index 5d87b099e5..7fe6896f2c 100644
--- a/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
+++ b/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
@@ -303,7 +303,7 @@ var vmNamesToApply = !empty(vmNames) ? vmNames : vmGeneratedNames
 
 var enableChildTelemetry = false
 
-module virtualMachine '../../../arm/Microsoft.Compute/virtualMachines/deploy.bicep' = [for (vmName, index) in vmNamesToApply: {
+module virtualMachine '../../../modules/Microsoft.Compute/virtualMachines/deploy.bicep' = [for (vmName, index) in vmNamesToApply: {
   name: '${deployment().name}-vm-${index}'
   params: {
     name: vmName
diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
index 80971b71eb..353f473ba7 100644
--- a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
+++ b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
@@ -19,7 +19,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
   }
 }
 
-module virtualNetworkPeering '../../../../arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep' = [for peeringConfiguration in peeringConfigurations: {
+module virtualNetworkPeering '../../../../modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep' = [for peeringConfiguration in peeringConfigurations: {
   name: 'virtualNetworkPeering-${last(split(peeringConfiguration.remoteVirtualNetworkId, '/'))}'
   params: {
     name: contains(peeringConfiguration, 'peeringName') ? '${peeringConfiguration.peeringName}' : '${localVnetName}-${last(split(peeringConfiguration.remoteVirtualNetworkId, '/'))}'
diff --git a/docs/wiki/Getting started - Get module cross-references.md b/docs/wiki/Getting started - Get module cross-references.md
index 01a521d98b..90fe83e917 100644
--- a/docs/wiki/Getting started - Get module cross-references.md	
+++ b/docs/wiki/Getting started - Get module cross-references.md	
@@ -31,7 +31,7 @@ For details on how to use the function please refer to the script's local docume
 ## Example output
 
 ```PowerShell
-VERBOSE: The modules in path [ResourceModules\arm] have the following local folder dependencies:
+VERBOSE: The modules in path [ResourceModules\modules] have the following local folder dependencies:
 VERBOSE:
 VERBOSE: Resource: Microsoft.ApiManagement/service
 VERBOSE: - Microsoft.ApiManagement/authorizationServers
diff --git a/docs/wiki/Getting started - Scenario 1 Onboard module library and CI environment.md b/docs/wiki/Getting started - Scenario 1 Onboard module library and CI environment.md
index ddc0c77038..60cb381934 100644
--- a/docs/wiki/Getting started - Scenario 1 Onboard module library and CI environment.md	
+++ b/docs/wiki/Getting started - Scenario 1 Onboard module library and CI environment.md	
@@ -367,16 +367,16 @@ For this reason, make sure to update the references in the following modules onc
 
 | File | Parameter | Notes |
 | - | - | - |
-| `arm\Microsoft.Compute\diskEncryptionSets\.parameters\parameters.json` |`keyUrl.value` | |
-| `arm\Microsoft.Compute\virtualMachines\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachines\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachineScaleSets\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachineScaleSets\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Sql\managedInstances\.parameters\parameters.json` | `keys.value.uri` | |
-| `arm\Microsoft.Network\applicationGateways\.parameters\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
+| `modules\Microsoft.Compute\diskEncryptionSets\.parameters\parameters.json` |`keyUrl.value` | |
+| `modules\Microsoft.Compute\virtualMachines\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachines\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Sql\managedInstances\.parameters\parameters.json` | `keys.value.uri` | |
+| `modules\Microsoft.Network\applicationGateways\.parameters\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
 
 </details>
 
diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md
index a2de168827..8d6cc66800 100644
--- a/docs/wiki/Solution creation.md	
+++ b/docs/wiki/Solution creation.md	
@@ -54,8 +54,8 @@ Once you start building a solution using this library you may wonder how best to
 
 - 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 our 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 set parameter ([example](https://github.com/Azure/ResourceModules/blob/main/arm/Microsoft.AnalysisServices/servers/readme.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/arm/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 set module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/arm/Microsoft.AnalysisServices/servers/readme.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust to it 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 set 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 set 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 to it 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
@@ -114,7 +114,7 @@ param subnets array = [
 // =========== //
 
 // Resource Group
-module rg '../arm/Microsoft.Resources/resourceGroups/deploy.bicep' = {
+module rg '../modules/Microsoft.Resources/resourceGroups/deploy.bicep' = {
   name: 'registry-rg'
   params: {
     name: resourceGroupName
@@ -123,7 +123,7 @@ module rg '../arm/Microsoft.Resources/resourceGroups/deploy.bicep' = {
 }
 
 // Network Security Group
-module nsg '../arm/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
+module nsg '../modules/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
   name: 'registry-nsg'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -135,7 +135,7 @@ module nsg '../arm/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
 }
 
 // Virtual Network
-module vnet '../arm/Microsoft.Network/virtualNetworks/deploy.bicep' = {
+module vnet '../modules/Microsoft.Network/virtualNetworks/deploy.bicep' = {
   name: 'registry-vnet'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -433,7 +433,7 @@ jobs:
       - name: 'Deploy resource group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Resources/resourceGroups/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/ResourceGroup/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -444,7 +444,7 @@ jobs:
       - name: 'Deploy network security group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Network/networkSecurityGroups/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Network/networkSecurityGroups/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/NetworkSecurityGroups/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -455,7 +455,7 @@ jobs:
       - name: 'Deploy virtual network A'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Network/virtualNetworks/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Network/virtualNetworks/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/VirtualNetwork/vnet-A.parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/docs/wiki/The CI environment - GitHub ReadMe module table update.md b/docs/wiki/The CI environment - GitHub ReadMe module table update.md
index 72c0a5917f..e79842bb9c 100644
--- a/docs/wiki/The CI environment - GitHub ReadMe module table update.md	
+++ b/docs/wiki/The CI environment - GitHub ReadMe module table update.md	
@@ -1,5 +1,5 @@
 Use this script to update a given ReadMe's module table in its 'Available Resource Modules' section.
-In the platform's pipeline `platform.updateReadMe.yml`, this script is invoked each time anything in the `arm` path changes to keep the table in sync. It updates both the root ReadMe (`/readme.md`) and `arm` folder ReadMe (`/arm/readme.md`) with a different set of required columns
+In the platform's pipeline `platform.updateReadMe.yml`, this script is invoked each time anything in the `modules` path changes to keep the table in sync. It updates both the root ReadMe (`/readme.md`) and `modules` folder ReadMe (`/modules/readme.md`) with a different set of required columns
 
 ---
 
diff --git a/docs/wiki/The CI environment - Pipeline design.md b/docs/wiki/The CI environment - Pipeline design.md
index 6d2a436098..74294833e4 100644
--- a/docs/wiki/The CI environment - Pipeline design.md	
+++ b/docs/wiki/The CI environment - Pipeline design.md	
@@ -268,9 +268,9 @@ In addition to the above resources, the following secrets, keys and certificates
 
 The repository includes two major ReadMe files that should stay in sync with the available modules.
 
-The first can be found in the repository root (`README.md`) and the second in the modules folder (`arm/README.md`).
+The first can be found in the repository root (`README.md`) and the second in the modules folder (`modules/README.md`).
 
-The ReadMe pipeline is triggered each time changes are pushed to the `main` branch and only if a template in the `arm` folder is being altered. The pipeline leverages the script documented in the [GitHub ReadMe module table update](./The%20CI%20environment%20-%20GitHub%20ReadMe%20module%20table%20update) page.
+The ReadMe pipeline is triggered each time changes are pushed to the `main` branch and only if a template in the `modules` folder is being altered. The pipeline leverages the script documented in the [GitHub ReadMe module table update](./The%20CI%20environment%20-%20GitHub%20ReadMe%20module%20table%20update) page.
 
 Once triggered, the pipeline crawls through the library and updates the tables in each corresponding ReadMe file, creating links to the corresponding pipeline runs and updating the list of entries.
 
diff --git a/docs/wiki/The CI environment - Static validation.md b/docs/wiki/The CI environment - Static validation.md
index f5890346ed..efcd8e8a38 100644
--- a/docs/wiki/The CI environment - Static validation.md	
+++ b/docs/wiki/The CI environment - Static validation.md	
@@ -12,7 +12,7 @@ This section provides an overview of the principles the static validation is bui
 
 All module Unit tests are performed with the help of [Pester](https://github.com/pester/Pester) and ensure that our modules are configured correctly, documentation is up to date, and modules don't turn stale.
 
-The following activities are run executing the `arm/.global/global.module.tests.ps1` script.
+The following activities are run executing the `modules/.global/global.module.tests.ps1` script.
 
 - **File & folder tests** validate that the module folder structure is set up in the intended way. e.g.:
   - readme.md file exists
@@ -48,7 +48,7 @@ In this phase, Pester analyzes the API version of each resource type deployed by
 
 In particular, each resource's API version is compared with those currently available on Azure. Accepted are both the latest 5 versions (including preview versions) as well as the latest 5 non-preview versions.
 
-This test also leverages the `arm/.global/global.module.tests.ps1` script.
+This test also leverages the `modules/.global/global.module.tests.ps1` script.
 
 # Verify the static validation of your module locally
 
@@ -64,7 +64,7 @@ $pathToRepository = '<pathToClonedRepo>'
 
 # REQUIRED INPUT FOR TESTING
 $TestModuleLocallyInput = @{
-    templateFilePath              = "$pathToRepository\arm\Microsoft.Authorization\roleDefinitions\deploy.bicep"
+    templateFilePath              = "$pathToRepository\modules\Microsoft.Authorization\roleDefinitions\deploy.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 9c825706db..1403033bd0 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -29,9 +29,9 @@ They can be deployed in different configurations just by changing the input para
 
 # General guidelines
 
-- All resource modules in the 'arm' folder should not allow deployment loops on the top level resource but may optionally allow deployment loops on their child-resources.
+- All resource modules in the 'modules' folder should not allow deployment loops on the top level resource but may optionally allow deployment loops on their child-resources.
   > **Example:** The storage account module allows the deployment of a single storage account with, optionally, multiple blob containers, multiple file shares, multiple queues and/or multiple tables.
-- The 'constructs' folder contains examples of deployment logic built on top of resource modules contained in the 'arm' folder, allowing for example deployment loops on top level resources.
+- The 'constructs' folder contains examples of deployment logic built on top of resource modules contained in the 'modules' folder, allowing for example deployment loops on top level resources.
   > **Example:** The VirtualNetworkPeering construct leverages the VirtualNetworkPeering module to deploy multiple virtual network peerings at once
 - Where the resource type in question supports it, the module should have support for:
   1. **Diagnostic logs** and **metrics** (you can have them sent to any combination of storage account, log analytics and event hub)
@@ -54,7 +54,7 @@ A **CARML module** consists of
 - One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.parameters` sub-folder.
 - A `readme.md` file which describes the module itself.
 
-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 `arm` folder.
+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.
 
 Also, each module should be implemented with all capabilities it and its children support. This includes
 - `Locks`
diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md
index e78cfef2f9..4f60812db0 100644
--- a/docs/wiki/The library - Module usage.md	
+++ b/docs/wiki/The library - Module usage.md	
@@ -34,9 +34,9 @@ $inputObject = @{
   ResourceGroupName     = 'ExampleGroup'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.KeyVault\vault\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.KeyVault\vault\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.KeyVault/vaults/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.KeyVault/vaults/deploy.bicep'
 }
 New-AzResourceGroupDeployment @inputObject
 ```
@@ -58,9 +58,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Resources\resourceGroups\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/deploy.bicep'
 }
 New-AzDeployment @inputObject
 ```
@@ -83,9 +83,9 @@ $inputObject = @{
   Location              = 'EastUS2'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
 }
 New-AzManagementGroupDeployment @inputObject
 ```
@@ -107,9 +107,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Subscription\aliases\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Subscription\aliases\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Subscription/aliases/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/deploy.bicep'
 }
 New-AzTenantDeployment @inputObject
 ```
@@ -134,9 +134,9 @@ $inputObject = @(
   '--resource-group', 'ExampleGroup',
   '--parameters',     '@parameters.json',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep",
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep",
   # Using a remote reference
-  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Storage/storageAccounts/deploy.bicep'
+  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Storage/storageAccounts/deploy.bicep'
 )
 az deployment group create @inputObject
 ```
@@ -158,9 +158,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Resources\resourceGroups\deploy.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/deploy.bicep'
 )
 az deployment sub create @inputObject
 ```
@@ -183,9 +183,9 @@ $inputObject = @(
   '--location',            'EastUS2',
   '--management-group-id', 'myManagementGroup',
   # Using a local reference
-  '--template-file',       "$home\ResourceModules\arm\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
+  '--template-file',       "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
+  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
 )
 az deployment mg create @inputObject
 ```
@@ -207,9 +207,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Subscription\aliases\deploy.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Subscription\aliases\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Subscription/aliases/deploy.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/deploy.bicep'
 )
 az deployment tenant create @inputObject
 ```
diff --git a/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md b/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md
index dd99d01175..a64af835da 100644
--- a/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md	
+++ b/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md	
@@ -2,7 +2,7 @@ In this area, we provide instructions to migrate from CARML version 0.3.1 to ver
 
 # Modules
 ## General import of new modules
-New modules can usually be migrated by adding the content of the release's `arm` folder into your own `arm` folder.
+New modules can usually be migrated by adding the content of the release's `modules` folder into your own `modules` folder.
 
 > **Note:** You should only do this from a branch and carefully compare any changes the platform displays.
 >
@@ -41,7 +41,7 @@ When migrating, you may notice that many of the resource names in the module par
 You can remove these placeholders as you see fit, or migrate them together with the changes explained in the [`General pipeline updates`](#general-pipeline-updates) & [` NamePrefix in settings.json`](#nameprefix-in-settingsjson) sections of this guide.
 
 ## Version file
-A `version.json` file was added to each individual module. Please make sure such a file is added to every module folder in the `arm` folder structure.
+A `version.json` file was added to each individual module. Please make sure such a file is added to every module folder in the `modules` folder structure.
 
 For more information on how versioning is handled see [here](https://github.com/Azure/ResourceModules/wiki/PipelinesDesign#publish).
 
@@ -50,7 +50,7 @@ For the modules you copy over, a `version.json` file will already be available.
 # CI environment
 
 ## General pipeline updates
-General updates can be migrated by essentially copying/replacing any code outside of the `arm` folder (i.e. `.github`/`.azuredevops`/`utilities`/`docs`). If you modified the CI environment in the meantime, make sure to carefully merge any conflicting code. Noteworthy changes include:
+General updates can be migrated by essentially copying/replacing any code outside of the `modules` folder (i.e. `.github`/`.azuredevops`/`utilities`/`docs`). If you modified the CI environment in the meantime, make sure to carefully merge any conflicting code. Noteworthy changes include:
 -	renamed composite actions / templates,
 -	extended placeholder handling,
 -	extended pipeline functionality (e.g., managementgroup-level removal),
diff --git a/arm/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
similarity index 98%
rename from arm/.global/global.module.tests.ps1
rename to modules/.global/global.module.tests.ps1
index 9ed165273e..393fa998ba 100644
--- a/arm/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -33,9 +33,9 @@ Describe 'File/folder tests' -Tag Modules {
         $moduleFolderTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             $moduleFolderTestCases += @{
-                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 moduleFolderPath = $moduleFolderPath
-                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
+                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
             }
         }
 
@@ -99,7 +99,7 @@ Describe 'File/folder tests' -Tag Modules {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             if (Test-Path (Join-Path $moduleFolderPath '.parameters')) {
                 $folderTestCases += @{
-                    moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                    moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                     moduleFolderPath = $moduleFolderPath
                 }
             }
@@ -120,7 +120,7 @@ Describe 'File/folder tests' -Tag Modules {
             if (Test-Path $parameterFolderPath) {
                 foreach ($parameterFile in (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force)) {
                     $parameterFolderFilesTestCases += @{
-                        moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                        moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                         parameterFilePath = $parameterFile.FullName
                     }
                 }
@@ -145,7 +145,7 @@ Describe 'Readme tests' -Tag Readme {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
 
             # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-            $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -166,7 +166,7 @@ Describe 'Readme tests' -Tag Readme {
             }
 
             $readmeFolderTestCases += @{
-                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 moduleFolderPath = $moduleFolderPath
                 templateContent  = $templateContent
                 templateFilePath = $templateFilePath
@@ -469,7 +469,7 @@ Describe 'Deployment template tests' -Tag Template {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
 
             # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-            $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -512,7 +512,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             # Test file setup
             $deploymentFolderTestCases += @{
-                moduleFolderName       = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName       = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 templateContent        = $templateContent
                 templateFilePath       = $templateFilePath
                 parameterFileTestCases = $parameterFileTestCases
@@ -721,7 +721,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             $outputs = $templateContent.outputs
 
-            $primaryResourceType = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/arm/')[1]
+            $primaryResourceType = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/modules/')[1]
             $primaryResourceTypeResource = $templateContent.resources | Where-Object { $_.type -eq $primaryResourceType }
 
             if ($primaryResourceTypeResource.keys -contains 'location' -and $primaryResourceTypeResource.location -ne 'global') {
@@ -885,7 +885,7 @@ Describe 'Deployment template tests' -Tag Template {
                             tokenSettings     = $Settings.parameterFileTokens
                             tokenName         = $token
                             tokenValue        = $enforcedTokenList[$token]
-                            moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                            moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                         }
                     }
                 }
@@ -918,10 +918,10 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
     $ApiVersions = Get-AzResourceProvider -ListAvailable
     foreach ($moduleFolderPath in $moduleFolderPathsFiltered) {
 
-        $moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
 
         # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-        $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+        $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
         if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
             if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                 $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
diff --git a/arm/.global/shared/helper.psm1 b/modules/.global/shared/helper.psm1
similarity index 100%
rename from arm/.global/shared/helper.psm1
rename to modules/.global/shared/helper.psm1
diff --git a/arm/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep b/modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
rename to modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.AAD/DomainServices/.parameters/parameters.json b/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/.parameters/parameters.json
rename to modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
diff --git a/arm/Microsoft.AAD/DomainServices/deploy.bicep b/modules/Microsoft.AAD/DomainServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/deploy.bicep
rename to modules/Microsoft.AAD/DomainServices/deploy.bicep
diff --git a/arm/Microsoft.AAD/DomainServices/readme.md b/modules/Microsoft.AAD/DomainServices/readme.md
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/readme.md
rename to modules/Microsoft.AAD/DomainServices/readme.md
diff --git a/arm/Microsoft.AAD/DomainServices/version.json b/modules/Microsoft.AAD/DomainServices/version.json
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/version.json
rename to modules/Microsoft.AAD/DomainServices/version.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep b/modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
rename to modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/modules/Microsoft.AnalysisServices/servers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/deploy.bicep
rename to modules/Microsoft.AnalysisServices/servers/deploy.bicep
diff --git a/arm/Microsoft.AnalysisServices/servers/readme.md b/modules/Microsoft.AnalysisServices/servers/readme.md
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/readme.md
rename to modules/Microsoft.AnalysisServices/servers/readme.md
diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/modules/Microsoft.AnalysisServices/servers/version.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/version.json
rename to modules/Microsoft.AnalysisServices/servers/version.json
diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep b/modules/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
rename to modules/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep b/modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/min.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/min.parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep b/modules/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json b/modules/Microsoft.ApiManagement/service/apiVersionSets/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/version.json
diff --git a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep b/modules/Microsoft.ApiManagement/service/apis/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apis/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep b/modules/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md b/modules/Microsoft.ApiManagement/service/apis/policies/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/readme.md
rename to modules/Microsoft.ApiManagement/service/apis/policies/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/version.json b/modules/Microsoft.ApiManagement/service/apis/policies/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/version.json
rename to modules/Microsoft.ApiManagement/service/apis/policies/version.json
diff --git a/arm/Microsoft.ApiManagement/service/apis/readme.md b/modules/Microsoft.ApiManagement/service/apis/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/readme.md
rename to modules/Microsoft.ApiManagement/service/apis/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apis/version.json b/modules/Microsoft.ApiManagement/service/apis/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/version.json
rename to modules/Microsoft.ApiManagement/service/apis/version.json
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep b/modules/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md b/modules/Microsoft.ApiManagement/service/authorizationServers/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/readme.md
rename to modules/Microsoft.ApiManagement/service/authorizationServers/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json b/modules/Microsoft.ApiManagement/service/authorizationServers/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/version.json
rename to modules/Microsoft.ApiManagement/service/authorizationServers/version.json
diff --git a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep b/modules/Microsoft.ApiManagement/service/backends/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/backends/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/backends/readme.md b/modules/Microsoft.ApiManagement/service/backends/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/readme.md
rename to modules/Microsoft.ApiManagement/service/backends/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/backends/version.json b/modules/Microsoft.ApiManagement/service/backends/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/version.json
rename to modules/Microsoft.ApiManagement/service/backends/version.json
diff --git a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep b/modules/Microsoft.ApiManagement/service/caches/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/caches/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/caches/readme.md b/modules/Microsoft.ApiManagement/service/caches/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/readme.md
rename to modules/Microsoft.ApiManagement/service/caches/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/caches/version.json b/modules/Microsoft.ApiManagement/service/caches/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/version.json
rename to modules/Microsoft.ApiManagement/service/caches/version.json
diff --git a/arm/Microsoft.ApiManagement/service/deploy.bicep b/modules/Microsoft.ApiManagement/service/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep b/modules/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md b/modules/Microsoft.ApiManagement/service/identityProviders/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/readme.md
rename to modules/Microsoft.ApiManagement/service/identityProviders/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/version.json b/modules/Microsoft.ApiManagement/service/identityProviders/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/version.json
rename to modules/Microsoft.ApiManagement/service/identityProviders/version.json
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep b/modules/Microsoft.ApiManagement/service/namedValues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/namedValues/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/readme.md b/modules/Microsoft.ApiManagement/service/namedValues/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/readme.md
rename to modules/Microsoft.ApiManagement/service/namedValues/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/version.json b/modules/Microsoft.ApiManagement/service/namedValues/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/version.json
rename to modules/Microsoft.ApiManagement/service/namedValues/version.json
diff --git a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep b/modules/Microsoft.ApiManagement/service/policies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/policies/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/policies/readme.md b/modules/Microsoft.ApiManagement/service/policies/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/readme.md
rename to modules/Microsoft.ApiManagement/service/policies/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/policies/version.json b/modules/Microsoft.ApiManagement/service/policies/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/version.json
rename to modules/Microsoft.ApiManagement/service/policies/version.json
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep b/modules/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md b/modules/Microsoft.ApiManagement/service/portalsettings/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/readme.md
rename to modules/Microsoft.ApiManagement/service/portalsettings/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/version.json b/modules/Microsoft.ApiManagement/service/portalsettings/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/version.json
rename to modules/Microsoft.ApiManagement/service/portalsettings/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/apis/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/apis/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/readme.md b/modules/Microsoft.ApiManagement/service/products/apis/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/readme.md
rename to modules/Microsoft.ApiManagement/service/products/apis/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/version.json b/modules/Microsoft.ApiManagement/service/products/apis/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/version.json
rename to modules/Microsoft.ApiManagement/service/products/apis/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/groups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/groups/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/readme.md b/modules/Microsoft.ApiManagement/service/products/groups/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/readme.md
rename to modules/Microsoft.ApiManagement/service/products/groups/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/version.json b/modules/Microsoft.ApiManagement/service/products/groups/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/version.json
rename to modules/Microsoft.ApiManagement/service/products/groups/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/readme.md b/modules/Microsoft.ApiManagement/service/products/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/readme.md
rename to modules/Microsoft.ApiManagement/service/products/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/version.json b/modules/Microsoft.ApiManagement/service/products/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/version.json
rename to modules/Microsoft.ApiManagement/service/products/version.json
diff --git a/arm/Microsoft.ApiManagement/service/readme.md b/modules/Microsoft.ApiManagement/service/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/readme.md
rename to modules/Microsoft.ApiManagement/service/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep b/modules/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md b/modules/Microsoft.ApiManagement/service/subscriptions/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/readme.md
rename to modules/Microsoft.ApiManagement/service/subscriptions/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/version.json b/modules/Microsoft.ApiManagement/service/subscriptions/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/version.json
rename to modules/Microsoft.ApiManagement/service/subscriptions/version.json
diff --git a/arm/Microsoft.ApiManagement/service/version.json b/modules/Microsoft.ApiManagement/service/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/version.json
rename to modules/Microsoft.ApiManagement/service/version.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/deploy.bicep b/modules/Microsoft.AppConfiguration/configurationStores/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/deploy.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/deploy.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/readme.md
rename to modules/Microsoft.AppConfiguration/configurationStores/readme.md
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/version.json b/modules/Microsoft.AppConfiguration/configurationStores/version.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/version.json
rename to modules/Microsoft.AppConfiguration/configurationStores/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/readme.md b/modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/version.json b/modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/readme.md b/modules/Microsoft.Authorization/policyAssignments/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyAssignments/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/readme.md
index 02016376b4..7435e31142 100644
--- a/arm/Microsoft.Authorization/policyAssignments/readme.md
+++ b/modules/Microsoft.Authorization/policyAssignments/readme.md
@@ -154,7 +154,7 @@ module policyassignment 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.aut
 ```
 **Local Path Reference**
 ```bicep
-module policyassignment 'yourpath/arm/Microsoft.Authorization.policyAssignments/subscription/deploy.bicep' = {}
+module policyassignment 'yourpath/modules/Microsoft.Authorization.policyAssignments/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/version.json b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/readme.md b/modules/Microsoft.Authorization/policyAssignments/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/version.json b/modules/Microsoft.Authorization/policyAssignments/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/version.json
rename to modules/Microsoft.Authorization/policyAssignments/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/version.json b/modules/Microsoft.Authorization/policyAssignments/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/version.json
rename to modules/Microsoft.Authorization/policyAssignments/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/readme.md b/modules/Microsoft.Authorization/policyDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyDefinitions/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/readme.md
index 7c39d19ba6..a08e72fc08 100644
--- a/arm/Microsoft.Authorization/policyDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/policyDefinitions/readme.md
@@ -113,7 +113,7 @@ module policydefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.aut
 ```
 **Local Path Reference**
 ```bicep
-module policydefinition 'yourpath/arm/Microsoft.Authorization.policyDefinitions/subscription/deploy.bicep' = {}
+module policydefinition 'yourpath/modules/Microsoft.Authorization.policyDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/version.json b/modules/Microsoft.Authorization/policyDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/version.json b/modules/Microsoft.Authorization/policyDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/readme.md b/modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/version.json b/modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/readme.md b/modules/Microsoft.Authorization/policyExemptions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyExemptions/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/readme.md
index f5db0ca33c..1ecf14c0a7 100644
--- a/arm/Microsoft.Authorization/policyExemptions/readme.md
+++ b/modules/Microsoft.Authorization/policyExemptions/readme.md
@@ -132,7 +132,7 @@ module policyexemption 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.auth
 ```
 **Local Path Reference**
 ```bicep
-module policyexemption 'yourpath/arm/Microsoft.Authorization.policyExemptions/subscription/deploy.bicep' = {}
+module policyexemption 'yourpath/modules/Microsoft.Authorization.policyExemptions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/version.json b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/readme.md b/modules/Microsoft.Authorization/policyExemptions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/version.json b/modules/Microsoft.Authorization/policyExemptions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/version.json
rename to modules/Microsoft.Authorization/policyExemptions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/version.json b/modules/Microsoft.Authorization/policyExemptions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/version.json
rename to modules/Microsoft.Authorization/policyExemptions/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policySetDefinitions/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/readme.md
index c5bbda9874..b87a2c6531 100644
--- a/arm/Microsoft.Authorization/policySetDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/policySetDefinitions/readme.md
@@ -116,7 +116,7 @@ module policysetdefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.
 ```
 **Local Path Reference**
 ```bicep
-module policysetdefinition 'yourpath/arm/Microsoft.Authorization.policySetDefinitions/subscription/deploy.bicep' = {}
+module policysetdefinition 'yourpath/modules/Microsoft.Authorization.policySetDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/version.json b/modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/version.json b/modules/Microsoft.Authorization/policySetDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/readme.md b/modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/version.json b/modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/version.json
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/readme.md b/modules/Microsoft.Authorization/roleAssignments/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/roleAssignments/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/readme.md
index 05a8353cb7..8c6d16f9fc 100644
--- a/arm/Microsoft.Authorization/roleAssignments/readme.md
+++ b/modules/Microsoft.Authorization/roleAssignments/readme.md
@@ -150,7 +150,7 @@ module roleassignment 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.autho
 ```
 **Local Path Reference**
 ```bicep
-module roleassignment 'yourpath/arm/Microsoft.Authorization.roleAssignments/subscription/deploy.bicep' = {}
+module roleassignment 'yourpath/modules/Microsoft.Authorization.roleAssignments/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/version.json b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/readme.md b/modules/Microsoft.Authorization/roleAssignments/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/version.json b/modules/Microsoft.Authorization/roleAssignments/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/version.json
rename to modules/Microsoft.Authorization/roleAssignments/subscription/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/version.json b/modules/Microsoft.Authorization/roleAssignments/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/version.json
rename to modules/Microsoft.Authorization/roleAssignments/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/readme.md b/modules/Microsoft.Authorization/roleDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/roleDefinitions/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/readme.md
index d2f9eb0abb..0d8e2897b4 100644
--- a/arm/Microsoft.Authorization/roleDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/roleDefinitions/readme.md
@@ -150,7 +150,7 @@ module roledefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.autho
 ```
 **Local Path Reference**
 ```bicep
-module roledefinition 'yourpath/arm/Microsoft.Authorization.roleDefinitions/subscription/deploy.bicep' = {}
+module roledefinition 'yourpath/modules/Microsoft.Authorization.roleDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/version.json b/modules/Microsoft.Authorization/roleDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/version.json b/modules/Microsoft.Authorization/roleDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_solution.bicep b/modules/Microsoft.Automation/automationAccounts/.bicep/nested_solution.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.bicep/nested_solution.bicep
rename to modules/Microsoft.Automation/automationAccounts/.bicep/nested_solution.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md b/modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/readme.md b/modules/Microsoft.Automation/automationAccounts/modules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/modules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/version.json b/modules/Microsoft.Automation/automationAccounts/modules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/version.json
rename to modules/Microsoft.Automation/automationAccounts/modules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/modules/Microsoft.Automation/automationAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/readme.md
rename to modules/Microsoft.Automation/automationAccounts/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md b/modules/Microsoft.Automation/automationAccounts/runbooks/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/readme.md
rename to modules/Microsoft.Automation/automationAccounts/runbooks/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json b/modules/Microsoft.Automation/automationAccounts/runbooks/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/version.json
rename to modules/Microsoft.Automation/automationAccounts/runbooks/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/readme.md b/modules/Microsoft.Automation/automationAccounts/schedules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/schedules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/version.json b/modules/Microsoft.Automation/automationAccounts/schedules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/version.json
rename to modules/Microsoft.Automation/automationAccounts/schedules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/variables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/variables/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/readme.md b/modules/Microsoft.Automation/automationAccounts/variables/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/readme.md
rename to modules/Microsoft.Automation/automationAccounts/variables/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/version.json b/modules/Microsoft.Automation/automationAccounts/variables/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/version.json
rename to modules/Microsoft.Automation/automationAccounts/variables/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/version.json b/modules/Microsoft.Automation/automationAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/version.json
rename to modules/Microsoft.Automation/automationAccounts/version.json
diff --git a/arm/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Batch/batchAccounts/.parameters/parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/.parameters/parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Batch/batchAccounts/deploy.bicep b/modules/Microsoft.Batch/batchAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/deploy.bicep
rename to modules/Microsoft.Batch/batchAccounts/deploy.bicep
diff --git a/arm/Microsoft.Batch/batchAccounts/readme.md b/modules/Microsoft.Batch/batchAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/readme.md
rename to modules/Microsoft.Batch/batchAccounts/readme.md
diff --git a/arm/Microsoft.Batch/batchAccounts/version.json b/modules/Microsoft.Batch/batchAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/version.json
rename to modules/Microsoft.Batch/batchAccounts/version.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep b/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/deploy.bicep b/modules/Microsoft.CognitiveServices/accounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/deploy.bicep
rename to modules/Microsoft.CognitiveServices/accounts/deploy.bicep
diff --git a/arm/Microsoft.CognitiveServices/accounts/readme.md b/modules/Microsoft.CognitiveServices/accounts/readme.md
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/readme.md
rename to modules/Microsoft.CognitiveServices/accounts/readme.md
diff --git a/arm/Microsoft.CognitiveServices/accounts/version.json b/modules/Microsoft.CognitiveServices/accounts/version.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/version.json
rename to modules/Microsoft.CognitiveServices/accounts/version.json
diff --git a/arm/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Compute/availabilitySets/.parameters/parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.parameters/parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/availabilitySets/deploy.bicep b/modules/Microsoft.Compute/availabilitySets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/deploy.bicep
rename to modules/Microsoft.Compute/availabilitySets/deploy.bicep
diff --git a/arm/Microsoft.Compute/availabilitySets/readme.md b/modules/Microsoft.Compute/availabilitySets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/readme.md
rename to modules/Microsoft.Compute/availabilitySets/readme.md
diff --git a/arm/Microsoft.Compute/availabilitySets/version.json b/modules/Microsoft.Compute/availabilitySets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/version.json
rename to modules/Microsoft.Compute/availabilitySets/version.json
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep b/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep
rename to modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json b/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
rename to modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep b/modules/Microsoft.Compute/diskEncryptionSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep
rename to modules/Microsoft.Compute/diskEncryptionSets/deploy.bicep
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/readme.md b/modules/Microsoft.Compute/diskEncryptionSets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/readme.md
rename to modules/Microsoft.Compute/diskEncryptionSets/readme.md
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/version.json b/modules/Microsoft.Compute/diskEncryptionSets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/version.json
rename to modules/Microsoft.Compute/diskEncryptionSets/version.json
diff --git a/arm/Microsoft.Compute/disks/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/disks/.parameters/image.parameters.json b/modules/Microsoft.Compute/disks/.parameters/image.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/image.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/image.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/import.parameters.json b/modules/Microsoft.Compute/disks/.parameters/import.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/import.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/import.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/min.parameters.json b/modules/Microsoft.Compute/disks/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/parameters.json b/modules/Microsoft.Compute/disks/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/disks/deploy.bicep b/modules/Microsoft.Compute/disks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/disks/deploy.bicep
rename to modules/Microsoft.Compute/disks/deploy.bicep
diff --git a/arm/Microsoft.Compute/disks/readme.md b/modules/Microsoft.Compute/disks/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/disks/readme.md
rename to modules/Microsoft.Compute/disks/readme.md
diff --git a/arm/Microsoft.Compute/disks/version.json b/modules/Microsoft.Compute/disks/version.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/version.json
rename to modules/Microsoft.Compute/disks/version.json
diff --git a/arm/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/galleries/.parameters/images.parameters.json b/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.parameters/images.parameters.json
rename to modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
diff --git a/arm/Microsoft.Compute/galleries/.parameters/parameters.json b/modules/Microsoft.Compute/galleries/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.parameters/parameters.json
rename to modules/Microsoft.Compute/galleries/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/galleries/deploy.bicep b/modules/Microsoft.Compute/galleries/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/deploy.bicep
rename to modules/Microsoft.Compute/galleries/deploy.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/deploy.bicep b/modules/Microsoft.Compute/galleries/images/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/deploy.bicep
rename to modules/Microsoft.Compute/galleries/images/deploy.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/readme.md b/modules/Microsoft.Compute/galleries/images/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/readme.md
rename to modules/Microsoft.Compute/galleries/images/readme.md
diff --git a/arm/Microsoft.Compute/galleries/images/version.json b/modules/Microsoft.Compute/galleries/images/version.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/version.json
rename to modules/Microsoft.Compute/galleries/images/version.json
diff --git a/arm/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/galleries/readme.md
rename to modules/Microsoft.Compute/galleries/readme.md
diff --git a/arm/Microsoft.Compute/galleries/version.json b/modules/Microsoft.Compute/galleries/version.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/version.json
rename to modules/Microsoft.Compute/galleries/version.json
diff --git a/arm/Microsoft.Compute/images/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/images/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/images/.parameters/parameters.json b/modules/Microsoft.Compute/images/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/images/.parameters/parameters.json
rename to modules/Microsoft.Compute/images/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/images/deploy.bicep b/modules/Microsoft.Compute/images/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/images/deploy.bicep
rename to modules/Microsoft.Compute/images/deploy.bicep
diff --git a/arm/Microsoft.Compute/images/readme.md b/modules/Microsoft.Compute/images/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/images/readme.md
rename to modules/Microsoft.Compute/images/readme.md
diff --git a/arm/Microsoft.Compute/images/version.json b/modules/Microsoft.Compute/images/version.json
similarity index 100%
rename from arm/Microsoft.Compute/images/version.json
rename to modules/Microsoft.Compute/images/version.json
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json b/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep b/modules/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
rename to modules/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/readme.md b/modules/Microsoft.Compute/proximityPlacementGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/readme.md
rename to modules/Microsoft.Compute/proximityPlacementGroups/readme.md
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/version.json b/modules/Microsoft.Compute/proximityPlacementGroups/version.json
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/version.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/version.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md b/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/readme.md
rename to modules/Microsoft.Compute/virtualMachineScaleSets/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json b/modules/Microsoft.Compute/virtualMachineScaleSets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/version.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/version.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep b/modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
rename to modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/deploy.bicep b/modules/Microsoft.Compute/virtualMachines/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachines/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep b/modules/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/readme.md b/modules/Microsoft.Compute/virtualMachines/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/readme.md
rename to modules/Microsoft.Compute/virtualMachines/extensions/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/version.json b/modules/Microsoft.Compute/virtualMachines/extensions/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/version.json
rename to modules/Microsoft.Compute/virtualMachines/extensions/version.json
diff --git a/arm/Microsoft.Compute/virtualMachines/readme.md b/modules/Microsoft.Compute/virtualMachines/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/readme.md
rename to modules/Microsoft.Compute/virtualMachines/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachines/version.json b/modules/Microsoft.Compute/virtualMachines/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/version.json
rename to modules/Microsoft.Compute/virtualMachines/version.json
diff --git a/arm/Microsoft.Consumption/budgets/.parameters/parameters.json b/modules/Microsoft.Consumption/budgets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/.parameters/parameters.json
rename to modules/Microsoft.Consumption/budgets/.parameters/parameters.json
diff --git a/arm/Microsoft.Consumption/budgets/deploy.bicep b/modules/Microsoft.Consumption/budgets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/deploy.bicep
rename to modules/Microsoft.Consumption/budgets/deploy.bicep
diff --git a/arm/Microsoft.Consumption/budgets/readme.md b/modules/Microsoft.Consumption/budgets/readme.md
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/readme.md
rename to modules/Microsoft.Consumption/budgets/readme.md
diff --git a/arm/Microsoft.Consumption/budgets/version.json b/modules/Microsoft.Consumption/budgets/version.json
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/version.json
rename to modules/Microsoft.Consumption/budgets/version.json
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json b/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
rename to modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep b/modules/Microsoft.ContainerInstance/containerGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep
rename to modules/Microsoft.ContainerInstance/containerGroups/deploy.bicep
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/readme.md b/modules/Microsoft.ContainerInstance/containerGroups/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/readme.md
rename to modules/Microsoft.ContainerInstance/containerGroups/readme.md
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/version.json b/modules/Microsoft.ContainerInstance/containerGroups/version.json
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/version.json
rename to modules/Microsoft.ContainerInstance/containerGroups/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep b/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/.parameters/parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/readme.md b/modules/Microsoft.ContainerRegistry/registries/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/readme.md b/modules/Microsoft.ContainerRegistry/registries/replications/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/replications/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/version.json b/modules/Microsoft.ContainerRegistry/registries/replications/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/version.json
rename to modules/Microsoft.ContainerRegistry/registries/replications/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/version.json b/modules/Microsoft.ContainerRegistry/registries/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/version.json
rename to modules/Microsoft.ContainerRegistry/registries/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/readme.md b/modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/version.json b/modules/Microsoft.ContainerRegistry/registries/webhooks/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/version.json
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/version.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep b/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md b/modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json b/modules/Microsoft.ContainerService/managedClusters/agentPools/version.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/version.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/deploy.bicep
rename to modules/Microsoft.ContainerService/managedClusters/deploy.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/readme.md b/modules/Microsoft.ContainerService/managedClusters/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/readme.md
rename to modules/Microsoft.ContainerService/managedClusters/readme.md
diff --git a/arm/Microsoft.ContainerService/managedClusters/version.json b/modules/Microsoft.ContainerService/managedClusters/version.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/version.json
rename to modules/Microsoft.ContainerService/managedClusters/version.json
diff --git a/arm/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep b/modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DataFactory/factories/.parameters/parameters.json b/modules/Microsoft.DataFactory/factories/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/.parameters/parameters.json
rename to modules/Microsoft.DataFactory/factories/.parameters/parameters.json
diff --git a/arm/Microsoft.DataFactory/factories/deploy.bicep b/modules/Microsoft.DataFactory/factories/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep b/modules/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md b/modules/Microsoft.DataFactory/factories/integrationRuntime/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json b/modules/Microsoft.DataFactory/factories/integrationRuntime/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/version.json
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
diff --git a/arm/Microsoft.DataFactory/factories/readme.md b/modules/Microsoft.DataFactory/factories/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/readme.md
rename to modules/Microsoft.DataFactory/factories/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/version.json b/modules/Microsoft.DataFactory/factories/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/version.json
rename to modules/Microsoft.DataFactory/factories/version.json
diff --git a/arm/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Databricks/workspaces/.parameters/parameters.json b/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/.parameters/parameters.json
rename to modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.Databricks/workspaces/deploy.bicep b/modules/Microsoft.Databricks/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/deploy.bicep
rename to modules/Microsoft.Databricks/workspaces/deploy.bicep
diff --git a/arm/Microsoft.Databricks/workspaces/readme.md b/modules/Microsoft.Databricks/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/readme.md
rename to modules/Microsoft.Databricks/workspaces/readme.md
diff --git a/arm/Microsoft.Databricks/workspaces/version.json b/modules/Microsoft.Databricks/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/version.json
rename to modules/Microsoft.Databricks/workspaces/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/Microsoft.DesktopVirtualization/hostpools/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/readme.md
rename to modules/Microsoft.DesktopVirtualization/hostpools/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/Microsoft.DesktopVirtualization/hostpools/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/version.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/readme.md
rename to modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/Microsoft.DesktopVirtualization/scalingplans/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/version.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/readme.md
rename to modules/Microsoft.DesktopVirtualization/workspaces/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/Microsoft.DesktopVirtualization/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/version.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/version.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep b/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
rename to modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/.parameters/parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/deploy.bicep b/modules/Microsoft.EventGrid/systemTopics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/deploy.bicep
rename to modules/Microsoft.EventGrid/systemTopics/deploy.bicep
diff --git a/arm/Microsoft.EventGrid/systemTopics/readme.md b/modules/Microsoft.EventGrid/systemTopics/readme.md
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/readme.md
rename to modules/Microsoft.EventGrid/systemTopics/readme.md
diff --git a/arm/Microsoft.EventGrid/systemTopics/version.json b/modules/Microsoft.EventGrid/systemTopics/version.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/version.json
rename to modules/Microsoft.EventGrid/systemTopics/version.json
diff --git a/arm/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep b/modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
rename to modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.EventGrid/topics/.parameters/parameters.json b/modules/Microsoft.EventGrid/topics/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/topics/.parameters/parameters.json
diff --git a/arm/Microsoft.EventGrid/topics/deploy.bicep b/modules/Microsoft.EventGrid/topics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/deploy.bicep
rename to modules/Microsoft.EventGrid/topics/deploy.bicep
diff --git a/arm/Microsoft.EventGrid/topics/readme.md b/modules/Microsoft.EventGrid/topics/readme.md
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/readme.md
rename to modules/Microsoft.EventGrid/topics/readme.md
diff --git a/arm/Microsoft.EventGrid/topics/version.json b/modules/Microsoft.EventGrid/topics/version.json
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/version.json
rename to modules/Microsoft.EventGrid/topics/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep b/modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/.parameters/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.EventHub/namespaces/.parameters/parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.parameters/parameters.json
rename to modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep b/modules/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md b/modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json b/modules/Microsoft.EventHub/namespaces/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/deploy.bicep b/modules/Microsoft.EventHub/namespaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep b/modules/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/readme.md b/modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/version.json b/modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/version.json
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/readme.md b/modules/Microsoft.EventHub/namespaces/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/readme.md
rename to modules/Microsoft.EventHub/namespaces/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/version.json b/modules/Microsoft.EventHub/namespaces/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/version.json
rename to modules/Microsoft.EventHub/namespaces/version.json
diff --git a/arm/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep b/modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
rename to modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.HealthBot/healthBots/.parameters/parameters.json b/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/.parameters/parameters.json
rename to modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
diff --git a/arm/Microsoft.HealthBot/healthBots/deploy.bicep b/modules/Microsoft.HealthBot/healthBots/deploy.bicep
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/deploy.bicep
rename to modules/Microsoft.HealthBot/healthBots/deploy.bicep
diff --git a/arm/Microsoft.HealthBot/healthBots/readme.md b/modules/Microsoft.HealthBot/healthBots/readme.md
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/readme.md
rename to modules/Microsoft.HealthBot/healthBots/readme.md
diff --git a/arm/Microsoft.HealthBot/healthBots/version.json b/modules/Microsoft.HealthBot/healthBots/version.json
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/version.json
rename to modules/Microsoft.HealthBot/healthBots/version.json
diff --git a/arm/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/actionGroups/.parameters/parameters.json b/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/.parameters/parameters.json
rename to modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/actionGroups/deploy.bicep b/modules/Microsoft.Insights/actionGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/deploy.bicep
rename to modules/Microsoft.Insights/actionGroups/deploy.bicep
diff --git a/arm/Microsoft.Insights/actionGroups/readme.md b/modules/Microsoft.Insights/actionGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/readme.md
rename to modules/Microsoft.Insights/actionGroups/readme.md
diff --git a/arm/Microsoft.Insights/actionGroups/version.json b/modules/Microsoft.Insights/actionGroups/version.json
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/version.json
rename to modules/Microsoft.Insights/actionGroups/version.json
diff --git a/arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep b/modules/Microsoft.Insights/activityLogAlerts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
rename to modules/Microsoft.Insights/activityLogAlerts/deploy.bicep
diff --git a/arm/Microsoft.Insights/activityLogAlerts/readme.md b/modules/Microsoft.Insights/activityLogAlerts/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/readme.md
rename to modules/Microsoft.Insights/activityLogAlerts/readme.md
diff --git a/arm/Microsoft.Insights/activityLogAlerts/version.json b/modules/Microsoft.Insights/activityLogAlerts/version.json
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/version.json
rename to modules/Microsoft.Insights/activityLogAlerts/version.json
diff --git a/arm/Microsoft.Insights/components/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/components/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/components/.parameters/parameters.json b/modules/Microsoft.Insights/components/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/components/.parameters/parameters.json
rename to modules/Microsoft.Insights/components/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/components/deploy.bicep b/modules/Microsoft.Insights/components/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/components/deploy.bicep
rename to modules/Microsoft.Insights/components/deploy.bicep
diff --git a/arm/Microsoft.Insights/components/readme.md b/modules/Microsoft.Insights/components/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/components/readme.md
rename to modules/Microsoft.Insights/components/readme.md
diff --git a/arm/Microsoft.Insights/components/version.json b/modules/Microsoft.Insights/components/version.json
similarity index 100%
rename from arm/Microsoft.Insights/components/version.json
rename to modules/Microsoft.Insights/components/version.json
diff --git a/arm/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json b/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
rename to modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep b/modules/Microsoft.Insights/diagnosticSettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/deploy.bicep
rename to modules/Microsoft.Insights/diagnosticSettings/deploy.bicep
diff --git a/arm/Microsoft.Insights/diagnosticSettings/readme.md b/modules/Microsoft.Insights/diagnosticSettings/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/readme.md
rename to modules/Microsoft.Insights/diagnosticSettings/readme.md
diff --git a/arm/Microsoft.Insights/diagnosticSettings/version.json b/modules/Microsoft.Insights/diagnosticSettings/version.json
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/version.json
rename to modules/Microsoft.Insights/diagnosticSettings/version.json
diff --git a/arm/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/metricAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/metricAlerts/deploy.bicep b/modules/Microsoft.Insights/metricAlerts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/deploy.bicep
rename to modules/Microsoft.Insights/metricAlerts/deploy.bicep
diff --git a/arm/Microsoft.Insights/metricAlerts/readme.md b/modules/Microsoft.Insights/metricAlerts/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/readme.md
rename to modules/Microsoft.Insights/metricAlerts/readme.md
diff --git a/arm/Microsoft.Insights/metricAlerts/version.json b/modules/Microsoft.Insights/metricAlerts/version.json
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/version.json
rename to modules/Microsoft.Insights/metricAlerts/version.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json b/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
rename to modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep b/modules/Microsoft.Insights/privateLinkScopes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/deploy.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/readme.md b/modules/Microsoft.Insights/privateLinkScopes/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/readme.md
rename to modules/Microsoft.Insights/privateLinkScopes/readme.md
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/version.json b/modules/Microsoft.Insights/privateLinkScopes/version.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/version.json
rename to modules/Microsoft.Insights/privateLinkScopes/version.json
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json b/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
rename to modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep b/modules/Microsoft.Insights/scheduledQueryRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
rename to modules/Microsoft.Insights/scheduledQueryRules/deploy.bicep
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/readme.md b/modules/Microsoft.Insights/scheduledQueryRules/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/readme.md
rename to modules/Microsoft.Insights/scheduledQueryRules/readme.md
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/version.json b/modules/Microsoft.Insights/scheduledQueryRules/version.json
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/version.json
rename to modules/Microsoft.Insights/scheduledQueryRules/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
rename to modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/.parameters/min.parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KeyVault/vaults/.parameters/parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.parameters/parameters.json
rename to modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep b/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json b/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/deploy.bicep b/modules/Microsoft.KeyVault/vaults/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
rename to modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep b/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/keys/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/readme.md b/modules/Microsoft.KeyVault/vaults/keys/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/readme.md
rename to modules/Microsoft.KeyVault/vaults/keys/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/keys/version.json b/modules/Microsoft.KeyVault/vaults/keys/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/version.json
rename to modules/Microsoft.KeyVault/vaults/keys/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/readme.md b/modules/Microsoft.KeyVault/vaults/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/readme.md
rename to modules/Microsoft.KeyVault/vaults/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
rename to modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/readme.md b/modules/Microsoft.KeyVault/vaults/secrets/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/readme.md
rename to modules/Microsoft.KeyVault/vaults/secrets/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/version.json b/modules/Microsoft.KeyVault/vaults/secrets/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/version.json
rename to modules/Microsoft.KeyVault/vaults/secrets/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/version.json b/modules/Microsoft.KeyVault/vaults/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/version.json
rename to modules/Microsoft.KeyVault/vaults/version.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/deploy.bicep b/modules/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
rename to modules/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/readme.md b/modules/Microsoft.KubernetesConfiguration/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/readme.md
rename to modules/Microsoft.KubernetesConfiguration/extensions/readme.md
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/version.json b/modules/Microsoft.KubernetesConfiguration/extensions/version.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/version.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/version.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
diff --git a/arm/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep b/modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Logic/workflows/.parameters/parameters.json b/modules/Microsoft.Logic/workflows/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Logic/workflows/.parameters/parameters.json
rename to modules/Microsoft.Logic/workflows/.parameters/parameters.json
diff --git a/arm/Microsoft.Logic/workflows/deploy.bicep b/modules/Microsoft.Logic/workflows/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Logic/workflows/deploy.bicep
rename to modules/Microsoft.Logic/workflows/deploy.bicep
diff --git a/arm/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
similarity index 100%
rename from arm/Microsoft.Logic/workflows/readme.md
rename to modules/Microsoft.Logic/workflows/readme.md
diff --git a/arm/Microsoft.Logic/workflows/version.json b/modules/Microsoft.Logic/workflows/version.json
similarity index 100%
rename from arm/Microsoft.Logic/workflows/version.json
rename to modules/Microsoft.Logic/workflows/version.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep b/modules/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/readme.md b/modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/readme.md
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/version.json b/modules/Microsoft.MachineLearningServices/workspaces/computes/version.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/version.json
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/version.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep b/modules/Microsoft.MachineLearningServices/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/deploy.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/readme.md b/modules/Microsoft.MachineLearningServices/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/readme.md
rename to modules/Microsoft.MachineLearningServices/workspaces/readme.md
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/version.json b/modules/Microsoft.MachineLearningServices/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/version.json
rename to modules/Microsoft.MachineLearningServices/workspaces/version.json
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep b/modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep b/modules/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
rename to modules/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md b/modules/Microsoft.ManagedServices/registrationDefinitions/readme.md
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
rename to modules/Microsoft.ManagedServices/registrationDefinitions/readme.md
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json b/modules/Microsoft.ManagedServices/registrationDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/version.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/version.json
diff --git a/arm/Microsoft.Management/managementGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Management/managementGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Management/managementGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Management/managementGroups/.parameters/parameters.json b/modules/Microsoft.Management/managementGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/.parameters/parameters.json
rename to modules/Microsoft.Management/managementGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Management/managementGroups/deploy.bicep b/modules/Microsoft.Management/managementGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/deploy.bicep
rename to modules/Microsoft.Management/managementGroups/deploy.bicep
diff --git a/arm/Microsoft.Management/managementGroups/readme.md b/modules/Microsoft.Management/managementGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/readme.md
rename to modules/Microsoft.Management/managementGroups/readme.md
diff --git a/arm/Microsoft.Management/managementGroups/version.json b/modules/Microsoft.Management/managementGroups/version.json
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/version.json
rename to modules/Microsoft.Management/managementGroups/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/readme.md b/modules/Microsoft.NetApp/netAppAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/version.json b/modules/Microsoft.NetApp/netAppAccounts/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/version.json
diff --git a/arm/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json b/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/applicationGateways/deploy.bicep b/modules/Microsoft.Network/applicationGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/deploy.bicep
rename to modules/Microsoft.Network/applicationGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/applicationGateways/readme.md b/modules/Microsoft.Network/applicationGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/readme.md
rename to modules/Microsoft.Network/applicationGateways/readme.md
diff --git a/arm/Microsoft.Network/applicationGateways/version.json b/modules/Microsoft.Network/applicationGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/version.json
rename to modules/Microsoft.Network/applicationGateways/version.json
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep b/modules/Microsoft.Network/applicationSecurityGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep
rename to modules/Microsoft.Network/applicationSecurityGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/readme.md b/modules/Microsoft.Network/applicationSecurityGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/readme.md
rename to modules/Microsoft.Network/applicationSecurityGroups/readme.md
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/version.json b/modules/Microsoft.Network/applicationSecurityGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/version.json
rename to modules/Microsoft.Network/applicationSecurityGroups/version.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep
rename to modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
rename to modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/deploy.bicep b/modules/Microsoft.Network/azureFirewalls/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/deploy.bicep
rename to modules/Microsoft.Network/azureFirewalls/deploy.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/readme.md b/modules/Microsoft.Network/azureFirewalls/readme.md
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/readme.md
rename to modules/Microsoft.Network/azureFirewalls/readme.md
diff --git a/arm/Microsoft.Network/azureFirewalls/version.json b/modules/Microsoft.Network/azureFirewalls/version.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/version.json
rename to modules/Microsoft.Network/azureFirewalls/version.json
diff --git a/arm/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/min.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/deploy.bicep b/modules/Microsoft.Network/bastionHosts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/deploy.bicep
rename to modules/Microsoft.Network/bastionHosts/deploy.bicep
diff --git a/arm/Microsoft.Network/bastionHosts/readme.md b/modules/Microsoft.Network/bastionHosts/readme.md
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/readme.md
rename to modules/Microsoft.Network/bastionHosts/readme.md
diff --git a/arm/Microsoft.Network/bastionHosts/version.json b/modules/Microsoft.Network/bastionHosts/version.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/version.json
rename to modules/Microsoft.Network/bastionHosts/version.json
diff --git a/arm/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
rename to modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
diff --git a/arm/Microsoft.Network/connections/deploy.bicep b/modules/Microsoft.Network/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/connections/deploy.bicep
rename to modules/Microsoft.Network/connections/deploy.bicep
diff --git a/arm/Microsoft.Network/connections/readme.md b/modules/Microsoft.Network/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/connections/readme.md
rename to modules/Microsoft.Network/connections/readme.md
diff --git a/arm/Microsoft.Network/connections/version.json b/modules/Microsoft.Network/connections/version.json
similarity index 100%
rename from arm/Microsoft.Network/connections/version.json
rename to modules/Microsoft.Network/connections/version.json
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json b/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
rename to modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep b/modules/Microsoft.Network/ddosProtectionPlans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep
rename to modules/Microsoft.Network/ddosProtectionPlans/deploy.bicep
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/readme.md b/modules/Microsoft.Network/ddosProtectionPlans/readme.md
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/readme.md
rename to modules/Microsoft.Network/ddosProtectionPlans/readme.md
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/version.json b/modules/Microsoft.Network/ddosProtectionPlans/version.json
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/version.json
rename to modules/Microsoft.Network/ddosProtectionPlans/version.json
diff --git a/arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json b/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
rename to modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/modules/Microsoft.Network/expressRouteCircuits/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/deploy.bicep
rename to modules/Microsoft.Network/expressRouteCircuits/deploy.bicep
diff --git a/arm/Microsoft.Network/expressRouteCircuits/readme.md b/modules/Microsoft.Network/expressRouteCircuits/readme.md
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/readme.md
rename to modules/Microsoft.Network/expressRouteCircuits/readme.md
diff --git a/arm/Microsoft.Network/expressRouteCircuits/version.json b/modules/Microsoft.Network/expressRouteCircuits/version.json
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/version.json
rename to modules/Microsoft.Network/expressRouteCircuits/version.json
diff --git a/arm/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/firewallPolicies/.parameters/parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/.parameters/parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/firewallPolicies/deploy.bicep b/modules/Microsoft.Network/firewallPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/deploy.bicep
rename to modules/Microsoft.Network/firewallPolicies/deploy.bicep
diff --git a/arm/Microsoft.Network/firewallPolicies/readme.md b/modules/Microsoft.Network/firewallPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/readme.md
rename to modules/Microsoft.Network/firewallPolicies/readme.md
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
diff --git a/arm/Microsoft.Network/firewallPolicies/version.json b/modules/Microsoft.Network/firewallPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/version.json
rename to modules/Microsoft.Network/firewallPolicies/version.json
diff --git a/arm/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/frontDoors/.parameters/parameters.json b/modules/Microsoft.Network/frontDoors/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/.parameters/parameters.json
rename to modules/Microsoft.Network/frontDoors/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/frontDoors/deploy.bicep b/modules/Microsoft.Network/frontDoors/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/deploy.bicep
rename to modules/Microsoft.Network/frontDoors/deploy.bicep
diff --git a/arm/Microsoft.Network/frontDoors/readme.md b/modules/Microsoft.Network/frontDoors/readme.md
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/readme.md
rename to modules/Microsoft.Network/frontDoors/readme.md
diff --git a/arm/Microsoft.Network/frontDoors/version.json b/modules/Microsoft.Network/frontDoors/version.json
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/version.json
rename to modules/Microsoft.Network/frontDoors/version.json
diff --git a/arm/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/ipGroups/.parameters/parameters.json b/modules/Microsoft.Network/ipGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/ipGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/modules/Microsoft.Network/ipGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/deploy.bicep
rename to modules/Microsoft.Network/ipGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/ipGroups/readme.md b/modules/Microsoft.Network/ipGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/readme.md
rename to modules/Microsoft.Network/ipGroups/readme.md
diff --git a/arm/Microsoft.Network/ipGroups/version.json b/modules/Microsoft.Network/ipGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/version.json
rename to modules/Microsoft.Network/ipGroups/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep b/modules/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/deploy.bicep b/modules/Microsoft.Network/loadBalancers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep b/modules/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/readme.md b/modules/Microsoft.Network/loadBalancers/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/readme.md
rename to modules/Microsoft.Network/loadBalancers/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/version.json b/modules/Microsoft.Network/loadBalancers/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/version.json
rename to modules/Microsoft.Network/loadBalancers/version.json
diff --git a/arm/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/localNetworkGateways/.parameters/parameters.json b/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep b/modules/Microsoft.Network/localNetworkGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/deploy.bicep
rename to modules/Microsoft.Network/localNetworkGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/localNetworkGateways/readme.md b/modules/Microsoft.Network/localNetworkGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/readme.md
rename to modules/Microsoft.Network/localNetworkGateways/readme.md
diff --git a/arm/Microsoft.Network/localNetworkGateways/version.json b/modules/Microsoft.Network/localNetworkGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/version.json
rename to modules/Microsoft.Network/localNetworkGateways/version.json
diff --git a/arm/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/natGateways/.parameters/parameters.json b/modules/Microsoft.Network/natGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/natGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/natGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/natGateways/deploy.bicep b/modules/Microsoft.Network/natGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/natGateways/deploy.bicep
rename to modules/Microsoft.Network/natGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/natGateways/readme.md b/modules/Microsoft.Network/natGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/natGateways/readme.md
rename to modules/Microsoft.Network/natGateways/readme.md
diff --git a/arm/Microsoft.Network/natGateways/version.json b/modules/Microsoft.Network/natGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/natGateways/version.json
rename to modules/Microsoft.Network/natGateways/version.json
diff --git a/arm/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkInterfaces/.parameters/parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.parameters/parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkInterfaces/deploy.bicep b/modules/Microsoft.Network/networkInterfaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/deploy.bicep
rename to modules/Microsoft.Network/networkInterfaces/deploy.bicep
diff --git a/arm/Microsoft.Network/networkInterfaces/readme.md b/modules/Microsoft.Network/networkInterfaces/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/readme.md
rename to modules/Microsoft.Network/networkInterfaces/readme.md
diff --git a/arm/Microsoft.Network/networkInterfaces/version.json b/modules/Microsoft.Network/networkInterfaces/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/version.json
rename to modules/Microsoft.Network/networkInterfaces/version.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep b/modules/Microsoft.Network/networkSecurityGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/deploy.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/readme.md b/modules/Microsoft.Network/networkSecurityGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/readme.md
rename to modules/Microsoft.Network/networkSecurityGroups/readme.md
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep b/modules/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/readme.md b/modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/version.json b/modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/version.json
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/version.json b/modules/Microsoft.Network/networkSecurityGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/version.json
rename to modules/Microsoft.Network/networkSecurityGroups/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/.parameters/min.parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.parameters/parameters.json
rename to modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep b/modules/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/deploy.bicep b/modules/Microsoft.Network/networkWatchers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep b/modules/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md b/modules/Microsoft.Network/networkWatchers/flowLogs/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/readme.md
rename to modules/Microsoft.Network/networkWatchers/flowLogs/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json b/modules/Microsoft.Network/networkWatchers/flowLogs/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/version.json
rename to modules/Microsoft.Network/networkWatchers/flowLogs/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/readme.md b/modules/Microsoft.Network/networkWatchers/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/readme.md
rename to modules/Microsoft.Network/networkWatchers/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/version.json b/modules/Microsoft.Network/networkWatchers/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/version.json
rename to modules/Microsoft.Network/networkWatchers/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/A/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/A/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/A/readme.md b/modules/Microsoft.Network/privateDnsZones/A/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/readme.md
rename to modules/Microsoft.Network/privateDnsZones/A/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/A/version.json b/modules/Microsoft.Network/privateDnsZones/A/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/version.json
rename to modules/Microsoft.Network/privateDnsZones/A/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md b/modules/Microsoft.Network/privateDnsZones/AAAA/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/readme.md
rename to modules/Microsoft.Network/privateDnsZones/AAAA/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/version.json b/modules/Microsoft.Network/privateDnsZones/AAAA/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/version.json
rename to modules/Microsoft.Network/privateDnsZones/AAAA/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md b/modules/Microsoft.Network/privateDnsZones/CNAME/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/readme.md
rename to modules/Microsoft.Network/privateDnsZones/CNAME/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/version.json b/modules/Microsoft.Network/privateDnsZones/CNAME/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/version.json
rename to modules/Microsoft.Network/privateDnsZones/CNAME/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/MX/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/MX/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/readme.md b/modules/Microsoft.Network/privateDnsZones/MX/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/readme.md
rename to modules/Microsoft.Network/privateDnsZones/MX/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/version.json b/modules/Microsoft.Network/privateDnsZones/MX/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/version.json
rename to modules/Microsoft.Network/privateDnsZones/MX/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/readme.md b/modules/Microsoft.Network/privateDnsZones/PTR/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/readme.md
rename to modules/Microsoft.Network/privateDnsZones/PTR/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/version.json b/modules/Microsoft.Network/privateDnsZones/PTR/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/version.json
rename to modules/Microsoft.Network/privateDnsZones/PTR/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/readme.md b/modules/Microsoft.Network/privateDnsZones/SOA/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/readme.md
rename to modules/Microsoft.Network/privateDnsZones/SOA/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/version.json b/modules/Microsoft.Network/privateDnsZones/SOA/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/version.json
rename to modules/Microsoft.Network/privateDnsZones/SOA/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/readme.md b/modules/Microsoft.Network/privateDnsZones/SRV/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/readme.md
rename to modules/Microsoft.Network/privateDnsZones/SRV/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/version.json b/modules/Microsoft.Network/privateDnsZones/SRV/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/version.json
rename to modules/Microsoft.Network/privateDnsZones/SRV/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/readme.md b/modules/Microsoft.Network/privateDnsZones/TXT/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/readme.md
rename to modules/Microsoft.Network/privateDnsZones/TXT/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/version.json b/modules/Microsoft.Network/privateDnsZones/TXT/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/version.json
rename to modules/Microsoft.Network/privateDnsZones/TXT/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/readme.md b/modules/Microsoft.Network/privateDnsZones/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/readme.md
rename to modules/Microsoft.Network/privateDnsZones/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/version.json b/modules/Microsoft.Network/privateDnsZones/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/version.json
rename to modules/Microsoft.Network/privateDnsZones/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
diff --git a/arm/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/privateEndpoints/.parameters/parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.parameters/parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/privateEndpoints/deploy.bicep b/modules/Microsoft.Network/privateEndpoints/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/deploy.bicep
rename to modules/Microsoft.Network/privateEndpoints/deploy.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
diff --git a/arm/Microsoft.Network/privateEndpoints/readme.md b/modules/Microsoft.Network/privateEndpoints/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/readme.md
rename to modules/Microsoft.Network/privateEndpoints/readme.md
diff --git a/arm/Microsoft.Network/privateEndpoints/version.json b/modules/Microsoft.Network/privateEndpoints/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/version.json
rename to modules/Microsoft.Network/privateEndpoints/version.json
diff --git a/arm/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/publicIPAddresses/.parameters/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep b/modules/Microsoft.Network/publicIPAddresses/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/deploy.bicep
rename to modules/Microsoft.Network/publicIPAddresses/deploy.bicep
diff --git a/arm/Microsoft.Network/publicIPAddresses/readme.md b/modules/Microsoft.Network/publicIPAddresses/readme.md
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/readme.md
rename to modules/Microsoft.Network/publicIPAddresses/readme.md
diff --git a/arm/Microsoft.Network/publicIPAddresses/version.json b/modules/Microsoft.Network/publicIPAddresses/version.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/version.json
rename to modules/Microsoft.Network/publicIPAddresses/version.json
diff --git a/arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json b/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep b/modules/Microsoft.Network/publicIPPrefixes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/deploy.bicep
rename to modules/Microsoft.Network/publicIPPrefixes/deploy.bicep
diff --git a/arm/Microsoft.Network/publicIPPrefixes/readme.md b/modules/Microsoft.Network/publicIPPrefixes/readme.md
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/readme.md
rename to modules/Microsoft.Network/publicIPPrefixes/readme.md
diff --git a/arm/Microsoft.Network/publicIPPrefixes/version.json b/modules/Microsoft.Network/publicIPPrefixes/version.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/version.json
rename to modules/Microsoft.Network/publicIPPrefixes/version.json
diff --git a/arm/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/routeTables/.parameters/parameters.json b/modules/Microsoft.Network/routeTables/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/routeTables/.parameters/parameters.json
rename to modules/Microsoft.Network/routeTables/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/routeTables/deploy.bicep b/modules/Microsoft.Network/routeTables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/routeTables/deploy.bicep
rename to modules/Microsoft.Network/routeTables/deploy.bicep
diff --git a/arm/Microsoft.Network/routeTables/readme.md b/modules/Microsoft.Network/routeTables/readme.md
similarity index 100%
rename from arm/Microsoft.Network/routeTables/readme.md
rename to modules/Microsoft.Network/routeTables/readme.md
diff --git a/arm/Microsoft.Network/routeTables/version.json b/modules/Microsoft.Network/routeTables/version.json
similarity index 100%
rename from arm/Microsoft.Network/routeTables/version.json
rename to modules/Microsoft.Network/routeTables/version.json
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json b/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/modules/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
rename to modules/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md b/modules/Microsoft.Network/trafficmanagerprofiles/readme.md
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/readme.md
rename to modules/Microsoft.Network/trafficmanagerprofiles/readme.md
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/version.json b/modules/Microsoft.Network/trafficmanagerprofiles/version.json
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/version.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualHubs/.parameters/parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualHubs/deploy.bicep b/modules/Microsoft.Network/virtualHubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep b/modules/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md b/modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/version.json b/modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/version.json
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/readme.md
rename to modules/Microsoft.Network/virtualHubs/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/version.json b/modules/Microsoft.Network/virtualHubs/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/version.json
rename to modules/Microsoft.Network/virtualHubs/version.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep b/modules/Microsoft.Network/virtualNetworkGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworkGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/readme.md b/modules/Microsoft.Network/virtualNetworkGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/readme.md
rename to modules/Microsoft.Network/virtualNetworkGateways/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/version.json b/modules/Microsoft.Network/virtualNetworkGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/version.json
rename to modules/Microsoft.Network/virtualNetworkGateways/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/readme.md b/modules/Microsoft.Network/virtualNetworks/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/readme.md
rename to modules/Microsoft.Network/virtualNetworks/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md b/modules/Microsoft.Network/virtualNetworks/subnets/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/readme.md
rename to modules/Microsoft.Network/virtualNetworks/subnets/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/version.json b/modules/Microsoft.Network/virtualNetworks/subnets/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/version.json
rename to modules/Microsoft.Network/virtualNetworks/subnets/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/version.json b/modules/Microsoft.Network/virtualNetworks/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/version.json
rename to modules/Microsoft.Network/virtualNetworks/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
diff --git a/arm/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/virtualWans/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualWans/.parameters/parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualWans/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualWans/deploy.bicep b/modules/Microsoft.Network/virtualWans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/deploy.bicep
rename to modules/Microsoft.Network/virtualWans/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualWans/readme.md b/modules/Microsoft.Network/virtualWans/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/readme.md
rename to modules/Microsoft.Network/virtualWans/readme.md
diff --git a/arm/Microsoft.Network/virtualWans/version.json b/modules/Microsoft.Network/virtualWans/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/version.json
rename to modules/Microsoft.Network/virtualWans/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/vpnGateways/.parameters/parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep b/modules/Microsoft.Network/vpnGateways/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/connections/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/connections/readme.md b/modules/Microsoft.Network/vpnGateways/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/readme.md
rename to modules/Microsoft.Network/vpnGateways/connections/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/connections/version.json b/modules/Microsoft.Network/vpnGateways/connections/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/version.json
rename to modules/Microsoft.Network/vpnGateways/connections/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/deploy.bicep b/modules/Microsoft.Network/vpnGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep b/modules/Microsoft.Network/vpnGateways/natRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/natRules/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/readme.md b/modules/Microsoft.Network/vpnGateways/natRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/readme.md
rename to modules/Microsoft.Network/vpnGateways/natRules/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/version.json b/modules/Microsoft.Network/vpnGateways/natRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/version.json
rename to modules/Microsoft.Network/vpnGateways/natRules/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/readme.md b/modules/Microsoft.Network/vpnGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/readme.md
rename to modules/Microsoft.Network/vpnGateways/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/version.json b/modules/Microsoft.Network/vpnGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/version.json
rename to modules/Microsoft.Network/vpnGateways/version.json
diff --git a/arm/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Network/vpnSites/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/vpnSites/.parameters/parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnSites/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/vpnSites/deploy.bicep b/modules/Microsoft.Network/vpnSites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/deploy.bicep
rename to modules/Microsoft.Network/vpnSites/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnSites/readme.md b/modules/Microsoft.Network/vpnSites/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/readme.md
rename to modules/Microsoft.Network/vpnSites/readme.md
diff --git a/arm/Microsoft.Network/vpnSites/version.json b/modules/Microsoft.Network/vpnSites/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/version.json
rename to modules/Microsoft.Network/vpnSites/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep b/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md b/modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/modules/Microsoft.OperationalInsights/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/version.json b/modules/Microsoft.OperationalInsights/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep b/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
rename to modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/readme.md b/modules/Microsoft.RecoveryServices/vaults/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/version.json b/modules/Microsoft.RecoveryServices/vaults/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/version.json
rename to modules/Microsoft.RecoveryServices/vaults/version.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep b/modules/Microsoft.Resources/deploymentScripts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/deploy.bicep
rename to modules/Microsoft.Resources/deploymentScripts/deploy.bicep
diff --git a/arm/Microsoft.Resources/deploymentScripts/readme.md b/modules/Microsoft.Resources/deploymentScripts/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/readme.md
rename to modules/Microsoft.Resources/deploymentScripts/readme.md
diff --git a/arm/Microsoft.Resources/deploymentScripts/version.json b/modules/Microsoft.Resources/deploymentScripts/version.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/version.json
rename to modules/Microsoft.Resources/deploymentScripts/version.json
diff --git a/arm/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep
rename to modules/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep
diff --git a/arm/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Resources/resourceGroups/.parameters/parameters.json b/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/.parameters/parameters.json
rename to modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Resources/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/resourceGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/deploy.bicep
rename to modules/Microsoft.Resources/resourceGroups/deploy.bicep
diff --git a/arm/Microsoft.Resources/resourceGroups/readme.md b/modules/Microsoft.Resources/resourceGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/readme.md
rename to modules/Microsoft.Resources/resourceGroups/readme.md
diff --git a/arm/Microsoft.Resources/resourceGroups/version.json b/modules/Microsoft.Resources/resourceGroups/version.json
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/version.json
rename to modules/Microsoft.Resources/resourceGroups/version.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/min.parameters.json b/modules/Microsoft.Resources/tags/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/min.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/rg.parameters.json b/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/rg.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/sub.parameters.json b/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/sub.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Resources/tags/deploy.bicep b/modules/Microsoft.Resources/tags/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/deploy.bicep
rename to modules/Microsoft.Resources/tags/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/readme.md b/modules/Microsoft.Resources/tags/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/readme.md
rename to modules/Microsoft.Resources/tags/readme.md
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep b/modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
rename to modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/tags/resourceGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/deploy.bicep
rename to modules/Microsoft.Resources/tags/resourceGroups/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/readme.md b/modules/Microsoft.Resources/tags/resourceGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/readme.md
rename to modules/Microsoft.Resources/tags/resourceGroups/readme.md
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/version.json b/modules/Microsoft.Resources/tags/resourceGroups/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/version.json
rename to modules/Microsoft.Resources/tags/resourceGroups/version.json
diff --git a/arm/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep b/modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
rename to modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
diff --git a/arm/Microsoft.Resources/tags/subscriptions/deploy.bicep b/modules/Microsoft.Resources/tags/subscriptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/deploy.bicep
rename to modules/Microsoft.Resources/tags/subscriptions/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/subscriptions/readme.md b/modules/Microsoft.Resources/tags/subscriptions/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/readme.md
rename to modules/Microsoft.Resources/tags/subscriptions/readme.md
diff --git a/arm/Microsoft.Resources/tags/subscriptions/version.json b/modules/Microsoft.Resources/tags/subscriptions/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/version.json
rename to modules/Microsoft.Resources/tags/subscriptions/version.json
diff --git a/arm/Microsoft.Resources/tags/version.json b/modules/Microsoft.Resources/tags/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/version.json
rename to modules/Microsoft.Resources/tags/version.json
diff --git a/arm/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep b/modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
rename to modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
diff --git a/arm/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json b/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
rename to modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
diff --git a/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep b/modules/Microsoft.Security/azureSecurityCenter/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/deploy.bicep
rename to modules/Microsoft.Security/azureSecurityCenter/deploy.bicep
diff --git a/arm/Microsoft.Security/azureSecurityCenter/readme.md b/modules/Microsoft.Security/azureSecurityCenter/readme.md
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/readme.md
rename to modules/Microsoft.Security/azureSecurityCenter/readme.md
diff --git a/arm/Microsoft.Security/azureSecurityCenter/version.json b/modules/Microsoft.Security/azureSecurityCenter/version.json
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/version.json
rename to modules/Microsoft.Security/azureSecurityCenter/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/.parameters/parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/readme.md b/modules/Microsoft.ServiceBus/namespaces/queues/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/queues/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/version.json b/modules/Microsoft.ServiceBus/namespaces/queues/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/version.json
rename to modules/Microsoft.ServiceBus/namespaces/queues/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/readme.md b/modules/Microsoft.ServiceBus/namespaces/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/readme.md b/modules/Microsoft.ServiceBus/namespaces/topics/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/topics/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/version.json b/modules/Microsoft.ServiceBus/namespaces/topics/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/version.json
rename to modules/Microsoft.ServiceBus/namespaces/topics/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/version.json b/modules/Microsoft.ServiceBus/namespaces/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/version.json
rename to modules/Microsoft.ServiceBus/namespaces/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
rename to modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/deploy.bicep
rename to modules/Microsoft.ServiceFabric/clusters/deploy.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/readme.md
rename to modules/Microsoft.ServiceFabric/clusters/readme.md
diff --git a/arm/Microsoft.ServiceFabric/clusters/version.json b/modules/Microsoft.ServiceFabric/clusters/version.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/version.json
rename to modules/Microsoft.ServiceFabric/clusters/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep b/modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json b/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/.parameters/parameters.json
rename to modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep b/modules/Microsoft.Sql/managedInstances/administrators/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/administrators/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/readme.md b/modules/Microsoft.Sql/managedInstances/administrators/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/readme.md
rename to modules/Microsoft.Sql/managedInstances/administrators/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/version.json b/modules/Microsoft.Sql/managedInstances/administrators/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/version.json
rename to modules/Microsoft.Sql/managedInstances/administrators/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/readme.md b/modules/Microsoft.Sql/managedInstances/databases/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/version.json b/modules/Microsoft.Sql/managedInstances/databases/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/deploy.bicep b/modules/Microsoft.Sql/managedInstances/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep b/modules/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md b/modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep b/modules/Microsoft.Sql/managedInstances/keys/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/keys/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/keys/readme.md b/modules/Microsoft.Sql/managedInstances/keys/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/readme.md
rename to modules/Microsoft.Sql/managedInstances/keys/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/keys/version.json b/modules/Microsoft.Sql/managedInstances/keys/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/version.json
rename to modules/Microsoft.Sql/managedInstances/keys/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/readme.md b/modules/Microsoft.Sql/managedInstances/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/readme.md
rename to modules/Microsoft.Sql/managedInstances/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/version.json b/modules/Microsoft.Sql/managedInstances/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/version.json
rename to modules/Microsoft.Sql/managedInstances/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Sql/servers/.parameters/admin.parameters.json b/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/.parameters/admin.parameters.json
rename to modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/modules/Microsoft.Sql/servers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/.parameters/parameters.json
rename to modules/Microsoft.Sql/servers/.parameters/parameters.json
diff --git a/arm/Microsoft.Sql/servers/databases/deploy.bicep b/modules/Microsoft.Sql/servers/databases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/deploy.bicep
rename to modules/Microsoft.Sql/servers/databases/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/modules/Microsoft.Sql/servers/databases/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/readme.md
rename to modules/Microsoft.Sql/servers/databases/readme.md
diff --git a/arm/Microsoft.Sql/servers/databases/version.json b/modules/Microsoft.Sql/servers/databases/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/version.json
rename to modules/Microsoft.Sql/servers/databases/version.json
diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/modules/Microsoft.Sql/servers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/deploy.bicep
rename to modules/Microsoft.Sql/servers/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep b/modules/Microsoft.Sql/servers/firewallRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/deploy.bicep
rename to modules/Microsoft.Sql/servers/firewallRules/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/firewallRules/readme.md b/modules/Microsoft.Sql/servers/firewallRules/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/readme.md
rename to modules/Microsoft.Sql/servers/firewallRules/readme.md
diff --git a/arm/Microsoft.Sql/servers/firewallRules/version.json b/modules/Microsoft.Sql/servers/firewallRules/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/version.json
rename to modules/Microsoft.Sql/servers/firewallRules/version.json
diff --git a/arm/Microsoft.Sql/servers/readme.md b/modules/Microsoft.Sql/servers/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/readme.md
rename to modules/Microsoft.Sql/servers/readme.md
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep b/modules/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md b/modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json b/modules/Microsoft.Sql/servers/securityAlertPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/version.json
diff --git a/arm/Microsoft.Sql/servers/version.json b/modules/Microsoft.Sql/servers/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/version.json
rename to modules/Microsoft.Sql/servers/version.json
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/version.json b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md b/modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json b/modules/Microsoft.Storage/storageAccounts/fileServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/fileServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md b/modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md b/modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/modules/Microsoft.Storage/storageAccounts/queueServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/queueServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/readme.md b/modules/Microsoft.Storage/storageAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/readme.md
rename to modules/Microsoft.Storage/storageAccounts/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md b/modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/modules/Microsoft.Storage/storageAccounts/tableServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/tableServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/version.json b/modules/Microsoft.Storage/storageAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/version.json
rename to modules/Microsoft.Storage/storageAccounts/version.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep b/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep b/modules/Microsoft.Synapse/privateLinkHubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep
rename to modules/Microsoft.Synapse/privateLinkHubs/deploy.bicep
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/readme.md b/modules/Microsoft.Synapse/privateLinkHubs/readme.md
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/readme.md
rename to modules/Microsoft.Synapse/privateLinkHubs/readme.md
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/version.json b/modules/Microsoft.Synapse/privateLinkHubs/version.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/version.json
rename to modules/Microsoft.Synapse/privateLinkHubs/version.json
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep b/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep b/modules/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md b/modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/version.json
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/version.json
diff --git a/arm/Microsoft.Web/connections/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Web/connections/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Web/connections/.parameters/parameters.json b/modules/Microsoft.Web/connections/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/connections/.parameters/parameters.json
rename to modules/Microsoft.Web/connections/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/connections/deploy.bicep b/modules/Microsoft.Web/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/connections/deploy.bicep
rename to modules/Microsoft.Web/connections/deploy.bicep
diff --git a/arm/Microsoft.Web/connections/readme.md b/modules/Microsoft.Web/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Web/connections/readme.md
rename to modules/Microsoft.Web/connections/readme.md
diff --git a/arm/Microsoft.Web/connections/version.json b/modules/Microsoft.Web/connections/version.json
similarity index 100%
rename from arm/Microsoft.Web/connections/version.json
rename to modules/Microsoft.Web/connections/version.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep b/modules/Microsoft.Web/hostingEnvironments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/deploy.bicep
rename to modules/Microsoft.Web/hostingEnvironments/deploy.bicep
diff --git a/arm/Microsoft.Web/hostingEnvironments/readme.md b/modules/Microsoft.Web/hostingEnvironments/readme.md
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/readme.md
rename to modules/Microsoft.Web/hostingEnvironments/readme.md
diff --git a/arm/Microsoft.Web/hostingEnvironments/version.json b/modules/Microsoft.Web/hostingEnvironments/version.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/version.json
rename to modules/Microsoft.Web/hostingEnvironments/version.json
diff --git a/arm/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Web/serverfarms/.parameters/parameters.json b/modules/Microsoft.Web/serverfarms/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/.parameters/parameters.json
rename to modules/Microsoft.Web/serverfarms/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/serverfarms/deploy.bicep b/modules/Microsoft.Web/serverfarms/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/deploy.bicep
rename to modules/Microsoft.Web/serverfarms/deploy.bicep
diff --git a/arm/Microsoft.Web/serverfarms/readme.md b/modules/Microsoft.Web/serverfarms/readme.md
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/readme.md
rename to modules/Microsoft.Web/serverfarms/readme.md
diff --git a/arm/Microsoft.Web/serverfarms/version.json b/modules/Microsoft.Web/serverfarms/version.json
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/version.json
rename to modules/Microsoft.Web/serverfarms/version.json
diff --git a/arm/Microsoft.Web/sites/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Web/sites/.parameters/fa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/fa.min.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/fa.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/fa.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/fa.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/wa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/wa.min.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/wa.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/wa.parameters.json
diff --git a/arm/Microsoft.Web/sites/config-appsettings/deploy.bicep b/modules/Microsoft.Web/sites/config-appsettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/deploy.bicep
rename to modules/Microsoft.Web/sites/config-appsettings/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/config-appsettings/readme.md b/modules/Microsoft.Web/sites/config-appsettings/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/readme.md
rename to modules/Microsoft.Web/sites/config-appsettings/readme.md
diff --git a/arm/Microsoft.Web/sites/config-appsettings/version.json b/modules/Microsoft.Web/sites/config-appsettings/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/version.json
rename to modules/Microsoft.Web/sites/config-appsettings/version.json
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep b/modules/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
rename to modules/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/readme.md b/modules/Microsoft.Web/sites/config-authsettingsv2/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/readme.md
rename to modules/Microsoft.Web/sites/config-authsettingsv2/readme.md
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/version.json b/modules/Microsoft.Web/sites/config-authsettingsv2/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/version.json
rename to modules/Microsoft.Web/sites/config-authsettingsv2/version.json
diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/modules/Microsoft.Web/sites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/deploy.bicep
rename to modules/Microsoft.Web/sites/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/readme.md b/modules/Microsoft.Web/sites/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/readme.md
rename to modules/Microsoft.Web/sites/readme.md
diff --git a/arm/Microsoft.Web/sites/version.json b/modules/Microsoft.Web/sites/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/version.json
rename to modules/Microsoft.Web/sites/version.json
diff --git a/arm/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep
rename to modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.Web/staticSites/.parameters/min.parameters.json b/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.parameters/min.parameters.json
rename to modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Web/staticSites/.parameters/parameters.json b/modules/Microsoft.Web/staticSites/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.parameters/parameters.json
rename to modules/Microsoft.Web/staticSites/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/staticSites/deploy.bicep b/modules/Microsoft.Web/staticSites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/staticSites/deploy.bicep
rename to modules/Microsoft.Web/staticSites/deploy.bicep
diff --git a/arm/Microsoft.Web/staticSites/readme.md b/modules/Microsoft.Web/staticSites/readme.md
similarity index 100%
rename from arm/Microsoft.Web/staticSites/readme.md
rename to modules/Microsoft.Web/staticSites/readme.md
diff --git a/arm/Microsoft.Web/staticSites/version.json b/modules/Microsoft.Web/staticSites/version.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/version.json
rename to modules/Microsoft.Web/staticSites/version.json
diff --git a/modules/README.md b/modules/README.md
new file mode 100644
index 0000000000..7896111c76
--- /dev/null
+++ b/modules/README.md
@@ -0,0 +1,104 @@
+In this section you can find useful information regarding the Modules that are contained in this repository.
+
+## Available Resource Modules
+
+| Name | Provider namespace | Resource Type |
+| - | - | - |
+| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) | `MS.AAD` | [DomainServices](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) |
+| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) | `MS.AnalysisServices` | [servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) |
+| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | `MS.ApiManagement` | [service](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) |
+| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | `MS.AppConfiguration` | [configurationStores](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) |
+| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) | `MS.Authorization` | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |
+| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |  | [policyDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |
+| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |  | [policyExemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |
+| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |  | [policySetDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |
+| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) |  | [roleAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) |
+| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) |  | [roleDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) |
+| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) | `MS.Automation` | [automationAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) |
+| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) | `MS.Batch` | [batchAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) |
+| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) | `MS.CognitiveServices` | [accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) |
+| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) | `MS.Compute` | [availabilitySets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) |
+| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) |  | [diskEncryptionSets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) |
+| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) |  | [disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) |
+| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) |  | [galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) |
+| [Images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) |  | [images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) |
+| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) |  | [proximityPlacementGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) |
+| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) |  | [virtualMachines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) |
+| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) |  | [virtualMachineScaleSets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) |
+| [Budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) | `MS.Consumption` | [budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) |
+| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) | `MS.ContainerInstance` | [containerGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) |
+| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) | `MS.ContainerRegistry` | [registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) |
+| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) | `MS.ContainerService` | [managedClusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) |
+| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) | `MS.Databricks` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) |
+| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) | `MS.DataFactory` | [factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) |
+| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) | `MS.DesktopVirtualization` | [applicationgroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) |
+| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |  | [hostpools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |
+| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |  | [scalingplans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |
+| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) |  | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) |
+| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) | `MS.DocumentDB` | [databaseAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) |
+| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) | `MS.EventGrid` | [systemTopics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) |
+| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) |  | [topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) |
+| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) | `MS.EventHub` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) |
+| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) | `MS.HealthBot` | [healthBots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) |
+| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) | `MS.Insights` | [actionGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) |
+| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) |  | [activityLogAlerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) |
+| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) |  | [components](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) |
+| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) |  | [diagnosticSettings](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) |
+| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) |  | [metricAlerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) |
+| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) |  | [privateLinkScopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) |
+| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) |  | [scheduledQueryRules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) |
+| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) | `MS.KeyVault` | [vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) |
+| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) | `MS.KubernetesConfiguration` | [extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) |
+| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) |  | [fluxConfigurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) |
+| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) | `MS.Logic` | [workflows](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) |
+| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) | `MS.achineLearningServices` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) |
+| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) | `MS.anagedIdentity` | [userAssignedIdentities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) |
+| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) | `MS.anagedServices` | [registrationDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) |
+| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) | `MS.anagement` | [managementGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) |
+| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) | `MS.NetApp` | [netAppAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) |
+| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) | `MS.Network` | [applicationGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) |
+| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) |  | [applicationSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) |
+| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) |  | [azureFirewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) |
+| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) |  | [bastionHosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) |
+| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) |  | [connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) |
+| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) |  | [ddosProtectionPlans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) |
+| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) |  | [expressRouteCircuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) |
+| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) |  | [firewallPolicies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) |
+| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) |  | [frontDoors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) |
+| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) |  | [ipGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) |
+| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) |  | [loadBalancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) |
+| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) |  | [localNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) |
+| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) |  | [natGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) |
+| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) |  | [networkInterfaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) |
+| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) |  | [networkSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) |
+| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) |  | [networkWatchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) |
+| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) |  | [privateDnsZones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) |
+| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) |  | [privateEndpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) |
+| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) |  | [publicIPAddresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) |
+| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) |  | [publicIPPrefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) |
+| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) |  | [routeTables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) |
+| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) |  | [trafficmanagerprofiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) |
+| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) |  | [virtualHubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) |
+| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) |  | [virtualNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) |
+| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) |  | [virtualNetworks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) |
+| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) |  | [virtualWans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) |
+| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |  | [vpnGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |
+| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |  | [vpnSites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |
+| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) | `MS.OperationalInsights` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) |
+| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) | `MS.RecoveryServices` | [vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) |
+| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) | `MS.Resources` | [deploymentScripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) |
+| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |  | [resourceGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |
+| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) |  | [tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) |
+| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) | `MS.Security` | [azureSecurityCenter](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) |
+| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) | `MS.ServiceBus` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) |
+| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) | `MS.ServiceFabric` | [clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) |
+| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) | `MS.Sql` | [managedInstances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) |
+| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) |  | [servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) |
+| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) | `MS.Storage` | [storageAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) |
+| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) | `MS.Synapse` | [privateLinkHubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) |
+| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) | `MS.VirtualMachineImages` | [imageTemplates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) |
+| [API Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) | `MS.Web` | [connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) |
+| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) |  | [hostingEnvironments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) |
+| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) |  | [serverfarms](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) |
+| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) |  | [sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) |
+| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) |  | [staticSites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) |
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
index 689a9534b7..752093ece5 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\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_rbac.bicep"
+Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_rbac.bicep"
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
@@ -98,7 +98,7 @@ function Find-TemplateFile {
 
     $FolderPath = Split-Path $Path -Parent
     $FolderName = Split-Path $Path -Leaf
-    if ($FolderName -eq 'arm') {
+    if ($FolderName -eq 'modules') {
         return $null
     }
 
@@ -126,9 +126,9 @@ Find the closest deploy.bicep/json file to the changed files in the module folde
 Mandatory. Path to the main/parent module folder.
 
 .EXAMPLE
-Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"
+Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\"
 
-C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
+C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
 
 Gets the closest deploy.bicep/json file to the changed files in the module folder structure.
 Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables'
@@ -142,7 +142,7 @@ function Get-TemplateFileToPublish {
         [Parameter(Mandatory)]
         [string] $ModuleFolderPath
     )
-    $ModuleFolderRelPath = $ModuleFolderPath.Split('/arm/')[-1]
+    $ModuleFolderRelPath = $ModuleFolderPath.Split('/modules/')[-1]
     $ModifiedFiles = Get-ModifiedFileList -Verbose
     Write-Verbose "Looking for modified files under: [$ModuleFolderRelPath]" -Verbose
     $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
@@ -157,7 +157,7 @@ function Get-TemplateFileToPublish {
 
     Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToPublish.count) -Verbose
     $TemplateFilesToPublish | ForEach-Object {
-        $RelPath = ($_.FullName).Split('/arm/')[-1]
+        $RelPath = ($_.FullName).Split('/modules/')[-1]
         $RelPath = $RelPath.Split('/deploy.')[0]
         Write-Verbose " - [$RelPath]" -Verbose
     }
@@ -179,15 +179,15 @@ Mandatory. Path to a deploy.bicep/json file.
 Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
 
 .EXAMPLE
-Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
+Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
 la---          05.12.2021    22:45           1427 deploy.bicep
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.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 deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.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 deploy.bicep/json file.
 
 .EXAMPLE
-Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
 
 0.3.630
 
@@ -347,16 +347,16 @@ Generates a hashtable with template file paths to publish with a new version.
 Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep'
+Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep'
 
 
 Name               Value
 ----               -----
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep
 Version            0.3.848-prerelease
 
 Generates a hashtable with template file paths to publish and their new versions.
@@ -429,7 +429,7 @@ function Get-ModulesToPublish {
     if ($ModulesToPublish.count -gt 0) {
         Write-Verbose 'Publish the following modules:'-Verbose
         $ModulesToPublish | ForEach-Object {
-            $RelPath = ($_.TemplateFilePath).Split('/arm/')[-1]
+            $RelPath = ($_.TemplateFilePath).Split('/modules/')[-1]
             $RelPath = $RelPath.Split('/deploy.')[0]
             Write-Verbose (' - [{0}] [{1}] ' -f $RelPath, $_.Version) -Verbose
         }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 584582b4e1..319c73b919 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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -76,8 +76,8 @@ function Publish-ModuleToPrivateBicepRegistry {
             }
         }
 
-        # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        # Extracts Microsoft.KeyVault/vaults from e.g. C:\modules\Microsoft.KeyVault\vaults\deploy.bicep
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/modules/')[1]
         $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 1a0a883a5f..df821bd8d8 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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-ModuleToTemplateSpec -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
+Publish-ModuleToTemplateSpec -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -56,7 +56,7 @@ function Publish-ModuleToTemplateSpec {
     }
 
     process {
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/modules/')[1]
         $templateSpecIdentifier = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 7868fe45fa..0dd3549f87 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -102,9 +102,9 @@ function Publish-ModuleToUniversalArtifactFeed {
         #################################
 
         # Universal package names => lowercase alphanumerics, dashes, dots or underscores, under 256 characters.
-        # 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
+        # 'C:\modules\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
         $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
-        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/modules/')[1]
         $universalPackageModuleName = ($universalPackageModuleName.Replace('\', '.').Replace('/', '.').toLower() -Replace '[^a-z0-9\.\-_]')[0..255] -join ''
         Write-Verbose "The universal package name is [$universalPackageModuleName]" -Verbose
 
diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index 17b701bd65..af2e94ca10 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -18,9 +18,9 @@ Optional. The name of the resource group the deployment was happening in. Releva
 Optional. The ID of the management group to fetch deployments from. Relevant for management-group level deployments.
 
 .EXAMPLE
-Initialize-DeploymentRemoval -DeploymentName 'virtualWans-20211204T1812029146Z' -TemplateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
+Initialize-DeploymentRemoval -DeploymentName 'virtualWans-20211204T1812029146Z' -TemplateFilePath "$home/ResourceModules/modules/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
 
-Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep"
+Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/modules/Microsoft.Network/virtualWans/deploy.bicep"
 #>
 function Initialize-DeploymentRemoval {
 
diff --git a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
index bb5cef5dd6..b13d619e7b 100644
--- a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
@@ -10,7 +10,7 @@ The relative path is returned instead of the full one to make paths easier to re
 Mandatory. The module path to search in.
 
 .EXAMPLE
-Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\arm\Microsoft.Compute\virtualMachines'
+Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines'
 
 Returns the relative file paths of all parameter files of the virtual machines module.
 #>
diff --git a/utilities/tools/ConvertTo-ARMTemplate.ps1 b/utilities/tools/ConvertTo-ARMTemplate.ps1
index ed3150bef3..90fe651023 100644
--- a/utilities/tools/ConvertTo-ARMTemplate.ps1
+++ b/utilities/tools/ConvertTo-ARMTemplate.ps1
@@ -56,20 +56,20 @@ param (
 )
 
 $rootPath = Get-Item -Path $Path | Select-Object -ExpandProperty 'FullName'
-$armFolderPath = Join-Path -Path $rootPath -ChildPath 'arm'
+$modulesFolderPath = Join-Path -Path $rootPath -ChildPath 'modules'
 if ($ConvertChildren) {
-    $BicepFilesToConvert = Get-ChildItem -Path $armFolderPath -Filter 'deploy.bicep' -Recurse -Force
+    $BicepFilesToConvert = Get-ChildItem -Path $modulesFolderPath -Filter 'deploy.bicep' -Recurse -Force
 } else {
-    $BicepFilesToConvert = Get-ChildItem -Path $armFolderPath -Filter 'deploy.bicep' -Recurse -Force -Depth 2
+    $BicepFilesToConvert = Get-ChildItem -Path $modulesFolderPath -Filter 'deploy.bicep' -Recurse -Force -Depth 2
 }
 
 #region Remove existing deploy.json files
 Write-Verbose 'Remove existing deploy.json files'
 
-if (Test-Path -Path (Join-Path -Path $armFolderPath -ChildPath 'deploy.bicep')) {
-    $JsonFilesToRemove = Get-ChildItem -Path $armFolderPath -Filter 'deploy.json' -Recurse -Force -File
+if (Test-Path -Path (Join-Path -Path $modulesFolderPath -ChildPath 'deploy.bicep')) {
+    $JsonFilesToRemove = Get-ChildItem -Path $modulesFolderPath -Filter 'deploy.json' -Recurse -Force -File
     Write-Verbose "Remove existing deploy.json files - Remove [$($JsonFilesToRemove.count)] file(s)"
-    if ($PSCmdlet.ShouldProcess("[$($JsonFilesToRemove.count)] deploy.json files(s) in path [$armFolderPath]", 'Remove-Item')) {
+    if ($PSCmdlet.ShouldProcess("[$($JsonFilesToRemove.count)] deploy.json files(s) in path [$modulesFolderPath]", 'Remove-Item')) {
         $JsonFilesToRemove | Remove-Item -Force
     }
     Write-Verbose 'Remove existing deploy.json files - Done'
@@ -81,7 +81,7 @@ if (Test-Path -Path (Join-Path -Path $armFolderPath -ChildPath 'deploy.bicep'))
 Write-Verbose 'Convert bicep files to json'
 
 Write-Verbose "Convert bicep files to json - Processing [$($BicepFilesToConvert.count)] file(s)"
-if ($PSCmdlet.ShouldProcess("[$($BicepFilesToConvert.count)] deploy.bicep file(s) in path [$armFolderPath]", 'az bicep build')) {
+if ($PSCmdlet.ShouldProcess("[$($BicepFilesToConvert.count)] deploy.bicep file(s) in path [$modulesFolderPath]", 'az bicep build')) {
     # parallelism is not supported on GitHub runners
     #$BicepFilesToConvert | ForEach-Object -ThrottleLimit $env:NUMBER_OF_PROCESSORS -Parallel {
     $BicepFilesToConvert | ForEach-Object {
@@ -97,7 +97,7 @@ if (-not $SkipMetadataCleanup) {
     Write-Verbose 'Remove Bicep metadata from json'
 
     Write-Verbose "Remove Bicep metadata from json - Processing [$($BicepFilesToConvert.count)] file(s)"
-    if ($PSCmdlet.ShouldProcess("[$($BicepFilesToConvert.count)] deploy.bicep file(s) in path [$armFolderPath]", 'Set-Content')) {
+    if ($PSCmdlet.ShouldProcess("[$($BicepFilesToConvert.count)] deploy.bicep file(s) in path [$modulesFolderPath]", 'Set-Content')) {
         # parallelism is not supported on GitHub runners
         #$BicepFilesToConvert | ForEach-Object -ThrottleLimit $env:NUMBER_OF_PROCESSORS -Parallel {
         $BicepFilesToConvert | ForEach-Object {
@@ -153,15 +153,15 @@ if (-not $SkipMetadataCleanup) {
 if (-not $SkipBicepCleanUp) {
     Write-Verbose 'Remove bicep files and folders'
 
-    $dotBicepFoldersToRemove = Get-ChildItem -Path $armFolderPath -Filter '.bicep' -Recurse -Force -Directory
+    $dotBicepFoldersToRemove = Get-ChildItem -Path $modulesFolderPath -Filter '.bicep' -Recurse -Force -Directory
     Write-Verbose "Remove bicep files and folders - Remove [$($dotBicepFoldersToRemove.count)] .bicep folder(s)"
-    if ($PSCmdlet.ShouldProcess("[$($dotBicepFoldersToRemove.count)] .bicep folder(s) in path [$armFolderPath]", 'Remove-Item')) {
+    if ($PSCmdlet.ShouldProcess("[$($dotBicepFoldersToRemove.count)] .bicep folder(s) in path [$modulesFolderPath]", 'Remove-Item')) {
         $dotBicepFoldersToRemove | Remove-Item -Recurse -Force
     }
 
-    $BicepFilesToRemove = Get-ChildItem -Path $armFolderPath -Filter '*.bicep' -Recurse -Force -File
+    $BicepFilesToRemove = Get-ChildItem -Path $modulesFolderPath -Filter '*.bicep' -Recurse -Force -File
     Write-Verbose "Remove bicep files and folders - Remove [$($BicepFilesToRemove.count)] *.bicep file(s)"
-    if ($PSCmdlet.ShouldProcess("[$($BicepFilesToRemove.count)] *.bicep file(s) in path [$armFolderPath]", 'Remove-Item')) {
+    if ($PSCmdlet.ShouldProcess("[$($BicepFilesToRemove.count)] *.bicep file(s) in path [$modulesFolderPath]", 'Remove-Item')) {
         $BicepFilesToRemove | Remove-Item -Force
     }
 
diff --git a/utilities/tools/Get-LinkedLocalModuleList.ps1 b/utilities/tools/Get-LinkedLocalModuleList.ps1
index 347997b8e9..23d23d798c 100644
--- a/utilities/tools/Get-LinkedLocalModuleList.ps1
+++ b/utilities/tools/Get-LinkedLocalModuleList.ps1
@@ -6,14 +6,14 @@ Print a list of all local references for the modules in a given path
 The result will be a list of all modules in the given path alongside their individual references to other modules in the folder structure
 
 .PARAMETER path
-Optional. The path to search in. Defaults to the 'arm' folder
+Optional. The path to search in. Defaults to the 'modules' folder
 
 .EXAMPLE
 Get-LinkedLocalModuleList
 
 Invoke the function with the default path. Prints a list such as:
 
-> The modules in path [C:\dev\ip\Azure-ResourceModules\ResourceModules\arm] have the following local folder dependencies:
+> The modules in path [C:\dev\ip\Azure-ResourceModules\ResourceModules\modules] have the following local folder dependencies:
 >
 > Resource: Microsoft.EventGrid/topics
 > - Microsoft.EventGrid/Microsoft.Network/privateEndpoints
@@ -26,7 +26,7 @@ Get-LinkedLocalModuleList -Path './Microsoft.Sql'
 
 Get only the references of the modules in folder path './Microsoft.Sql'
 
-> The modules in path [..\..\arm\Microsoft.Sql\] have the following local folder dependencies:
+> The modules in path [..\..\modules\Microsoft.Sql\] have the following local folder dependencies:
 >
 > Resource: Microsoft.Sql/servers
 > - Microsoft.Sql/Microsoft.Network/privateEndpoints
@@ -36,7 +36,7 @@ function Get-LinkedLocalModuleList {
     [CmdletBinding()]
     param (
         [Parameter()]
-        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'arm')
+        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'modules')
     )
 
     # Load used functions
diff --git a/utilities/tools/Get-LinkedModuleList.ps1 b/utilities/tools/Get-LinkedModuleList.ps1
index ebc4ea81f2..15c9ed932c 100644
--- a/utilities/tools/Get-LinkedModuleList.ps1
+++ b/utilities/tools/Get-LinkedModuleList.ps1
@@ -9,7 +9,7 @@ As an output you will receive a hashtable that (for each provider namespace) lis
 - Linked remote module tempaltes (e.g. via "module rg 'br/modules:(..):(..)'")
 
 .PARAMETER path
-Optional. The path to search in. Defaults to the 'arm' folder
+Optional. The path to search in. Defaults to the 'modules' folder
 
 .EXAMPLE
 Get-LinkedModuleList
@@ -40,7 +40,7 @@ function Get-LinkedModuleList {
     [CmdletBinding()]
     param (
         [Parameter()]
-        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'arm')
+        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'modules')
     )
 
     $resultSet = @{}
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index a91b2a501b..9a7ea14100 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -350,7 +350,7 @@ function Set-DeploymentExamplesSection {
     $SectionContent = [System.Collections.ArrayList]@()
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
-    $resourceTypeIdentifier = $moduleRoot.Split('arm')[1].Replace('\', '/').TrimStart('/')
+    $resourceTypeIdentifier = $moduleRoot.Split('modules')[1].Replace('\', '/').TrimStart('/')
     $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.parameters') -Filter '*parameters.json' -Recurse
 
     $index = 1
@@ -638,7 +638,7 @@ function Set-ModuleReadMe {
         throw "Failed to compile [$TemplateFilePath]"
     }
 
-    $fullResourcePath = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/arm/')[1]
+    $fullResourcePath = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/modules/')[1]
 
     # Check readme
     if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) {
@@ -673,7 +673,7 @@ function Set-ModuleReadMe {
     }
 
     # Update title
-    if ($TemplateFilePath.Replace('\', '/') -like '*/arm/*') {
+    if ($TemplateFilePath.Replace('\', '/') -like '*/modules/*') {
 
         if ($readMeFileContent[0] -notlike "*``[$fullResourcePath]``") {
             # Cut outdated
diff --git a/utilities/tools/Set-ReadMeModuleTable.ps1 b/utilities/tools/Set-ReadMeModuleTable.ps1
index 9ebb1235ea..937d1e4605 100644
--- a/utilities/tools/Set-ReadMeModuleTable.ps1
+++ b/utilities/tools/Set-ReadMeModuleTable.ps1
@@ -25,7 +25,7 @@ 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:\arm' -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'
 #>
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index dced7d66d2..081762ab77 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -166,7 +166,7 @@ function Test-ModuleLocally {
 
                 Invoke-Pester -Configuration @{
                     Run    = @{
-                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'arm/.global/global.module.tests.ps1') -Data @{
+                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'modules/.global/global.module.tests.ps1') -Data @{
                             moduleFolderPaths = Split-Path $TemplateFilePath -Parent
                             enforcedTokenList = $enforcedTokenList
                         }
diff --git a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
index 5ac8682b7a..fb41024aaf 100644
--- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
+++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
@@ -340,10 +340,10 @@ function Get-ResolvedSubServiceRow {
                 'Name' {
                     switch ($Environment) {
                         'ADO' {
-                            $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                         'GitHub' {
-                            $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                     }
 
@@ -365,10 +365,10 @@ function Get-ResolvedSubServiceRow {
                 'ResourceType' {
                     switch ($Environment) {
                         'ADO' {
-                            $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f $subName, $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f $subName, $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                         'GitHub' {
-                            $row['ResourceType'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f $subName, $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['ResourceType'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f $subName, $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                     }
 
@@ -451,7 +451,7 @@ Get-ModulesAsMarkdownTable -path 'C:\dev\Modules' -ColumnsInOrder @('Resource Ty
 Generate a markdown table for all modules in path 'C:\dev\Modules' with only the 'Resource Type' & 'Name' columns, , sorted by 'Name'
 
 .EXAMPLE
-Get-ModulesAsMarkdownTable -path 'C:\dev\ip\Azure-Modules\ResourceModules\arm' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','TemplateType','Status','Deploy')
+Get-ModulesAsMarkdownTable -path 'C:\dev\ip\Azure-Modules\ResourceModules\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','TemplateType','Status','Deploy')
 
 Generate a markdown table for all modules in path 'C:\dev\Modules' with only the 'Name','TemplateType','Status' &'Deploy' columns, sorted by 'Name'
 #>
@@ -544,10 +544,10 @@ function Get-ModulesAsMarkdownTable {
                         'Name' {
                             switch ($Environment) {
                                 'ADO' {
-                                    $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                                 'GitHub' {
-                                    $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                             }
                         }
@@ -568,10 +568,10 @@ function Get-ModulesAsMarkdownTable {
                         'ResourceType' {
                             switch ($Environment) {
                                 'ADO' {
-                                    $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                                 'GitHub' {
-                                    $row['ResourceType'] += ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f $containedFolderName, $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['ResourceType'] += ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f $containedFolderName, $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                             }
 
diff --git a/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1 b/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
index 422bba1b51..8a544ed4d0 100644
--- a/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
+++ b/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
@@ -7,14 +7,14 @@ param ()
 BeforeAll {
     # Define paths
     $rootPath = (Get-Item $PSScriptRoot).Parent.Parent.Parent.FullName
-    $armFolderPath = Join-Path $rootPath 'arm'
+    $modulesFolderPath = Join-Path $rootPath 'modules'
     $toolsPath = Join-Path $rootPath 'utilities' 'tools'
 
     # Collect original files
-    $bicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.Name -like '*.bicep' }).Count
-    $nestedBicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.Name -like 'nested_*bicep' }).Count
-    $deployBicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.Name -match 'deploy.bicep' }).Count
-    $deployParentBicepFilesCount = (Get-ChildItem -Recurse $armFolderPath -Depth 2 | Where-Object { $_.Name -match 'deploy.bicep' }).Count
+    $bicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.Name -like '*.bicep' }).Count
+    $nestedBicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.Name -like 'nested_*bicep' }).Count
+    $deployBicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.Name -match 'deploy.bicep' }).Count
+    $deployParentBicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath -Depth 2 | Where-Object { $_.Name -match 'deploy.bicep' }).Count
 
     # GitHub Workflows
     $moduleWorkflowFiles = Get-ChildItem -Path (Join-Path $rootPath '.github' 'workflows') -Filter 'ms.*.yml' -File
@@ -48,17 +48,17 @@ Describe 'Test default behavior' -Tag 'Default' {
     }
 
     It 'All top-level deploy.bicep files are converted to deploy.json' {
-        $deployJsonFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
+        $deployJsonFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
         $deployJsonFilesCount | Should -Be $deployParentBicepFilesCount
     }
 
     It 'All bicep files are removed' {
-        $bicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
+        $bicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
         $bicepFilesCount | Should -Be 0
     }
 
     It 'All json files have metadata removed' {
-        $deployJsonFiles = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
+        $deployJsonFiles = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
         $metadataFound = $false
 
         foreach ($deployJsonFile in $deployJsonFiles) {
@@ -109,17 +109,17 @@ Describe 'Test flag to including children' -Tag 'ConvertChildren' {
     }
 
     It 'All deploy.bicep files are converted to deploy.json' {
-        $deployJsonFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
+        $deployJsonFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
         $deployJsonFilesCount | Should -Be $deployBicepFilesCount
     }
 
     It 'All bicep files are removed' {
-        $bicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
+        $bicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
         $bicepFilesCount | Should -Be 0
     }
 
     It 'All json files have metadata removed' {
-        $deployJsonFiles = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
+        $deployJsonFiles = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
         $metadataFound = $false
 
         foreach ($deployJsonFile in $deployJsonFiles) {
@@ -170,17 +170,17 @@ Describe 'Test flags that skip logic' -Tag 'Skip' {
     }
 
     It 'All deploy.bicep files are converted to deploy.json' {
-        $deployJsonFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
+        $deployJsonFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' }).Count
         $deployJsonFilesCount | Should -Be $deployParentBicepFilesCount
     }
 
     It 'All bicep files are still there' {
-        $bicepFilesCount = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
+        $bicepFilesCount = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match '.*.bicep' }).Count
         $bicepFilesCount | Should -Be $bicepFilesCount
     }
 
     It 'All json files still have metadata' {
-        $deployJsonFiles = (Get-ChildItem -Recurse $armFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
+        $deployJsonFiles = (Get-ChildItem -Recurse $modulesFolderPath | Where-Object { $_.FullName -match 'deploy.json' })
         $metadataFound = $false
 
         foreach ($deployJsonFile in $deployJsonFiles) {

From 8b11eb66713fe47f07c076623bcf06ce24fbd2a2 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Tue, 7 Jun 2022 10:42:43 +0200
Subject: [PATCH 02/16] Update settings for MSX instance (#2)

---
 global.variables.yml | 8 ++++----
 settings.json        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/global.variables.yml b/global.variables.yml
index 7fed8d13f9..231f1341af 100644
--- a/global.variables.yml
+++ b/global.variables.yml
@@ -8,7 +8,7 @@ variables:
   ######################################
 
   location: 'West Europe' # The default location to test deploy resources to
-  resourceGroupName: 'validation-rg' # The default resource group to test deployment resources into
+  resourceGroupName: 'modules-rg' # The default resource group to test deployment resources into
 
   ######################################
   # Publish: Template-Spec settings
@@ -24,8 +24,8 @@ variables:
   ######################################
 
   bicepRegistryDoPublish: true # Set to true, if you would like to publish module templates to a bicep registry
-  bicepRegistryName: adpsxxazacrx001 # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created.
-  bicepRegistryRGName: 'artifacts-rg' # The resource group that hosts the private bicep registry (ACR)
+  bicepRegistryName: msxbicep # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created.
+  bicepRegistryRGName: 'modules-rg' # The resource group that hosts the private bicep registry (ACR)
   bicepRegistryRgLocation: 'West Europe' # The location of the resource group to publish to
 
   ###########################################################################################################################
@@ -38,7 +38,7 @@ variables:
 
   vmImage: 'ubuntu-latest' # Use this for Microsoft-hosted agents
   poolName: '' # Use this for self-hosted agents
-  serviceConnection: 'CARML-CSU-Tenant-Connection'
+  serviceConnection: 'S001-DemoSub'
 
   ######################################
   # Source
diff --git a/settings.json b/settings.json
index 9198a0f7d0..0b2e1342f7 100644
--- a/settings.json
+++ b/settings.json
@@ -5,7 +5,7 @@
         "localTokens": [
             {
                 "name": "namePrefix",
-                "value": "carml",
+                "value": "msx",
                 "metadata": {
                     "description": "A 3-5 character length string, included in the resources names"
                 }

From 2dbc2bad85afc6a2d1b5a568477b6dc24fdae7c5 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Tue, 7 Jun 2022 12:06:14 +0200
Subject: [PATCH 03/16] trigger

---
 utilities/pipelines/triggerAllPipelines | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 utilities/pipelines/triggerAllPipelines

diff --git a/utilities/pipelines/triggerAllPipelines b/utilities/pipelines/triggerAllPipelines
new file mode 100644
index 0000000000..9daeafb986
--- /dev/null
+++ b/utilities/pipelines/triggerAllPipelines
@@ -0,0 +1 @@
+test

From 7882f061e3c35c40ecf350c1e63fc0c67aecb6b2 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Tue, 7 Jun 2022 16:41:37 +0200
Subject: [PATCH 04/16] fix misreplace of 'farm' being replaced to 'fmodules'

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 534d417430..3da478c1a9 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ The CI environment supports both ARM and Bicep and can be leveraged using GitHub
 | [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | [!['ApiManagement: Service'](https://github.com/Azure/ResourceModules/workflows/ApiManagement:%20Service/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.apimanagement.service.yml) |
 | [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | [!['AppConfiguration: ConfigurationStores'](https://github.com/Azure/ResourceModules/workflows/AppConfiguration:%20ConfigurationStores/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.appconfiguration.configurationstores.yml) |
 | [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) | [!['Web: HostingEnvironments'](https://github.com/Azure/ResourceModules/workflows/Web:%20HostingEnvironments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.hostingenvironments.yml) |
-| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfmoduless) | [!['Web: Serverfmoduless'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfmoduless/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfmoduless.yml) |
+| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) | [!['Web: Serverfarms'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfarms/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfarms.yml) |
 | [Application Insights](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) | [!['Insights: Components'](https://github.com/Azure/ResourceModules/workflows/Insights:%20Components/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.components.yml) |
 | [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) | [!['Network: ApplicationSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationsecuritygroups.yml) |
 | [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) | [!['Automation: AutomationAccounts'](https://github.com/Azure/ResourceModules/workflows/Automation:%20AutomationAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.automation.automationaccounts.yml) |

From 033592b2267f4dda9b9ab77afed8d8b2e97a7a8c Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Tue, 7 Jun 2022 17:29:14 +0200
Subject: [PATCH 05/16] updated globals

---
 global.variables.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.variables.yml b/global.variables.yml
index 231f1341af..29db37ffd3 100644
--- a/global.variables.yml
+++ b/global.variables.yml
@@ -8,14 +8,14 @@ variables:
   ######################################
 
   location: 'West Europe' # The default location to test deploy resources to
-  resourceGroupName: 'modules-rg' # The default resource group to test deployment resources into
+  resourceGroupName: 'validation-rg' # The default resource group to test deployment resources into
 
   ######################################
   # Publish: Template-Spec settings
   ######################################
 
   templateSpecsDoPublish: true # Set to true, if you would like to publish module templates as template specs
-  templateSpecsRGName: 'artifacts-rg' # The name of the resource group to publish to. If the resource group does not exist, it will be created.
+  templateSpecsRGName: 'templates-rg' # The name of the resource group to publish to. If the resource group does not exist, it will be created.
   templateSpecsRGLocation: 'West Europe' # The location of the resource group to publish to
   templateSpecsDescription: components # The description to add to template specs published by this platform
 

From 20ef114689ebfa37f4f2efb0d107ca6188ac213b Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Tue, 7 Jun 2022 17:56:06 +0200
Subject: [PATCH 06/16] Test with SPN permission

---
 .../vaults/parameters/parameters.json                          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/dependencies/Microsoft.RecoveryServices/vaults/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.RecoveryServices/vaults/parameters/parameters.json
index 6a6c15ed6e..2fc18da584 100644
--- a/utilities/pipelines/dependencies/Microsoft.RecoveryServices/vaults/parameters/parameters.json
+++ b/utilities/pipelines/dependencies/Microsoft.RecoveryServices/vaults/parameters/parameters.json
@@ -255,7 +255,8 @@
                     "roleDefinitionIdOrName": "Reader",
                     "principalIds": [
                         "<<msiPrincipalID>>" // The object ID of the deployed MSI. Replaced by the pipeline
-                    ]
+                    ],
+                    "principalType": "ServicePrincipal"
                 }
             ]
         }

From caa90c6c7b23cd4200fef22dbc0e26ecbf956985 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Wed, 8 Jun 2022 00:22:24 +0200
Subject: [PATCH 07/16] Triggering all pipelines

---
 utilities/pipelines/triggerAllPipelines | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/triggerAllPipelines b/utilities/pipelines/triggerAllPipelines
index 9daeafb986..2c6de2205d 100644
--- a/utilities/pipelines/triggerAllPipelines
+++ b/utilities/pipelines/triggerAllPipelines
@@ -1 +1 @@
-test
+Trigger

From 9009fcb4f6be6d4b713d47cdb96440eb3689acc3 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 23 Jun 2022 11:45:48 +0200
Subject: [PATCH 08/16] Restore settings.json

---
 settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.json b/settings.json
index 0b2e1342f7..9198a0f7d0 100644
--- a/settings.json
+++ b/settings.json
@@ -5,7 +5,7 @@
         "localTokens": [
             {
                 "name": "namePrefix",
-                "value": "msx",
+                "value": "carml",
                 "metadata": {
                     "description": "A 3-5 character length string, included in the resources names"
                 }

From 3b4c5e2e08b3cbd9ca83ac386376c86328500377 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 23 Jun 2022 11:47:31 +0200
Subject: [PATCH 09/16] Restore global.variables.yml

---
 global.variables.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/global.variables.yml b/global.variables.yml
index 29db37ffd3..7fed8d13f9 100644
--- a/global.variables.yml
+++ b/global.variables.yml
@@ -15,7 +15,7 @@ variables:
   ######################################
 
   templateSpecsDoPublish: true # Set to true, if you would like to publish module templates as template specs
-  templateSpecsRGName: 'templates-rg' # The name of the resource group to publish to. If the resource group does not exist, it will be created.
+  templateSpecsRGName: 'artifacts-rg' # The name of the resource group to publish to. If the resource group does not exist, it will be created.
   templateSpecsRGLocation: 'West Europe' # The location of the resource group to publish to
   templateSpecsDescription: components # The description to add to template specs published by this platform
 
@@ -24,8 +24,8 @@ variables:
   ######################################
 
   bicepRegistryDoPublish: true # Set to true, if you would like to publish module templates to a bicep registry
-  bicepRegistryName: msxbicep # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created.
-  bicepRegistryRGName: 'modules-rg' # The resource group that hosts the private bicep registry (ACR)
+  bicepRegistryName: adpsxxazacrx001 # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created.
+  bicepRegistryRGName: 'artifacts-rg' # The resource group that hosts the private bicep registry (ACR)
   bicepRegistryRgLocation: 'West Europe' # The location of the resource group to publish to
 
   ###########################################################################################################################
@@ -38,7 +38,7 @@ variables:
 
   vmImage: 'ubuntu-latest' # Use this for Microsoft-hosted agents
   poolName: '' # Use this for self-hosted agents
-  serviceConnection: 'S001-DemoSub'
+  serviceConnection: 'CARML-CSU-Tenant-Connection'
 
   ######################################
   # Source

From ee67c6027153f5e0709f680e5f95e515656bd62d Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 23 Jun 2022 11:48:49 +0200
Subject: [PATCH 10/16] remove trigger all pipeline file

---
 utilities/pipelines/triggerAllPipelines | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 utilities/pipelines/triggerAllPipelines

diff --git a/utilities/pipelines/triggerAllPipelines b/utilities/pipelines/triggerAllPipelines
deleted file mode 100644
index 2c6de2205d..0000000000
--- a/utilities/pipelines/triggerAllPipelines
+++ /dev/null
@@ -1 +0,0 @@
-Trigger

From cc920848f21b57e5f4f2dfbd39e040465d4e5dd6 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 23 Jun 2022 11:50:45 +0200
Subject: [PATCH 11/16] restore Upgrade doc

---
 docs/wiki/Upgrade from 0.3.1 to 0.4.0.md | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md b/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md
index a64af835da..a84db6589c 100644
--- a/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md	
+++ b/docs/wiki/Upgrade from 0.3.1 to 0.4.0.md	
@@ -1,26 +1,26 @@
-In this area, we provide instructions to migrate from CARML version 0.3.1 to version 0.4.0. The content is divided into two main parts: The updates to the modules & the CI environment.
+In this area, we provide instructions to migrate from CARML version 0.3.1 to version 0.4.0. The content is divided into two main parts: The updates to the modules & to the CI environment.
 
 # Modules
 ## General import of new modules
-New modules can usually be migrated by adding the content of the release's `modules` folder into your own `modules` folder.
+New modules can usually be migrated by adding the content of the release's `arm` folder into your own `arm` folder.
 
-> **Note:** You should only do this from a branch and carefully compare any changes the platform displays.
+> **Note:** You should only do this in a new branch dedicated for the update process, and carefully compare any changes the platform displays.
 >
 > This is especially important if you have implemented any changes yourself that would otherwise be overwritten. In these cases, make sure to merge your changes with the ones suggested by CARML.
 >
 > Also, take special note of any new, required parameter or changed parameter name if you also modified any module's parameter files.
 
-You will notice other changes, such as modified `parameter.json` files and `version.json` files", whose upgrade is explained in more detail in the corresponding section.
+You will notice other changes, such as modified `parameter.json` files and `version.json` files", for which, the upgrade process is explained in more details in the corresponding section.
 
 ## Migrate AutoMange module
-The original **standalone** AutoManage module was merged into the virtual machine module (as an extension to follow latest best practices) and subsequently removed.
+The original **standalone** AutoManage module was merged into the virtual machine module (as an extension to follow the latest best practices) and subsequently removed.
 
-Feel free to keep the separate module but note that you can now deploy AutoManage directly with a virtual machine. If you're not using the dedicated module, we recommend removing it altogether.
+You can decide to keep the separate module, but note that you can now deploy AutoManage directly with a virtual machine. If you're not using the dedicated module, we recommend removing it altogether.
 
 ## Updated outputs
-A big breaking change is the alignment of module outputs.
+A more extensive, breaking change is the alignment of module outputs.
 
-We removed any reference to the module type from the output names. For example:
+We removed all references to the module type from the output names. For example:
 
 ```bicep
 output name string
@@ -36,12 +36,12 @@ The rational is to align all modules and shorten the outputs, as it is intuitive
 Migrating to this change (by overwriting the original module templates/outputs) won't affect the CI pipelines and you can use the environment as is. However, if you built solutions using relative paths to the modules, make sure you update any output reference of the same.
 
 ## Parameter file name prefix
-When migrating, you may notice that many of the resource names in the module parameter files have a placeholder `<<namePrefix>>`. This placeholder is automatically replaced when executing any of the CI pipelines and as such requires changes to the [CI environment](#nameprefix-in-settingsjson) too.
+When migrating, you may notice that many of the resource names in the module parameter files have a placeholder `<<namePrefix>>`. This placeholder is automatically replaced when running any of the CI pipelines and as such, requires changes to the [CI environment](#nameprefix-in-settingsjson) too.
 
 You can remove these placeholders as you see fit, or migrate them together with the changes explained in the [`General pipeline updates`](#general-pipeline-updates) & [` NamePrefix in settings.json`](#nameprefix-in-settingsjson) sections of this guide.
 
 ## Version file
-A `version.json` file was added to each individual module. Please make sure such a file is added to every module folder in the `modules` folder structure.
+A `version.json` file was added to each individual module. Please make sure such a file is added to every module folder in the `arm` folder structure.
 
 For more information on how versioning is handled see [here](https://github.com/Azure/ResourceModules/wiki/PipelinesDesign#publish).
 
@@ -50,16 +50,16 @@ For the modules you copy over, a `version.json` file will already be available.
 # CI environment
 
 ## General pipeline updates
-General updates can be migrated by essentially copying/replacing any code outside of the `modules` folder (i.e. `.github`/`.azuredevops`/`utilities`/`docs`). If you modified the CI environment in the meantime, make sure to carefully merge any conflicting code. Noteworthy changes include:
+General updates can be migrated by copying/replacing any code outside of the `arm` folder (i.e., `.github`, `.azuredevops`, `utilities`, `docs`). If you modified the CI environment in the meantime, make sure to carefully merge any conflicting code. Noteworthy changes include:
 -	renamed composite actions / templates,
 -	extended placeholder handling,
--	extended pipeline functionality (e.g., managementgroup-level removal),
+-	extended pipeline functionality (e.g., management group level removal),
 -	publishing of child modules and
 -	overall extended publishing using `version.json` files
 -	additional deployments in the dependencies pipeline
 
 ## NamePrefix in settings.json
-A change that affects all modules is the introduction of the `namePrefix` property in the local `settings.json` file.
+A change that affects all modules, is the introduction of the `namePrefix` property in the local `settings.json` file.
 This prefix is used to simplify the introduction of a "personalized" resource name prefix, avoiding the chance of name conflict with other users.
 
 When migrating, this change should be introduced before or together with the update of the [individual modules](#parameter-file-name-prefix), as their parameter files make have use of this placeholder.

From bac0503b807b6a3d72b2a46b9bff939735dfd341 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 25 Jun 2022 22:48:08 +0200
Subject: [PATCH 12/16] Rebase and restore from upstream/main

---
 .../modulePipelines/ms.aad.domainservices.yml |   6 +-
 .../ms.analysisservices.servers.yml           |   6 +-
 .../ms.apimanagement.service.yml              |   6 +-
 ...s.appconfiguration.configurationstores.yml |   6 +-
 .../ms.authorization.locks.yml                |   6 +-
 .../ms.authorization.policyassignments.yml    |   6 +-
 .../ms.authorization.policydefinitions.yml    |   6 +-
 .../ms.authorization.policyexemptions.yml     |   6 +-
 .../ms.authorization.policysetdefinitions.yml |   6 +-
 .../ms.authorization.roleassignments.yml      |   6 +-
 .../ms.authorization.roledefinitions.yml      |   6 +-
 .../ms.automation.automationaccounts.yml      |   6 +-
 .../ms.batch.batchaccounts.yml                |   6 +-
 .../ms.cognitiveservices.accounts.yml         |   6 +-
 .../ms.compute.availabilitysets.yml           |   6 +-
 .../ms.compute.diskencryptionsets.yml         |   6 +-
 .../modulePipelines/ms.compute.disks.yml      |   6 +-
 .../modulePipelines/ms.compute.galleries.yml  |   6 +-
 .../modulePipelines/ms.compute.images.yml     |   6 +-
 .../ms.compute.proximityplacementgroups.yml   |   6 +-
 .../ms.compute.virtualmachines.yml            |   6 +-
 .../ms.compute.virtualmachinescalesets.yml    |   6 +-
 .../ms.consumption.budgets.yml                |   6 +-
 .../ms.containerinstance.containergroups.yml  |   6 +-
 .../ms.containerregistry.registries.yml       |   6 +-
 .../ms.containerservice.managedclusters.yml   |   6 +-
 .../ms.databricks.workspaces.yml              |   6 +-
 .../ms.datafactory.factories.yml              |   6 +-
 .../ms.dataprotection.backupvaults.yml        |   6 +-
 ...esktopvirtualization.applicationgroups.yml |   6 +-
 .../ms.desktopvirtualization.hostpools.yml    |   6 +-
 .../ms.desktopvirtualization.scalingplans.yml |   6 +-
 .../ms.desktopvirtualization.workspaces.yml   |   6 +-
 .../ms.documentdb.databaseaccounts.yml        |   6 +-
 .../ms.eventgrid.systemtopics.yml             |   6 +-
 .../modulePipelines/ms.eventgrid.topics.yml   |   6 +-
 .../ms.eventhub.namespaces.yml                |   6 +-
 .../ms.healthbot.healthbots.yml               |   6 +-
 .../ms.insights.actiongroups.yml              |   6 +-
 .../ms.insights.activitylogalerts.yml         |   6 +-
 .../ms.insights.components.yml                |   6 +-
 .../ms.insights.diagnosticsettings.yml        |   6 +-
 .../ms.insights.metricalerts.yml              |   6 +-
 .../ms.insights.privatelinkscopes.yml         |   6 +-
 .../ms.insights.scheduledqueryrules.yml       |   6 +-
 .../modulePipelines/ms.keyvault.vaults.yml    |   6 +-
 .../ms.kubernetesconfiguration.extensions.yml |   6 +-
 ...rnetesconfiguration.fluxconfigurations.yml |   6 +-
 .../modulePipelines/ms.logic.workflows.yml    |   6 +-
 .../ms.machinelearningservices.workspaces.yml |   6 +-
 ...managedidentity.userassignedidentities.yml |   6 +-
 ...anagedservices.registrationdefinitions.yml |   6 +-
 .../ms.management.managementgroups.yml        |   6 +-
 .../ms.netapp.netappaccounts.yml              |   6 +-
 .../ms.network.applicationgateways.yml        |   6 +-
 .../ms.network.applicationsecuritygroups.yml  |   6 +-
 .../ms.network.azurefirewalls.yml             |   6 +-
 .../ms.network.bastionhosts.yml               |   6 +-
 .../ms.network.connections.yml                |   6 +-
 .../ms.network.ddosprotectionplans.yml        |   6 +-
 .../ms.network.expressroutecircuits.yml       |   6 +-
 .../ms.network.firewallpolicies.yml           |   6 +-
 .../modulePipelines/ms.network.frontdoors.yml |   6 +-
 .../modulePipelines/ms.network.ipgroups.yml   |   6 +-
 .../ms.network.loadbalancers.yml              |   6 +-
 .../ms.network.localnetworkgateways.yml       |   6 +-
 .../ms.network.natgateways.yml                |   6 +-
 .../ms.network.networkinterfaces.yml          |   6 +-
 .../ms.network.networksecuritygroups.yml      |   6 +-
 .../ms.network.networkwatchers.yml            |   6 +-
 .../ms.network.privatednszones.yml            |   6 +-
 .../ms.network.privateendpoints.yml           |   6 +-
 .../ms.network.publicipaddresses.yml          |   6 +-
 .../ms.network.publicipprefixes.yml           |   6 +-
 .../ms.network.routetables.yml                |   6 +-
 .../ms.network.trafficmanagerprofiles.yml     |   6 +-
 .../ms.network.virtualhubs.yml                |   6 +-
 .../ms.network.virtualnetworkgateways.yml     |   6 +-
 .../ms.network.virtualnetworks.yml            |   6 +-
 .../ms.network.virtualwans.yml                |   6 +-
 .../ms.network.vpngateways.yml                |   6 +-
 .../modulePipelines/ms.network.vpnsites.yml   |   6 +-
 .../ms.operationalinsights.workspaces.yml     |   6 +-
 .../ms.operationsmanagement.solutions.yml     |   6 +-
 .../ms.recoveryservices.vaults.yml            |   6 +-
 .../ms.resources.deploymentscripts.yml        |   6 +-
 .../ms.resources.resourcegroups.yml           |   6 +-
 .../modulePipelines/ms.resources.tags.yml     |   6 +-
 .../ms.security.azuresecuritycenter.yml       |   6 +-
 .../ms.servicebus.namespaces.yml              |   6 +-
 .../ms.servicefabric.clusters.yml             |   4 +-
 .../ms.sql.managedinstances.yml               |   6 +-
 .../modulePipelines/ms.sql.servers.yml        |   6 +-
 .../ms.storage.storageaccounts.yml            |   6 +-
 .../ms.synapse.privatelinkhubs.yml            |   6 +-
 ...ms.virtualmachineimages.imagetemplates.yml |   6 +-
 .../modulePipelines/ms.web.connections.yml    |   6 +-
 .../ms.web.hostingenvironments.yml            |   6 +-
 .../modulePipelines/ms.web.serverfarms.yml    |   6 +-
 .azuredevops/modulePipelines/ms.web.sites.yml |   6 +-
 .../modulePipelines/ms.web.staticsites.yml    |   6 +-
 .../pipelineTemplates/jobs.publishModule.yml  |   6 +-
 .../jobs.validateModulePester.yml             |   6 +-
 .../platform.dependencies.yml                 |   2 +-
 .../platform.updateReadMe.yml                 |  10 +-
 .../templates/publishModule/action.yml        |   6 +-
 .../validateModuleDeployment/action.yml       |   4 +-
 .../templates/validateModulePester/action.yml |  10 +-
 .github/workflows/ms.aad.domainservices.yml   |   6 +-
 .../workflows/ms.analysisservices.servers.yml |   6 +-
 .../workflows/ms.apimanagement.service.yml    |   6 +-
 ...s.appconfiguration.configurationstores.yml |   6 +-
 .github/workflows/ms.authorization.locks.yml  |   6 +-
 .../ms.authorization.policyassignments.yml    |   6 +-
 .../ms.authorization.policydefinitions.yml    |   6 +-
 .../ms.authorization.policyexemptions.yml     |   6 +-
 .../ms.authorization.policysetdefinitions.yml |   6 +-
 .../ms.authorization.roleassignments.yml      |   6 +-
 .../ms.authorization.roledefinitions.yml      |   6 +-
 .../ms.automation.automationaccounts.yml      |   6 +-
 .github/workflows/ms.batch.batchaccounts.yml  |   6 +-
 .../ms.cognitiveservices.accounts.yml         |   6 +-
 .../workflows/ms.compute.availabilitysets.yml |   6 +-
 .../ms.compute.diskencryptionsets.yml         |   6 +-
 .github/workflows/ms.compute.disks.yml        |   6 +-
 .github/workflows/ms.compute.galleries.yml    |   6 +-
 .github/workflows/ms.compute.images.yml       |   6 +-
 .../ms.compute.proximityplacementgroups.yml   |   6 +-
 .../workflows/ms.compute.virtualmachines.yml  |   6 +-
 .../ms.compute.virtualmachinescalesets.yml    |   6 +-
 .github/workflows/ms.consumption.budgets.yml  |   6 +-
 .../ms.containerinstance.containergroups.yml  |   6 +-
 .../ms.containerregistry.registries.yml       |   6 +-
 .../ms.containerservice.managedclusters.yml   |   6 +-
 .../workflows/ms.databricks.workspaces.yml    |   6 +-
 .../workflows/ms.datafactory.factories.yml    |   6 +-
 .../ms.dataprotection.backupvaults.yml        |  98 ++++-----
 ...esktopvirtualization.applicationgroups.yml |   6 +-
 .../ms.desktopvirtualization.hostpools.yml    |   6 +-
 .../ms.desktopvirtualization.scalingplans.yml |   6 +-
 .../ms.desktopvirtualization.workspaces.yml   |   6 +-
 .../ms.documentdb.databaseaccounts.yml        |   6 +-
 .../workflows/ms.eventgrid.systemtopics.yml   |   6 +-
 .github/workflows/ms.eventgrid.topics.yml     |   6 +-
 .github/workflows/ms.eventhub.namespaces.yml  |   6 +-
 .github/workflows/ms.healthbot.healthbots.yml |   6 +-
 .../workflows/ms.insights.actiongroups.yml    |   6 +-
 .../ms.insights.activitylogalerts.yml         |   6 +-
 .github/workflows/ms.insights.components.yml  |   6 +-
 .../ms.insights.diagnosticsettings.yml        |   6 +-
 .../workflows/ms.insights.metricalerts.yml    |   6 +-
 .../ms.insights.privatelinkscopes.yml         |   6 +-
 .../ms.insights.scheduledqueryrules.yml       |   6 +-
 .github/workflows/ms.keyvault.vaults.yml      |   6 +-
 .../ms.kubernetesconfiguration.extensions.yml |   6 +-
 ...rnetesconfiguration.fluxconfigurations.yml |   6 +-
 .github/workflows/ms.logic.workflows.yml      |   6 +-
 .../ms.machinelearningservices.workspaces.yml |   6 +-
 ...managedidentity.userassignedidentities.yml |   6 +-
 ...anagedservices.registrationdefinitions.yml |   6 +-
 .../ms.management.managementgroups.yml        |   6 +-
 .../workflows/ms.netapp.netappaccounts.yml    |   6 +-
 .../ms.network.applicationgateways.yml        |   6 +-
 .../ms.network.applicationsecuritygroups.yml  |   6 +-
 .../workflows/ms.network.azurefirewalls.yml   |   6 +-
 .github/workflows/ms.network.bastionhosts.yml |   6 +-
 .github/workflows/ms.network.connections.yml  |   6 +-
 .../ms.network.ddosprotectionplans.yml        |   6 +-
 .../ms.network.expressroutecircuits.yml       |   6 +-
 .../workflows/ms.network.firewallpolicies.yml |   6 +-
 .github/workflows/ms.network.frontdoors.yml   |   6 +-
 .github/workflows/ms.network.ipgroups.yml     |   6 +-
 .../workflows/ms.network.loadbalancers.yml    |   6 +-
 .../ms.network.localnetworkgateways.yml       |   6 +-
 .github/workflows/ms.network.natgateways.yml  |   6 +-
 .../ms.network.networkinterfaces.yml          |   6 +-
 .../ms.network.networksecuritygroups.yml      |   6 +-
 .../workflows/ms.network.networkwatchers.yml  |   6 +-
 .../workflows/ms.network.privatednszones.yml  |   6 +-
 .../workflows/ms.network.privateendpoints.yml |   6 +-
 .../ms.network.publicipaddresses.yml          |   6 +-
 .../workflows/ms.network.publicipprefixes.yml |   6 +-
 .github/workflows/ms.network.routetables.yml  |   6 +-
 .../ms.network.trafficmanagerprofiles.yml     |   6 +-
 .github/workflows/ms.network.virtualhubs.yml  |   6 +-
 .../ms.network.virtualnetworkgateways.yml     |   6 +-
 .../workflows/ms.network.virtualnetworks.yml  |   6 +-
 .github/workflows/ms.network.virtualwans.yml  |   6 +-
 .github/workflows/ms.network.vpngateways.yml  |   6 +-
 .github/workflows/ms.network.vpnsites.yml     |   6 +-
 .../ms.operationalinsights.workspaces.yml     |   6 +-
 .../ms.operationsmanagement.solutions.yml     |   6 +-
 .../workflows/ms.recoveryservices.vaults.yml  |   6 +-
 .../ms.resources.deploymentscripts.yml        |   6 +-
 .../workflows/ms.resources.resourcegroups.yml |   6 +-
 .github/workflows/ms.resources.tags.yml       |   6 +-
 .../ms.security.azuresecuritycenter.yml       |   6 +-
 .../workflows/ms.servicebus.namespaces.yml    |   6 +-
 .../workflows/ms.servicefabric.clusters.yml   |   6 +-
 .github/workflows/ms.sql.managedinstances.yml |   6 +-
 .github/workflows/ms.sql.servers.yml          |   6 +-
 .../workflows/ms.storage.storageaccounts.yml  |   6 +-
 .../workflows/ms.synapse.privatelinkhubs.yml  |   6 +-
 ...ms.virtualmachineimages.imagetemplates.yml |   6 +-
 .github/workflows/ms.web.connections.yml      |   6 +-
 .../workflows/ms.web.hostingenvironments.yml  |   6 +-
 .github/workflows/ms.web.serverfarms.yml      |   6 +-
 .github/workflows/ms.web.sites.yml            |   6 +-
 .github/workflows/ms.web.staticsites.yml      |   6 +-
 .github/workflows/platform.dependencies.yml   |  76 ++++---
 .github/workflows/platform.updateReadMe.yml   |  10 +-
 README.md                                     | 202 +++++++++---------
 arm/README.md                                 | 107 ----------
 .../.bicep/nested_roleAssignments.bicep       |   6 +-
 .../virtualMachinesMultiple/deploy.bicep      |   2 +-
 .../deploy.bicep                              |   2 +-
 ...g started - Get module cross-references.md |   2 +-
 ...board module library and CI environment.md |  24 +--
 docs/wiki/Solution creation.md                |  16 +-
 ...ent - GitHub ReadMe module table update.md |   2 +-
 .../The CI environment - Pipeline design.md   |   4 +-
 .../The CI environment - Static validation.md |   6 +-
 docs/wiki/The library - Module design.md      |   6 +-
 docs/wiki/The library - Module usage.md       |  32 +--
 .../.global/global.module.tests.ps1           |  30 +--
 {arm => modules}/.global/shared/helper.psm1   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../Microsoft.AAD/DomainServices/deploy.bicep |   0
 .../Microsoft.AAD/DomainServices/readme.md    |   0
 .../Microsoft.AAD/DomainServices/version.json |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../servers/.parameters/max.parameters.json   |   0
 .../servers/.parameters/min.parameters.json   |   0
 .../servers/.parameters/parameters.json       |   0
 .../servers/deploy.bicep                      |   0
 .../servers/readme.md                         |   0
 .../servers/version.json                      |   0
 .../.bicep/nested_authorizationServers.bicep  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../service/.parameters/max.parameters.json   |   0
 .../service/.parameters/min.parameters.json   |   0
 .../service/.parameters/parameters.json       |   0
 .../service/apiVersionSets/deploy.bicep       |   0
 .../service/apiVersionSets/readme.md          |   0
 .../service/apiVersionSets/version.json       |   0
 .../service/apis/deploy.bicep                 |   0
 .../service/apis/policies/deploy.bicep        |   0
 .../service/apis/policies/readme.md           |   0
 .../service/apis/policies/version.json        |   0
 .../service/apis/readme.md                    |   0
 .../service/apis/version.json                 |   0
 .../service/authorizationServers/deploy.bicep |   0
 .../service/authorizationServers/readme.md    |   0
 .../service/authorizationServers/version.json |   0
 .../service/backends/deploy.bicep             |   0
 .../service/backends/readme.md                |   0
 .../service/backends/version.json             |   0
 .../service/caches/deploy.bicep               |   0
 .../service/caches/readme.md                  |   0
 .../service/caches/version.json               |   0
 .../service/deploy.bicep                      |   0
 .../service/identityProviders/deploy.bicep    |   0
 .../service/identityProviders/readme.md       |   0
 .../service/identityProviders/version.json    |   0
 .../service/namedValues/deploy.bicep          |   0
 .../service/namedValues/readme.md             |   0
 .../service/namedValues/version.json          |   0
 .../service/policies/deploy.bicep             |   0
 .../service/policies/readme.md                |   0
 .../service/policies/version.json             |   0
 .../service/portalsettings/deploy.bicep       |   0
 .../service/portalsettings/readme.md          |   0
 .../service/portalsettings/version.json       |   0
 .../service/products/apis/deploy.bicep        |   0
 .../service/products/apis/readme.md           |   0
 .../service/products/apis/version.json        |   0
 .../service/products/deploy.bicep             |   0
 .../service/products/groups/deploy.bicep      |   0
 .../service/products/groups/readme.md         |   0
 .../service/products/groups/version.json      |   0
 .../service/products/readme.md                |   0
 .../service/products/version.json             |   0
 .../Microsoft.ApiManagement/service/readme.md |   0
 .../service/subscriptions/deploy.bicep        |   0
 .../service/subscriptions/readme.md           |   0
 .../service/subscriptions/version.json        |   0
 .../service/version.json                      |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../configurationStores/deploy.bicep          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../keyValues/deploy.bicep                    |   0
 .../configurationStores/keyValues/readme.md   |   0
 .../keyValues/version.json                    |   0
 .../configurationStores/readme.md             |   0
 .../configurationStores/version.json          |   0
 .../locks/.parameters/rg.parameters.json      |   0
 .../locks/deploy.bicep                        |   0
 .../Microsoft.Authorization/locks/readme.md   |   0
 .../locks/resourceGroup/deploy.bicep          |   0
 .../locks/resourceGroup/readme.md             |   0
 .../locks/resourceGroup/version.json          |   0
 .../locks/subscription/deploy.bicep           |   0
 .../locks/subscription/readme.md              |   0
 .../locks/subscription/version.json           |   0
 .../locks/version.json                        |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyAssignments/deploy.bicep            |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyAssignments/readme.md               |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../policyAssignments/resourceGroup/readme.md |   0
 .../resourceGroup/version.json                |   0
 .../subscription/deploy.bicep                 |   0
 .../policyAssignments/subscription/readme.md  |   0
 .../subscription/version.json                 |   0
 .../policyAssignments/version.json            |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyDefinitions/deploy.bicep            |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyDefinitions/readme.md               |   2 +-
 .../subscription/deploy.bicep                 |   0
 .../policyDefinitions/subscription/readme.md  |   0
 .../subscription/version.json                 |   0
 .../policyDefinitions/version.json            |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policyExemptions/deploy.bicep             |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policyExemptions/readme.md                |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../policyExemptions/resourceGroup/readme.md  |   0
 .../resourceGroup/version.json                |   0
 .../subscription/deploy.bicep                 |   0
 .../policyExemptions/subscription/readme.md   |   0
 .../subscription/version.json                 |   0
 .../policyExemptions/version.json             |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../policySetDefinitions/deploy.bicep         |   0
 .../managementGroup/deploy.bicep              |   0
 .../managementGroup/readme.md                 |   0
 .../managementGroup/version.json              |   0
 .../policySetDefinitions/readme.md            |   2 +-
 .../subscription/deploy.bicep                 |   0
 .../subscription/readme.md                    |   0
 .../subscription/version.json                 |   0
 .../policySetDefinitions/version.json         |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../roleAssignments/deploy.bicep              |   0
 .../managementGroup/deploy.bicep              |   0
 .../roleAssignments/managementGroup/readme.md |   0
 .../managementGroup/version.json              |   0
 .../roleAssignments/readme.md                 |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../roleAssignments/resourceGroup/readme.md   |   0
 .../resourceGroup/version.json                |   0
 .../roleAssignments/subscription/deploy.bicep |   0
 .../roleAssignments/subscription/readme.md    |   0
 .../roleAssignments/subscription/version.json |   0
 .../roleAssignments/version.json              |   0
 .../.parameters/mg.min.parameters.json        |   0
 .../.parameters/mg.parameters.json            |   0
 .../.parameters/rg.min.parameters.json        |   0
 .../.parameters/rg.parameters.json            |   0
 .../.parameters/sub.min.parameters.json       |   0
 .../.parameters/sub.parameters.json           |   0
 .../roleDefinitions/deploy.bicep              |   0
 .../managementGroup/deploy.bicep              |   0
 .../roleDefinitions/managementGroup/readme.md |   0
 .../managementGroup/version.json              |   0
 .../roleDefinitions/readme.md                 |   2 +-
 .../resourceGroup/deploy.bicep                |   0
 .../roleDefinitions/resourceGroup/readme.md   |   0
 .../resourceGroup/version.json                |   0
 .../roleDefinitions/subscription/deploy.bicep |   0
 .../roleDefinitions/subscription/readme.md    |   0
 .../roleDefinitions/subscription/version.json |   0
 .../roleDefinitions/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/encr.parameters.json          |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../automationAccounts/deploy.bicep           |   0
 .../jobSchedules/deploy.bicep                 |   0
 .../automationAccounts/jobSchedules/readme.md |   0
 .../jobSchedules/version.json                 |   0
 .../automationAccounts/modules/deploy.bicep   |   0
 .../automationAccounts/modules/readme.md      |   0
 .../automationAccounts/modules/version.json   |   0
 .../automationAccounts/readme.md              |   0
 .../automationAccounts/runbooks/deploy.bicep  |   0
 .../automationAccounts/runbooks/readme.md     |   0
 .../automationAccounts/runbooks/version.json  |   0
 .../automationAccounts/schedules/deploy.bicep |   0
 .../automationAccounts/schedules/readme.md    |   0
 .../automationAccounts/schedules/version.json |   0
 .../softwareUpdateConfigurations/deploy.bicep |   0
 .../softwareUpdateConfigurations/readme.md    |   0
 .../softwareUpdateConfigurations/version.json |   0
 .../automationAccounts/variables/deploy.bicep |   0
 .../automationAccounts/variables/readme.md    |   0
 .../automationAccounts/variables/version.json |   0
 .../automationAccounts/version.json           |   0
 .../.parameters/min.parameters.json           |   0
 .../batchAccounts/.parameters/parameters.json |   0
 .../batchAccounts/deploy.bicep                |   0
 .../Microsoft.Batch/batchAccounts/readme.md   |   0
 .../batchAccounts/version.json                |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../accounts/.parameters/encr.parameters.json |   0
 .../accounts/.parameters/min.parameters.json  |   0
 .../accounts/.parameters/parameters.json      |   0
 .../.parameters/speech.parameters.json        |   0
 .../accounts/deploy.bicep                     |   0
 .../accounts/readme.md                        |   0
 .../accounts/version.json                     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../availabilitySets/deploy.bicep             |   0
 .../availabilitySets/readme.md                |   0
 .../availabilitySets/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../diskEncryptionSets/deploy.bicep           |   0
 .../diskEncryptionSets/readme.md              |   0
 .../diskEncryptionSets/version.json           |   0
 .../disks/.bicep/nested_roleAssignments.bicep |   0
 .../disks/.parameters/image.parameters.json   |   0
 .../disks/.parameters/import.parameters.json  |   0
 .../disks/.parameters/min.parameters.json     |   0
 .../disks/.parameters/parameters.json         |   0
 .../Microsoft.Compute/disks/deploy.bicep      |   0
 .../Microsoft.Compute/disks/readme.md         |   0
 .../Microsoft.Compute/disks/version.json      |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/images.parameters.json        |   0
 .../galleries/.parameters/parameters.json     |   0
 .../Microsoft.Compute/galleries/deploy.bicep  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../galleries/images/deploy.bicep             |   0
 .../galleries/images/readme.md                |   0
 .../galleries/images/version.json             |   0
 .../Microsoft.Compute/galleries/readme.md     |   0
 .../Microsoft.Compute/galleries/version.json  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../images/.parameters/parameters.json        |   0
 .../Microsoft.Compute/images/deploy.bicep     |   0
 .../Microsoft.Compute/images/readme.md        |   0
 .../Microsoft.Compute/images/version.json     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../proximityPlacementGroups/deploy.bicep     |   0
 .../proximityPlacementGroups/readme.md        |   0
 .../proximityPlacementGroups/version.json     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/linux.min.parameters.json     |   0
 .../.parameters/linux.parameters.json         |   0
 .../.parameters/windows.min.parameters.json   |   0
 .../.parameters/windows.parameters.json       |   0
 .../virtualMachineScaleSets/deploy.bicep      |   0
 .../extensions/deploy.bicep                   |   0
 .../extensions/readme.md                      |   0
 .../extensions/version.json                   |   0
 .../virtualMachineScaleSets/readme.md         |   0
 .../virtualMachineScaleSets/version.json      |   0
 .../.bicep/nested_networkInterface.bicep      |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/linux.autmg.parameters.json   |   0
 .../.parameters/linux.min.parameters.json     |   0
 .../.parameters/linux.parameters.json         |   0
 .../.parameters/windows.autmg.parameters.json |   0
 .../.parameters/windows.min.parameters.json   |   0
 .../.parameters/windows.parameters.json       |   0
 .../virtualMachines/deploy.bicep              |   0
 .../virtualMachines/extensions/deploy.bicep   |   0
 .../virtualMachines/extensions/readme.md      |   0
 .../virtualMachines/extensions/version.json   |   0
 .../virtualMachines/readme.md                 |   0
 .../virtualMachines/version.json              |   0
 .../budgets/.parameters/parameters.json       |   0
 .../budgets/deploy.bicep                      |   0
 .../Microsoft.Consumption/budgets/readme.md   |   0
 .../budgets/version.json                      |   0
 .../.parameters/parameters.json               |   0
 .../containerGroups/deploy.bicep              |   0
 .../containerGroups/readme.md                 |   0
 .../containerGroups/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/encr.parameters.json          |   0
 .../.parameters/min.parameters.json           |   0
 .../registries/.parameters/parameters.json    |   0
 .../registries/deploy.bicep                   |   0
 .../registries/readme.md                      |   0
 .../registries/replications/deploy.bicep      |   0
 .../registries/replications/readme.md         |   0
 .../registries/replications/version.json      |   0
 .../registries/version.json                   |   0
 .../registries/webhooks/deploy.bicep          |   0
 .../registries/webhooks/readme.md             |   0
 .../registries/webhooks/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/azure.parameters.json         |   0
 .../.parameters/kubenet.parameters.json       |   0
 .../managedClusters/agentPools/deploy.bicep   |   0
 .../managedClusters/agentPools/readme.md      |   0
 .../managedClusters/agentPools/version.json   |   0
 .../managedClusters/deploy.bicep              |   0
 .../managedClusters/readme.md                 |   0
 .../managedClusters/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../factories/.parameters/parameters.json     |   0
 .../factories/deploy.bicep                    |   0
 .../factories/integrationRuntime/deploy.bicep |   0
 .../factories/integrationRuntime/readme.md    |   0
 .../factories/integrationRuntime/version.json |   0
 .../managedVirtualNetwork/deploy.bicep        |   0
 .../factories/managedVirtualNetwork/readme.md |   0
 .../managedVirtualNetwork/version.json        |   0
 .../Microsoft.DataFactory/factories/readme.md |   0
 .../factories/version.json                    |   0
 .../backupVaults/.bicep/nested_rbac.bicep     |   0
 .../.parameters/min.parameters.json           |   0
 .../backupVaults/.parameters/parameters.json  |   0
 .../backupVaults/backupPolicies/deploy.bicep  |   0
 .../backupVaults/backupPolicies/readme.md     |   0
 .../backupVaults/backupPolicies/version.json  |   0
 .../backupVaults/deploy.bicep                 |   0
 .../backupVaults/readme.md                    |   0
 .../backupVaults/version.json                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/deploy.bicep                   |   0
 .../Microsoft.Databricks/workspaces/readme.md |   0
 .../workspaces/version.json                   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../applications/deploy.bicep                 |   0
 .../applicationgroups/applications/readme.md  |   0
 .../applications/version.json                 |   0
 .../applicationgroups/deploy.bicep            |   0
 .../applicationgroups/readme.md               |   0
 .../applicationgroups/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../hostpools/.parameters/parameters.json     |   0
 .../hostpools/deploy.bicep                    |   0
 .../hostpools/readme.md                       |   0
 .../hostpools/version.json                    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../scalingplans/deploy.bicep                 |   0
 .../scalingplans/readme.md                    |   0
 .../scalingplans/version.json                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/version.json                   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/mongodb.parameters.json       |   0
 .../.parameters/plain.parameters.json         |   0
 .../.parameters/sqldb.parameters.json         |   0
 .../databaseAccounts/deploy.bicep             |   0
 .../mongodbDatabases/collections/deploy.bicep |   0
 .../mongodbDatabases/collections/readme.md    |   0
 .../mongodbDatabases/collections/version.json |   0
 .../mongodbDatabases/deploy.bicep             |   0
 .../mongodbDatabases/readme.md                |   0
 .../mongodbDatabases/version.json             |   0
 .../databaseAccounts/readme.md                |   0
 .../sqlDatabases/containers/deploy.bicep      |   0
 .../sqlDatabases/containers/readme.md         |   0
 .../sqlDatabases/containers/version.json      |   0
 .../sqlDatabases/deploy.bicep                 |   0
 .../databaseAccounts/sqlDatabases/readme.md   |   0
 .../sqlDatabases/version.json                 |   0
 .../databaseAccounts/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../systemTopics/.parameters/parameters.json  |   0
 .../systemTopics/deploy.bicep                 |   0
 .../systemTopics/readme.md                    |   0
 .../systemTopics/version.json                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../topics/.parameters/parameters.json        |   0
 .../Microsoft.EventGrid/topics/deploy.bicep   |   0
 .../Microsoft.EventGrid/topics/readme.md      |   0
 .../Microsoft.EventGrid/topics/version.json   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../namespaces/.parameters/parameters.json    |   0
 .../authorizationRules/deploy.bicep           |   0
 .../namespaces/authorizationRules/readme.md   |   0
 .../authorizationRules/version.json           |   0
 .../namespaces/deploy.bicep                   |   0
 .../disasterRecoveryConfigs/deploy.bicep      |   0
 .../disasterRecoveryConfigs/readme.md         |   0
 .../disasterRecoveryConfigs/version.json      |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../eventhubs/authorizationRules/deploy.bicep |   0
 .../eventhubs/authorizationRules/readme.md    |   0
 .../eventhubs/authorizationRules/version.json |   0
 .../eventhubs/consumergroups/deploy.bicep     |   0
 .../eventhubs/consumergroups/readme.md        |   0
 .../eventhubs/consumergroups/version.json     |   0
 .../namespaces/eventhubs/deploy.bicep         |   0
 .../namespaces/eventhubs/readme.md            |   0
 .../namespaces/eventhubs/version.json         |   0
 .../namespaces/networkRuleSets/deploy.bicep   |   0
 .../namespaces/networkRuleSets/readme.md      |   0
 .../namespaces/networkRuleSets/version.json   |   0
 .../Microsoft.EventHub/namespaces/readme.md   |   0
 .../namespaces/version.json                   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../healthBots/.parameters/parameters.json    |   0
 .../healthBots/deploy.bicep                   |   0
 .../Microsoft.HealthBot/healthBots/readme.md  |   0
 .../healthBots/version.json                   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../actionGroups/.parameters/parameters.json  |   0
 .../actionGroups/deploy.bicep                 |   0
 .../Microsoft.Insights/actionGroups/readme.md |   0
 .../actionGroups/version.json                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../activityLogAlerts/deploy.bicep            |   0
 .../activityLogAlerts/readme.md               |   0
 .../activityLogAlerts/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../components/.parameters/parameters.json    |   0
 .../components/deploy.bicep                   |   0
 .../Microsoft.Insights/components/readme.md   |   0
 .../components/version.json                   |   0
 .../.parameters/parameters.json               |   0
 .../diagnosticSettings/deploy.bicep           |   0
 .../diagnosticSettings/readme.md              |   0
 .../diagnosticSettings/version.json           |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../metricAlerts/.parameters/parameters.json  |   0
 .../metricAlerts/deploy.bicep                 |   0
 .../Microsoft.Insights/metricAlerts/readme.md |   0
 .../metricAlerts/version.json                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../privateLinkScopes/deploy.bicep            |   0
 .../privateLinkScopes/readme.md               |   0
 .../scopedResources/deploy.bicep              |   0
 .../scopedResources/readme.md                 |   0
 .../scopedResources/version.json              |   0
 .../privateLinkScopes/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../scheduledQueryRules/deploy.bicep          |   0
 .../scheduledQueryRules/readme.md             |   0
 .../scheduledQueryRules/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../vaults/.parameters/min.parameters.json    |   0
 .../vaults/.parameters/parameters.json        |   0
 .../vaults/accessPolicies/deploy.bicep        |   0
 .../vaults/accessPolicies/readme.md           |   0
 .../vaults/accessPolicies/version.json        |   0
 .../Microsoft.KeyVault/vaults/deploy.bicep    |   0
 .../keys/.bicep/nested_roleAssignments.bicep  |   0
 .../vaults/keys/deploy.bicep                  |   0
 .../Microsoft.KeyVault/vaults/keys/readme.md  |   0
 .../vaults/keys/version.json                  |   0
 .../Microsoft.KeyVault/vaults/readme.md       |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../vaults/secrets/deploy.bicep               |   0
 .../vaults/secrets/readme.md                  |   0
 .../vaults/secrets/version.json               |   0
 .../Microsoft.KeyVault/vaults/version.json    |   0
 .../.parameters/min.parameters.json           |   0
 .../extensions/.parameters/parameters.json    |   0
 .../extensions/deploy.bicep                   |   0
 .../extensions/readme.md                      |   0
 .../extensions/version.json                   |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../fluxConfigurations/deploy.bicep           |   0
 .../fluxConfigurations/readme.md              |   0
 .../fluxConfigurations/version.json           |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../workflows/.parameters/parameters.json     |   0
 .../Microsoft.Logic/workflows/deploy.bicep    |   0
 .../Microsoft.Logic/workflows/readme.md       |   0
 .../Microsoft.Logic/workflows/version.json    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/computes/deploy.bicep          |   0
 .../workspaces/computes/readme.md             |   0
 .../workspaces/computes/version.json          |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/version.json                   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../userAssignedIdentities/deploy.bicep       |   0
 .../userAssignedIdentities/readme.md          |   0
 .../userAssignedIdentities/version.json       |   0
 .../nested_registrationAssignment.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/rg.parameters.json            |   0
 .../registrationDefinitions/deploy.bicep      |   0
 .../registrationDefinitions/readme.md         |   0
 .../registrationDefinitions/version.json      |   0
 .../.parameters/parameters.json               |   0
 .../managementGroups/deploy.bicep             |   0
 .../managementGroups/readme.md                |   0
 .../managementGroups/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/nfs3.parameters.json          |   0
 .../.parameters/nfs41.parameters.json         |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../netAppAccounts/capacityPools/deploy.bicep |   0
 .../netAppAccounts/capacityPools/readme.md    |   0
 .../netAppAccounts/capacityPools/version.json |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../capacityPools/volumes/deploy.bicep        |   0
 .../capacityPools/volumes/readme.md           |   0
 .../capacityPools/volumes/version.json        |   0
 .../netAppAccounts/deploy.bicep               |   0
 .../Microsoft.NetApp/netAppAccounts/readme.md |   0
 .../netAppAccounts/version.json               |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../applicationGateways/deploy.bicep          |   0
 .../applicationGateways/readme.md             |   0
 .../applicationGateways/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../applicationSecurityGroups/deploy.bicep    |   0
 .../applicationSecurityGroups/readme.md       |   0
 .../applicationSecurityGroups/version.json    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/addpip.parameters.json        |   0
 .../.parameters/custompip.parameters.json     |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../azureFirewalls/deploy.bicep               |   0
 .../azureFirewalls/readme.md                  |   0
 .../azureFirewalls/version.json               |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/addpip.parameters.json        |   0
 .../.parameters/custompip.parameters.json     |   0
 .../.parameters/min.parameters.json           |   0
 .../bastionHosts/.parameters/parameters.json  |   0
 .../bastionHosts/deploy.bicep                 |   0
 .../Microsoft.Network/bastionHosts/readme.md  |   0
 .../bastionHosts/version.json                 |   0
 .../.parameters/vnet2vnet.parameters.json     |   0
 .../connections/deploy.bicep                  |   0
 .../Microsoft.Network/connections/readme.md   |   0
 .../connections/version.json                  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../ddosProtectionPlans/deploy.bicep          |   0
 .../ddosProtectionPlans/readme.md             |   0
 .../ddosProtectionPlans/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../expressRouteCircuits/deploy.bicep         |   0
 .../expressRouteCircuits/readme.md            |   0
 .../expressRouteCircuits/version.json         |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../firewallPolicies/deploy.bicep             |   0
 .../firewallPolicies/readme.md                |   0
 .../ruleCollectionGroups/deploy.bicep         |   0
 .../ruleCollectionGroups/readme.md            |   0
 .../ruleCollectionGroups/version.json         |   0
 .../firewallPolicies/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../frontDoors/.parameters/parameters.json    |   0
 .../Microsoft.Network/frontDoors/deploy.bicep |   0
 .../Microsoft.Network/frontDoors/readme.md    |   0
 .../Microsoft.Network/frontDoors/version.json |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../ipGroups/.parameters/parameters.json      |   0
 .../Microsoft.Network/ipGroups/deploy.bicep   |   0
 .../Microsoft.Network/ipGroups/readme.md      |   0
 .../Microsoft.Network/ipGroups/version.json   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/internal.parameters.json      |   0
 .../.parameters/min.parameters.json           |   0
 .../loadBalancers/.parameters/parameters.json |   0
 .../backendAddressPools/deploy.bicep          |   0
 .../backendAddressPools/readme.md             |   0
 .../backendAddressPools/version.json          |   0
 .../loadBalancers/deploy.bicep                |   0
 .../inboundNatRules/deploy.bicep              |   0
 .../loadBalancers/inboundNatRules/readme.md   |   0
 .../inboundNatRules/version.json              |   0
 .../Microsoft.Network/loadBalancers/readme.md |   0
 .../loadBalancers/version.json                |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../localNetworkGateways/deploy.bicep         |   0
 .../localNetworkGateways/readme.md            |   0
 .../localNetworkGateways/version.json         |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../natGateways/.parameters/parameters.json   |   0
 .../natGateways/deploy.bicep                  |   0
 .../Microsoft.Network/natGateways/readme.md   |   0
 .../natGateways/version.json                  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../networkInterfaces/deploy.bicep            |   0
 .../networkInterfaces/readme.md               |   0
 .../networkInterfaces/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../networkSecurityGroups/deploy.bicep        |   0
 .../networkSecurityGroups/readme.md           |   0
 .../securityRules/deploy.bicep                |   0
 .../securityRules/readme.md                   |   0
 .../securityRules/version.json                |   0
 .../networkSecurityGroups/version.json        |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../connectionMonitors/deploy.bicep           |   0
 .../connectionMonitors/readme.md              |   0
 .../connectionMonitors/version.json           |   0
 .../networkWatchers/deploy.bicep              |   0
 .../networkWatchers/flowLogs/deploy.bicep     |   0
 .../networkWatchers/flowLogs/readme.md        |   0
 .../networkWatchers/flowLogs/version.json     |   0
 .../networkWatchers/readme.md                 |   0
 .../networkWatchers/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../A/.bicep/nested_roleAssignments.bicep     |   0
 .../privateDnsZones/A/deploy.bicep            |   0
 .../privateDnsZones/A/readme.md               |   0
 .../privateDnsZones/A/version.json            |   0
 .../AAAA/.bicep/nested_roleAssignments.bicep  |   0
 .../privateDnsZones/AAAA/deploy.bicep         |   0
 .../privateDnsZones/AAAA/readme.md            |   0
 .../privateDnsZones/AAAA/version.json         |   0
 .../CNAME/.bicep/nested_roleAssignments.bicep |   0
 .../privateDnsZones/CNAME/deploy.bicep        |   0
 .../privateDnsZones/CNAME/readme.md           |   0
 .../privateDnsZones/CNAME/version.json        |   0
 .../MX/.bicep/nested_roleAssignments.bicep    |   0
 .../privateDnsZones/MX/deploy.bicep           |   0
 .../privateDnsZones/MX/readme.md              |   0
 .../privateDnsZones/MX/version.json           |   0
 .../PTR/.bicep/nested_roleAssignments.bicep   |   0
 .../privateDnsZones/PTR/deploy.bicep          |   0
 .../privateDnsZones/PTR/readme.md             |   0
 .../privateDnsZones/PTR/version.json          |   0
 .../SOA/.bicep/nested_roleAssignments.bicep   |   0
 .../privateDnsZones/SOA/deploy.bicep          |   0
 .../privateDnsZones/SOA/readme.md             |   0
 .../privateDnsZones/SOA/version.json          |   0
 .../SRV/.bicep/nested_roleAssignments.bicep   |   0
 .../privateDnsZones/SRV/deploy.bicep          |   0
 .../privateDnsZones/SRV/readme.md             |   0
 .../privateDnsZones/SRV/version.json          |   0
 .../TXT/.bicep/nested_roleAssignments.bicep   |   0
 .../privateDnsZones/TXT/deploy.bicep          |   0
 .../privateDnsZones/TXT/readme.md             |   0
 .../privateDnsZones/TXT/version.json          |   0
 .../privateDnsZones/deploy.bicep              |   0
 .../privateDnsZones/readme.md                 |   0
 .../privateDnsZones/version.json              |   0
 .../virtualNetworkLinks/deploy.bicep          |   0
 .../virtualNetworkLinks/readme.md             |   0
 .../virtualNetworkLinks/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../privateEndpoints/deploy.bicep             |   0
 .../privateDnsZoneGroups/deploy.bicep         |   0
 .../privateDnsZoneGroups/readme.md            |   0
 .../privateDnsZoneGroups/version.json         |   0
 .../privateEndpoints/readme.md                |   0
 .../privateEndpoints/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../publicIPAddresses/deploy.bicep            |   0
 .../publicIPAddresses/readme.md               |   0
 .../publicIPAddresses/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../publicIPPrefixes/deploy.bicep             |   0
 .../publicIPPrefixes/readme.md                |   0
 .../publicIPPrefixes/version.json             |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../routeTables/.parameters/parameters.json   |   0
 .../routeTables/deploy.bicep                  |   0
 .../Microsoft.Network/routeTables/readme.md   |   0
 .../routeTables/version.json                  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../trafficmanagerprofiles/deploy.bicep       |   0
 .../trafficmanagerprofiles/readme.md          |   0
 .../trafficmanagerprofiles/version.json       |   0
 .../.parameters/min.parameters.json           |   0
 .../virtualHubs/.parameters/parameters.json   |   0
 .../virtualHubs/deploy.bicep                  |   0
 .../virtualHubs/hubRouteTables/deploy.bicep   |   0
 .../virtualHubs/hubRouteTables/readme.md      |   0
 .../virtualHubs/hubRouteTables/version.json   |   0
 .../hubVirtualNetworkConnections/deploy.bicep |   0
 .../hubVirtualNetworkConnections/readme.md    |   0
 .../hubVirtualNetworkConnections/version.json |   0
 .../Microsoft.Network/virtualHubs/readme.md   |   0
 .../virtualHubs/version.json                  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/expressRoute.parameters.json  |   0
 .../.parameters/vpn.parameters.json           |   0
 .../virtualNetworkGateways/deploy.bicep       |   0
 .../virtualNetworkGateways/readme.md          |   0
 .../virtualNetworkGateways/version.json       |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/vnetPeering.parameters.json   |   0
 .../virtualNetworks/deploy.bicep              |   0
 .../virtualNetworks/readme.md                 |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../virtualNetworks/subnets/deploy.bicep      |   0
 .../virtualNetworks/subnets/readme.md         |   0
 .../virtualNetworks/subnets/version.json      |   0
 .../virtualNetworks/version.json              |   0
 .../virtualNetworkPeerings/deploy.bicep       |   0
 .../virtualNetworkPeerings/readme.md          |   0
 .../virtualNetworkPeerings/version.json       |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../virtualWans/.parameters/parameters.json   |   0
 .../virtualWans/deploy.bicep                  |   0
 .../Microsoft.Network/virtualWans/readme.md   |   0
 .../virtualWans/version.json                  |   0
 .../.parameters/min.parameters.json           |   0
 .../vpnGateways/.parameters/parameters.json   |   0
 .../vpnGateways/connections/deploy.bicep      |   0
 .../vpnGateways/connections/readme.md         |   0
 .../vpnGateways/connections/version.json      |   0
 .../vpnGateways/deploy.bicep                  |   0
 .../vpnGateways/natRules/deploy.bicep         |   0
 .../vpnGateways/natRules/readme.md            |   0
 .../vpnGateways/natRules/version.json         |   0
 .../Microsoft.Network/vpnGateways/readme.md   |   0
 .../vpnGateways/version.json                  |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../vpnSites/.parameters/min.parameters.json  |   0
 .../vpnSites/.parameters/parameters.json      |   0
 .../Microsoft.Network/vpnSites/deploy.bicep   |   0
 .../Microsoft.Network/vpnSites/readme.md      |   0
 .../Microsoft.Network/vpnSites/version.json   |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../workspaces/.parameters/parameters.json    |   0
 .../workspaces/dataSources/deploy.bicep       |   0
 .../workspaces/dataSources/readme.md          |   0
 .../workspaces/dataSources/version.json       |   0
 .../workspaces/deploy.bicep                   |   0
 .../workspaces/linkedServices/deploy.bicep    |   0
 .../workspaces/linkedServices/readme.md       |   0
 .../workspaces/linkedServices/version.json    |   0
 .../workspaces/readme.md                      |   0
 .../workspaces/savedSearches/deploy.bicep     |   0
 .../workspaces/savedSearches/readme.md        |   0
 .../workspaces/savedSearches/version.json     |   0
 .../storageInsightConfigs/deploy.bicep        |   0
 .../storageInsightConfigs/readme.md           |   0
 .../storageInsightConfigs/version.json        |   0
 .../workspaces/version.json                   |   0
 .../solutions/.parameters/min.parameters.json |   0
 .../solutions/.parameters/ms.parameters.json  |   0
 .../.parameters/nonms.parameters.json         |   0
 .../solutions/deploy.bicep                    |   0
 .../solutions/readme.md                       |   0
 .../solutions/version.json                    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../vaults/.parameters/dr.parameters.json     |   0
 .../vaults/.parameters/min.parameters.json    |   0
 .../vaults/.parameters/parameters.json        |   0
 .../vaults/backupConfig/deploy.bicep          |   0
 .../vaults/backupConfig/readme.md             |   0
 .../vaults/backupConfig/version.json          |   0
 .../vaults/backupPolicies/deploy.bicep        |   0
 .../vaults/backupPolicies/readme.md           |   0
 .../vaults/backupPolicies/version.json        |   0
 .../vaults/backupStorageConfig/deploy.bicep   |   0
 .../vaults/backupStorageConfig/readme.md      |   0
 .../vaults/backupStorageConfig/version.json   |   0
 .../vaults/deploy.bicep                       |   0
 .../vaults/protectionContainers/deploy.bicep  |   0
 .../protectedItems/deploy.bicep               |   0
 .../protectedItems/readme.md                  |   0
 .../protectedItems/version.json               |   0
 .../vaults/protectionContainers/readme.md     |   0
 .../vaults/protectionContainers/version.json  |   0
 .../vaults/readme.md                          |   0
 .../vaults/replicationFabrics/deploy.bicep    |   0
 .../vaults/replicationFabrics/readme.md       |   0
 .../deploy.bicep                              |   0
 .../replicationProtectionContainers/readme.md |   0
 .../deploy.bicep                              |   0
 .../readme.md                                 |   0
 .../version.json                              |   0
 .../version.json                              |   0
 .../vaults/replicationFabrics/version.json    |   0
 .../vaults/replicationPolicies/deploy.bicep   |   0
 .../vaults/replicationPolicies/readme.md      |   0
 .../vaults/replicationPolicies/version.json   |   0
 .../vaults/version.json                       |   0
 .../.parameters/cli.parameters.json           |   0
 .../.parameters/ps.parameters.json            |   0
 .../deploymentScripts/deploy.bicep            |   0
 .../deploymentScripts/readme.md               |   0
 .../deploymentScripts/version.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../resourceGroups/deploy.bicep               |   0
 .../resourceGroups/readme.md                  |   0
 .../resourceGroups/version.json               |   0
 .../tags/.parameters/min.parameters.json      |   0
 .../tags/.parameters/rg.parameters.json       |   0
 .../tags/.parameters/sub.parameters.json      |   0
 .../Microsoft.Resources/tags/deploy.bicep     |   0
 .../Microsoft.Resources/tags/readme.md        |   0
 .../tags/resourceGroups/.bicep/readTags.bicep |   0
 .../tags/resourceGroups/deploy.bicep          |   0
 .../tags/resourceGroups/readme.md             |   0
 .../tags/resourceGroups/version.json          |   0
 .../tags/subscriptions/.bicep/readTags.bicep  |   0
 .../tags/subscriptions/deploy.bicep           |   0
 .../tags/subscriptions/readme.md              |   0
 .../tags/subscriptions/version.json           |   0
 .../Microsoft.Resources/tags/version.json     |   0
 .../.bicep/nested_iotSecuritySolutions.bicep  |   0
 .../.parameters/parameters.json               |   0
 .../azureSecurityCenter/deploy.bicep          |   0
 .../azureSecurityCenter/readme.md             |   0
 .../azureSecurityCenter/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../namespaces/.parameters/parameters.json    |   0
 .../authorizationRules/deploy.bicep           |   0
 .../namespaces/authorizationRules/readme.md   |   0
 .../authorizationRules/version.json           |   0
 .../namespaces/deploy.bicep                   |   0
 .../disasterRecoveryConfigs/deploy.bicep      |   0
 .../disasterRecoveryConfigs/readme.md         |   0
 .../disasterRecoveryConfigs/version.json      |   0
 .../namespaces/ipFilterRules/deploy.bicep     |   0
 .../namespaces/ipFilterRules/readme.md        |   0
 .../namespaces/ipFilterRules/version.json     |   0
 .../migrationConfigurations/deploy.bicep      |   0
 .../migrationConfigurations/readme.md         |   0
 .../migrationConfigurations/version.json      |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../queues/authorizationRules/deploy.bicep    |   0
 .../queues/authorizationRules/readme.md       |   0
 .../queues/authorizationRules/version.json    |   0
 .../namespaces/queues/deploy.bicep            |   0
 .../namespaces/queues/readme.md               |   0
 .../namespaces/queues/version.json            |   0
 .../Microsoft.ServiceBus/namespaces/readme.md |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../topics/authorizationRules/deploy.bicep    |   0
 .../topics/authorizationRules/readme.md       |   0
 .../topics/authorizationRules/version.json    |   0
 .../namespaces/topics/deploy.bicep            |   0
 .../namespaces/topics/readme.md               |   0
 .../namespaces/topics/version.json            |   0
 .../namespaces/version.json                   |   0
 .../virtualNetworkRules/deploy.bicep          |   0
 .../namespaces/virtualNetworkRules/readme.md  |   0
 .../virtualNetworkRules/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../clusters/.parameters/cert.parameters.json |   0
 .../clusters/.parameters/full.parameters.json |   0
 .../clusters/.parameters/min.parameters.json  |   0
 .../clusters/applicationTypes/deploy.bicep    |   0
 .../clusters/applicationTypes/readme.md       |   0
 .../clusters/applicationTypes/version.json    |   0
 .../clusters/deploy.bicep                     |   0
 .../clusters/readme.md                        |   0
 .../clusters/version.json                     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../administrators/deploy.bicep               |   0
 .../managedInstances/administrators/readme.md |   0
 .../administrators/version.json               |   0
 .../deploy.bicep                              |   0
 .../backupLongTermRetentionPolicies/readme.md |   0
 .../version.json                              |   0
 .../deploy.bicep                              |   0
 .../readme.md                                 |   0
 .../version.json                              |   0
 .../managedInstances/databases/deploy.bicep   |   0
 .../managedInstances/databases/readme.md      |   0
 .../managedInstances/databases/version.json   |   0
 .../managedInstances/deploy.bicep             |   0
 .../encryptionProtector/deploy.bicep          |   0
 .../encryptionProtector/readme.md             |   0
 .../encryptionProtector/version.json          |   0
 .../managedInstances/keys/deploy.bicep        |   0
 .../managedInstances/keys/readme.md           |   0
 .../managedInstances/keys/version.json        |   0
 .../Microsoft.Sql/managedInstances/readme.md  |   0
 .../securityAlertPolicies/deploy.bicep        |   0
 .../securityAlertPolicies/readme.md           |   0
 .../securityAlertPolicies/version.json        |   0
 .../managedInstances/version.json             |   0
 .../vulnerabilityAssessments/deploy.bicep     |   0
 .../vulnerabilityAssessments/readme.md        |   0
 .../vulnerabilityAssessments/version.json     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../servers/.parameters/admin.parameters.json |   0
 .../servers/.parameters/parameters.json       |   0
 .../servers/databases/deploy.bicep            |   0
 .../Microsoft.Sql/servers/databases/readme.md |   0
 .../servers/databases/version.json            |   0
 .../Microsoft.Sql/servers/deploy.bicep        |   0
 .../servers/firewallRules/deploy.bicep        |   0
 .../servers/firewallRules/readme.md           |   0
 .../servers/firewallRules/version.json        |   0
 .../Microsoft.Sql/servers/readme.md           |   0
 .../securityAlertPolicies/deploy.bicep        |   0
 .../servers/securityAlertPolicies/readme.md   |   0
 .../securityAlertPolicies/version.json        |   0
 .../Microsoft.Sql/servers/version.json        |   0
 .../vulnerabilityAssessments/deploy.bicep     |   0
 .../vulnerabilityAssessments/readme.md        |   0
 .../vulnerabilityAssessments/version.json     |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/encr.parameters.json          |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/nfs.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../.parameters/v1.parameters.json            |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../blobServices/containers/deploy.bicep      |   0
 .../immutabilityPolicies/deploy.bicep         |   0
 .../containers/immutabilityPolicies/readme.md |   0
 .../immutabilityPolicies/version.json         |   0
 .../blobServices/containers/readme.md         |   0
 .../blobServices/containers/version.json      |   0
 .../storageAccounts/blobServices/deploy.bicep |   0
 .../storageAccounts/blobServices/readme.md    |   0
 .../storageAccounts/blobServices/version.json |   0
 .../storageAccounts/deploy.bicep              |   0
 .../storageAccounts/fileServices/deploy.bicep |   0
 .../storageAccounts/fileServices/readme.md    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../fileServices/shares/deploy.bicep          |   0
 .../fileServices/shares/readme.md             |   0
 .../fileServices/shares/version.json          |   0
 .../storageAccounts/fileServices/version.json |   0
 .../managementPolicies/deploy.bicep           |   0
 .../managementPolicies/readme.md              |   0
 .../managementPolicies/version.json           |   0
 .../queueServices/deploy.bicep                |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../queueServices/queues/deploy.bicep         |   0
 .../queueServices/queues/readme.md            |   0
 .../queueServices/queues/version.json         |   0
 .../storageAccounts/queueServices/readme.md   |   0
 .../queueServices/version.json                |   0
 .../storageAccounts/readme.md                 |   0
 .../tableServices/deploy.bicep                |   0
 .../storageAccounts/tableServices/readme.md   |   0
 .../tableServices/tables/deploy.bicep         |   0
 .../tableServices/tables/readme.md            |   0
 .../tableServices/tables/version.json         |   0
 .../tableServices/version.json                |   0
 .../storageAccounts/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../.parameters/parameters.json               |   0
 .../privateLinkHubs/deploy.bicep              |   0
 .../privateLinkHubs/readme.md                 |   0
 .../privateLinkHubs/version.json              |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/parameters.json               |   0
 .../imageTemplates/deploy.bicep               |   0
 .../imageTemplates/readme.md                  |   0
 .../imageTemplates/version.json               |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../connections/.parameters/parameters.json   |   0
 .../Microsoft.Web/connections/deploy.bicep    |   0
 .../Microsoft.Web/connections/readme.md       |   0
 .../Microsoft.Web/connections/version.json    |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/asev2.parameters.json         |   0
 .../.parameters/asev3.parameters.json         |   0
 .../hostingEnvironments/deploy.bicep          |   0
 .../hostingEnvironments/readme.md             |   0
 .../hostingEnvironments/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../serverfarms/.parameters/parameters.json   |   0
 .../Microsoft.Web/serverfarms/deploy.bicep    |   0
 .../Microsoft.Web/serverfarms/readme.md       |   0
 .../Microsoft.Web/serverfarms/version.json    |   0
 .../sites/.bicep/nested_roleAssignments.bicep |   0
 .../sites/.parameters/fa.min.parameters.json  |   0
 .../sites/.parameters/fa.parameters.json      |   0
 .../sites/.parameters/wa.min.parameters.json  |   0
 .../sites/.parameters/wa.parameters.json      |   0
 .../sites/config-appsettings/deploy.bicep     |   0
 .../sites/config-appsettings/readme.md        |   0
 .../sites/config-appsettings/version.json     |   0
 .../sites/config-authsettingsv2/deploy.bicep  |   0
 .../sites/config-authsettingsv2/readme.md     |   0
 .../sites/config-authsettingsv2/version.json  |   0
 .../Microsoft.Web/sites/deploy.bicep          |   0
 .../Microsoft.Web/sites/readme.md             |   0
 .../Microsoft.Web/sites/version.json          |   0
 .../.bicep/nested_roleAssignments.bicep       |   0
 .../.parameters/min.parameters.json           |   0
 .../staticSites/.parameters/parameters.json   |   0
 .../Microsoft.Web/staticSites/deploy.bicep    |   0
 .../Microsoft.Web/staticSites/readme.md       |   0
 .../Microsoft.Web/staticSites/version.json    |   0
 modules/README.md                             | 107 ++++++++++
 .../resourcePublish/Get-ModulesToPublish.ps1  |  34 +--
 .../Publish-ModuleToPrivateBicepRegistry.ps1  |   8 +-
 .../Publish-ModuleToTemplateSpec.ps1          |   6 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1 |   8 +-
 .../Initialize-DeploymentRemoval.ps1          |   4 +-
 .../Get-ModuleParameterFiles.ps1              |   2 +-
 utilities/tools/ConvertTo-ARMTemplate.ps1     |   2 +-
 utilities/tools/Get-LinkedLocalModuleList.ps1 |   8 +-
 utilities/tools/Get-LinkedModuleList.ps1      |   4 +-
 utilities/tools/Set-ModuleReadMe.ps1          |   6 +-
 utilities/tools/Set-ReadMeModuleTable.ps1     |   2 +-
 utilities/tools/Test-ModuleLocally.ps1        |   2 +-
 .../helper/Get-ModulesAsMarkdownTable.ps1     |  18 +-
 .../tests/ConvertTo-ARMTemplate.Tests.ps1     |   2 +-
 1270 files changed, 1052 insertions(+), 1046 deletions(-)
 delete mode 100644 arm/README.md
 rename {arm => modules}/.global/global.module.tests.ps1 (98%)
 rename {arm => modules}/.global/shared/helper.psm1 (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/readme.md (100%)
 rename {arm => modules}/Microsoft.AAD/DomainServices/version.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/readme.md (100%)
 rename {arm => modules}/Microsoft.AnalysisServices/servers/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/max.parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apiVersionSets/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/policies/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/apis/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/authorizationServers/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/backends/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/caches/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/identityProviders/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/namedValues/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/policies/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/portalsettings/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/apis/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/groups/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/products/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/readme.md (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/subscriptions/version.json (100%)
 rename {arm => modules}/Microsoft.ApiManagement/service/version.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/keyValues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/keyValues/version.json (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/readme.md (100%)
 rename {arm => modules}/Microsoft.AppConfiguration/configurationStores/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/locks/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyAssignments/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policyExemptions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/policySetDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleAssignments/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/managementGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/readme.md (99%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/readme.md (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/subscription/version.json (100%)
 rename {arm => modules}/Microsoft.Authorization/roleDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/jobSchedules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/modules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/runbooks/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/schedules/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/readme.md (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/variables/version.json (100%)
 rename {arm => modules}/Microsoft.Automation/automationAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Batch/batchAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/readme.md (100%)
 rename {arm => modules}/Microsoft.CognitiveServices/accounts/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/availabilitySets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/diskEncryptionSets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/image.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/import.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/disks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/disks/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/disks/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.parameters/images.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/images/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/galleries/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/images/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/images/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/images/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/images/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/proximityPlacementGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachineScaleSets/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/readme.md (100%)
 rename {arm => modules}/Microsoft.Compute/virtualMachines/version.json (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/readme.md (100%)
 rename {arm => modules}/Microsoft.Consumption/budgets/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerInstance/containerGroups/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/replications/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerRegistry/registries/webhooks/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/agentPools/version.json (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/readme.md (100%)
 rename {arm => modules}/Microsoft.ContainerService/managedClusters/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/integrationRuntime/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/readme.md (100%)
 rename {arm => modules}/Microsoft.DataFactory/factories/version.json (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/backupPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/backupPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/readme.md (100%)
 rename {arm => modules}/Microsoft.DataProtection/backupVaults/version.json (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.Databricks/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/applicationgroups/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/hostpools/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/scalingplans/version.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.DesktopVirtualization/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json (100%)
 rename {arm => modules}/Microsoft.DocumentDB/databaseAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/readme.md (100%)
 rename {arm => modules}/Microsoft.EventGrid/systemTopics/version.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/readme.md (100%)
 rename {arm => modules}/Microsoft.EventGrid/topics/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/eventhubs/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/networkRuleSets/version.json (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/readme.md (100%)
 rename {arm => modules}/Microsoft.EventHub/namespaces/version.json (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/readme.md (100%)
 rename {arm => modules}/Microsoft.HealthBot/healthBots/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/actionGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/activityLogAlerts/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/components/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/components/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/components/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/components/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/diagnosticSettings/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/metricAlerts/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/scopedResources/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/privateLinkScopes/version.json (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Insights/scheduledQueryRules/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/accessPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/keys/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/readme.md (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/secrets/version.json (100%)
 rename {arm => modules}/Microsoft.KeyVault/vaults/version.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/readme.md (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/extensions/version.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/readme.md (100%)
 rename {arm => modules}/Microsoft.Logic/workflows/version.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/readme.md (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/computes/version.json (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.MachineLearningServices/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md (100%)
 rename {arm => modules}/Microsoft.ManagedIdentity/userAssignedIdentities/version.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/readme.md (100%)
 rename {arm => modules}/Microsoft.ManagedServices/registrationDefinitions/version.json (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Management/managementGroups/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.NetApp/netAppAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/applicationGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/applicationSecurityGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/azureFirewalls/version.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/bastionHosts/version.json (100%)
 rename {arm => modules}/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/ddosProtectionPlans/version.json (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/expressRouteCircuits/version.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/firewallPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/frontDoors/version.json (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/ipGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/backendAddressPools/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/inboundNatRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/loadBalancers/version.json (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/localNetworkGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/natGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkInterfaces/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/securityRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkSecurityGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/connectionMonitors/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/flowLogs/version.json (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/networkWatchers/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/A/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/AAAA/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/CNAME/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/MX/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/PTR/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SOA/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/SRV/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/TXT/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/privateEndpoints/version.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/publicIPAddresses/version.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/publicIPPrefixes/version.json (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/routeTables/version.json (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/trafficmanagerprofiles/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubRouteTables/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualHubs/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworkGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/subnets/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/virtualWans/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/natRules/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnGateways/version.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/readme.md (100%)
 rename {arm => modules}/Microsoft.Network/vpnSites/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/dataSources/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/linkedServices/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/savedSearches/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.OperationalInsights/workspaces/version.json (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/readme.md (100%)
 rename {arm => modules}/Microsoft.OperationsManagement/solutions/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupConfig/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/protectionContainers/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.RecoveryServices/vaults/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/deploymentScripts/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/resourceGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/rg.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/.parameters/sub.parameters.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/resourceGroups/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/readme.md (100%)
 rename {arm => modules}/Microsoft.Resources/tags/subscriptions/version.json (100%)
 rename {arm => modules}/Microsoft.Resources/tags/version.json (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/readme.md (100%)
 rename {arm => modules}/Microsoft.Security/azureSecurityCenter/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/queues/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/topics/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/applicationTypes/version.json (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/readme.md (100%)
 rename {arm => modules}/Microsoft.ServiceFabric/clusters/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/administrators/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/databases/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/encryptionProtector/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/keys/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.parameters/admin.parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/databases/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/firewallRules/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/securityAlertPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/version.json (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md (100%)
 rename {arm => modules}/Microsoft.Sql/servers/vulnerabilityAssessments/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/containers/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/blobServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/shares/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/fileServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/managementPolicies/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/queues/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/queueServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/tables/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/tableServices/version.json (100%)
 rename {arm => modules}/Microsoft.Storage/storageAccounts/version.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/readme.md (100%)
 rename {arm => modules}/Microsoft.Synapse/privateLinkHubs/version.json (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/readme.md (100%)
 rename {arm => modules}/Microsoft.VirtualMachineImages/imageTemplates/version.json (100%)
 rename {arm => modules}/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Web/connections/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/connections/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/connections/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/connections/version.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/hostingEnvironments/version.json (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/serverfarms/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/fa.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/fa.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/wa.min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/.parameters/wa.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-appsettings/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/config-authsettingsv2/version.json (100%)
 rename {arm => modules}/Microsoft.Web/sites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/sites/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/sites/version.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.parameters/min.parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/.parameters/parameters.json (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/deploy.bicep (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/readme.md (100%)
 rename {arm => modules}/Microsoft.Web/staticSites/version.json (100%)
 create mode 100644 modules/README.md

diff --git a/.azuredevops/modulePipelines/ms.aad.domainservices.yml b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
index a11e9a9940..5d5aae952c 100644
--- a/.azuredevops/modulePipelines/ms.aad.domainservices.yml
+++ b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.aad.domainservices.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.AAD/DomainServices/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AAD/DomainServices/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AAD/DomainServices'
+    value: '/modules/Microsoft.AAD/DomainServices'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index 61c1cf2529..e2352cfa4f 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.AnalysisServices/servers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AnalysisServices/servers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AnalysisServices/servers'
+    value: '/modules/Microsoft.AnalysisServices/servers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index c9ce3c1ec4..eb9597d02c 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.apimanagement.service.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ApiManagement/service/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ApiManagement/service/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ApiManagement/service'
+    value: '/modules/Microsoft.ApiManagement/service'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
index 71b9c1aaea..0feb981ff2 100644
--- a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
+++ b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.AppConfiguration/configurationStores/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.AppConfiguration/configurationStores/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.AppConfiguration/configurationStores'
+    value: '/modules/Microsoft.AppConfiguration/configurationStores'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.locks.yml b/.azuredevops/modulePipelines/ms.authorization.locks.yml
index 796262ea91..1422b4a4c6 100644
--- a/.azuredevops/modulePipelines/ms.authorization.locks.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.locks.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.locks.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/locks/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/locks/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/locks'
+    value: '/modules/Microsoft.Authorization/locks'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index 58909f70ec..c58331ead5 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/policyAssignments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyAssignments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyAssignments'
+    value: '/modules/Microsoft.Authorization/policyAssignments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index d72e85726e..93fd0f469f 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/policyDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyDefinitions'
+    value: '/modules/Microsoft.Authorization/policyDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index bf0ba49d1d..50b00a7f08 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/policyExemptions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policyExemptions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policyExemptions'
+    value: '/modules/Microsoft.Authorization/policyExemptions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index 075a7d1e98..e4c77a27b4 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/policySetDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/policySetDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/policySetDefinitions'
+    value: '/modules/Microsoft.Authorization/policySetDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index eaf576d22e..fb6bba1d74 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/roleAssignments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/roleAssignments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/roleAssignments'
+    value: '/modules/Microsoft.Authorization/roleAssignments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index 7d17acf846..3129650057 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Authorization/roleDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Authorization/roleDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Authorization/roleDefinitions'
+    value: '/modules/Microsoft.Authorization/roleDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index 712302abd9..f4bc5e919f 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Automation/automationAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Automation/automationAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Automation/automationAccounts'
+    value: '/modules/Microsoft.Automation/automationAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index 281f7c72c2..4013ce3b44 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Batch/batchAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Batch/batchAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Batch/batchAccounts'
+    value: '/modules/Microsoft.Batch/batchAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index 2630458041..f14fc92495 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.CognitiveServices/accounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.CognitiveServices/accounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.CognitiveServices/accounts'
+    value: '/modules/Microsoft.CognitiveServices/accounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index c824e8c9be..edd9663f84 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/availabilitySets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/availabilitySets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/availabilitySets'
+    value: '/modules/Microsoft.Compute/availabilitySets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 7f75460410..414b010e09 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/diskEncryptionSets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/diskEncryptionSets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/diskEncryptionSets'
+    value: '/modules/Microsoft.Compute/diskEncryptionSets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.disks.yml b/.azuredevops/modulePipelines/ms.compute.disks.yml
index 3f9cae557f..0aec061792 100644
--- a/.azuredevops/modulePipelines/ms.compute.disks.yml
+++ b/.azuredevops/modulePipelines/ms.compute.disks.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.disks.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/disks/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/disks/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/disks'
+    value: '/modules/Microsoft.Compute/disks'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index cf84e0fbef..a20b15290c 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.galleries.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/galleries/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/galleries/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/galleries'
+    value: '/modules/Microsoft.Compute/galleries'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index 834db0a5d7..6209ee2c2c 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.images.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/images/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/images/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/images'
+    value: '/modules/Microsoft.Compute/images'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index c14f444ee2..d1371bccb5 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/proximityPlacementGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/proximityPlacementGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/proximityPlacementGroups'
+    value: '/modules/Microsoft.Compute/proximityPlacementGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index 2fc6340f98..4358c822fc 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/virtualMachines/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/virtualMachines/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/virtualMachines'
+    value: '/modules/Microsoft.Compute/virtualMachines'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 70b43e3cc6..22028b3495 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Compute/virtualMachineScaleSets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Compute/virtualMachineScaleSets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Compute/virtualMachineScaleSets'
+    value: '/modules/Microsoft.Compute/virtualMachineScaleSets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index ba9e462fa4..1c6a664daf 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.consumption.budgets.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Consumption/budgets/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Consumption/budgets/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Consumption/budgets'
+    value: '/modules/Microsoft.Consumption/budgets'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index 694b57b52b..855d7dd391 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ContainerInstance/containerGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerInstance/containerGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerInstance/containerGroups'
+    value: '/modules/Microsoft.ContainerInstance/containerGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index aca706eb23..7995ba5e46 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerregistry.registries.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ContainerRegistry/registries/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerRegistry/registries/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerRegistry/registries'
+    value: '/modules/Microsoft.ContainerRegistry/registries'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index 68d4bc63d7..963ee36755 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ContainerService/managedClusters/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ContainerService/managedClusters/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ContainerService/managedClusters'
+    value: '/modules/Microsoft.ContainerService/managedClusters'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index 7ec75b0a9b..5f4c9bf50c 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.databricks.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Databricks/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Databricks/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Databricks/workspaces'
+    value: '/modules/Microsoft.Databricks/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index ccfabaf55b..97d4f2f0a6 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.datafactory.factories.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DataFactory/factories/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DataFactory/factories/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DataFactory/factories'
+    value: '/modules/Microsoft.DataFactory/factories'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
index 55ba9a7eea..82f6aa3685 100644
--- a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
+++ b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DataProtection/vaults/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DataProtection/vaults/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DataProtection/backupVaults'
+    value: '/modules/Microsoft.DataProtection/backupVaults'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index 51d36df82c..7f866f9e57 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/applicationgroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/applicationgroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/applicationgroups'
+    value: '/modules/Microsoft.DesktopVirtualization/applicationgroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index 1d1c49a4d2..937f2f72b4 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/hostpools/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/hostpools/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/hostpools'
+    value: '/modules/Microsoft.DesktopVirtualization/hostpools'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
index d17711a4bc..312bb14859 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/scalingplans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/scalingplans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/scalingplans'
+    value: '/modules/Microsoft.DesktopVirtualization/scalingplans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index cfad4bfdc2..36306e9943 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DesktopVirtualization/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DesktopVirtualization/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DesktopVirtualization/workspaces'
+    value: '/modules/Microsoft.DesktopVirtualization/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index 4966965b0b..07d69002ee 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.DocumentDB/databaseAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.DocumentDB/databaseAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.DocumentDB/databaseAccounts'
+    value: '/modules/Microsoft.DocumentDB/databaseAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
index 71a74153cf..a5b5e4c51b 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.EventGrid/systemTopics/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventGrid/systemTopics/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventGrid/systemTopics'
+    value: '/modules/Microsoft.EventGrid/systemTopics'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index 76fbff905a..bce5557c01 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventgrid.topics.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.EventGrid/topics/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventGrid/topics/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventGrid/topics'
+    value: '/modules/Microsoft.EventGrid/topics'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index b3d86604f3..35755a6eab 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.EventHub/namespaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.EventHub/namespaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.EventHub/namespaces'
+    value: '/modules/Microsoft.EventHub/namespaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index 8e5078a82a..86e2587c59 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.HealthBot/healthBots/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.HealthBot/healthBots/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.HealthBot/healthBots'
+    value: '/modules/Microsoft.HealthBot/healthBots'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index dcecbc2b6a..1d6b367fee 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.actiongroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/actionGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/actionGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/actionGroups'
+    value: '/modules/Microsoft.Insights/actionGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index e5de0671d3..0290432eeb 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/activityLogAlerts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/activityLogAlerts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/activityLogAlerts'
+    value: '/modules/Microsoft.Insights/activityLogAlerts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index 129e5301e2..2ebf16d0f5 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.components.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/components/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/components/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/components'
+    value: '/modules/Microsoft.Insights/components'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index d1407b082c..68cbcd7a8b 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/diagnosticSettings/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/diagnosticSettings/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/diagnosticSettings'
+    value: '/modules/Microsoft.Insights/diagnosticSettings'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index a92a0c44aa..e2c559ed99 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.metricalerts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/metricAlerts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/metricAlerts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/metricAlerts'
+    value: '/modules/Microsoft.Insights/metricAlerts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index f2f22672c9..15d793c90a 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/privateLinkScopes/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/privateLinkScopes/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/privateLinkScopes'
+    value: '/modules/Microsoft.Insights/privateLinkScopes'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index cf0a3e7e2c..3ec1537e46 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Insights/scheduledQueryRules/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Insights/scheduledQueryRules/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Insights/scheduledQueryRules'
+    value: '/modules/Microsoft.Insights/scheduledQueryRules'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index dd9f52090d..39f0e155c1 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.keyvault.vaults.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.KeyVault/vaults/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KeyVault/vaults/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KeyVault/vaults'
+    value: '/modules/Microsoft.KeyVault/vaults'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
index 6e4a9957b8..7f53c0e67f 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.KubernetesConfiguration/extensions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KubernetesConfiguration/extensions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KubernetesConfiguration/extensions'
+    value: '/modules/Microsoft.KubernetesConfiguration/extensions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
index cc43f6e135..75b300c5b6 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.KubernetesConfiguration/fluxConfigurations'
+    value: '/modules/Microsoft.KubernetesConfiguration/fluxConfigurations'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 661b4d355c..0935dfc17e 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.logic.workflows.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Logic/workflows/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Logic/workflows/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Logic/workflows'
+    value: '/modules/Microsoft.Logic/workflows'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index d309cdb975..25d3dff698 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.MachineLearningServices/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.MachineLearningServices/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.MachineLearningServices/workspaces'
+    value: '/modules/Microsoft.MachineLearningServices/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index 80121f67e5..1f00c7cfc7 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ManagedIdentity/userAssignedIdentities/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ManagedIdentity/userAssignedIdentities/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ManagedIdentity/userAssignedIdentities'
+    value: '/modules/Microsoft.ManagedIdentity/userAssignedIdentities'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index 62fee30f9b..f32c9014d9 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ManagedServices/registrationDefinitions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ManagedServices/registrationDefinitions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ManagedServices/registrationDefinitions'
+    value: '/modules/Microsoft.ManagedServices/registrationDefinitions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 308ff44dc5..2b6835ee2b 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.management.managementgroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Management/managementGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Management/managementGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Management/managementGroups'
+    value: '/modules/Microsoft.Management/managementGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index 2b161f504d..51301ce92e 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.NetApp/netAppAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.NetApp/netAppAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.NetApp/netAppAccounts'
+    value: '/modules/Microsoft.NetApp/netAppAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index 6225a4f68c..94f69382f6 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.applicationgateways.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/applicationGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/applicationGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/applicationGateways'
+    value: '/modules/Microsoft.Network/applicationGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index f4e3156552..acd62eae47 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/applicationSecurityGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/applicationSecurityGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/applicationSecurityGroups'
+    value: '/modules/Microsoft.Network/applicationSecurityGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index 4a55274d85..2f54d10839 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/azureFirewalls/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/azureFirewalls/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/azureFirewalls'
+    value: '/modules/Microsoft.Network/azureFirewalls'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index a456581930..ffdb3bcbd4 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.bastionhosts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/bastionHosts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/bastionHosts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/bastionHosts'
+    value: '/modules/Microsoft.Network/bastionHosts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index 2111b74e77..fb94033d50 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.connections.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/connections/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/connections/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/connections'
+    value: '/modules/Microsoft.Network/connections'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index 0f63e495bc..0e31c7a082 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/ddosProtectionPlans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/ddosProtectionPlans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/ddosProtectionPlans'
+    value: '/modules/Microsoft.Network/ddosProtectionPlans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index 1fc686d50f..8cf0e657b8 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/expressRouteCircuits/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/expressRouteCircuits/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/expressRouteCircuits'
+    value: '/modules/Microsoft.Network/expressRouteCircuits'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 69a52d6e60..d0628548a1 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/firewallpolicies/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/firewallpolicies/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/firewallpolicies'
+    value: '/modules/Microsoft.Network/firewallpolicies'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.frontdoors.yml b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
index 6ef0c447e5..60ec3ae34b 100644
--- a/.azuredevops/modulePipelines/ms.network.frontdoors.yml
+++ b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.frontdoors.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/frontDoors/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/frontDoors/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/frontDoors'
+    value: '/modules/Microsoft.Network/frontDoors'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index 2cebe6016a..68741237c9 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.ipgroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/ipGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/ipGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/ipGroups'
+    value: '/modules/Microsoft.Network/ipGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index 1ab86396d9..79a642a9a2 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.loadbalancers.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/loadBalancers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/loadBalancers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/loadBalancers'
+    value: '/modules/Microsoft.Network/loadBalancers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index 74c7f3f7bd..0ee1e4d5dc 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/localNetworkGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/localNetworkGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/localNetworkGateways'
+    value: '/modules/Microsoft.Network/localNetworkGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index 036aebbf69..c8c54a6b23 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.natgateways.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/natGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/natGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/natGateways'
+    value: '/modules/Microsoft.Network/natGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
index ce5051d2f2..774230b786 100644
--- a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/networkInterfaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkInterfaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkInterfaces'
+    value: '/modules/Microsoft.Network/networkInterfaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index 97508a03c9..508abc9800 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/networkSecurityGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkSecurityGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkSecurityGroups'
+    value: '/modules/Microsoft.Network/networkSecurityGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index e18f04f34c..70dbbd7165 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.networkwatchers.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/networkWatchers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/networkWatchers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/networkWatchers'
+    value: '/modules/Microsoft.Network/networkWatchers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index 9b152568fb..fbdae8dbbe 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.privatednszones.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/privateDnsZones/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/privateDnsZones/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/privateDnsZones'
+    value: '/modules/Microsoft.Network/privateDnsZones'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index fd9b955ead..08c0110f53 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.privateendpoints.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/privateEndpoints/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/privateEndpoints/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/privateEndpoints'
+    value: '/modules/Microsoft.Network/privateEndpoints'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index 2bf7ddc62e..8162834d2c 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/publicIPAddresses/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/publicIPAddresses/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/publicIPAddresses'
+    value: '/modules/Microsoft.Network/publicIPAddresses'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index 4b779ece81..0f4ac763e0 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/publicIPPrefixes/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/publicIPPrefixes/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/publicIPPrefixes'
+    value: '/modules/Microsoft.Network/publicIPPrefixes'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index 1aac7ed90d..3e7285e19b 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.routetables.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/routeTables/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/routeTables/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/routeTables'
+    value: '/modules/Microsoft.Network/routeTables'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index 45d8db3d5a..e3d4a02456 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/trafficmanagerprofiles/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/trafficmanagerprofiles/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/trafficmanagerprofiles'
+    value: '/modules/Microsoft.Network/trafficmanagerprofiles'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
index c117fae374..ff44ffc9cb 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualhubs.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/virtualHubs/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualHubs/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualHubs'
+    value: '/modules/Microsoft.Network/virtualHubs'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index 51a9c6a5a6..f83662a85b 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/virtualNetworkGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualNetworkGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualNetworkGateways'
+    value: '/modules/Microsoft.Network/virtualNetworkGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index 8d1ae7e5dc..3afcc78e93 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/virtualNetworks/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualNetworks/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualNetworks'
+    value: '/modules/Microsoft.Network/virtualNetworks'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index b507e19983..2f2aa5d2ab 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.virtualwans.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/virtualWans/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/virtualWans/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/virtualWans'
+    value: '/modules/Microsoft.Network/virtualWans'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.vpngateways.yml b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
index cc2d3f9c8b..5375efbf13 100644
--- a/.azuredevops/modulePipelines/ms.network.vpngateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.vpngateways.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/vpnGateways/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/vpnGateways/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/vpnGateways'
+    value: '/modules/Microsoft.Network/vpnGateways'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.network.vpnsites.yml b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
index 2c9be39166..1671947a58 100644
--- a/.azuredevops/modulePipelines/ms.network.vpnsites.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.vpnsites.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Network/vpnSites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Network/vpnSites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Network/vpnSites'
+    value: '/modules/Microsoft.Network/vpnSites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index daf7fc3728..8b4b67de7d 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.OperationalInsights/workspaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.OperationalInsights/workspaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.OperationalInsights/workspaces'
+    value: '/modules/Microsoft.OperationalInsights/workspaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
index 483f0184d5..ba8cdae0b1 100644
--- a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
+++ b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.OperationsManagement/solutions/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.OperationsManagement/solutions/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.OperationsManagement/solutions'
+    value: '/modules/Microsoft.OperationsManagement/solutions'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index bc65e9622b..cba2c234be 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.RecoveryServices/vaults/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.RecoveryServices/vaults/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.RecoveryServices/vaults'
+    value: '/modules/Microsoft.RecoveryServices/vaults'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index cd826e0c27..d22921db65 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Resources/deploymentScripts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/deploymentScripts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/deploymentScripts'
+    value: '/modules/Microsoft.Resources/deploymentScripts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index 9bde0ab4fc..d9dda35a3c 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Resources/resourceGroups/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/resourceGroups/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/resourceGroups'
+    value: '/modules/Microsoft.Resources/resourceGroups'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.resources.tags.yml b/.azuredevops/modulePipelines/ms.resources.tags.yml
index d0fe3f9404..2a63417b98 100644
--- a/.azuredevops/modulePipelines/ms.resources.tags.yml
+++ b/.azuredevops/modulePipelines/ms.resources.tags.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.resources.tags.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Resources/tags/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Resources/tags/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Resources/tags'
+    value: '/modules/Microsoft.Resources/tags'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index a08f557ef1..ab25a3a0d5 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Security/azureSecurityCenter/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Security/azureSecurityCenter/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Security/azureSecurityCenter'
+    value: '/modules/Microsoft.Security/azureSecurityCenter'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index d555a10dde..8f7a938e6b 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.ServiceBus/namespaces/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.ServiceBus/namespaces/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ServiceBus/namespaces'
+    value: '/modules/Microsoft.ServiceBus/namespaces'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 34031c7247..5828d6268f 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -22,7 +22,7 @@ trigger:
       - '/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
       - '/Microsoft.ServiceFabric/clusters/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.ServiceFabric/clusters'
+    value: '/modules/Microsoft.ServiceFabric/clusters'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index 2a063183c0..8d238daff1 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.sql.managedinstances.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Sql/managedInstances/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Sql/managedInstances/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Sql/managedInstances'
+    value: '/modules/Microsoft.Sql/managedInstances'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index c644d3a1df..ed0125f637 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.sql.servers.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Sql/servers/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Sql/servers/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Sql/servers'
+    value: '/modules/Microsoft.Sql/servers'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index 51f381d312..5b4e07ed3b 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Storage/storageAccounts/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Storage/storageAccounts/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Storage/storageAccounts'
+    value: '/modules/Microsoft.Storage/storageAccounts'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index e34d190ed5..246865319c 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Synapse/privateLinkHubs/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Synapse/privateLinkHubs/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Synapse/privateLinkHubs'
+    value: '/modules/Microsoft.Synapse/privateLinkHubs'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 525c02e6fb..818ab369d5 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.VirtualMachineImages/imageTemplates/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.VirtualMachineImages/imageTemplates/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.VirtualMachineImages/imageTemplates'
+    value: '/modules/Microsoft.VirtualMachineImages/imageTemplates'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index 9abaa4136d..ffba362d13 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.connections.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Web/connections/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/connections/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/connections'
+    value: '/modules/Microsoft.Web/connections'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index fc2abe59b5..1cdbca5b71 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Web/hostingEnvironments/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/hostingEnvironments/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/hostingEnvironments'
+    value: '/modules/Microsoft.Web/hostingEnvironments'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index 285b2ce94b..4288d2a1e3 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.serverfarms.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Web/serverfarms/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/serverfarms/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/serverfarms'
+    value: '/modules/Microsoft.Web/serverfarms'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index 2c7584cd63..28173a7c34 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.sites.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Web/sites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/sites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/sites'
+    value: '/modules/Microsoft.Web/sites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/modulePipelines/ms.web.staticsites.yml b/.azuredevops/modulePipelines/ms.web.staticsites.yml
index 7784a2ce12..23fed47790 100644
--- a/.azuredevops/modulePipelines/ms.web.staticsites.yml
+++ b/.azuredevops/modulePipelines/ms.web.staticsites.yml
@@ -21,8 +21,8 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.web.staticsites.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/arm/Microsoft.Web/staticSites/*'
-      - '/arm/.global/global.module.tests.ps1'
+      - '/modules/Microsoft.Web/staticSites/*'
+      - '/modules/.global/global.module.tests.ps1'
     exclude:
       - '/**/*.md'
 
@@ -30,7 +30,7 @@ variables:
   - template: '../../global.variables.yml'
   - group: 'PLATFORM_VARIABLES'
   - name: modulePath
-    value: '/arm/Microsoft.Web/staticSites'
+    value: '/modules/Microsoft.Web/staticSites'
 
 stages:
   - stage: Validation
diff --git a/.azuredevops/pipelineTemplates/jobs.publishModule.yml b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
index 622e05a8e5..f22e1761c3 100644
--- a/.azuredevops/pipelineTemplates/jobs.publishModule.yml
+++ b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
@@ -176,7 +176,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
@@ -235,7 +235,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
@@ -295,7 +295,7 @@ jobs:
 
             # Publish the modified child resources
             foreach ($ModuleToPublish in $ModulesToPublish) {
-              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+              $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
               Write-Host "##[group]$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
               $functionInput = @{
diff --git a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
index 9e2870a142..f91af7360c 100644
--- a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+++ b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
@@ -164,14 +164,14 @@ jobs:
             # --------------------- #
             Invoke-Pester -Configuration @{
               Run        = @{
-                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'arm' '.global' 'global.module.tests.ps1') -Data @{
+                Container = New-PesterContainer -Path (Join-Path '$(moduleRepoRoot)' 'modules' '.global' 'global.module.tests.ps1') -Data @{
                   moduleFolderPaths = $moduleFolderPaths
                   enforcedTokenList = $enforcedTokenList
                 }
               }
               TestResult = @{
                 TestSuiteName = 'Global Module Tests'
-                OutputPath    = 'arm/.global/global-testResults.xml'
+                OutputPath    = 'modules/.global/global-testResults.xml'
                 OutputFormat  = 'NUnitXml'
                 Enabled       = $true
               }
@@ -188,6 +188,6 @@ jobs:
           testResultsFormat: NUnit
           testResultsFiles: global-testResults.xml
           failTaskOnFailedTests: true
-          searchFolder: 'arm/.global'
+          searchFolder: 'modules/.global'
         continueOnError: false
         condition: succeededOrFailed()
diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml
index 33013e95ea..dc97836ddc 100644
--- a/.azuredevops/platformPipelines/platform.dependencies.yml
+++ b/.azuredevops/platformPipelines/platform.dependencies.yml
@@ -30,7 +30,7 @@ variables:
   - name: dependencyPath
     value: 'utilities/pipelines/dependencies'
   - name: modulesPath
-    value: 'arm'
+    value: 'modules'
   - name: defaultResourceGroupName
     value: 'validation-rg'
 
diff --git a/.azuredevops/platformPipelines/platform.updateReadMe.yml b/.azuredevops/platformPipelines/platform.updateReadMe.yml
index d2eb068bf0..928e74bbd2 100644
--- a/.azuredevops/platformPipelines/platform.updateReadMe.yml
+++ b/.azuredevops/platformPipelines/platform.updateReadMe.yml
@@ -9,8 +9,8 @@ trigger:
       - main
   paths:
     include:
-      - 'arm/**/deploy.bicep'
-      - 'arm/**/deploy.json'
+      - 'modules/**/deploy.bicep'
+      - 'modules/**/deploy.json'
 
 variables:
   - template: '../../global.variables.yml'
@@ -39,7 +39,7 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' 'utilities' 'tools' 'Set-ReadMeModuleTable.ps1')
 
             $functionInput = @{
-              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'arm'
+              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'modules'
               FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'README.md'
               Organization   = '$(System.CollectionUri)'.Split('/')[3]
               RepositoryName = '$(Build.Repository.Name)'
@@ -63,8 +63,8 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' 'utilities' 'tools' 'Set-ReadMeModuleTable.ps1')
 
             $functionInput = @{
-              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'arm'
-              FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'arm/README.md'
+              ModulesPath    = Join-Path '$(System.DefaultWorkingDirectory)' 'modules'
+              FilePath       = Join-Path '$(System.DefaultWorkingDirectory)' 'modules/README.md'
               Organization   = '$(System.CollectionUri)'.Split('/')[3]
               RepositoryName = '$(Build.Repository.Name)'
               ColumnsInOrder = @('Name', 'ProviderNamespace','ResourceType')
diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index cb3a327922..18aaa70a7b 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                                                         | 'arm/Microsoft.ApiManagement/service/deploy.bicep' |
+##   | templateFilePath         | true     | ''      | The path to the template file to publish                                                         | 'modules/Microsoft.ApiManagement/service/deploy.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'       |
@@ -116,7 +116,7 @@ runs:
 
           # Publish the modified child resources
           foreach ($ModuleToPublish in $ModulesToPublish) {
-            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
             Write-Output "::group::$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
             $functionInput = @{
@@ -160,7 +160,7 @@ runs:
 
           # Publish the modified child resources
           foreach ($ModuleToPublish in $ModulesToPublish) {
-            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/arm/')[-1]).Split('/deploy.')[0]
+            $RelPath = (($ModuleToPublish.TemplateFilePath).Split('/modules/')[-1]).Split('/deploy.')[0]
             Write-Output "::group::$(' - [{0}] [{1}]' -f $RelPath, $ModuleToPublish.Version)"
 
             $functionInput = @{
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 7d23efa771..ef6401620d 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -14,8 +14,8 @@
 ##   |============================================================================================================================================================================|
 ##   | Parameter                 | Required | Default | Description                                           | Example                                                           |
 ##   |---------------------------|----------|---------|-------------------------------------------------------|-------------------------------------------------------------------|
-##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment              | 'arm/Microsoft.ApiManagement/service/deploy.bicep'                |
-##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'arm/Microsoft.ApiManagement/service/.parameters/parameters.json' |
+##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment              | 'modules/Microsoft.ApiManagement/service/deploy.bicep'                |
+##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'modules/Microsoft.ApiManagement/service/.parameters/parameters.json' |
 ##   | location                  | true     | ''      | The location to use for deployment                    | 'WestEurope'                                                      |
 ##   | resourceGroupName         | false    | ''      | The resource group to deploy to                       | 'validation-rg'                                                   |
 ##   | subscriptionId            | false    | ''      | The subscriptionId 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 2585707067..dc07cf78cc 100644
--- a/.github/actions/templates/validateModulePester/action.yml
+++ b/.github/actions/templates/validateModulePester/action.yml
@@ -3,7 +3,7 @@
 #########################################################
 ##
 ## This composite action contains the logic to validate a module using a set of Pester tests
-## The tests are implemented in file 'arm/.global/global.module.tests.ps1'
+## The tests are implemented in file 'modules/.global/global.module.tests.ps1'
 ##
 #########################################################
 ##
@@ -14,7 +14,7 @@
 ##   |===========================================================================================================|
 ##   | Parameter  | Required | Default | Description                     | Example                               |
 ##   |------------|----------|---------|---------------------------------|---------------------------------------|
-##   | modulePath | true     | ''      | The path to the module's folder | 'arm/Microsoft.ApiManagement/service' |
+##   | modulePath | true     | ''      | The path to the module's folder | 'modules/Microsoft.ApiManagement/service' |
 ##   |===========================================================================================================|
 ##
 ##---------------------------------------------##
@@ -95,14 +95,14 @@ runs:
         # --------------------- #
         Invoke-Pester -Configuration @{
           Run        = @{
-            Container = New-PesterContainer -Path 'arm/.global/global.module.tests.ps1' -Data @{
+            Container = New-PesterContainer -Path 'modules/.global/global.module.tests.ps1' -Data @{
               moduleFolderPaths = $moduleFolderPaths
               enforcedTokenList = $enforcedTokenList
             }
           }
           TestResult = @{
             TestSuiteName = 'Global Module Tests'
-            OutputPath    = 'arm/.global/global-testResults.xml'
+            OutputPath    = 'modules/.global/global-testResults.xml'
             OutputFormat  = 'JUnitXml'
             Enabled       = $true
           }
@@ -115,4 +115,4 @@ runs:
       uses: EnricoMi/publish-unit-test-result-action@v1
       if: always()
       with:
-        files: 'arm/.global/*-testResults.xml'
+        files: 'modules/.global/*-testResults.xml'
diff --git a/.github/workflows/ms.aad.domainservices.yml b/.github/workflows/ms.aad.domainservices.yml
index 229590b5e4..9c7dc030c4 100644
--- a/.github/workflows/ms.aad.domainservices.yml
+++ b/.github/workflows/ms.aad.domainservices.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.aad.domainservices.yml'
-      - 'arm/Microsoft.AAD/DomainServices/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AAD/DomainServices/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AAD/DomainServices'
+  modulePath: 'modules/Microsoft.AAD/DomainServices'
   workflowPath: '.github/workflows/ms.aad.domainservices.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index 4330ec663a..d89e4b0956 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.analysisservices.servers.yml'
-      - 'arm/Microsoft.AnalysisServices/servers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AnalysisServices/servers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AnalysisServices/servers'
+  modulePath: 'modules/Microsoft.AnalysisServices/servers'
   workflowPath: '.github/workflows/ms.analysisservices.servers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index b3078cda39..b04a8a7374 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.apimanagement.service.yml'
-      - 'arm/Microsoft.ApiManagement/service/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ApiManagement/service/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ApiManagement/service'
+  modulePath: 'modules/Microsoft.ApiManagement/service'
   workflowPath: '.github/workflows/ms.apimanagement.service.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.appconfiguration.configurationstores.yml b/.github/workflows/ms.appconfiguration.configurationstores.yml
index 2a6e3997f9..73bc29e477 100644
--- a/.github/workflows/ms.appconfiguration.configurationstores.yml
+++ b/.github/workflows/ms.appconfiguration.configurationstores.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.appconfiguration.configurationstores.yml'
-      - 'arm/Microsoft.AppConfiguration/configurationStores/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.AppConfiguration/configurationStores/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.AppConfiguration/configurationStores'
+  modulePath: 'modules/Microsoft.AppConfiguration/configurationStores'
   workflowPath: '.github/workflows/ms.appconfiguration.configurationstores.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.locks.yml b/.github/workflows/ms.authorization.locks.yml
index 49c6070b64..53ae10acd3 100644
--- a/.github/workflows/ms.authorization.locks.yml
+++ b/.github/workflows/ms.authorization.locks.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.locks.yml'
-      - 'arm/Microsoft.Authorization/locks/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/locks/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/locks'
+  modulePath: 'modules/Microsoft.Authorization/locks'
   workflowPath: '.github/workflows/ms.authorization.locks.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index ebb21af4a3..e1710d9ae2 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policyassignments.yml'
-      - 'arm/Microsoft.Authorization/policyAssignments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyAssignments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyAssignments'
+  modulePath: 'modules/Microsoft.Authorization/policyAssignments'
   workflowPath: '.github/workflows/ms.authorization.policyassignments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index e02a09c206..f3f6b3eee5 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policydefinitions.yml'
-      - 'arm/Microsoft.Authorization/policyDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/policyDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policydefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index cbacdd34c7..64d0f4c63e 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policyexemptions.yml'
-      - 'arm/Microsoft.Authorization/policyExemptions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policyExemptions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policyExemptions'
+  modulePath: 'modules/Microsoft.Authorization/policyExemptions'
   workflowPath: '.github/workflows/ms.authorization.policyexemptions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 5fee8e7ebf..38a3a40b79 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.policysetdefinitions.yml'
-      - 'arm/Microsoft.Authorization/policySetDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/policySetDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/policySetDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/policySetDefinitions'
   workflowPath: '.github/workflows/ms.authorization.policysetdefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index e7e8c53828..8d0f8a65c9 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.roleassignments.yml'
-      - 'arm/Microsoft.Authorization/roleAssignments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/roleAssignments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/roleAssignments'
+  modulePath: 'modules/Microsoft.Authorization/roleAssignments'
   workflowPath: '.github/workflows/ms.authorization.roleassignments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index 95a3a5cc1d..dfc4ff4114 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.authorization.roledefinitions.yml'
-      - 'arm/Microsoft.Authorization/roleDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Authorization/roleDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Authorization/roleDefinitions'
+  modulePath: 'modules/Microsoft.Authorization/roleDefinitions'
   workflowPath: '.github/workflows/ms.authorization.roledefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index e2a3cc2bc9..223913b69a 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -20,15 +20,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.automation.automationaccounts.yml'
-      - 'arm/Microsoft.Automation/automationAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Automation/automationAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Automation/automationAccounts'
+  modulePath: 'modules/Microsoft.Automation/automationAccounts'
   workflowPath: '.github/workflows/ms.automation.automationaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index bdab22a0fb..99438c8f5e 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.batch.batchaccounts.yml'
-      - 'arm/Microsoft.Batch/batchAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Batch/batchAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Batch/batchAccounts'
+  modulePath: 'modules/Microsoft.Batch/batchAccounts'
   workflowPath: '.github/workflows/ms.batch.batchaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index f320fd876d..5ea5e69477 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.cognitiveservices.accounts.yml'
-      - 'arm/Microsoft.CognitiveServices/accounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.CognitiveServices/accounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.CognitiveServices/accounts'
+  modulePath: 'modules/Microsoft.CognitiveServices/accounts'
   workflowPath: '.github/workflows/ms.cognitiveservices.accounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index a873271346..24ee9e6810 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.availabilitysets.yml'
-      - 'arm/Microsoft.Compute/availabilitySets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/availabilitySets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/availabilitySets'
+  modulePath: 'modules/Microsoft.Compute/availabilitySets'
   workflowPath: '.github/workflows/ms.compute.availabilitysets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index 4249bc2d92..2ec3d0070a 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.diskencryptionsets.yml'
-      - 'arm/Microsoft.Compute/diskEncryptionSets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/diskEncryptionSets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/diskEncryptionSets'
+  modulePath: 'modules/Microsoft.Compute/diskEncryptionSets'
   workflowPath: '.github/workflows/ms.compute.diskencryptionsets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.disks.yml b/.github/workflows/ms.compute.disks.yml
index 8495ead6ae..b7e448c3f8 100644
--- a/.github/workflows/ms.compute.disks.yml
+++ b/.github/workflows/ms.compute.disks.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.disks.yml'
-      - 'arm/Microsoft.Compute/disks/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/disks/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/disks'
+  modulePath: 'modules/Microsoft.Compute/disks'
   workflowPath: '.github/workflows/ms.compute.disks.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index 3e341e0474..d1253419b2 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.galleries.yml'
-      - 'arm/Microsoft.Compute/galleries/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/galleries/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/galleries'
+  modulePath: 'modules/Microsoft.Compute/galleries'
   workflowPath: '.github/workflows/ms.compute.galleries.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index 1e6aefa800..429badf603 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.images.yml'
-      - 'arm/Microsoft.Compute/images/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/images/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/images'
+  modulePath: 'modules/Microsoft.Compute/images'
   workflowPath: '.github/workflows/ms.compute.images.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index 8dd426e6f6..039369a56c 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.proximityplacementgroups.yml'
-      - 'arm/Microsoft.Compute/proximityPlacementGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/proximityPlacementGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/proximityPlacementGroups'
+  modulePath: 'modules/Microsoft.Compute/proximityPlacementGroups'
   workflowPath: '.github/workflows/ms.compute.proximityplacementgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index bb336d8917..607ff5ae93 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.virtualmachines.yml'
-      - 'arm/Microsoft.Compute/virtualMachines/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/virtualMachines/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/virtualMachines'
+  modulePath: 'modules/Microsoft.Compute/virtualMachines'
   workflowPath: '.github/workflows/ms.compute.virtualmachines.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index 3cc180a270..7a5bfa94cd 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.compute.virtualmachinescalesets.yml'
-      - 'arm/Microsoft.Compute/virtualMachineScaleSets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Compute/virtualMachineScaleSets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Compute/virtualMachineScaleSets'
+  modulePath: 'modules/Microsoft.Compute/virtualMachineScaleSets'
   workflowPath: '.github/workflows/ms.compute.virtualmachinescalesets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index 1050a427d8..0dcc0234b2 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.consumption.budgets.yml'
-      - 'arm/Microsoft.Consumption/budgets/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Consumption/budgets/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Consumption/budgets'
+  modulePath: 'modules/Microsoft.Consumption/budgets'
   workflowPath: '.github/workflows/ms.consumption.budgets.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index b742a184d5..ca09181a94 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerinstance.containergroups.yml'
-      - 'arm/Microsoft.ContainerInstance/containerGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerInstance/containerGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerInstance/containerGroups'
+  modulePath: 'modules/Microsoft.ContainerInstance/containerGroups'
   workflowPath: '.github/workflows/ms.containerinstance.containergroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index afbf8879e1..85bc59ab19 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerregistry.registries.yml'
-      - 'arm/Microsoft.ContainerRegistry/registries/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerRegistry/registries/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerRegistry/registries'
+  modulePath: 'modules/Microsoft.ContainerRegistry/registries'
   workflowPath: '.github/workflows/ms.containerregistry.registries.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 2198f54e26..a8ecaa5331 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.containerservice.managedclusters.yml'
-      - 'arm/Microsoft.ContainerService/managedClusters/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ContainerService/managedClusters/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ContainerService/managedClusters'
+  modulePath: 'modules/Microsoft.ContainerService/managedClusters'
   workflowPath: '.github/workflows/ms.containerservice.managedclusters.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index b8cbfab40b..74cabd195b 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.databricks.workspaces.yml'
-      - 'arm/Microsoft.Databricks/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Databricks/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Databricks/workspaces'
+  modulePath: 'modules/Microsoft.Databricks/workspaces'
   workflowPath: '.github/workflows/ms.databricks.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index 5c29c4ee5d..1ae1fbb5ee 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.datafactory.factories.yml'
-      - 'arm/Microsoft.DataFactory/factories/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DataFactory/factories/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DataFactory/factories'
+  modulePath: 'modules/Microsoft.DataFactory/factories'
   workflowPath: '.github/workflows/ms.datafactory.factories.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.dataprotection.backupvaults.yml b/.github/workflows/ms.dataprotection.backupvaults.yml
index 58e5749b5e..c56adbc3f1 100644
--- a/.github/workflows/ms.dataprotection.backupvaults.yml
+++ b/.github/workflows/ms.dataprotection.backupvaults.yml
@@ -1,39 +1,39 @@
-name: "DataProtection: BackupVaults"
+name: 'DataProtection: BackupVaults'
 
 on:
   workflow_dispatch:
     inputs:
       removeDeployment:
         type: boolean
-        description: "Remove deployed module"
+        description: 'Remove deployed module'
         required: false
         default: true
       prerelease:
         type: boolean
-        description: "Publish prerelease module"
+        description: 'Publish prerelease module'
         required: false
         default: false
   push:
     branches:
       - main
     paths:
-      - ".github/actions/templates/**"
-      - ".github/workflows/ms.dataprotection.backupvaults.yml"
-      - "arm/Microsoft.DataProtection/backupVaults/**"
-      - "arm/.global/global.module.tests.ps1"
-      - "!*/**/readme.md"
-      - "utilities/pipelines/**"
-      - "!utilities/pipelines/dependencies/**"
+      - '.github/actions/templates/**'
+      - '.github/workflows/ms.dataprotection.backupvaults.yml'
+      - 'modules/Microsoft.DataProtection/backupVaults/**'
+      - 'modules/.global/global.module.tests.ps1'
+      - '!*/**/readme.md'
+      - 'utilities/pipelines/**'
+      - '!utilities/pipelines/dependencies/**'
 
 env:
-  variablesPath: "global.variables.yml"
-  modulePath: "arm/Microsoft.DataProtection/backupVaults"
-  workflowPath: ".github/workflows/ms.dataprotection.backupvaults.yml"
+  variablesPath: 'global.variables.yml'
+  modulePath: 'modules/Microsoft.DataProtection/backupVaults'
+  workflowPath: '.github/workflows/ms.dataprotection.backupvaults.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
-  ARM_SUBSCRIPTION_ID: "${{ secrets.ARM_SUBSCRIPTION_ID }}"
-  ARM_MGMTGROUP_ID: "${{ secrets.ARM_MGMTGROUP_ID }}"
-  ARM_TENANT_ID: "${{ secrets.ARM_TENANT_ID }}"
-  DEPLOYMENT_SP_ID: "${{ secrets.DEPLOYMENT_SP_ID }}"
+  ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+  ARM_MGMTGROUP_ID: '${{ secrets.ARM_MGMTGROUP_ID }}'
+  ARM_TENANT_ID: '${{ secrets.ARM_TENANT_ID }}'
+  DEPLOYMENT_SP_ID: '${{ secrets.DEPLOYMENT_SP_ID }}'
 
 jobs:
   ###########################
@@ -41,22 +41,22 @@ jobs:
   ###########################
   job_initialize_pipeline:
     runs-on: ubuntu-20.04
-    name: "Initialize pipeline"
+    name: 'Initialize pipeline'
     steps:
-      - name: "Checkout"
+      - name: 'Checkout'
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: "Set input parameters to output variables"
+      - name: 'Set input parameters to output variables'
         id: get-workflow-param
         uses: ./.github/actions/templates/getWorkflowInput
         with:
-          workflowPath: "${{ env.workflowPath}}"
-      - name: "Get parameter file paths"
+          workflowPath: '${{ env.workflowPath}}'
+      - name: 'Get parameter file paths'
         id: get-parameter-file-paths
         uses: ./.github/actions/templates/getParameterFiles
         with:
-          modulePath: "${{ env.modulePath }}"
+          modulePath: '${{ env.modulePath }}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
       parameterFilePaths: ${{ steps.get-parameter-file-paths.outputs.parameterFilePaths }}
@@ -66,23 +66,23 @@ jobs:
   #########################
   job_module_pester_validation:
     runs-on: ubuntu-20.04
-    name: "Static validation"
+    name: 'Static validation'
     steps:
-      - name: "Checkout"
+      - name: 'Checkout'
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: "Run tests"
+      - name: 'Run tests'
         uses: ./.github/actions/templates/validateModulePester
         with:
-          modulePath: "${{ env.modulePath }}"
+          modulePath: '${{ env.modulePath }}'
 
   #############################
   #   Deployment validation   #
   #############################
   job_module_deploy_validation:
     runs-on: ubuntu-20.04
-    name: "Deployment validation"
+    name: 'Deployment validation'
     needs:
       - job_initialize_pipeline
       - job_module_pester_validation
@@ -91,7 +91,7 @@ jobs:
       matrix:
         parameterFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.parameterFilePaths) }}
     steps:
-      - name: "Checkout"
+      - name: 'Checkout'
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -99,28 +99,28 @@ jobs:
         uses: ./.github/actions/templates/setEnvironmentVariables
         with:
           variablesPath: ${{ env.variablesPath }}
-      - name: "Using parameter file [${{ matrix.parameterFilePaths }}]"
+      - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: "${{ env.modulePath }}/deploy.bicep"
-          parameterFilePath: "${{ env.modulePath }}/${{ matrix.parameterFilePaths }}"
-          location: "${{ env.location }}"
-          resourceGroupName: "${{ env.resourceGroupName }}"
-          subscriptionId: "${{ secrets.ARM_SUBSCRIPTION_ID }}"
-          managementGroupId: "${{ secrets.ARM_MGMTGROUP_ID }}"
-          removeDeployment: "${{ needs.job_initialize_pipeline.outputs.removeDeployment }}"
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+          parameterFilePath: '${{ env.modulePath }}/${{ matrix.parameterFilePaths }}'
+          location: '${{ env.location }}'
+          resourceGroupName: '${{ env.resourceGroupName }}'
+          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+          removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'
 
   ##################
   #   Publishing   #
   ##################
   job_publish_module:
-    name: "Publishing"
+    name: 'Publishing'
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_module_deploy_validation
     steps:
-      - name: "Checkout"
+      - name: 'Checkout'
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -128,15 +128,15 @@ jobs:
         uses: ./.github/actions/templates/setEnvironmentVariables
         with:
           variablesPath: ${{ env.variablesPath }}
-      - name: "Publishing"
+      - name: 'Publishing'
         uses: ./.github/actions/templates/publishModule
         with:
-          templateFilePath: "${{ env.modulePath }}/deploy.bicep"
-          templateSpecsRGName: "${{ env.templateSpecsRGName }}"
-          templateSpecsRGLocation: "${{ env.templateSpecsRGLocation }}"
-          templateSpecsDescription: "${{ env.templateSpecsDescription }}"
-          templateSpecsDoPublish: "${{ env.templateSpecsDoPublish }}"
-          bicepRegistryName: "${{ env.bicepRegistryName }}"
-          bicepRegistryRGName: "${{ env.bicepRegistryRGName }}"
-          bicepRegistryRgLocation: "${{ env.bicepRegistryRgLocation }}"
-          bicepRegistryDoPublish: "${{ env.bicepRegistryDoPublish }}"
\ No newline at end of file
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+          templateSpecsRGName: '${{ env.templateSpecsRGName }}'
+          templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
+          templateSpecsDescription: '${{ env.templateSpecsDescription }}'
+          templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
+          bicepRegistryName: '${{ env.bicepRegistryName }}'
+          bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
+          bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
+          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index 33ce312ca1..08233297a9 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
-      - 'arm/Microsoft.DesktopVirtualization/applicationgroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/applicationgroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/applicationgroups'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/applicationgroups'
   workflowPath: '.github/workflows/ms.desktopvirtualization.applicationgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index 32848ee2b7..e9467fc5f2 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.hostpools.yml'
-      - 'arm/Microsoft.DesktopVirtualization/hostpools/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/hostpools/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/hostpools'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/hostpools'
   workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
index fab5ecae6b..2be99b6d5c 100644
--- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml
+++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
-      - 'arm/Microsoft.DesktopVirtualization/scalingplans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/scalingplans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/scalingplans'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/scalingplans'
   workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index 7cfaa3e7be..c5598aa7af 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.desktopvirtualization.workspaces.yml'
-      - 'arm/Microsoft.DesktopVirtualization/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DesktopVirtualization/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DesktopVirtualization/workspaces'
+  modulePath: 'modules/Microsoft.DesktopVirtualization/workspaces'
   workflowPath: '.github/workflows/ms.desktopvirtualization.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index c61a97e61d..bf98c479d8 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.documentdb.databaseaccounts.yml'
-      - 'arm/Microsoft.DocumentDB/databaseAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.DocumentDB/databaseAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.DocumentDB/databaseAccounts'
+  modulePath: 'modules/Microsoft.DocumentDB/databaseAccounts'
   workflowPath: '.github/workflows/ms.documentdb.databaseaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventgrid.systemtopics.yml b/.github/workflows/ms.eventgrid.systemtopics.yml
index 27a694db1f..f4f5ab3a06 100644
--- a/.github/workflows/ms.eventgrid.systemtopics.yml
+++ b/.github/workflows/ms.eventgrid.systemtopics.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventgrid.systemtopics.yml'
-      - 'arm/Microsoft.EventGrid/systemTopics/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventGrid/systemTopics/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventGrid/systemTopics'
+  modulePath: 'modules/Microsoft.EventGrid/systemTopics'
   workflowPath: '.github/workflows/ms.eventgrid.systemtopics.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index 84cc1e4c19..16a7384c71 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventgrid.topics.yml'
-      - 'arm/Microsoft.EventGrid/topics/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventGrid/topics/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventGrid/topics'
+  modulePath: 'modules/Microsoft.EventGrid/topics'
   workflowPath: '.github/workflows/ms.eventgrid.topics.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index a7582951bc..1a75f805fe 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.eventhub.namespaces.yml'
-      - 'arm/Microsoft.EventHub/namespaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.EventHub/namespaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.EventHub/namespaces'
+  modulePath: 'modules/Microsoft.EventHub/namespaces'
   workflowPath: '.github/workflows/ms.eventhub.namespaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index 59e4f32200..43530361a9 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.healthbot.healthbots.yml'
-      - 'arm/Microsoft.HealthBot/healthBots/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.HealthBot/healthBots/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.HealthBot/healthBots'
+  modulePath: 'modules/Microsoft.HealthBot/healthBots'
   workflowPath: '.github/workflows/ms.healthbot.healthbots.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index b9758fd8aa..d388901c80 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.actiongroups.yml'
-      - 'arm/Microsoft.Insights/actionGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/actionGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/actionGroups'
+  modulePath: 'modules/Microsoft.Insights/actionGroups'
   workflowPath: '.github/workflows/ms.insights.actiongroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index 3f1f01f514..97e287c8fd 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.activitylogalerts.yml'
-      - 'arm/Microsoft.Insights/activityLogAlerts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/activityLogAlerts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/activityLogAlerts'
+  modulePath: 'modules/Microsoft.Insights/activityLogAlerts'
   workflowPath: '.github/workflows/ms.insights.activitylogalerts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index ed559d1c8e..ad8569778e 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.components.yml'
-      - 'arm/Microsoft.Insights/components/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/components/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/components'
+  modulePath: 'modules/Microsoft.Insights/components'
   workflowPath: '.github/workflows/ms.insights.components.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index b49863642c..556e6d95af 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.diagnosticsettings.yml'
-      - 'arm/Microsoft.Insights/diagnosticsettings/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/diagnosticsettings/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/diagnosticSettings'
+  modulePath: 'modules/Microsoft.Insights/diagnosticSettings'
   workflowPath: '.github/workflows/ms.insights.diagnosticsettings.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index 7f4e64a2b7..c238711b06 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.metricalerts.yml'
-      - 'arm/Microsoft.Insights/metricAlerts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/metricAlerts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/metricAlerts'
+  modulePath: 'modules/Microsoft.Insights/metricAlerts'
   workflowPath: '.github/workflows/ms.insights.metricalerts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index 35e362059b..c342b41a94 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.privatelinkscopes.yml'
-      - 'arm/Microsoft.Insights/privateLinkScopes/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/privateLinkScopes/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/privateLinkScopes'
+  modulePath: 'modules/Microsoft.Insights/privateLinkScopes'
   workflowPath: '.github/workflows/ms.insights.privatelinkscopes.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index 3ac293149b..f94d3e3fe9 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.insights.scheduledqueryrules.yml'
-      - 'arm/Microsoft.Insights/scheduledQueryRules/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Insights/scheduledQueryRules/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Insights/scheduledQueryRules'
+  modulePath: 'modules/Microsoft.Insights/scheduledQueryRules'
   workflowPath: '.github/workflows/ms.insights.scheduledqueryrules.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index a428a0e48a..1067ceab94 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.keyvault.vaults.yml'
-      - 'arm/Microsoft.KeyVault/vaults/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KeyVault/vaults/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KeyVault/vaults'
+  modulePath: 'modules/Microsoft.KeyVault/vaults'
   workflowPath: '.github/workflows/ms.keyvault.vaults.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.kubernetesconfiguration.extensions.yml b/.github/workflows/ms.kubernetesconfiguration.extensions.yml
index cb6c3b7664..03163a781c 100644
--- a/.github/workflows/ms.kubernetesconfiguration.extensions.yml
+++ b/.github/workflows/ms.kubernetesconfiguration.extensions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.kubernetesconfiguration.extensions.yml'
-      - 'arm/Microsoft.KubernetesConfiguration/extensions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KubernetesConfiguration/extensions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KubernetesConfiguration/extensions'
+  modulePath: 'modules/Microsoft.KubernetesConfiguration/extensions'
   workflowPath: '.github/workflows/ms.kubernetesconfiguration.extensions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml b/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
index 47ec3b2fc6..9d6e7ae21c 100644
--- a/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml'
-      - 'arm/Microsoft.KubernetesConfiguration/fluxConfigurations/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.KubernetesConfiguration/fluxConfigurations/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.KubernetesConfiguration/fluxConfigurations'
+  modulePath: 'modules/Microsoft.KubernetesConfiguration/fluxConfigurations'
   workflowPath: '.github/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 03e09b6410..19a4d65ea3 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.logic.workflows.yml'
-      - 'arm/Microsoft.Logic/workflows/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Logic/workflows/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Logic/workflows'
+  modulePath: 'modules/Microsoft.Logic/workflows'
   workflowPath: '.github/workflows/ms.logic.workflows.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index aab2efcaeb..5df607c47b 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.machinelearningservices.workspaces.yml'
-      - 'arm/Microsoft.MachineLearningServices/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.MachineLearningServices/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.MachineLearningServices/workspaces'
+  modulePath: 'modules/Microsoft.MachineLearningServices/workspaces'
   workflowPath: '.github/workflows/ms.machinelearningservices.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index e85f71f65a..d0c233a4c4 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.managedidentity.userassignedidentities.yml'
-      - 'arm/Microsoft.ManagedIdentity/userAssignedIdentities/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ManagedIdentity/userAssignedIdentities/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ManagedIdentity/userAssignedIdentities'
+  modulePath: 'modules/Microsoft.ManagedIdentity/userAssignedIdentities'
   workflowPath: '.github/workflows/ms.managedidentity.userassignedidentities.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index 174cdf5a4d..9825845d2a 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.managedservices.registrationdefinitions.yml'
-      - 'arm/Microsoft.ManagedServices/registrationDefinitions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ManagedServices/registrationDefinitions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ManagedServices/registrationDefinitions'
+  modulePath: 'modules/Microsoft.ManagedServices/registrationDefinitions'
   workflowPath: '.github/workflows/ms.managedservices.registrationdefinitions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index 00860c6205..ff7edf7a55 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.management.managementgroups.yml'
-      - 'arm/Microsoft.Management/managementGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Management/managementGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Management/managementGroups'
+  modulePath: 'modules/Microsoft.Management/managementGroups'
   workflowPath: '.github/workflows/ms.management.managementgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index 0aa8dc46b1..0c1aa8555b 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.netapp.netappaccounts.yml'
-      - 'arm/Microsoft.NetApp/netAppAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.NetApp/netAppAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.NetApp/netAppAccounts'
+  modulePath: 'modules/Microsoft.NetApp/netAppAccounts'
   workflowPath: '.github/workflows/ms.netapp.netappaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index 4e8aa732e5..930f387bce 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.applicationgateways.yml'
-      - 'arm/Microsoft.Network/applicationGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/applicationGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/applicationGateways'
+  modulePath: 'modules/Microsoft.Network/applicationGateways'
   workflowPath: '.github/workflows/ms.network.applicationgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index a4f3df798d..49f9bb3071 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.applicationsecuritygroups.yml'
-      - 'arm/Microsoft.Network/applicationSecurityGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/applicationSecurityGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/applicationSecurityGroups'
+  modulePath: 'modules/Microsoft.Network/applicationSecurityGroups'
   workflowPath: '.github/workflows/ms.network.applicationsecuritygroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index 93bffd1e5b..2de448b7af 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.azurefirewalls.yml'
-      - 'arm/Microsoft.Network/azureFirewalls/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/azureFirewalls/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/azureFirewalls'
+  modulePath: 'modules/Microsoft.Network/azureFirewalls'
   workflowPath: '.github/workflows/ms.network.azurefirewalls.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index 4737fe021a..7bb3d48b6a 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.bastionhosts.yml'
-      - 'arm/Microsoft.Network/bastionHosts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/bastionHosts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/bastionHosts'
+  modulePath: 'modules/Microsoft.Network/bastionHosts'
   workflowPath: '.github/workflows/ms.network.bastionhosts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index e37af7123d..76bb4cd9bd 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.connections.yml'
-      - 'arm/Microsoft.Network/connections/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/connections/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/connections'
+  modulePath: 'modules/Microsoft.Network/connections'
   workflowPath: '.github/workflows/ms.network.connections.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index 0f83af3940..4582c415a7 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.ddosprotectionplans.yml'
-      - 'arm/Microsoft.Network/ddosProtectionPlans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/ddosProtectionPlans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/ddosProtectionPlans'
+  modulePath: 'modules/Microsoft.Network/ddosProtectionPlans'
   workflowPath: '.github/workflows/ms.network.ddosprotectionplans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index a8bc58510a..4f1d1c87f1 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.expressroutecircuits.yml'
-      - 'arm/Microsoft.Network/expressRouteCircuits/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/expressRouteCircuits/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/expressRouteCircuits'
+  modulePath: 'modules/Microsoft.Network/expressRouteCircuits'
   workflowPath: '.github/workflows/ms.network.expressroutecircuits.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index 6137b0212f..fab9e32a34 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.firewallpolicies.yml'
-      - 'arm/Microsoft.Network/firewallPolicies/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/firewallPolicies/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/firewallPolicies'
+  modulePath: 'modules/Microsoft.Network/firewallPolicies'
   workflowPath: '.github/workflows/ms.network.firewallpolicies.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.frontdoors.yml b/.github/workflows/ms.network.frontdoors.yml
index 5e511cae0b..65d1960ddc 100644
--- a/.github/workflows/ms.network.frontdoors.yml
+++ b/.github/workflows/ms.network.frontdoors.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.frontdoors.yml'
-      - 'arm/Microsoft.Network/frontDoors/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/frontDoors/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/frontDoors'
+  modulePath: 'modules/Microsoft.Network/frontDoors'
   workflowPath: '.github/workflows/ms.network.frontdoors.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index 3a13b6d30b..c2e71a6c59 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.ipgroups.yml'
-      - 'arm/Microsoft.Network/ipGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/ipGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/ipGroups'
+  modulePath: 'modules/Microsoft.Network/ipGroups'
   workflowPath: '.github/workflows/ms.network.ipgroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index 3d23e74394..6eb3b3acf4 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.loadbalancers.yml'
-      - 'arm/Microsoft.Network/loadBalancers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/loadBalancers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/loadBalancers'
+  modulePath: 'modules/Microsoft.Network/loadBalancers'
   workflowPath: '.github/workflows/ms.network.loadbalancers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index be05683a4b..704d6dc29c 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.localnetworkgateways.yml'
-      - 'arm/Microsoft.Network/localNetworkGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/localNetworkGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/localNetworkGateways'
+  modulePath: 'modules/Microsoft.Network/localNetworkGateways'
   workflowPath: '.github/workflows/ms.network.localnetworkgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index ebdd539815..fd3b0b0f4c 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.natgateways.yml'
-      - 'arm/Microsoft.Network/natGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/natGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/natGateways'
+  modulePath: 'modules/Microsoft.Network/natGateways'
   workflowPath: '.github/workflows/ms.network.natgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networkinterfaces.yml b/.github/workflows/ms.network.networkinterfaces.yml
index feda3575e3..3351651662 100644
--- a/.github/workflows/ms.network.networkinterfaces.yml
+++ b/.github/workflows/ms.network.networkinterfaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networkinterfaces.yml'
-      - 'arm/Microsoft.Network/networkInterfaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkInterfaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkInterfaces'
+  modulePath: 'modules/Microsoft.Network/networkInterfaces'
   workflowPath: '.github/workflows/ms.network.networkinterfaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index 186a49f9c6..ec4143097d 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networksecuritygroups.yml'
-      - 'arm/Microsoft.Network/networkSecurityGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkSecurityGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkSecurityGroups'
+  modulePath: 'modules/Microsoft.Network/networkSecurityGroups'
   workflowPath: '.github/workflows/ms.network.networksecuritygroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 3728a63e58..1f1773ba2e 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.networkwatchers.yml'
-      - 'arm/Microsoft.Network/networkWatchers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/networkWatchers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/networkWatchers'
+  modulePath: 'modules/Microsoft.Network/networkWatchers'
   workflowPath: '.github/workflows/ms.network.networkwatchers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index 3afa12980f..5186987b00 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.privatednszones.yml'
-      - 'arm/Microsoft.Network/privateDnsZones/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/privateDnsZones/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/privateDnsZones'
+  modulePath: 'modules/Microsoft.Network/privateDnsZones'
   workflowPath: '.github/workflows/ms.network.privatednszones.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index 06132ed4a2..b7fed464dd 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.privateendpoints.yml'
-      - 'arm/Microsoft.Network/privateEndpoints/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/privateEndpoints/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/privateEndpoints'
+  modulePath: 'modules/Microsoft.Network/privateEndpoints'
   workflowPath: '.github/workflows/ms.network.privateendpoints.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index ff2e212f7b..b1e9fbcc11 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.publicipaddresses.yml'
-      - 'arm/Microsoft.Network/publicIPAddresses/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/publicIPAddresses/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/publicIPAddresses'
+  modulePath: 'modules/Microsoft.Network/publicIPAddresses'
   workflowPath: '.github/workflows/ms.network.publicipaddresses.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 7ee726e778..714bc5bdb2 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.publicipprefixes.yml'
-      - 'arm/Microsoft.Network/publicIPPrefixes/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/publicIPPrefixes/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/publicIPPrefixes'
+  modulePath: 'modules/Microsoft.Network/publicIPPrefixes'
   workflowPath: '.github/workflows/ms.network.publicipprefixes.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index c64d0c4b61..9f4bb512c4 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.routetables.yml'
-      - 'arm/Microsoft.Network/routeTables/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/routeTables/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/routeTables'
+  modulePath: 'modules/Microsoft.Network/routeTables'
   workflowPath: '.github/workflows/ms.network.routetables.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index 38e8f66a8c..d1a0a6b561 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.trafficmanagerprofiles.yml'
-      - 'arm/Microsoft.Network/trafficmanagerprofiles/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/trafficmanagerprofiles/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/trafficmanagerprofiles'
+  modulePath: 'modules/Microsoft.Network/trafficmanagerprofiles'
   workflowPath: '.github/workflows/ms.network.trafficmanagerprofiles.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualhubs.yml b/.github/workflows/ms.network.virtualhubs.yml
index cf5d3d8db7..9e2221dff4 100644
--- a/.github/workflows/ms.network.virtualhubs.yml
+++ b/.github/workflows/ms.network.virtualhubs.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualhubs.yml'
-      - 'arm/Microsoft.Network/virtualHubs/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualHubs/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualHubs'
+  modulePath: 'modules/Microsoft.Network/virtualHubs'
   workflowPath: '.github/workflows/ms.network.virtualhubs.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index d0ad36a1fa..a96f19b58f 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualnetworkgateways.yml'
-      - 'arm/Microsoft.Network/virtualNetworkGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualNetworkGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualNetworkGateways'
+  modulePath: 'modules/Microsoft.Network/virtualNetworkGateways'
   workflowPath: '.github/workflows/ms.network.virtualnetworkgateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index b1445fc3ce..8ffde5c19e 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualnetworks.yml'
-      - 'arm/Microsoft.Network/virtualNetworks/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualNetworks/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualNetworks'
+  modulePath: 'modules/Microsoft.Network/virtualNetworks'
   workflowPath: '.github/workflows/ms.network.virtualnetworks.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index af84aa61d6..911e6fe50a 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.virtualwans.yml'
-      - 'arm/Microsoft.Network/virtualWans/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/virtualWans/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/virtualWans'
+  modulePath: 'modules/Microsoft.Network/virtualWans'
   workflowPath: '.github/workflows/ms.network.virtualwans.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.vpngateways.yml b/.github/workflows/ms.network.vpngateways.yml
index a478903089..2fb8cc1797 100644
--- a/.github/workflows/ms.network.vpngateways.yml
+++ b/.github/workflows/ms.network.vpngateways.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.vpngateways.yml'
-      - 'arm/Microsoft.Network/vpnGateways/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/vpnGateways/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/vpnGateways'
+  modulePath: 'modules/Microsoft.Network/vpnGateways'
   workflowPath: '.github/workflows/ms.network.vpngateways.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.network.vpnsites.yml b/.github/workflows/ms.network.vpnsites.yml
index fb0f8c8d3f..b72ddae6e1 100644
--- a/.github/workflows/ms.network.vpnsites.yml
+++ b/.github/workflows/ms.network.vpnsites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.network.vpnsites.yml'
-      - 'arm/Microsoft.Network/vpnSites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Network/vpnSites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Network/vpnSites'
+  modulePath: 'modules/Microsoft.Network/vpnSites'
   workflowPath: '.github/workflows/ms.network.vpnsites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index 9ddfc177f5..fd0c3c685a 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.operationalinsights.workspaces.yml'
-      - 'arm/Microsoft.OperationalInsights/workspaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.OperationalInsights/workspaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.OperationalInsights/workspaces'
+  modulePath: 'modules/Microsoft.OperationalInsights/workspaces'
   workflowPath: '.github/workflows/ms.operationalinsights.workspaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.operationsmanagement.solutions.yml b/.github/workflows/ms.operationsmanagement.solutions.yml
index db74fec086..da92a74b21 100644
--- a/.github/workflows/ms.operationsmanagement.solutions.yml
+++ b/.github/workflows/ms.operationsmanagement.solutions.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.operationsmanagement.solutions.yml'
-      - 'arm/Microsoft.OperationsManagement/solutions/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.OperationsManagement/solutions/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.OperationsManagement/solutions'
+  modulePath: 'modules/Microsoft.OperationsManagement/solutions'
   workflowPath: '.github/workflows/ms.operationsmanagement.solutions.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index 15e09441c3..275e0498de 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.recoveryservices.vaults.yml'
-      - 'arm/Microsoft.RecoveryServices/vaults/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.RecoveryServices/vaults/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.RecoveryServices/vaults'
+  modulePath: 'modules/Microsoft.RecoveryServices/vaults'
   workflowPath: '.github/workflows/ms.recoveryservices.vaults.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 967b05e4b9..32b6b0f767 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.deploymentscripts.yml'
-      - 'arm/Microsoft.Resources/deploymentScripts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/deploymentScripts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/deploymentScripts'
+  modulePath: 'modules/Microsoft.Resources/deploymentScripts'
   workflowPath: '.github/workflows/ms.resources.deploymentscripts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index 392cd5740b..60de42f8b8 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.resourcegroups.yml'
-      - 'arm/Microsoft.Resources/resourceGroups/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/resourceGroups/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/resourceGroups'
+  modulePath: 'modules/Microsoft.Resources/resourceGroups'
   workflowPath: '.github/workflows/ms.resources.resourcegroups.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.resources.tags.yml b/.github/workflows/ms.resources.tags.yml
index c35776cb2d..fb54367126 100644
--- a/.github/workflows/ms.resources.tags.yml
+++ b/.github/workflows/ms.resources.tags.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.resources.tags.yml'
-      - 'arm/Microsoft.Resources/tags/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Resources/tags/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Resources/tags'
+  modulePath: 'modules/Microsoft.Resources/tags'
   workflowPath: '.github/workflows/ms.resources.tags.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index 0eab54dc73..bca0ebedff 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.security.azuresecuritycenter.yml'
-      - 'arm/Microsoft.Security/azureSecurityCenter/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Security/azureSecurityCenter/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Security/azureSecurityCenter'
+  modulePath: 'modules/Microsoft.Security/azureSecurityCenter'
   workflowPath: '.github/workflows/ms.security.azuresecuritycenter.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index e290a78302..fb84ab7ccd 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.servicebus.namespaces.yml'
-      - 'arm/Microsoft.ServiceBus/namespaces/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ServiceBus/namespaces/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ServiceBus/namespaces'
+  modulePath: 'modules/Microsoft.ServiceBus/namespaces'
   workflowPath: '.github/workflows/ms.servicebus.namespaces.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.servicefabric.clusters.yml b/.github/workflows/ms.servicefabric.clusters.yml
index d53258695c..9895c4f192 100644
--- a/.github/workflows/ms.servicefabric.clusters.yml
+++ b/.github/workflows/ms.servicefabric.clusters.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.servicefabric.clusters.yml'
-      - 'arm/Microsoft.ServiceFabric/clusters/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.ServiceFabric/clusters/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.ServiceFabric/clusters'
+  modulePath: 'modules/Microsoft.ServiceFabric/clusters'
   workflowPath: '.github/workflows/ms.servicefabric.clusters.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index 70cacaaaaf..e3c6df7041 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.sql.managedinstances.yml'
-      - 'arm/Microsoft.Sql/managedInstances/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Sql/managedInstances/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Sql/managedInstances'
+  modulePath: 'modules/Microsoft.Sql/managedInstances'
   workflowPath: '.github/workflows/ms.sql.managedinstances.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index c2b15642ee..61623e9bfb 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.sql.servers.yml'
-      - 'arm/Microsoft.Sql/servers/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Sql/servers/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Sql/servers'
+  modulePath: 'modules/Microsoft.Sql/servers'
   workflowPath: '.github/workflows/ms.sql.servers.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 25ca93d427..dfd7c811fc 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.storage.storageaccounts.yml'
-      - 'arm/Microsoft.Storage/storageAccounts/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Storage/storageAccounts/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Storage/storageAccounts'
+  modulePath: 'modules/Microsoft.Storage/storageAccounts'
   workflowPath: '.github/workflows/ms.storage.storageaccounts.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 7c70983ae5..d0287ac8d3 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.synapse.privatelinkhubs.yml'
-      - 'arm/Microsoft.Synapse/privateLinkHubs/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Synapse/privateLinkHubs/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Synapse/privateLinkHubs'
+  modulePath: 'modules/Microsoft.Synapse/privateLinkHubs'
   workflowPath: '.github/workflows/ms.synapse.privatelinkhubs.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index 1a586bcf64..7d1c122891 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.virtualmachineimages.imagetemplates.yml'
-      - 'arm/Microsoft.VirtualMachineImages/imageTemplates/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.VirtualMachineImages/imageTemplates/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.VirtualMachineImages/imageTemplates'
+  modulePath: 'modules/Microsoft.VirtualMachineImages/imageTemplates'
   workflowPath: '.github/workflows/ms.virtualmachineimages.imagetemplates.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index e32df8e3c9..24a5452946 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.connections.yml'
-      - 'arm/Microsoft.Web/connections/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/connections/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/connections'
+  modulePath: 'modules/Microsoft.Web/connections'
   workflowPath: '.github/workflows/ms.web.connections.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index 0d926983ec..cc7f884c27 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.hostingenvironments.yml'
-      - 'arm/Microsoft.Web/hostingEnvironments/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/hostingEnvironments/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/hostingEnvironments'
+  modulePath: 'modules/Microsoft.Web/hostingEnvironments'
   workflowPath: '.github/workflows/ms.web.hostingenvironments.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 1ba700cf21..d0d6a3a41d 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.serverfarms.yml'
-      - 'arm/Microsoft.Web/serverfarms/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/serverfarms/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/serverfarms'
+  modulePath: 'modules/Microsoft.Web/serverfarms'
   workflowPath: '.github/workflows/ms.web.serverfarms.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index a83b5659d2..5f69a15df6 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.sites.yml'
-      - 'arm/Microsoft.Web/sites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/sites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/sites'
+  modulePath: 'modules/Microsoft.Web/sites'
   workflowPath: '.github/workflows/ms.web.sites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/ms.web.staticsites.yml b/.github/workflows/ms.web.staticsites.yml
index bc0920919b..b387de58ae 100644
--- a/.github/workflows/ms.web.staticsites.yml
+++ b/.github/workflows/ms.web.staticsites.yml
@@ -19,15 +19,15 @@ on:
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.web.staticsites.yml'
-      - 'arm/Microsoft.Web/staticSites/**'
-      - 'arm/.global/global.module.tests.ps1'
+      - 'modules/Microsoft.Web/staticSites/**'
+      - 'modules/.global/global.module.tests.ps1'
       - '!*/**/readme.md'
       - 'utilities/pipelines/**'
       - '!utilities/pipelines/dependencies/**'
 
 env:
   variablesPath: 'global.variables.yml'
-  modulePath: 'arm/Microsoft.Web/staticSites'
+  modulePath: 'modules/Microsoft.Web/staticSites'
   workflowPath: '.github/workflows/ms.web.staticsites.yml'
   AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
   ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml
index 1754c3c32c..a1addb1653 100644
--- a/.github/workflows/platform.dependencies.yml
+++ b/.github/workflows/platform.dependencies.yml
@@ -43,7 +43,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        parameterFilePaths: ['validation.parameters.json', 'locks.parameters.json']
+        parameterFilePaths:
+          ['validation.parameters.json', 'locks.parameters.json']
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
@@ -52,7 +53,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -80,7 +81,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -111,7 +112,7 @@ jobs:
         id: deploy_msi
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -150,7 +151,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -178,7 +179,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -206,7 +207,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -234,7 +235,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -253,7 +254,12 @@ jobs:
       fail-fast: false
       matrix:
         parameterFilePaths:
-          ['appi.parameters.json', 'aut.parameters.json', 'sol.parameters.json', 'parameters.json']
+          [
+            'appi.parameters.json',
+            'aut.parameters.json',
+            'sol.parameters.json',
+            'parameters.json',
+          ]
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
@@ -263,7 +269,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -292,7 +298,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -400,7 +406,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -434,7 +440,7 @@ jobs:
         id: deploy_imgt
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -597,7 +603,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -625,7 +631,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -653,7 +659,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -682,7 +688,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -719,7 +725,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -750,7 +756,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -778,7 +784,7 @@ jobs:
             'lb.parameters.json',
             'lb.min.parameters.json',
             'fw.parameters.json',
-            'fw.additional.parameters.json'
+            'fw.additional.parameters.json',
           ]
     steps:
       - name: 'Checkout'
@@ -789,7 +795,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -819,7 +825,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -849,7 +855,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -879,7 +885,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -910,7 +916,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -943,7 +949,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1123,7 +1129,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1245,7 +1251,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1273,7 +1279,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/subscription/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/subscription/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1306,7 +1312,7 @@ jobs:
             '11.azfw.parameters.json',
             '12.bastion.parameters.json',
             '13.bastion.parameters.json',
-            'parameters.json'
+            'parameters.json',
           ]
     steps:
       - name: 'Checkout'
@@ -1317,7 +1323,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1347,7 +1353,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1375,7 +1381,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1405,7 +1411,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
@@ -1433,7 +1439,7 @@ jobs:
       - name: 'Deploy module'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
+          templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep'
           parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.defaultResourceGroupName }}'
diff --git a/.github/workflows/platform.updateReadMe.yml b/.github/workflows/platform.updateReadMe.yml
index 829dd17ae6..9e3d0dfcf2 100644
--- a/.github/workflows/platform.updateReadMe.yml
+++ b/.github/workflows/platform.updateReadMe.yml
@@ -10,8 +10,8 @@ on:
     branches:
       - main
     paths:
-      - 'arm/**/deploy.bicep'
-      - 'arm/**/deploy.json'
+      - 'modules/**/deploy.bicep'
+      - 'modules/**/deploy.json'
 
 env:
   pipelinePrincipalGitUserName: 'CARMLPipelinePrincipal'
@@ -34,7 +34,7 @@ jobs:
           . "$env:GITHUB_WORKSPACE/utilities/tools/Set-ReadMeModuleTable.ps1"
 
           $functionInput = @{
-            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'arm'
+            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'modules'
             FilePath       = Join-Path $env:GITHUB_WORKSPACE 'README.md'
             Organization   = ($env:GITHUB_REPOSITORY).split('/')[0]
             RepositoryName = ($env:GITHUB_REPOSITORY).split('/')[1]
@@ -55,8 +55,8 @@ jobs:
           . "$env:GITHUB_WORKSPACE/utilities/tools/Set-ReadMeModuleTable.ps1"
 
           $functionInput = @{
-            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'arm'
-            FilePath       = Join-Path $env:GITHUB_WORKSPACE 'arm/README.md'
+            ModulesPath    = Join-Path $env:GITHUB_WORKSPACE 'modules'
+            FilePath       = Join-Path $env:GITHUB_WORKSPACE 'modules/README.md'
             Organization   = ($env:GITHUB_REPOSITORY).split('/')[0]
             RepositoryName = ($env:GITHUB_REPOSITORY).split('/')[1]
             ColumnsInOrder = @('Name', 'ProviderNamespace','ResourceType')
diff --git a/README.md b/README.md
index 7d4e4a6241..2f4ae8107d 100644
--- a/README.md
+++ b/README.md
@@ -29,107 +29,107 @@ The CI environment supports both ARM and Bicep and can be leveraged using GitHub
 
 | Name | Status |
 | - | - |
-| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) | [!['Insights: ActionGroups'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActionGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.actiongroups.yml) |
-| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) | [!['Insights: ActivityLogAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActivityLogAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.activitylogalerts.yml) |
-| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) | [!['Insights: DiagnosticSettings'](https://github.com/Azure/ResourceModules/workflows/Insights:%20DiagnosticSettings/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.diagnosticsettings.yml) |
-| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) | [!['AnalysisServices: Servers'](https://github.com/Azure/ResourceModules/workflows/AnalysisServices:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.analysisservices.servers.yml) |
-| [API Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) | [!['Web: Connections'](https://github.com/Azure/ResourceModules/workflows/Web:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.connections.yml) |
-| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) | [!['ApiManagement: Service'](https://github.com/Azure/ResourceModules/workflows/ApiManagement:%20Service/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.apimanagement.service.yml) |
-| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) | [!['AppConfiguration: ConfigurationStores'](https://github.com/Azure/ResourceModules/workflows/AppConfiguration:%20ConfigurationStores/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.appconfiguration.configurationstores.yml) |
-| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) | [!['Web: HostingEnvironments'](https://github.com/Azure/ResourceModules/workflows/Web:%20HostingEnvironments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.hostingenvironments.yml) |
-| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) | [!['Web: Serverfarms'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfarms/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfarms.yml) |
-| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) | [!['Insights: Components'](https://github.com/Azure/ResourceModules/workflows/Insights:%20Components/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.components.yml) |
-| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) | [!['Network: ApplicationSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationsecuritygroups.yml) |
-| [Authorization Locks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/locks) | [!['Authorization: Locks'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20Locks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.locks.yml) |
-| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) | [!['Automation: AutomationAccounts'](https://github.com/Azure/ResourceModules/workflows/Automation:%20AutomationAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.automation.automationaccounts.yml) |
-| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) | [!['Compute: AvailabilitySets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20AvailabilitySets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.availabilitysets.yml) |
-| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) | [!['DesktopVirtualization: ApplicationGroups'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20ApplicationGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.applicationgroups.yml) |
-| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) | [!['DesktopVirtualization: HostPools'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20HostPools/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.hostpools.yml) |
-| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) | [!['DesktopVirtualization: Scalingplans'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Scalingplans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.scalingplans.yml) |
-| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) | [!['DesktopVirtualization: Workspaces'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.workspaces.yml) |
-| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) | [!['AAD: DomainServices'](https://github.com/Azure/ResourceModules/workflows/AAD:%20DomainServices/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.aad.domainservices.yml) |
-| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) | [!['Compute: Galleries'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Galleries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.galleries.yml) |
-| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) | [!['Databricks: Workspaces'](https://github.com/Azure/ResourceModules/workflows/Databricks:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.databricks.workspaces.yml) |
-| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) | [!['Network: AzureFirewalls'](https://github.com/Azure/ResourceModules/workflows/Network:%20AzureFirewalls/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.azurefirewalls.yml) |
-| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) | [!['HealthBot: HealthBots'](https://github.com/Azure/ResourceModules/workflows/HealthBot:%20HealthBots/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.healthbot.healthbots.yml) |
-| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) | [!['ContainerService: ManagedClusters'](https://github.com/Azure/ResourceModules/workflows/ContainerService:%20ManagedClusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerservice.managedclusters.yml) |
-| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) | [!['Insights: PrivateLinkScopes'](https://github.com/Azure/ResourceModules/workflows/Insights:%20PrivateLinkScopes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.privatelinkscopes.yml) |
-| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) | [!['NetApp: NetAppAccounts'](https://github.com/Azure/ResourceModules/workflows/NetApp:%20NetAppAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.netapp.netappaccounts.yml) |
-| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) | [!['Security: AzureSecurityCenter'](https://github.com/Azure/ResourceModules/workflows/Security:%20AzureSecurityCenter/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.security.azuresecuritycenter.yml) |
-| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) | [!['Synapse: PrivateLinkHubs'](https://github.com/Azure/ResourceModules/workflows/Synapse:%20PrivateLinkHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.synapse.privatelinkhubs.yml) |
-| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) | [!['Network: BastionHosts'](https://github.com/Azure/ResourceModules/workflows/Network:%20BastionHosts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.bastionhosts.yml) |
-| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) | [!['Batch: BatchAccounts'](https://github.com/Azure/ResourceModules/workflows/Batch:%20BatchAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.batch.batchaccounts.yml) |
-| [Budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) | [!['Consumption: Budgets'](https://github.com/Azure/ResourceModules/workflows/Consumption:%20Budgets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.consumption.budgets.yml) |
-| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) | [!['CognitiveServices: Accounts'](https://github.com/Azure/ResourceModules/workflows/CognitiveServices:%20Accounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.cognitiveservices.accounts.yml) |
-| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) | [!['Compute: Disks'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Disks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.disks.yml) |
-| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) | [!['ContainerInstance: ContainerGroups'](https://github.com/Azure/ResourceModules/workflows/ContainerInstance:%20ContainerGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerinstance.containergroups.yml) |
-| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) | [!['ContainerRegistry: Registries'](https://github.com/Azure/ResourceModules/workflows/ContainerRegistry:%20Registries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerregistry.registries.yml) |
-| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) | [!['DataFactory: Factories'](https://github.com/Azure/ResourceModules/workflows/DataFactory:%20Factories/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.datafactory.factories.yml) |
-| [DataProtection BackupVaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataProtection/backupVaults) | [![DataProtection: BackupVaults](https://github.com/Azure/ResourceModules/workflows/DataProtection:%20BackupVaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.dataprotection.backupvaults.yml) |
-| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) | [!['Network: DdosProtectionPlans'](https://github.com/Azure/ResourceModules/workflows/Network:%20DdosProtectionPlans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ddosprotectionplans.yml) |
-| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) | [!['Resources: DeploymentScripts'](https://github.com/Azure/ResourceModules/workflows/Resources:%20DeploymentScripts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.deploymentscripts.yml) |
-| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) | [!['Compute: DiskEncryptionSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20DiskEncryptionSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.diskencryptionsets.yml) |
-| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) | [!['DocumentDB: DatabaseAccounts'](https://github.com/Azure/ResourceModules/workflows/DocumentDB:%20DatabaseAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.documentdb.databaseaccounts.yml) |
-| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) | [!['EventGrid: System Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20System%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.systemtopics.yml) |
-| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) | [!['EventGrid: Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.topics.yml) |
-| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) | [!['EventHub: Namespaces'](https://github.com/Azure/ResourceModules/workflows/EventHub:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventhub.namespaces.yml) |
-| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) | [!['Network: ExpressRouteCircuits'](https://github.com/Azure/ResourceModules/workflows/Network:%20ExpressRouteCircuits/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.expressroutecircuits.yml) |
-| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) | [!['Network: FirewallPolicies'](https://github.com/Azure/ResourceModules/workflows/Network:%20FirewallPolicies/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.firewallpolicies.yml) |
-| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) | [!['Network: Frontdoors'](https://github.com/Azure/ResourceModules/workflows/Network:%20Frontdoors/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.frontdoors.yml) |
-| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) | [!['VirtualMachineImages: ImageTemplates'](https://github.com/Azure/ResourceModules/workflows/VirtualMachineImages:%20ImageTemplates/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.virtualmachineimages.imagetemplates.yml) |
-| [Images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) | [!['Compute: Images'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Images/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.images.yml) |
-| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) | [!['Network: IpGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20IpGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ipgroups.yml) |
-| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) | [!['KeyVault: Vaults'](https://github.com/Azure/ResourceModules/workflows/KeyVault:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.keyvault.vaults.yml) |
-| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) | [!['KubernetesConfiguration: Extensions'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20Extensions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.extensions.yml) |
-| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) | [!['KubernetesConfiguration: FluxConfigurations'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20FluxConfigurations/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml) |
-| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) | [!['Network: LoadBalancers'](https://github.com/Azure/ResourceModules/workflows/Network:%20LoadBalancers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.loadbalancers.yml) |
-| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) | [!['Network: LocalNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20LocalNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.localnetworkgateways.yml) |
-| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) | [!['OperationalInsights: Workspaces'](https://github.com/Azure/ResourceModules/workflows/OperationalInsights:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationalinsights.workspaces.yml) |
-| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) | [!['Logic: Workflows'](https://github.com/Azure/ResourceModules/workflows/Logic:%20Workflows/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.logic.workflows.yml) |
-| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) | [!['MachineLearningServices: Workspaces'](https://github.com/Azure/ResourceModules/workflows/MachineLearningServices:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.machinelearningservices.workspaces.yml) |
-| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) | [!['Management: ManagementGroups'](https://github.com/Azure/ResourceModules/workflows/Management:%20ManagementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.management.managementgroups.yml) |
-| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) | [!['Insights: MetricAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20MetricAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.metricalerts.yml) |
-| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) | [!['Network: NatGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20NatGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.natgateways.yml) |
-| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) | [!['Network: ApplicationGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationgateways.yml) |
-| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) | [!['Network: NetworkInterfaces'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkInterfaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkinterfaces.yml) |
-| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) | [!['Network: NetworkSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networksecuritygroups.yml) |
-| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) | [!['Network: NetworkWatchers'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkWatchers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkwatchers.yml) |
-| [OperationsManagement Solutions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationsManagement/solutions) | [!['OperationsManagement: Solutions'](https://github.com/Azure/ResourceModules/workflows/OperationsManagement:%20Solutions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationsmanagement.solutions.yml) |
-| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) | [!['Authorization: PolicyAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyassignments.yml) |
-| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) | [!['Authorization: PolicyDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policydefinitions.yml) |
-| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) | [!['Authorization: PolicyExemptions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyExemptions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyexemptions.yml) |
-| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) | [!['Authorization: PolicySetDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicySetDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policysetdefinitions.yml) |
-| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) | [!['Network: PrivateDnsZones'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateDnsZones/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privatednszones.yml) |
-| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) | [!['Network: PrivateEndpoints'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateEndpoints/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privateendpoints.yml) |
-| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) | [!['Compute: ProximityPlacementGroups'](https://github.com/Azure/ResourceModules/workflows/Compute:%20ProximityPlacementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.proximityplacementgroups.yml) |
-| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) | [!['Network: PublicIpAddresses'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpAddresses/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipaddresses.yml) |
-| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) | [!['Network: PublicIpPrefixes'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpPrefixes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipprefixes.yml) |
-| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) | [!['RecoveryServices: Vaults'](https://github.com/Azure/ResourceModules/workflows/RecoveryServices:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.recoveryservices.vaults.yml) |
-| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) | [!['ManagedServices: RegistrationDefinitions'](https://github.com/Azure/ResourceModules/workflows/ManagedServices:%20RegistrationDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedservices.registrationdefinitions.yml) |
-| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) | [!['Resources: ResourceGroups'](https://github.com/Azure/ResourceModules/workflows/Resources:%20ResourceGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.resourcegroups.yml) |
-| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) | [!['Resources: Tags'](https://github.com/Azure/ResourceModules/workflows/Resources:%20Tags/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.tags.yml) |
-| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) | [!['Authorization: RoleAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roleassignments.yml) |
-| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) | [!['Authorization: RoleDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roledefinitions.yml) |
-| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) | [!['Network: RouteTables'](https://github.com/Azure/ResourceModules/workflows/Network:%20RouteTables/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.routetables.yml) |
-| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) | [!['Insights: ScheduledQueryRules'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ScheduledQueryRules/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.scheduledqueryrules.yml) |
-| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) | [!['ServiceBus: Namespaces'](https://github.com/Azure/ResourceModules/workflows/ServiceBus:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicebus.namespaces.yml) |
-| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) | [!['Service Fabric: Clusters'](https://github.com/Azure/ResourceModules/workflows/Service%20Fabric:%20Clusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicefabric.clusters.yml) |
-| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) | [!['Sql: ManagedInstances'](https://github.com/Azure/ResourceModules/workflows/Sql:%20ManagedInstances/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.managedinstances.yml) |
-| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) | [!['Sql: Servers'](https://github.com/Azure/ResourceModules/workflows/Sql:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.servers.yml) |
-| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) | [!['Web: StaticSites'](https://github.com/Azure/ResourceModules/workflows/Web:%20StaticSites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.staticsites.yml) |
-| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) | [!['Storage: StorageAccounts'](https://github.com/Azure/ResourceModules/workflows/Storage:%20StorageAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.storage.storageaccounts.yml) |
-| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) | [!['Network: TrafficManagerProfiles'](https://github.com/Azure/ResourceModules/workflows/Network:%20TrafficManagerProfiles/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.trafficmanagerprofiles.yml) |
-| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) | [!['ManagedIdentity: UserAssignedIdentities'](https://github.com/Azure/ResourceModules/workflows/ManagedIdentity:%20UserAssignedIdentities/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedidentity.userassignedidentities.yml) |
-| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) | [!['Network: VirtualHubs'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualhubs.yml) |
-| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) | [!['Compute: VirtualMachineScaleSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachineScaleSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachinescalesets.yml) |
-| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) | [!['Compute: VirtualMachines'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachines/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachines.yml) |
-| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) | [!['Network: Connections'](https://github.com/Azure/ResourceModules/workflows/Network:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.connections.yml) |
-| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) | [!['Network: VirtualNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworkgateways.yml) |
-| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) | [!['Network: VirtualNetworks'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworks.yml) |
-| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) | [!['Network: VirtualWans'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualWans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualwans.yml) |
-| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) | [!['Network: VPNGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPNGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpngateways.yml) |
-| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) | [!['Network: VPN Sites'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPN%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpnsites.yml) |
-| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) | [!['Web: Sites'](https://github.com/Azure/ResourceModules/workflows/Web:%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.sites.yml) |
+| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) | [!['Insights: ActionGroups'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActionGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.actiongroups.yml) |
+| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) | [!['Insights: ActivityLogAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ActivityLogAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.activitylogalerts.yml) |
+| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) | [!['Insights: DiagnosticSettings'](https://github.com/Azure/ResourceModules/workflows/Insights:%20DiagnosticSettings/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.diagnosticsettings.yml) |
+| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) | [!['AnalysisServices: Servers'](https://github.com/Azure/ResourceModules/workflows/AnalysisServices:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.analysisservices.servers.yml) |
+| [API Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) | [!['Web: Connections'](https://github.com/Azure/ResourceModules/workflows/Web:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.connections.yml) |
+| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | [!['ApiManagement: Service'](https://github.com/Azure/ResourceModules/workflows/ApiManagement:%20Service/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.apimanagement.service.yml) |
+| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | [!['AppConfiguration: ConfigurationStores'](https://github.com/Azure/ResourceModules/workflows/AppConfiguration:%20ConfigurationStores/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.appconfiguration.configurationstores.yml) |
+| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) | [!['Web: HostingEnvironments'](https://github.com/Azure/ResourceModules/workflows/Web:%20HostingEnvironments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.hostingenvironments.yml) |
+| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) | [!['Web: Serverfarms'](https://github.com/Azure/ResourceModules/workflows/Web:%20Serverfarms/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.serverfarms.yml) |
+| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) | [!['Insights: Components'](https://github.com/Azure/ResourceModules/workflows/Insights:%20Components/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.components.yml) |
+| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) | [!['Network: ApplicationSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationsecuritygroups.yml) |
+| [Authorization Locks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/locks) | [!['Authorization: Locks'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20Locks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.locks.yml) |
+| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) | [!['Automation: AutomationAccounts'](https://github.com/Azure/ResourceModules/workflows/Automation:%20AutomationAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.automation.automationaccounts.yml) |
+| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) | [!['Compute: AvailabilitySets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20AvailabilitySets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.availabilitysets.yml) |
+| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) | [!['DesktopVirtualization: ApplicationGroups'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20ApplicationGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.applicationgroups.yml) |
+| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) | [!['DesktopVirtualization: HostPools'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20HostPools/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.hostpools.yml) |
+| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) | [!['DesktopVirtualization: Scalingplans'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Scalingplans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.scalingplans.yml) |
+| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) | [!['DesktopVirtualization: Workspaces'](https://github.com/Azure/ResourceModules/workflows/DesktopVirtualization:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.desktopvirtualization.workspaces.yml) |
+| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) | [!['AAD: DomainServices'](https://github.com/Azure/ResourceModules/workflows/AAD:%20DomainServices/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.aad.domainservices.yml) |
+| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) | [!['Compute: Galleries'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Galleries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.galleries.yml) |
+| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) | [!['Databricks: Workspaces'](https://github.com/Azure/ResourceModules/workflows/Databricks:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.databricks.workspaces.yml) |
+| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) | [!['Network: AzureFirewalls'](https://github.com/Azure/ResourceModules/workflows/Network:%20AzureFirewalls/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.azurefirewalls.yml) |
+| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) | [!['HealthBot: HealthBots'](https://github.com/Azure/ResourceModules/workflows/HealthBot:%20HealthBots/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.healthbot.healthbots.yml) |
+| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) | [!['ContainerService: ManagedClusters'](https://github.com/Azure/ResourceModules/workflows/ContainerService:%20ManagedClusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerservice.managedclusters.yml) |
+| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) | [!['Insights: PrivateLinkScopes'](https://github.com/Azure/ResourceModules/workflows/Insights:%20PrivateLinkScopes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.privatelinkscopes.yml) |
+| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) | [!['NetApp: NetAppAccounts'](https://github.com/Azure/ResourceModules/workflows/NetApp:%20NetAppAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.netapp.netappaccounts.yml) |
+| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) | [!['Security: AzureSecurityCenter'](https://github.com/Azure/ResourceModules/workflows/Security:%20AzureSecurityCenter/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.security.azuresecuritycenter.yml) |
+| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) | [!['Synapse: PrivateLinkHubs'](https://github.com/Azure/ResourceModules/workflows/Synapse:%20PrivateLinkHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.synapse.privatelinkhubs.yml) |
+| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) | [!['Network: BastionHosts'](https://github.com/Azure/ResourceModules/workflows/Network:%20BastionHosts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.bastionhosts.yml) |
+| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) | [!['Batch: BatchAccounts'](https://github.com/Azure/ResourceModules/workflows/Batch:%20BatchAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.batch.batchaccounts.yml) |
+| [Budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) | [!['Consumption: Budgets'](https://github.com/Azure/ResourceModules/workflows/Consumption:%20Budgets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.consumption.budgets.yml) |
+| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) | [!['CognitiveServices: Accounts'](https://github.com/Azure/ResourceModules/workflows/CognitiveServices:%20Accounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.cognitiveservices.accounts.yml) |
+| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) | [!['Compute: Disks'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Disks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.disks.yml) |
+| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) | [!['ContainerInstance: ContainerGroups'](https://github.com/Azure/ResourceModules/workflows/ContainerInstance:%20ContainerGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerinstance.containergroups.yml) |
+| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) | [!['ContainerRegistry: Registries'](https://github.com/Azure/ResourceModules/workflows/ContainerRegistry:%20Registries/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.containerregistry.registries.yml) |
+| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) | [!['DataFactory: Factories'](https://github.com/Azure/ResourceModules/workflows/DataFactory:%20Factories/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.datafactory.factories.yml) |
+| [DataProtection BackupVaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataProtection/backupVaults) | [![DataProtection: BackupVaults](https://github.com/Azure/ResourceModules/workflows/DataProtection:%20BackupVaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.dataprotection.backupvaults.yml) |
+| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) | [!['Network: DdosProtectionPlans'](https://github.com/Azure/ResourceModules/workflows/Network:%20DdosProtectionPlans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ddosprotectionplans.yml) |
+| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) | [!['Resources: DeploymentScripts'](https://github.com/Azure/ResourceModules/workflows/Resources:%20DeploymentScripts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.deploymentscripts.yml) |
+| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) | [!['Compute: DiskEncryptionSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20DiskEncryptionSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.diskencryptionsets.yml) |
+| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) | [!['DocumentDB: DatabaseAccounts'](https://github.com/Azure/ResourceModules/workflows/DocumentDB:%20DatabaseAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.documentdb.databaseaccounts.yml) |
+| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) | [!['EventGrid: System Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20System%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.systemtopics.yml) |
+| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) | [!['EventGrid: Topics'](https://github.com/Azure/ResourceModules/workflows/EventGrid:%20Topics/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventgrid.topics.yml) |
+| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) | [!['EventHub: Namespaces'](https://github.com/Azure/ResourceModules/workflows/EventHub:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.eventhub.namespaces.yml) |
+| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) | [!['Network: ExpressRouteCircuits'](https://github.com/Azure/ResourceModules/workflows/Network:%20ExpressRouteCircuits/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.expressroutecircuits.yml) |
+| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) | [!['Network: FirewallPolicies'](https://github.com/Azure/ResourceModules/workflows/Network:%20FirewallPolicies/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.firewallpolicies.yml) |
+| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) | [!['Network: Frontdoors'](https://github.com/Azure/ResourceModules/workflows/Network:%20Frontdoors/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.frontdoors.yml) |
+| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) | [!['VirtualMachineImages: ImageTemplates'](https://github.com/Azure/ResourceModules/workflows/VirtualMachineImages:%20ImageTemplates/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.virtualmachineimages.imagetemplates.yml) |
+| [Images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) | [!['Compute: Images'](https://github.com/Azure/ResourceModules/workflows/Compute:%20Images/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.images.yml) |
+| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) | [!['Network: IpGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20IpGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.ipgroups.yml) |
+| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) | [!['KeyVault: Vaults'](https://github.com/Azure/ResourceModules/workflows/KeyVault:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.keyvault.vaults.yml) |
+| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) | [!['KubernetesConfiguration: Extensions'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20Extensions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.extensions.yml) |
+| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) | [!['KubernetesConfiguration: FluxConfigurations'](https://github.com/Azure/ResourceModules/workflows/KubernetesConfiguration:%20FluxConfigurations/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.kubernetesconfiguration.fluxconfigurations.yml) |
+| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) | [!['Network: LoadBalancers'](https://github.com/Azure/ResourceModules/workflows/Network:%20LoadBalancers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.loadbalancers.yml) |
+| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) | [!['Network: LocalNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20LocalNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.localnetworkgateways.yml) |
+| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) | [!['OperationalInsights: Workspaces'](https://github.com/Azure/ResourceModules/workflows/OperationalInsights:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationalinsights.workspaces.yml) |
+| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) | [!['Logic: Workflows'](https://github.com/Azure/ResourceModules/workflows/Logic:%20Workflows/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.logic.workflows.yml) |
+| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) | [!['MachineLearningServices: Workspaces'](https://github.com/Azure/ResourceModules/workflows/MachineLearningServices:%20Workspaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.machinelearningservices.workspaces.yml) |
+| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) | [!['Management: ManagementGroups'](https://github.com/Azure/ResourceModules/workflows/Management:%20ManagementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.management.managementgroups.yml) |
+| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) | [!['Insights: MetricAlerts'](https://github.com/Azure/ResourceModules/workflows/Insights:%20MetricAlerts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.metricalerts.yml) |
+| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) | [!['Network: NatGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20NatGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.natgateways.yml) |
+| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) | [!['Network: ApplicationGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20ApplicationGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.applicationgateways.yml) |
+| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) | [!['Network: NetworkInterfaces'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkInterfaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkinterfaces.yml) |
+| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) | [!['Network: NetworkSecurityGroups'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkSecurityGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networksecuritygroups.yml) |
+| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) | [!['Network: NetworkWatchers'](https://github.com/Azure/ResourceModules/workflows/Network:%20NetworkWatchers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.networkwatchers.yml) |
+| [OperationsManagement Solutions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationsManagement/solutions) | [!['OperationsManagement: Solutions'](https://github.com/Azure/ResourceModules/workflows/OperationsManagement:%20Solutions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.operationsmanagement.solutions.yml) |
+| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) | [!['Authorization: PolicyAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyassignments.yml) |
+| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) | [!['Authorization: PolicyDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policydefinitions.yml) |
+| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) | [!['Authorization: PolicyExemptions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicyExemptions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policyexemptions.yml) |
+| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) | [!['Authorization: PolicySetDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20PolicySetDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.policysetdefinitions.yml) |
+| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) | [!['Network: PrivateDnsZones'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateDnsZones/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privatednszones.yml) |
+| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) | [!['Network: PrivateEndpoints'](https://github.com/Azure/ResourceModules/workflows/Network:%20PrivateEndpoints/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.privateendpoints.yml) |
+| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) | [!['Compute: ProximityPlacementGroups'](https://github.com/Azure/ResourceModules/workflows/Compute:%20ProximityPlacementGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.proximityplacementgroups.yml) |
+| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) | [!['Network: PublicIpAddresses'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpAddresses/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipaddresses.yml) |
+| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) | [!['Network: PublicIpPrefixes'](https://github.com/Azure/ResourceModules/workflows/Network:%20PublicIpPrefixes/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.publicipprefixes.yml) |
+| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) | [!['RecoveryServices: Vaults'](https://github.com/Azure/ResourceModules/workflows/RecoveryServices:%20Vaults/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.recoveryservices.vaults.yml) |
+| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) | [!['ManagedServices: RegistrationDefinitions'](https://github.com/Azure/ResourceModules/workflows/ManagedServices:%20RegistrationDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedservices.registrationdefinitions.yml) |
+| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) | [!['Resources: ResourceGroups'](https://github.com/Azure/ResourceModules/workflows/Resources:%20ResourceGroups/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.resourcegroups.yml) |
+| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) | [!['Resources: Tags'](https://github.com/Azure/ResourceModules/workflows/Resources:%20Tags/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.resources.tags.yml) |
+| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) | [!['Authorization: RoleAssignments'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleAssignments/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roleassignments.yml) |
+| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) | [!['Authorization: RoleDefinitions'](https://github.com/Azure/ResourceModules/workflows/Authorization:%20RoleDefinitions/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.authorization.roledefinitions.yml) |
+| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) | [!['Network: RouteTables'](https://github.com/Azure/ResourceModules/workflows/Network:%20RouteTables/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.routetables.yml) |
+| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) | [!['Insights: ScheduledQueryRules'](https://github.com/Azure/ResourceModules/workflows/Insights:%20ScheduledQueryRules/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.insights.scheduledqueryrules.yml) |
+| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) | [!['ServiceBus: Namespaces'](https://github.com/Azure/ResourceModules/workflows/ServiceBus:%20Namespaces/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicebus.namespaces.yml) |
+| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) | [!['Service Fabric: Clusters'](https://github.com/Azure/ResourceModules/workflows/Service%20Fabric:%20Clusters/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.servicefabric.clusters.yml) |
+| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) | [!['Sql: ManagedInstances'](https://github.com/Azure/ResourceModules/workflows/Sql:%20ManagedInstances/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.managedinstances.yml) |
+| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) | [!['Sql: Servers'](https://github.com/Azure/ResourceModules/workflows/Sql:%20Servers/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.sql.servers.yml) |
+| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) | [!['Web: StaticSites'](https://github.com/Azure/ResourceModules/workflows/Web:%20StaticSites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.staticsites.yml) |
+| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) | [!['Storage: StorageAccounts'](https://github.com/Azure/ResourceModules/workflows/Storage:%20StorageAccounts/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.storage.storageaccounts.yml) |
+| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) | [!['Network: TrafficManagerProfiles'](https://github.com/Azure/ResourceModules/workflows/Network:%20TrafficManagerProfiles/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.trafficmanagerprofiles.yml) |
+| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) | [!['ManagedIdentity: UserAssignedIdentities'](https://github.com/Azure/ResourceModules/workflows/ManagedIdentity:%20UserAssignedIdentities/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.managedidentity.userassignedidentities.yml) |
+| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) | [!['Network: VirtualHubs'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualHubs/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualhubs.yml) |
+| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) | [!['Compute: VirtualMachineScaleSets'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachineScaleSets/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachinescalesets.yml) |
+| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) | [!['Compute: VirtualMachines'](https://github.com/Azure/ResourceModules/workflows/Compute:%20VirtualMachines/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.compute.virtualmachines.yml) |
+| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) | [!['Network: Connections'](https://github.com/Azure/ResourceModules/workflows/Network:%20Connections/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.connections.yml) |
+| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) | [!['Network: VirtualNetworkGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworkGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworkgateways.yml) |
+| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) | [!['Network: VirtualNetworks'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualNetworks/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualnetworks.yml) |
+| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) | [!['Network: VirtualWans'](https://github.com/Azure/ResourceModules/workflows/Network:%20VirtualWans/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.virtualwans.yml) |
+| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) | [!['Network: VPNGateways'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPNGateways/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpngateways.yml) |
+| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) | [!['Network: VPN Sites'](https://github.com/Azure/ResourceModules/workflows/Network:%20VPN%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.network.vpnsites.yml) |
+| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) | [!['Web: Sites'](https://github.com/Azure/ResourceModules/workflows/Web:%20Sites/badge.svg)](https://github.com/Azure/ResourceModules/actions/workflows/ms.web.sites.yml) |
 
 ## Tooling
 
diff --git a/arm/README.md b/arm/README.md
deleted file mode 100644
index cf3cb3aa21..0000000000
--- a/arm/README.md
+++ /dev/null
@@ -1,107 +0,0 @@
-In this section you can find useful information regarding the Modules that are contained in this repository.
-
-## Available Resource Modules
-
-| Name | Provider namespace | Resource Type |
-| - | - | - |
-| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) | `MS.AAD` | [DomainServices](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AAD/DomainServices) |
-| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) | `MS.AnalysisServices` | [servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AnalysisServices/servers) |
-| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) | `MS.ApiManagement` | [service](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ApiManagement/service) |
-| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) | `MS.AppConfiguration` | [configurationStores](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.AppConfiguration/configurationStores) |
-| [Authorization Locks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/locks) | `MS.Authorization` | [locks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/locks) |
-| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) |  | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyAssignments) |
-| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) |  | [policyDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyDefinitions) |
-| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) |  | [policyExemptions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policyExemptions) |
-| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) |  | [policySetDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/policySetDefinitions) |
-| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) |  | [roleAssignments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleAssignments) |
-| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) |  | [roleDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Authorization/roleDefinitions) |
-| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) | `MS.Automation` | [automationAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Automation/automationAccounts) |
-| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) | `MS.Batch` | [batchAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Batch/batchAccounts) |
-| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) | `MS.CognitiveServices` | [accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.CognitiveServices/accounts) |
-| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) | `MS.Compute` | [availabilitySets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/availabilitySets) |
-| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) |  | [diskEncryptionSets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/diskEncryptionSets) |
-| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) |  | [disks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/disks) |
-| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) |  | [galleries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/galleries) |
-| [Images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) |  | [images](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/images) |
-| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) |  | [proximityPlacementGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/proximityPlacementGroups) |
-| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) |  | [virtualMachines](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachines) |
-| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) |  | [virtualMachineScaleSets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Compute/virtualMachineScaleSets) |
-| [Budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) | `MS.Consumption` | [budgets](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Consumption/budgets) |
-| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) | `MS.ContainerInstance` | [containerGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerInstance/containerGroups) |
-| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) | `MS.ContainerRegistry` | [registries](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerRegistry/registries) |
-| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) | `MS.ContainerService` | [managedClusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ContainerService/managedClusters) |
-| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) | `MS.Databricks` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Databricks/workspaces) |
-| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) | `MS.DataFactory` | [factories](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataFactory/factories) |
-| [DataProtection BackupVaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataProtection/backupVaults) | `MS.DataProtection` | [backupVaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DataProtection/backupVaults) |
-| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) | `MS.DesktopVirtualization` | [applicationgroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/applicationgroups) |
-| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) |  | [hostpools](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/hostpools) |
-| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) |  | [scalingplans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/scalingplans) |
-| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) |  | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DesktopVirtualization/workspaces) |
-| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) | `MS.DocumentDB` | [databaseAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.DocumentDB/databaseAccounts) |
-| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) | `MS.EventGrid` | [systemTopics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/systemTopics) |
-| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) |  | [topics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventGrid/topics) |
-| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) | `MS.EventHub` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.EventHub/namespaces) |
-| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) | `MS.HealthBot` | [healthBots](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.HealthBot/healthBots) |
-| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) | `MS.Insights` | [actionGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/actionGroups) |
-| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) |  | [activityLogAlerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/activityLogAlerts) |
-| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) |  | [components](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/components) |
-| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) |  | [diagnosticSettings](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/diagnosticSettings) |
-| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) |  | [metricAlerts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/metricAlerts) |
-| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) |  | [privateLinkScopes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/privateLinkScopes) |
-| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) |  | [scheduledQueryRules](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Insights/scheduledQueryRules) |
-| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) | `MS.KeyVault` | [vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KeyVault/vaults) |
-| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) | `MS.KubernetesConfiguration` | [extensions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/extensions) |
-| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) |  | [fluxConfigurations](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.KubernetesConfiguration/fluxConfigurations) |
-| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) | `MS.Logic` | [workflows](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Logic/workflows) |
-| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) | `MS.achineLearningServices` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.MachineLearningServices/workspaces) |
-| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) | `MS.anagedIdentity` | [userAssignedIdentities](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedIdentity/userAssignedIdentities) |
-| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) | `MS.anagedServices` | [registrationDefinitions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ManagedServices/registrationDefinitions) |
-| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) | `MS.anagement` | [managementGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Management/managementGroups) |
-| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) | `MS.NetApp` | [netAppAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.NetApp/netAppAccounts) |
-| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) | `MS.Network` | [applicationGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationGateways) |
-| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) |  | [applicationSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/applicationSecurityGroups) |
-| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) |  | [azureFirewalls](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/azureFirewalls) |
-| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) |  | [bastionHosts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/bastionHosts) |
-| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) |  | [connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/connections) |
-| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) |  | [ddosProtectionPlans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ddosProtectionPlans) |
-| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) |  | [expressRouteCircuits](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/expressRouteCircuits) |
-| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) |  | [firewallPolicies](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/firewallPolicies) |
-| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) |  | [frontDoors](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/frontDoors) |
-| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) |  | [ipGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/ipGroups) |
-| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) |  | [loadBalancers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/loadBalancers) |
-| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) |  | [localNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/localNetworkGateways) |
-| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) |  | [natGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/natGateways) |
-| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) |  | [networkInterfaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkInterfaces) |
-| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) |  | [networkSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkSecurityGroups) |
-| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) |  | [networkWatchers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/networkWatchers) |
-| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) |  | [privateDnsZones](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateDnsZones) |
-| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) |  | [privateEndpoints](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/privateEndpoints) |
-| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) |  | [publicIPAddresses](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPAddresses) |
-| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) |  | [publicIPPrefixes](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/publicIPPrefixes) |
-| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) |  | [routeTables](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/routeTables) |
-| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) |  | [trafficmanagerprofiles](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/trafficmanagerprofiles) |
-| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) |  | [virtualHubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualHubs) |
-| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) |  | [virtualNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworkGateways) |
-| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) |  | [virtualNetworks](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualNetworks) |
-| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) |  | [virtualWans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/virtualWans) |
-| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) |  | [vpnGateways](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnGateways) |
-| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) |  | [vpnSites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Network/vpnSites) |
-| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) | `MS.OperationalInsights` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationalInsights/workspaces) |
-| [OperationsManagement Solutions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationsManagement/solutions) | `MS.OperationsManagement` | [solutions](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.OperationsManagement/solutions) |
-| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) | `MS.RecoveryServices` | [vaults](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.RecoveryServices/vaults) |
-| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) | `MS.Resources` | [deploymentScripts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/deploymentScripts) |
-| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) |  | [resourceGroups](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/resourceGroups) |
-| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) |  | [tags](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Resources/tags) |
-| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) | `MS.Security` | [azureSecurityCenter](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Security/azureSecurityCenter) |
-| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) | `MS.ServiceBus` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceBus/namespaces) |
-| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) | `MS.ServiceFabric` | [clusters](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.ServiceFabric/clusters) |
-| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) | `MS.Sql` | [managedInstances](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/managedInstances) |
-| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) |  | [servers](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Sql/servers) |
-| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) | `MS.Storage` | [storageAccounts](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Storage/storageAccounts) |
-| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) | `MS.Synapse` | [privateLinkHubs](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Synapse/privateLinkHubs) |
-| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) | `MS.VirtualMachineImages` | [imageTemplates](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.VirtualMachineImages/imageTemplates) |
-| [API Connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) | `MS.Web` | [connections](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/connections) |
-| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) |  | [hostingEnvironments](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/hostingEnvironments) |
-| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) |  | [serverfarms](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/serverfarms) |
-| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) |  | [sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/sites) |
-| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) |  | [staticSites](https://github.com/Azure/ResourceModules/tree/main/arm/Microsoft.Web/staticSites) |
diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_roleAssignments.bicep b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_roleAssignments.bicep
index e9139f12a1..eab4087e91 100644
--- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_roleAssignments.bicep
+++ b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_roleAssignments.bicep
@@ -291,7 +291,7 @@ var builtInRoleNames = {
   'Azure Maps Contributor': '/providers/Microsoft.Authorization/roleDefinitions/dba33070-676a-4fb0-87fa-064dc56ff7fb'
 }
 
-module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) {
+module roleAssignments_mg '../../../../modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) {
   name: 'roleAssignments_mg-${guid(deployment().name, location, principalId)}'
   scope: managementGroup(managementGroupId)
   params: {
@@ -301,7 +301,7 @@ module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignmen
   }
 }]
 
-module roleAssignments_sub '../../../../arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(subscriptionId) && empty(resourceGroupName)) {
+module roleAssignments_sub '../../../../modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(subscriptionId) && empty(resourceGroupName)) {
   name: 'roleAssignments_sub-${guid(deployment().name, location, principalId)}'
   scope: subscription(subscriptionId)
   params: {
@@ -311,7 +311,7 @@ module roleAssignments_sub '../../../../arm/Microsoft.Authorization/roleAssignme
   }
 }]
 
-module roleAssignments_rg '../../../../arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) {
+module roleAssignments_rg '../../../../modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) {
   name: 'roleAssignments_rg-${guid(deployment().name, location, principalId)}'
   scope: resourceGroup(subscriptionId, resourceGroupName)
   params: {
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep b/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
index f35a53e0c0..5e79b624eb 100644
--- a/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
+++ b/constructs/Microsoft.Compute/virtualMachinesMultiple/deploy.bicep
@@ -300,7 +300,7 @@ var vmNamesToApply = !empty(vmNames) ? vmNames : vmGeneratedNames
 
 var enableReferencedModulesTelemetry = false
 
-module virtualMachine '../../../arm/Microsoft.Compute/virtualMachines/deploy.bicep' = [for (vmName, index) in vmNamesToApply: {
+module virtualMachine '../../../modules/Microsoft.Compute/virtualMachines/deploy.bicep' = [for (vmName, index) in vmNamesToApply: {
   name: '${deployment().name}-vm-${index}'
   params: {
     name: vmName
diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
index 80971b71eb..353f473ba7 100644
--- a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
+++ b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep
@@ -19,7 +19,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
   }
 }
 
-module virtualNetworkPeering '../../../../arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep' = [for peeringConfiguration in peeringConfigurations: {
+module virtualNetworkPeering '../../../../modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep' = [for peeringConfiguration in peeringConfigurations: {
   name: 'virtualNetworkPeering-${last(split(peeringConfiguration.remoteVirtualNetworkId, '/'))}'
   params: {
     name: contains(peeringConfiguration, 'peeringName') ? '${peeringConfiguration.peeringName}' : '${localVnetName}-${last(split(peeringConfiguration.remoteVirtualNetworkId, '/'))}'
diff --git a/docs/wiki/Getting started - Get module cross-references.md b/docs/wiki/Getting started - Get module cross-references.md
index abe10e5097..a81d551dd4 100644
--- a/docs/wiki/Getting started - Get module cross-references.md	
+++ b/docs/wiki/Getting started - Get module cross-references.md	
@@ -32,7 +32,7 @@ For details on how to use the function, please refer to the script's local docum
 ## Example output
 
 ```PowerShell
-VERBOSE: The modules in path [ResourceModules\arm] have the following local folder dependencies:
+VERBOSE: The modules in path [ResourceModules\modules] have the following local folder dependencies:
 VERBOSE:
 VERBOSE: Resource: Microsoft.ApiManagement/service
 VERBOSE: - Microsoft.ApiManagement/authorizationServers
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 15c4437991..52a5377a93 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	
@@ -88,7 +88,7 @@ To configure the CI environment you have to perform several steps:
 
 To lower the barrier to entry and allow users to easily define their own naming conventions, we introduced a default `'name prefix'` for all deployed resources.
 
-> **Note:** This prefix is only used by the CI environment you validate your modules in, and doesn't affect the naming of any resources you deploy as part of any multi-module solutions (applications/workloads) based on the modules. 
+> **Note:** This prefix is only used by the CI environment you validate your modules in, and doesn't affect the naming of any resources you deploy as part of any multi-module solutions (applications/workloads) based on the modules.
 
 Each pipeline in CARML deploying resources uses a logic that automatically replaces "tokens" (i.e., placeholders) in any parameter file. Tokens are stored in only a few central locations to facilitate maintenance (e.g., local `settings.json`, repository secrets or variable groups).
 
@@ -231,7 +231,7 @@ To let the worflow engine publish their results into your repository, you have t
 1. Make sure to enable `Read and write permissions`
 
     <img src="./media/SetupEnvironment/workflow_permissions.png" alt="Workflow Permissions">
-    
+
 </details>
 
 <p>
@@ -379,16 +379,16 @@ For this reason, make sure to update the references in the following modules onc
 
 | File | Parameter | Notes |
 | - | - | - |
-| `arm\Microsoft.Compute\diskEncryptionSets\.parameters\parameters.json` |`keyUrl.value` | |
-| `arm\Microsoft.Compute\virtualMachines\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachines\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachineScaleSets\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Compute\virtualMachineScaleSets\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `arm\Microsoft.Sql\managedInstances\.parameters\parameters.json` | `keys.value.uri` | |
-| `arm\Microsoft.Network\applicationGateways\.parameters\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
-| `arm\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
+| `modules\Microsoft.Compute\diskEncryptionSets\.parameters\parameters.json` |`keyUrl.value` | |
+| `modules\Microsoft.Compute\virtualMachines\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachines\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.parameters\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.parameters\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Sql\managedInstances\.parameters\parameters.json` | `keys.value.uri` | |
+| `modules\Microsoft.Network\applicationGateways\.parameters\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
+| `modules\Microsoft.Web\sites\.parameters\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
 
 </details>
 
diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md
index 8d3a037343..d5c8221c23 100644
--- a/docs/wiki/Solution creation.md	
+++ b/docs/wiki/Solution creation.md	
@@ -57,8 +57,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/arm/Microsoft.AnalysisServices/servers/readme.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/arm/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/arm/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/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.
 - 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
@@ -117,7 +117,7 @@ param subnets array = [
 // =========== //
 
 // Resource Group
-module rg '../arm/Microsoft.Resources/resourceGroups/deploy.bicep' = {
+module rg '../modules/Microsoft.Resources/resourceGroups/deploy.bicep' = {
   name: 'registry-rg'
   params: {
     name: resourceGroupName
@@ -126,7 +126,7 @@ module rg '../arm/Microsoft.Resources/resourceGroups/deploy.bicep' = {
 }
 
 // Network Security Group
-module nsg '../arm/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
+module nsg '../modules/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
   name: 'registry-nsg'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -138,7 +138,7 @@ module nsg '../arm/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
 }
 
 // Virtual Network
-module vnet '../arm/Microsoft.Network/virtualNetworks/deploy.bicep' = {
+module vnet '../modules/Microsoft.Network/virtualNetworks/deploy.bicep' = {
   name: 'registry-vnet'
   scope: resourceGroup(resourceGroupName)
   params: {
@@ -436,7 +436,7 @@ jobs:
       - name: 'Deploy resource group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Resources/resourceGroups/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/ResourceGroup/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -447,7 +447,7 @@ jobs:
       - name: 'Deploy network security group'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Network/networkSecurityGroups/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Network/networkSecurityGroups/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/NetworkSecurityGroups/parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
@@ -458,7 +458,7 @@ jobs:
       - name: 'Deploy virtual network A'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: './arm/Microsoft.Network/virtualNetworks/deploy.bicep'
+          templateFilePath: './modules/Microsoft.Network/virtualNetworks/deploy.bicep'
           parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/VirtualNetwork/vnet-A.parameters.json'
           location: '${{ env.defaultLocation }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/docs/wiki/The CI environment - GitHub ReadMe module table update.md b/docs/wiki/The CI environment - GitHub ReadMe module table update.md
index e7540f6ae3..029a760a80 100644
--- a/docs/wiki/The CI environment - GitHub ReadMe module table update.md	
+++ b/docs/wiki/The CI environment - GitHub ReadMe module table update.md	
@@ -1,5 +1,5 @@
 Use this script to update a given ReadMe's module table in its 'Available Resource Modules' section.
-In the platform's pipeline `platform.updateReadMe.yml`, this script is invoked each time anything in the `arm` path changes to keep the table in sync. It updates both the root ReadMe ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README)) and `arm` folder ReadMe ([`/arm/readme.md`](https://github.com/Azure/ResourceModules/blob/main/arm/readme)) with a different set of required columns
+In the platform's pipeline `platform.updateReadMe.yml`, this script is invoked each time anything in the `modules` path changes to keep the table in sync. It updates both the root ReadMe ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README)) and `modules` folder ReadMe ([`/modules/readme.md`](https://github.com/Azure/ResourceModules/blob/main/modules/readme)) with a different set of required columns
 
 ---
 
diff --git a/docs/wiki/The CI environment - Pipeline design.md b/docs/wiki/The CI environment - Pipeline design.md
index e48f49b75a..95e5434fca 100644
--- a/docs/wiki/The CI environment - Pipeline design.md	
+++ b/docs/wiki/The CI environment - Pipeline design.md	
@@ -256,9 +256,9 @@ In addition to the above resources, the following secrets, keys and certificates
 
 The repository includes two major ReadMe files that should stay in sync with the available modules.
 
-The first can be found in the repository root (`README.md`) and the second in the modules folder (`arm/README.md`).
+The first can be found in the repository root (`README.md`) and the second in the modules folder (`modules/README.md`).
 
-The ReadMe pipeline is triggered each time changes are pushed to the `main` branch and only if a template in the `arm` folder is being altered. The pipeline leverages the script documented on the [GitHub ReadMe module table update](./The%20CI%20environment%20-%20GitHub%20ReadMe%20module%20table%20update) page.
+The ReadMe pipeline is triggered each time changes are pushed to the `main` branch and only if a template in the `modules` folder is being altered. The pipeline leverages the script documented on the [GitHub ReadMe module table update](./The%20CI%20environment%20-%20GitHub%20ReadMe%20module%20table%20update) page.
 
 Once triggered, the pipeline crawls through the library and updates the tables in each corresponding ReadMe file, creating links to the corresponding pipeline runs and updating the list of entries.
 
diff --git a/docs/wiki/The CI environment - Static validation.md b/docs/wiki/The CI environment - Static validation.md
index 0396ce7f4c..b4595ccabc 100644
--- a/docs/wiki/The CI environment - Static validation.md	
+++ b/docs/wiki/The CI environment - Static validation.md	
@@ -14,7 +14,7 @@ This section provides an overview of the principles the static validation is bui
 
 All module Unit tests are performed with the help of [Pester](https://github.com/pester/Pester) to ensure that the modules are configured correctly, documentation is up to date, and modules don't turn stale.
 
-The following activities are performed by the [`arm/.global/global.module.tests.ps1`](https://github.com/Azure/ResourceModules/blob/main/arm/.global/global.module.tests.ps1) script.
+The following activities are performed by the [`modules/.global/global.module.tests.ps1`](https://github.com/Azure/ResourceModules/blob/main/modules/.global/global.module.tests.ps1) script.
 
 - **File & folder tests** validate that the module folder structure is set up in the intended way, e.g.:
   - readme.md file exists
@@ -50,7 +50,7 @@ In this phase, Pester analyzes the API version of each resource type deployed by
 
 In particular, each resource's API version is compared with those currently available on Azure. This test has a certain level of tolerance (does not enforce the latest version): the API version in use should be one of the 5 latest versions available (including preview versions) or one of the the 5 latest non-preview versions.
 
-This test also leverages the [`arm/.global/global.module.tests.ps1`](https://github.com/Azure/ResourceModules/blob/main/arm/.global/global.module.tests.ps1) script.
+This test also leverages the [`modules/.global/global.module.tests.ps1`](https://github.com/Azure/ResourceModules/blob/main/modules/.global/global.module.tests.ps1) script.
 
 # Verify the static validation of your module locally
 
@@ -65,7 +65,7 @@ $pathToRepository = '<pathToClonedRepo>'
 
 # REQUIRED INPUT FOR TESTING
 $TestModuleLocallyInput = @{
-    templateFilePath              = "$pathToRepository\arm\Microsoft.Authorization\roleDefinitions\deploy.bicep"
+    templateFilePath              = "$pathToRepository\modules\Microsoft.Authorization\roleDefinitions\deploy.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 bc63baa5f3..e674a91c31 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -38,9 +38,9 @@ They can be deployed in different configurations just by changing the input para
 
 # General guidelines
 
-- All resource modules in the 'arm' folder should not allow deployment loops on the top-level resource but may optionally allow deployment loops on their child resources.
+- All resource modules in the 'modules' folder should not allow deployment loops on the top-level resource but may optionally allow deployment loops on their child resources.
   > **Example:** The storage account module allows the deployment of a single storage account with, optionally, multiple blob containers, multiple file shares, multiple queues and/or multiple tables.
-- The 'constructs' folder contains examples of deployment logic built on top of resource modules included in the 'arm' folder, allowing for example, deployment loops on top-level resources.
+- The 'constructs' folder contains examples of deployment logic built on top of resource modules included in the 'modules' folder, allowing for example, deployment loops on top-level resources.
   > **Example:** The VirtualNetworkPeering construct leverages the VirtualNetworkPeering module to deploy multiple virtual network peering connections at once.
 - Where the resource type in question supports it, the module should have support for:
   1. **Diagnostic logs** and **metrics** (you can have them sent to one ore more of the following destination types: storage account, log analytics and event hub).
@@ -63,7 +63,7 @@ A **CARML module** consists of
 - One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.parameters` subfolder.
 - A `readme.md` file which describes the module itself.
 
-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 `arm` folder.
+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.
 
 Also, each module should be implemented with all capabilities it and its children support. This includes
 - `Locks`
diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md
index d6e6c423d8..ed03ba247d 100644
--- a/docs/wiki/The library - Module usage.md	
+++ b/docs/wiki/The library - Module usage.md	
@@ -33,9 +33,9 @@ $inputObject = @{
   ResourceGroupName     = 'ExampleGroup'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.KeyVault\vault\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.KeyVault\vault\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.KeyVault/vaults/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.KeyVault/vaults/deploy.bicep'
 }
 New-AzResourceGroupDeployment @inputObject
 ```
@@ -57,9 +57,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Resources\resourceGroups\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/deploy.bicep'
 }
 New-AzDeployment @inputObject
 ```
@@ -82,9 +82,9 @@ $inputObject = @{
   Location              = 'EastUS2'
   TemplateParameterFile = 'parameters.json'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
 }
 New-AzManagementGroupDeployment @inputObject
 ```
@@ -106,9 +106,9 @@ $inputObject = @{
   TemplateParameterFile = 'parameters.json'
   Location              = 'EastUS2'
   # Using a local reference
-  TemplateFile          = "$home\ResourceModules\arm\Microsoft.Subscription\aliases\deploy.bicep"
+  TemplateFile          = "$home\ResourceModules\modules\Microsoft.Subscription\aliases\deploy.bicep"
   # Using a remote reference
-  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Subscription/aliases/deploy.bicep'
+  # TemplateUri         = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/deploy.bicep'
 }
 New-AzTenantDeployment @inputObject
 ```
@@ -133,9 +133,9 @@ $inputObject = @(
   '--resource-group', 'ExampleGroup',
   '--parameters',     '@parameters.json',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep",
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep",
   # Using a remote reference
-  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Storage/storageAccounts/deploy.bicep'
+  # '--template-uri',   'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Storage/storageAccounts/deploy.bicep'
 )
 az deployment group create @inputObject
 ```
@@ -157,9 +157,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Resources\resourceGroups\deploy.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Resources/resourceGroups/deploy.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/deploy.bicep'
 )
 az deployment sub create @inputObject
 ```
@@ -182,9 +182,9 @@ $inputObject = @(
   '--location',            'EastUS2',
   '--management-group-id', 'myManagementGroup',
   # Using a local reference
-  '--template-file',       "$home\ResourceModules\arm\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
+  '--template-file',       "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
+  # '--template-uri',      'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep'
 )
 az deployment mg create @inputObject
 ```
@@ -206,9 +206,9 @@ $inputObject = @(
   '--parameters',     '@parameters.json',
   '--location',       'EastUS2',
   # Using a local reference
-  '--template-file',  "$home\ResourceModules\arm\Microsoft.Subscription\aliases\deploy.bicep"
+  '--template-file',  "$home\ResourceModules\modules\Microsoft.Subscription\aliases\deploy.bicep"
   # Using a remote reference
-  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/arm/Microsoft.Subscription/aliases/deploy.bicep'
+  # '--template-uri',  'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/deploy.bicep'
 )
 az deployment tenant create @inputObject
 ```
diff --git a/arm/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
similarity index 98%
rename from arm/.global/global.module.tests.ps1
rename to modules/.global/global.module.tests.ps1
index 049c61f1fa..3233d33690 100644
--- a/arm/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -38,9 +38,9 @@ Describe 'File/folder tests' -Tag Modules {
         $moduleFolderTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             $moduleFolderTestCases += @{
-                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 moduleFolderPath = $moduleFolderPath
-                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
+                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
             }
         }
 
@@ -108,7 +108,7 @@ Describe 'File/folder tests' -Tag Modules {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             if (Test-Path (Join-Path $moduleFolderPath '.parameters')) {
                 $folderTestCases += @{
-                    moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                    moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                     moduleFolderPath = $moduleFolderPath
                 }
             }
@@ -130,7 +130,7 @@ Describe 'File/folder tests' -Tag Modules {
             if (Test-Path $parameterFolderPath) {
                 foreach ($parameterFile in (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force)) {
                     $parameterFolderFilesTestCases += @{
-                        moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                        moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                         parameterFilePath = $parameterFile.FullName
                     }
                 }
@@ -156,7 +156,7 @@ Describe 'Readme tests' -Tag Readme {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
 
             # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-            $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -185,13 +185,13 @@ Describe 'Readme tests' -Tag Readme {
             }
 
             $readmeFolderTestCases += @{
-                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 moduleFolderPath = $moduleFolderPath
                 templateContent  = $templateContent
                 templateFilePath = $templateFilePath
                 readMeFilePath   = Join-Path -Path $moduleFolderPath 'readme.md'
                 readMeContent    = Get-Content (Join-Path -Path $moduleFolderPath 'readme.md')
-                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
+                isTopLevelModule = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Split('/').Count -eq 2 # <provider>/<resourceType>
             }
         }
 
@@ -471,7 +471,7 @@ Describe 'Deployment template tests' -Tag Template {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
 
             # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-            $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -522,7 +522,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             # Test file setup
             $deploymentFolderTestCases += @{
-                moduleFolderName       = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                moduleFolderName       = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                 templateContent        = $templateContent
                 templateFilePath       = $templateFilePath
                 parameterFileTestCases = $parameterFileTestCases
@@ -740,7 +740,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             $outputs = $templateContent.outputs
 
-            $primaryResourceType = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/arm/')[1]
+            $primaryResourceType = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/modules/')[1]
             $primaryResourceTypeResource = $templateContent.resources | Where-Object { $_.type -eq $primaryResourceType }
 
             if ($primaryResourceTypeResource.keys -contains 'location' -and $primaryResourceTypeResource.location -ne 'global') {
@@ -777,7 +777,7 @@ Describe 'Deployment template tests' -Tag Template {
             )
 
             # check if module contains a 'primary' resource we could draw a name from
-            $moduleResourceType = (Split-Path (($templateFilePath -replace '\\', '/') -split '/arm/')[1] -Parent) -replace '\\', '/'
+            $moduleResourceType = (Split-Path (($templateFilePath -replace '\\', '/') -split '/modules/')[1] -Parent) -replace '\\', '/'
             if ($templateContent.resources.type -notcontains $moduleResourceType) {
                 Set-ItResult -Skipped -Because 'the module template has no primary resource to fetch a name from.'
                 return
@@ -797,7 +797,7 @@ Describe 'Deployment template tests' -Tag Template {
             )
 
             # check if module contains a 'primary' resource we could draw a name from
-            $moduleResourceType = (Split-Path (($templateFilePath -replace '\\', '/') -split '/arm/')[1] -Parent) -replace '\\', '/'
+            $moduleResourceType = (Split-Path (($templateFilePath -replace '\\', '/') -split '/modules/')[1] -Parent) -replace '\\', '/'
             if ($templateContent.resources.type -notcontains $moduleResourceType) {
                 Set-ItResult -Skipped -Because 'the module template has no primary resource to fetch a resource ID from.'
                 return
@@ -927,7 +927,7 @@ Describe 'Deployment template tests' -Tag Template {
                             tokenSettings     = $Settings.parameterFileTokens
                             tokenName         = $token
                             tokenValue        = $enforcedTokenList[$token]
-                            moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+                            moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                         }
                     }
                 }
@@ -960,10 +960,10 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
     $ApiVersions = Get-AzResourceProvider -ListAvailable
     foreach ($moduleFolderPath in $moduleFolderPaths) {
 
-        $moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
 
         # For runtime purposes, we cache the compiled template in a hashtable that uses a formatted relative module path as a key
-        $moduleFolderPathKey = $moduleFolderPath.Split('arm')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+        $moduleFolderPathKey = $moduleFolderPath.Split('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
         if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
             if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                 $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
diff --git a/arm/.global/shared/helper.psm1 b/modules/.global/shared/helper.psm1
similarity index 100%
rename from arm/.global/shared/helper.psm1
rename to modules/.global/shared/helper.psm1
diff --git a/arm/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.AAD/DomainServices/.parameters/parameters.json b/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/.parameters/parameters.json
rename to modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
diff --git a/arm/Microsoft.AAD/DomainServices/deploy.bicep b/modules/Microsoft.AAD/DomainServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/deploy.bicep
rename to modules/Microsoft.AAD/DomainServices/deploy.bicep
diff --git a/arm/Microsoft.AAD/DomainServices/readme.md b/modules/Microsoft.AAD/DomainServices/readme.md
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/readme.md
rename to modules/Microsoft.AAD/DomainServices/readme.md
diff --git a/arm/Microsoft.AAD/DomainServices/version.json b/modules/Microsoft.AAD/DomainServices/version.json
similarity index 100%
rename from arm/Microsoft.AAD/DomainServices/version.json
rename to modules/Microsoft.AAD/DomainServices/version.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/.parameters/parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/modules/Microsoft.AnalysisServices/servers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/deploy.bicep
rename to modules/Microsoft.AnalysisServices/servers/deploy.bicep
diff --git a/arm/Microsoft.AnalysisServices/servers/readme.md b/modules/Microsoft.AnalysisServices/servers/readme.md
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/readme.md
rename to modules/Microsoft.AnalysisServices/servers/readme.md
diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/modules/Microsoft.AnalysisServices/servers/version.json
similarity index 100%
rename from arm/Microsoft.AnalysisServices/servers/version.json
rename to modules/Microsoft.AnalysisServices/servers/version.json
diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep b/modules/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
rename to modules/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/min.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/min.parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/.parameters/parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/.parameters/parameters.json
rename to modules/Microsoft.ApiManagement/service/.parameters/parameters.json
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep b/modules/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json b/modules/Microsoft.ApiManagement/service/apiVersionSets/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
rename to modules/Microsoft.ApiManagement/service/apiVersionSets/version.json
diff --git a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep b/modules/Microsoft.ApiManagement/service/apis/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apis/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep b/modules/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md b/modules/Microsoft.ApiManagement/service/apis/policies/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/readme.md
rename to modules/Microsoft.ApiManagement/service/apis/policies/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/version.json b/modules/Microsoft.ApiManagement/service/apis/policies/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/policies/version.json
rename to modules/Microsoft.ApiManagement/service/apis/policies/version.json
diff --git a/arm/Microsoft.ApiManagement/service/apis/readme.md b/modules/Microsoft.ApiManagement/service/apis/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/readme.md
rename to modules/Microsoft.ApiManagement/service/apis/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/apis/version.json b/modules/Microsoft.ApiManagement/service/apis/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/apis/version.json
rename to modules/Microsoft.ApiManagement/service/apis/version.json
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep b/modules/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md b/modules/Microsoft.ApiManagement/service/authorizationServers/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/readme.md
rename to modules/Microsoft.ApiManagement/service/authorizationServers/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json b/modules/Microsoft.ApiManagement/service/authorizationServers/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/authorizationServers/version.json
rename to modules/Microsoft.ApiManagement/service/authorizationServers/version.json
diff --git a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep b/modules/Microsoft.ApiManagement/service/backends/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/backends/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/backends/readme.md b/modules/Microsoft.ApiManagement/service/backends/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/readme.md
rename to modules/Microsoft.ApiManagement/service/backends/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/backends/version.json b/modules/Microsoft.ApiManagement/service/backends/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/backends/version.json
rename to modules/Microsoft.ApiManagement/service/backends/version.json
diff --git a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep b/modules/Microsoft.ApiManagement/service/caches/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/caches/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/caches/readme.md b/modules/Microsoft.ApiManagement/service/caches/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/readme.md
rename to modules/Microsoft.ApiManagement/service/caches/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/caches/version.json b/modules/Microsoft.ApiManagement/service/caches/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/caches/version.json
rename to modules/Microsoft.ApiManagement/service/caches/version.json
diff --git a/arm/Microsoft.ApiManagement/service/deploy.bicep b/modules/Microsoft.ApiManagement/service/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep b/modules/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md b/modules/Microsoft.ApiManagement/service/identityProviders/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/readme.md
rename to modules/Microsoft.ApiManagement/service/identityProviders/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/version.json b/modules/Microsoft.ApiManagement/service/identityProviders/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/identityProviders/version.json
rename to modules/Microsoft.ApiManagement/service/identityProviders/version.json
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep b/modules/Microsoft.ApiManagement/service/namedValues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/namedValues/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/readme.md b/modules/Microsoft.ApiManagement/service/namedValues/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/readme.md
rename to modules/Microsoft.ApiManagement/service/namedValues/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/version.json b/modules/Microsoft.ApiManagement/service/namedValues/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/namedValues/version.json
rename to modules/Microsoft.ApiManagement/service/namedValues/version.json
diff --git a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep b/modules/Microsoft.ApiManagement/service/policies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/policies/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/policies/readme.md b/modules/Microsoft.ApiManagement/service/policies/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/readme.md
rename to modules/Microsoft.ApiManagement/service/policies/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/policies/version.json b/modules/Microsoft.ApiManagement/service/policies/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/policies/version.json
rename to modules/Microsoft.ApiManagement/service/policies/version.json
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep b/modules/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md b/modules/Microsoft.ApiManagement/service/portalsettings/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/readme.md
rename to modules/Microsoft.ApiManagement/service/portalsettings/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/version.json b/modules/Microsoft.ApiManagement/service/portalsettings/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/portalsettings/version.json
rename to modules/Microsoft.ApiManagement/service/portalsettings/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/apis/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/apis/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/readme.md b/modules/Microsoft.ApiManagement/service/products/apis/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/readme.md
rename to modules/Microsoft.ApiManagement/service/products/apis/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/version.json b/modules/Microsoft.ApiManagement/service/products/apis/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/apis/version.json
rename to modules/Microsoft.ApiManagement/service/products/apis/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep b/modules/Microsoft.ApiManagement/service/products/groups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/products/groups/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/readme.md b/modules/Microsoft.ApiManagement/service/products/groups/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/readme.md
rename to modules/Microsoft.ApiManagement/service/products/groups/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/version.json b/modules/Microsoft.ApiManagement/service/products/groups/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/groups/version.json
rename to modules/Microsoft.ApiManagement/service/products/groups/version.json
diff --git a/arm/Microsoft.ApiManagement/service/products/readme.md b/modules/Microsoft.ApiManagement/service/products/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/readme.md
rename to modules/Microsoft.ApiManagement/service/products/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/products/version.json b/modules/Microsoft.ApiManagement/service/products/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/products/version.json
rename to modules/Microsoft.ApiManagement/service/products/version.json
diff --git a/arm/Microsoft.ApiManagement/service/readme.md b/modules/Microsoft.ApiManagement/service/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/readme.md
rename to modules/Microsoft.ApiManagement/service/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep b/modules/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
rename to modules/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md b/modules/Microsoft.ApiManagement/service/subscriptions/readme.md
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/readme.md
rename to modules/Microsoft.ApiManagement/service/subscriptions/readme.md
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/version.json b/modules/Microsoft.ApiManagement/service/subscriptions/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/subscriptions/version.json
rename to modules/Microsoft.ApiManagement/service/subscriptions/version.json
diff --git a/arm/Microsoft.ApiManagement/service/version.json b/modules/Microsoft.ApiManagement/service/version.json
similarity index 100%
rename from arm/Microsoft.ApiManagement/service/version.json
rename to modules/Microsoft.ApiManagement/service/version.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/deploy.bicep b/modules/Microsoft.AppConfiguration/configurationStores/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/deploy.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/deploy.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/keyValues/deploy.bicep b/modules/Microsoft.AppConfiguration/configurationStores/keyValues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/keyValues/deploy.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/keyValues/deploy.bicep
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md
rename to modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/keyValues/version.json b/modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/keyValues/version.json
rename to modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/readme.md
rename to modules/Microsoft.AppConfiguration/configurationStores/readme.md
diff --git a/arm/Microsoft.AppConfiguration/configurationStores/version.json b/modules/Microsoft.AppConfiguration/configurationStores/version.json
similarity index 100%
rename from arm/Microsoft.AppConfiguration/configurationStores/version.json
rename to modules/Microsoft.AppConfiguration/configurationStores/version.json
diff --git a/arm/Microsoft.Authorization/locks/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/locks/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/locks/deploy.bicep b/modules/Microsoft.Authorization/locks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/locks/deploy.bicep
rename to modules/Microsoft.Authorization/locks/deploy.bicep
diff --git a/arm/Microsoft.Authorization/locks/readme.md b/modules/Microsoft.Authorization/locks/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/locks/readme.md
rename to modules/Microsoft.Authorization/locks/readme.md
diff --git a/arm/Microsoft.Authorization/locks/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/locks/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/locks/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/locks/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/locks/resourceGroup/readme.md b/modules/Microsoft.Authorization/locks/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/locks/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/locks/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/locks/resourceGroup/version.json b/modules/Microsoft.Authorization/locks/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/locks/resourceGroup/version.json
rename to modules/Microsoft.Authorization/locks/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/locks/subscription/deploy.bicep b/modules/Microsoft.Authorization/locks/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/locks/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/locks/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/locks/subscription/readme.md b/modules/Microsoft.Authorization/locks/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/locks/subscription/readme.md
rename to modules/Microsoft.Authorization/locks/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/locks/subscription/version.json b/modules/Microsoft.Authorization/locks/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/locks/subscription/version.json
rename to modules/Microsoft.Authorization/locks/subscription/version.json
diff --git a/arm/Microsoft.Authorization/locks/version.json b/modules/Microsoft.Authorization/locks/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/locks/version.json
rename to modules/Microsoft.Authorization/locks/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/readme.md b/modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/managementGroup/version.json b/modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/readme.md b/modules/Microsoft.Authorization/policyAssignments/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyAssignments/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/readme.md
index 258fa3d2a6..9ee3780a3d 100644
--- a/arm/Microsoft.Authorization/policyAssignments/readme.md
+++ b/modules/Microsoft.Authorization/policyAssignments/readme.md
@@ -154,7 +154,7 @@ module policyassignment 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.aut
 ```
 **Local Path Reference**
 ```bicep
-module policyassignment 'yourpath/arm/Microsoft.Authorization.policyAssignments/subscription/deploy.bicep' = {}
+module policyassignment 'yourpath/modules/Microsoft.Authorization.policyAssignments/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/version.json b/modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
rename to modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyAssignments/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/readme.md b/modules/Microsoft.Authorization/policyAssignments/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/readme.md
rename to modules/Microsoft.Authorization/policyAssignments/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyAssignments/subscription/version.json b/modules/Microsoft.Authorization/policyAssignments/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/subscription/version.json
rename to modules/Microsoft.Authorization/policyAssignments/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyAssignments/version.json b/modules/Microsoft.Authorization/policyAssignments/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyAssignments/version.json
rename to modules/Microsoft.Authorization/policyAssignments/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/readme.md b/modules/Microsoft.Authorization/policyDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyDefinitions/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/readme.md
index 62b291946a..c35c3d5ed4 100644
--- a/arm/Microsoft.Authorization/policyDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/policyDefinitions/readme.md
@@ -113,7 +113,7 @@ module policydefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.aut
 ```
 **Local Path Reference**
 ```bicep
-module policydefinition 'yourpath/arm/Microsoft.Authorization.policyDefinitions/subscription/deploy.bicep' = {}
+module policydefinition 'yourpath/modules/Microsoft.Authorization.policyDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyDefinitions/subscription/version.json b/modules/Microsoft.Authorization/policyDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyDefinitions/version.json b/modules/Microsoft.Authorization/policyDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyDefinitions/version.json
rename to modules/Microsoft.Authorization/policyDefinitions/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/readme.md b/modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/managementGroup/version.json b/modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/readme.md b/modules/Microsoft.Authorization/policyExemptions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policyExemptions/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/readme.md
index f97ba36da0..77204717f5 100644
--- a/arm/Microsoft.Authorization/policyExemptions/readme.md
+++ b/modules/Microsoft.Authorization/policyExemptions/readme.md
@@ -132,7 +132,7 @@ module policyexemption 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.auth
 ```
 **Local Path Reference**
 ```bicep
-module policyexemption 'yourpath/arm/Microsoft.Authorization.policyExemptions/subscription/deploy.bicep' = {}
+module policyexemption 'yourpath/modules/Microsoft.Authorization.policyExemptions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/version.json b/modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
rename to modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policyExemptions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/readme.md b/modules/Microsoft.Authorization/policyExemptions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/readme.md
rename to modules/Microsoft.Authorization/policyExemptions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policyExemptions/subscription/version.json b/modules/Microsoft.Authorization/policyExemptions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/subscription/version.json
rename to modules/Microsoft.Authorization/policyExemptions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policyExemptions/version.json b/modules/Microsoft.Authorization/policyExemptions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policyExemptions/version.json
rename to modules/Microsoft.Authorization/policyExemptions/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/policySetDefinitions/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/readme.md
index 8a47a3172e..ca6fba54e6 100644
--- a/arm/Microsoft.Authorization/policySetDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/policySetDefinitions/readme.md
@@ -116,7 +116,7 @@ module policysetdefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.
 ```
 **Local Path Reference**
 ```bicep
-module policysetdefinition 'yourpath/arm/Microsoft.Authorization.policySetDefinitions/subscription/deploy.bicep' = {}
+module policysetdefinition 'yourpath/modules/Microsoft.Authorization.policySetDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/subscription/version.json b/modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/version.json b/modules/Microsoft.Authorization/policySetDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/policySetDefinitions/version.json
rename to modules/Microsoft.Authorization/policySetDefinitions/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/readme.md b/modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/managementGroup/version.json b/modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/managementGroup/version.json
rename to modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/readme.md b/modules/Microsoft.Authorization/roleAssignments/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/roleAssignments/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/readme.md
index c78f67fac0..b1f3aa4d16 100644
--- a/arm/Microsoft.Authorization/roleAssignments/readme.md
+++ b/modules/Microsoft.Authorization/roleAssignments/readme.md
@@ -150,7 +150,7 @@ module roleassignment 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.autho
 ```
 **Local Path Reference**
 ```bicep
-module roleassignment 'yourpath/arm/Microsoft.Authorization.roleAssignments/subscription/deploy.bicep' = {}
+module roleassignment 'yourpath/modules/Microsoft.Authorization.roleAssignments/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/version.json b/modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
rename to modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep b/modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/roleAssignments/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/readme.md b/modules/Microsoft.Authorization/roleAssignments/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/readme.md
rename to modules/Microsoft.Authorization/roleAssignments/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/roleAssignments/subscription/version.json b/modules/Microsoft.Authorization/roleAssignments/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/subscription/version.json
rename to modules/Microsoft.Authorization/roleAssignments/subscription/version.json
diff --git a/arm/Microsoft.Authorization/roleAssignments/version.json b/modules/Microsoft.Authorization/roleAssignments/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleAssignments/version.json
rename to modules/Microsoft.Authorization/roleAssignments/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/managementGroup/version.json b/modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/readme.md b/modules/Microsoft.Authorization/roleDefinitions/readme.md
similarity index 99%
rename from arm/Microsoft.Authorization/roleDefinitions/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/readme.md
index fdc02fd430..6d74ed6ac8 100644
--- a/arm/Microsoft.Authorization/roleDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/roleDefinitions/readme.md
@@ -150,7 +150,7 @@ module roledefinition 'br:bicepregistry.azurecr.io/bicep/modules/microsoft.autho
 ```
 **Local Path Reference**
 ```bicep
-module roledefinition 'yourpath/arm/Microsoft.Authorization.roleDefinitions/subscription/deploy.bicep' = {}
+module roledefinition 'yourpath/modules/Microsoft.Authorization.roleDefinitions/subscription/deploy.bicep' = {}
 ```
 
 ## Outputs
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json b/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep b/modules/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/deploy.bicep
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/readme.md b/modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/readme.md
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md
diff --git a/arm/Microsoft.Authorization/roleDefinitions/subscription/version.json b/modules/Microsoft.Authorization/roleDefinitions/subscription/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/subscription/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/subscription/version.json
diff --git a/arm/Microsoft.Authorization/roleDefinitions/version.json b/modules/Microsoft.Authorization/roleDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.Authorization/roleDefinitions/version.json
rename to modules/Microsoft.Authorization/roleDefinitions/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Automation/automationAccounts/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md b/modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
rename to modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/readme.md b/modules/Microsoft.Automation/automationAccounts/modules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/modules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/version.json b/modules/Microsoft.Automation/automationAccounts/modules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/modules/version.json
rename to modules/Microsoft.Automation/automationAccounts/modules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/modules/Microsoft.Automation/automationAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/readme.md
rename to modules/Microsoft.Automation/automationAccounts/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md b/modules/Microsoft.Automation/automationAccounts/runbooks/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/readme.md
rename to modules/Microsoft.Automation/automationAccounts/runbooks/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json b/modules/Microsoft.Automation/automationAccounts/runbooks/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/runbooks/version.json
rename to modules/Microsoft.Automation/automationAccounts/runbooks/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/readme.md b/modules/Microsoft.Automation/automationAccounts/schedules/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/readme.md
rename to modules/Microsoft.Automation/automationAccounts/schedules/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/version.json b/modules/Microsoft.Automation/automationAccounts/schedules/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/schedules/version.json
rename to modules/Microsoft.Automation/automationAccounts/schedules/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
rename to modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/variables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
rename to modules/Microsoft.Automation/automationAccounts/variables/deploy.bicep
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/readme.md b/modules/Microsoft.Automation/automationAccounts/variables/readme.md
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/readme.md
rename to modules/Microsoft.Automation/automationAccounts/variables/readme.md
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/version.json b/modules/Microsoft.Automation/automationAccounts/variables/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/variables/version.json
rename to modules/Microsoft.Automation/automationAccounts/variables/version.json
diff --git a/arm/Microsoft.Automation/automationAccounts/version.json b/modules/Microsoft.Automation/automationAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Automation/automationAccounts/version.json
rename to modules/Microsoft.Automation/automationAccounts/version.json
diff --git a/arm/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Batch/batchAccounts/.parameters/parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/.parameters/parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Batch/batchAccounts/deploy.bicep b/modules/Microsoft.Batch/batchAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/deploy.bicep
rename to modules/Microsoft.Batch/batchAccounts/deploy.bicep
diff --git a/arm/Microsoft.Batch/batchAccounts/readme.md b/modules/Microsoft.Batch/batchAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/readme.md
rename to modules/Microsoft.Batch/batchAccounts/readme.md
diff --git a/arm/Microsoft.Batch/batchAccounts/version.json b/modules/Microsoft.Batch/batchAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Batch/batchAccounts/version.json
rename to modules/Microsoft.Batch/batchAccounts/version.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
diff --git a/arm/Microsoft.CognitiveServices/accounts/deploy.bicep b/modules/Microsoft.CognitiveServices/accounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/deploy.bicep
rename to modules/Microsoft.CognitiveServices/accounts/deploy.bicep
diff --git a/arm/Microsoft.CognitiveServices/accounts/readme.md b/modules/Microsoft.CognitiveServices/accounts/readme.md
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/readme.md
rename to modules/Microsoft.CognitiveServices/accounts/readme.md
diff --git a/arm/Microsoft.CognitiveServices/accounts/version.json b/modules/Microsoft.CognitiveServices/accounts/version.json
similarity index 100%
rename from arm/Microsoft.CognitiveServices/accounts/version.json
rename to modules/Microsoft.CognitiveServices/accounts/version.json
diff --git a/arm/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Compute/availabilitySets/.parameters/parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/.parameters/parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/availabilitySets/deploy.bicep b/modules/Microsoft.Compute/availabilitySets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/deploy.bicep
rename to modules/Microsoft.Compute/availabilitySets/deploy.bicep
diff --git a/arm/Microsoft.Compute/availabilitySets/readme.md b/modules/Microsoft.Compute/availabilitySets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/readme.md
rename to modules/Microsoft.Compute/availabilitySets/readme.md
diff --git a/arm/Microsoft.Compute/availabilitySets/version.json b/modules/Microsoft.Compute/availabilitySets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/availabilitySets/version.json
rename to modules/Microsoft.Compute/availabilitySets/version.json
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json b/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
rename to modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep b/modules/Microsoft.Compute/diskEncryptionSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep
rename to modules/Microsoft.Compute/diskEncryptionSets/deploy.bicep
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/readme.md b/modules/Microsoft.Compute/diskEncryptionSets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/readme.md
rename to modules/Microsoft.Compute/diskEncryptionSets/readme.md
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/version.json b/modules/Microsoft.Compute/diskEncryptionSets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/diskEncryptionSets/version.json
rename to modules/Microsoft.Compute/diskEncryptionSets/version.json
diff --git a/arm/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/disks/.parameters/image.parameters.json b/modules/Microsoft.Compute/disks/.parameters/image.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/image.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/image.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/import.parameters.json b/modules/Microsoft.Compute/disks/.parameters/import.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/import.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/import.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/min.parameters.json b/modules/Microsoft.Compute/disks/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Compute/disks/.parameters/parameters.json b/modules/Microsoft.Compute/disks/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/.parameters/parameters.json
rename to modules/Microsoft.Compute/disks/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/disks/deploy.bicep b/modules/Microsoft.Compute/disks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/disks/deploy.bicep
rename to modules/Microsoft.Compute/disks/deploy.bicep
diff --git a/arm/Microsoft.Compute/disks/readme.md b/modules/Microsoft.Compute/disks/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/disks/readme.md
rename to modules/Microsoft.Compute/disks/readme.md
diff --git a/arm/Microsoft.Compute/disks/version.json b/modules/Microsoft.Compute/disks/version.json
similarity index 100%
rename from arm/Microsoft.Compute/disks/version.json
rename to modules/Microsoft.Compute/disks/version.json
diff --git a/arm/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/galleries/.parameters/images.parameters.json b/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.parameters/images.parameters.json
rename to modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
diff --git a/arm/Microsoft.Compute/galleries/.parameters/parameters.json b/modules/Microsoft.Compute/galleries/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/.parameters/parameters.json
rename to modules/Microsoft.Compute/galleries/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/galleries/deploy.bicep b/modules/Microsoft.Compute/galleries/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/deploy.bicep
rename to modules/Microsoft.Compute/galleries/deploy.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/deploy.bicep b/modules/Microsoft.Compute/galleries/images/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/deploy.bicep
rename to modules/Microsoft.Compute/galleries/images/deploy.bicep
diff --git a/arm/Microsoft.Compute/galleries/images/readme.md b/modules/Microsoft.Compute/galleries/images/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/readme.md
rename to modules/Microsoft.Compute/galleries/images/readme.md
diff --git a/arm/Microsoft.Compute/galleries/images/version.json b/modules/Microsoft.Compute/galleries/images/version.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/images/version.json
rename to modules/Microsoft.Compute/galleries/images/version.json
diff --git a/arm/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/galleries/readme.md
rename to modules/Microsoft.Compute/galleries/readme.md
diff --git a/arm/Microsoft.Compute/galleries/version.json b/modules/Microsoft.Compute/galleries/version.json
similarity index 100%
rename from arm/Microsoft.Compute/galleries/version.json
rename to modules/Microsoft.Compute/galleries/version.json
diff --git a/arm/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/images/.parameters/parameters.json b/modules/Microsoft.Compute/images/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/images/.parameters/parameters.json
rename to modules/Microsoft.Compute/images/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/images/deploy.bicep b/modules/Microsoft.Compute/images/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/images/deploy.bicep
rename to modules/Microsoft.Compute/images/deploy.bicep
diff --git a/arm/Microsoft.Compute/images/readme.md b/modules/Microsoft.Compute/images/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/images/readme.md
rename to modules/Microsoft.Compute/images/readme.md
diff --git a/arm/Microsoft.Compute/images/version.json b/modules/Microsoft.Compute/images/version.json
similarity index 100%
rename from arm/Microsoft.Compute/images/version.json
rename to modules/Microsoft.Compute/images/version.json
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json b/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep b/modules/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
rename to modules/Microsoft.Compute/proximityPlacementGroups/deploy.bicep
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/readme.md b/modules/Microsoft.Compute/proximityPlacementGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/readme.md
rename to modules/Microsoft.Compute/proximityPlacementGroups/readme.md
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/version.json b/modules/Microsoft.Compute/proximityPlacementGroups/version.json
similarity index 100%
rename from arm/Microsoft.Compute/proximityPlacementGroups/version.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/version.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md b/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/readme.md
rename to modules/Microsoft.Compute/virtualMachineScaleSets/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json b/modules/Microsoft.Compute/virtualMachineScaleSets/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachineScaleSets/version.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/version.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep b/modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
rename to modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
diff --git a/arm/Microsoft.Compute/virtualMachines/deploy.bicep b/modules/Microsoft.Compute/virtualMachines/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachines/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep b/modules/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
rename to modules/Microsoft.Compute/virtualMachines/extensions/deploy.bicep
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/readme.md b/modules/Microsoft.Compute/virtualMachines/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/readme.md
rename to modules/Microsoft.Compute/virtualMachines/extensions/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/version.json b/modules/Microsoft.Compute/virtualMachines/extensions/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/extensions/version.json
rename to modules/Microsoft.Compute/virtualMachines/extensions/version.json
diff --git a/arm/Microsoft.Compute/virtualMachines/readme.md b/modules/Microsoft.Compute/virtualMachines/readme.md
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/readme.md
rename to modules/Microsoft.Compute/virtualMachines/readme.md
diff --git a/arm/Microsoft.Compute/virtualMachines/version.json b/modules/Microsoft.Compute/virtualMachines/version.json
similarity index 100%
rename from arm/Microsoft.Compute/virtualMachines/version.json
rename to modules/Microsoft.Compute/virtualMachines/version.json
diff --git a/arm/Microsoft.Consumption/budgets/.parameters/parameters.json b/modules/Microsoft.Consumption/budgets/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/.parameters/parameters.json
rename to modules/Microsoft.Consumption/budgets/.parameters/parameters.json
diff --git a/arm/Microsoft.Consumption/budgets/deploy.bicep b/modules/Microsoft.Consumption/budgets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/deploy.bicep
rename to modules/Microsoft.Consumption/budgets/deploy.bicep
diff --git a/arm/Microsoft.Consumption/budgets/readme.md b/modules/Microsoft.Consumption/budgets/readme.md
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/readme.md
rename to modules/Microsoft.Consumption/budgets/readme.md
diff --git a/arm/Microsoft.Consumption/budgets/version.json b/modules/Microsoft.Consumption/budgets/version.json
similarity index 100%
rename from arm/Microsoft.Consumption/budgets/version.json
rename to modules/Microsoft.Consumption/budgets/version.json
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json b/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
rename to modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep b/modules/Microsoft.ContainerInstance/containerGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep
rename to modules/Microsoft.ContainerInstance/containerGroups/deploy.bicep
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/readme.md b/modules/Microsoft.ContainerInstance/containerGroups/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/readme.md
rename to modules/Microsoft.ContainerInstance/containerGroups/readme.md
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/version.json b/modules/Microsoft.ContainerInstance/containerGroups/version.json
similarity index 100%
rename from arm/Microsoft.ContainerInstance/containerGroups/version.json
rename to modules/Microsoft.ContainerInstance/containerGroups/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/.parameters/parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/readme.md b/modules/Microsoft.ContainerRegistry/registries/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/replications/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/readme.md b/modules/Microsoft.ContainerRegistry/registries/replications/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/replications/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/version.json b/modules/Microsoft.ContainerRegistry/registries/replications/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/replications/version.json
rename to modules/Microsoft.ContainerRegistry/registries/replications/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/version.json b/modules/Microsoft.ContainerRegistry/registries/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/version.json
rename to modules/Microsoft.ContainerRegistry/registries/version.json
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep b/modules/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/deploy.bicep
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/readme.md b/modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/readme.md
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md
diff --git a/arm/Microsoft.ContainerRegistry/registries/webhooks/version.json b/modules/Microsoft.ContainerRegistry/registries/webhooks/version.json
similarity index 100%
rename from arm/Microsoft.ContainerRegistry/registries/webhooks/version.json
rename to modules/Microsoft.ContainerRegistry/registries/webhooks/version.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md b/modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json b/modules/Microsoft.ContainerService/managedClusters/agentPools/version.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
rename to modules/Microsoft.ContainerService/managedClusters/agentPools/version.json
diff --git a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/deploy.bicep
rename to modules/Microsoft.ContainerService/managedClusters/deploy.bicep
diff --git a/arm/Microsoft.ContainerService/managedClusters/readme.md b/modules/Microsoft.ContainerService/managedClusters/readme.md
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/readme.md
rename to modules/Microsoft.ContainerService/managedClusters/readme.md
diff --git a/arm/Microsoft.ContainerService/managedClusters/version.json b/modules/Microsoft.ContainerService/managedClusters/version.json
similarity index 100%
rename from arm/Microsoft.ContainerService/managedClusters/version.json
rename to modules/Microsoft.ContainerService/managedClusters/version.json
diff --git a/arm/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DataFactory/factories/.parameters/parameters.json b/modules/Microsoft.DataFactory/factories/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/.parameters/parameters.json
rename to modules/Microsoft.DataFactory/factories/.parameters/parameters.json
diff --git a/arm/Microsoft.DataFactory/factories/deploy.bicep b/modules/Microsoft.DataFactory/factories/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep b/modules/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md b/modules/Microsoft.DataFactory/factories/integrationRuntime/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json b/modules/Microsoft.DataFactory/factories/integrationRuntime/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
rename to modules/Microsoft.DataFactory/factories/integrationRuntime/version.json
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json b/modules/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
rename to modules/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
diff --git a/arm/Microsoft.DataFactory/factories/readme.md b/modules/Microsoft.DataFactory/factories/readme.md
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/readme.md
rename to modules/Microsoft.DataFactory/factories/readme.md
diff --git a/arm/Microsoft.DataFactory/factories/version.json b/modules/Microsoft.DataFactory/factories/version.json
similarity index 100%
rename from arm/Microsoft.DataFactory/factories/version.json
rename to modules/Microsoft.DataFactory/factories/version.json
diff --git a/arm/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep b/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
rename to modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
diff --git a/arm/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json b/modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
diff --git a/arm/Microsoft.DataProtection/backupVaults/.parameters/parameters.json b/modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
diff --git a/arm/Microsoft.DataProtection/backupVaults/backupPolicies/deploy.bicep b/modules/Microsoft.DataProtection/backupVaults/backupPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/backupPolicies/deploy.bicep
rename to modules/Microsoft.DataProtection/backupVaults/backupPolicies/deploy.bicep
diff --git a/arm/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md b/modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md
rename to modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md
diff --git a/arm/Microsoft.DataProtection/backupVaults/backupPolicies/version.json b/modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/backupPolicies/version.json
rename to modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json
diff --git a/arm/Microsoft.DataProtection/backupVaults/deploy.bicep b/modules/Microsoft.DataProtection/backupVaults/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/deploy.bicep
rename to modules/Microsoft.DataProtection/backupVaults/deploy.bicep
diff --git a/arm/Microsoft.DataProtection/backupVaults/readme.md b/modules/Microsoft.DataProtection/backupVaults/readme.md
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/readme.md
rename to modules/Microsoft.DataProtection/backupVaults/readme.md
diff --git a/arm/Microsoft.DataProtection/backupVaults/version.json b/modules/Microsoft.DataProtection/backupVaults/version.json
similarity index 100%
rename from arm/Microsoft.DataProtection/backupVaults/version.json
rename to modules/Microsoft.DataProtection/backupVaults/version.json
diff --git a/arm/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Databricks/workspaces/.parameters/parameters.json b/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/.parameters/parameters.json
rename to modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.Databricks/workspaces/deploy.bicep b/modules/Microsoft.Databricks/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/deploy.bicep
rename to modules/Microsoft.Databricks/workspaces/deploy.bicep
diff --git a/arm/Microsoft.Databricks/workspaces/readme.md b/modules/Microsoft.Databricks/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/readme.md
rename to modules/Microsoft.Databricks/workspaces/readme.md
diff --git a/arm/Microsoft.Databricks/workspaces/version.json b/modules/Microsoft.Databricks/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.Databricks/workspaces/version.json
rename to modules/Microsoft.Databricks/workspaces/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/Microsoft.DesktopVirtualization/hostpools/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/readme.md
rename to modules/Microsoft.DesktopVirtualization/hostpools/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/Microsoft.DesktopVirtualization/hostpools/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/hostpools/version.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/readme.md
rename to modules/Microsoft.DesktopVirtualization/scalingplans/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/Microsoft.DesktopVirtualization/scalingplans/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/scalingplans/version.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/version.json
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
rename to modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/readme.md
rename to modules/Microsoft.DesktopVirtualization/workspaces/readme.md
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/Microsoft.DesktopVirtualization/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.DesktopVirtualization/workspaces/version.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/version.json b/modules/Microsoft.DocumentDB/databaseAccounts/version.json
similarity index 100%
rename from arm/Microsoft.DocumentDB/databaseAccounts/version.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/version.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/.parameters/parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
diff --git a/arm/Microsoft.EventGrid/systemTopics/deploy.bicep b/modules/Microsoft.EventGrid/systemTopics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/deploy.bicep
rename to modules/Microsoft.EventGrid/systemTopics/deploy.bicep
diff --git a/arm/Microsoft.EventGrid/systemTopics/readme.md b/modules/Microsoft.EventGrid/systemTopics/readme.md
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/readme.md
rename to modules/Microsoft.EventGrid/systemTopics/readme.md
diff --git a/arm/Microsoft.EventGrid/systemTopics/version.json b/modules/Microsoft.EventGrid/systemTopics/version.json
similarity index 100%
rename from arm/Microsoft.EventGrid/systemTopics/version.json
rename to modules/Microsoft.EventGrid/systemTopics/version.json
diff --git a/arm/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.EventGrid/topics/.parameters/parameters.json b/modules/Microsoft.EventGrid/topics/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/topics/.parameters/parameters.json
diff --git a/arm/Microsoft.EventGrid/topics/deploy.bicep b/modules/Microsoft.EventGrid/topics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/deploy.bicep
rename to modules/Microsoft.EventGrid/topics/deploy.bicep
diff --git a/arm/Microsoft.EventGrid/topics/readme.md b/modules/Microsoft.EventGrid/topics/readme.md
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/readme.md
rename to modules/Microsoft.EventGrid/topics/readme.md
diff --git a/arm/Microsoft.EventGrid/topics/version.json b/modules/Microsoft.EventGrid/topics/version.json
similarity index 100%
rename from arm/Microsoft.EventGrid/topics/version.json
rename to modules/Microsoft.EventGrid/topics/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/.parameters/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.EventHub/namespaces/.parameters/parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/.parameters/parameters.json
rename to modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep b/modules/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md b/modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json b/modules/Microsoft.EventHub/namespaces/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
rename to modules/Microsoft.EventHub/namespaces/authorizationRules/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/deploy.bicep b/modules/Microsoft.EventHub/namespaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
rename to modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md b/modules/Microsoft.EventHub/namespaces/eventhubs/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/readme.md
rename to modules/Microsoft.EventHub/namespaces/eventhubs/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json b/modules/Microsoft.EventHub/namespaces/eventhubs/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/eventhubs/version.json
rename to modules/Microsoft.EventHub/namespaces/eventhubs/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep b/modules/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/deploy.bicep
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/readme.md b/modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/networkRuleSets/version.json b/modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/networkRuleSets/version.json
rename to modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json
diff --git a/arm/Microsoft.EventHub/namespaces/readme.md b/modules/Microsoft.EventHub/namespaces/readme.md
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/readme.md
rename to modules/Microsoft.EventHub/namespaces/readme.md
diff --git a/arm/Microsoft.EventHub/namespaces/version.json b/modules/Microsoft.EventHub/namespaces/version.json
similarity index 100%
rename from arm/Microsoft.EventHub/namespaces/version.json
rename to modules/Microsoft.EventHub/namespaces/version.json
diff --git a/arm/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.HealthBot/healthBots/.parameters/parameters.json b/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/.parameters/parameters.json
rename to modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
diff --git a/arm/Microsoft.HealthBot/healthBots/deploy.bicep b/modules/Microsoft.HealthBot/healthBots/deploy.bicep
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/deploy.bicep
rename to modules/Microsoft.HealthBot/healthBots/deploy.bicep
diff --git a/arm/Microsoft.HealthBot/healthBots/readme.md b/modules/Microsoft.HealthBot/healthBots/readme.md
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/readme.md
rename to modules/Microsoft.HealthBot/healthBots/readme.md
diff --git a/arm/Microsoft.HealthBot/healthBots/version.json b/modules/Microsoft.HealthBot/healthBots/version.json
similarity index 100%
rename from arm/Microsoft.HealthBot/healthBots/version.json
rename to modules/Microsoft.HealthBot/healthBots/version.json
diff --git a/arm/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/actionGroups/.parameters/parameters.json b/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/.parameters/parameters.json
rename to modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/actionGroups/deploy.bicep b/modules/Microsoft.Insights/actionGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/deploy.bicep
rename to modules/Microsoft.Insights/actionGroups/deploy.bicep
diff --git a/arm/Microsoft.Insights/actionGroups/readme.md b/modules/Microsoft.Insights/actionGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/readme.md
rename to modules/Microsoft.Insights/actionGroups/readme.md
diff --git a/arm/Microsoft.Insights/actionGroups/version.json b/modules/Microsoft.Insights/actionGroups/version.json
similarity index 100%
rename from arm/Microsoft.Insights/actionGroups/version.json
rename to modules/Microsoft.Insights/actionGroups/version.json
diff --git a/arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep b/modules/Microsoft.Insights/activityLogAlerts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
rename to modules/Microsoft.Insights/activityLogAlerts/deploy.bicep
diff --git a/arm/Microsoft.Insights/activityLogAlerts/readme.md b/modules/Microsoft.Insights/activityLogAlerts/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/readme.md
rename to modules/Microsoft.Insights/activityLogAlerts/readme.md
diff --git a/arm/Microsoft.Insights/activityLogAlerts/version.json b/modules/Microsoft.Insights/activityLogAlerts/version.json
similarity index 100%
rename from arm/Microsoft.Insights/activityLogAlerts/version.json
rename to modules/Microsoft.Insights/activityLogAlerts/version.json
diff --git a/arm/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/components/.parameters/parameters.json b/modules/Microsoft.Insights/components/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/components/.parameters/parameters.json
rename to modules/Microsoft.Insights/components/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/components/deploy.bicep b/modules/Microsoft.Insights/components/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/components/deploy.bicep
rename to modules/Microsoft.Insights/components/deploy.bicep
diff --git a/arm/Microsoft.Insights/components/readme.md b/modules/Microsoft.Insights/components/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/components/readme.md
rename to modules/Microsoft.Insights/components/readme.md
diff --git a/arm/Microsoft.Insights/components/version.json b/modules/Microsoft.Insights/components/version.json
similarity index 100%
rename from arm/Microsoft.Insights/components/version.json
rename to modules/Microsoft.Insights/components/version.json
diff --git a/arm/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json b/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
rename to modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep b/modules/Microsoft.Insights/diagnosticSettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/deploy.bicep
rename to modules/Microsoft.Insights/diagnosticSettings/deploy.bicep
diff --git a/arm/Microsoft.Insights/diagnosticSettings/readme.md b/modules/Microsoft.Insights/diagnosticSettings/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/readme.md
rename to modules/Microsoft.Insights/diagnosticSettings/readme.md
diff --git a/arm/Microsoft.Insights/diagnosticSettings/version.json b/modules/Microsoft.Insights/diagnosticSettings/version.json
similarity index 100%
rename from arm/Microsoft.Insights/diagnosticSettings/version.json
rename to modules/Microsoft.Insights/diagnosticSettings/version.json
diff --git a/arm/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/metricAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/metricAlerts/deploy.bicep b/modules/Microsoft.Insights/metricAlerts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/deploy.bicep
rename to modules/Microsoft.Insights/metricAlerts/deploy.bicep
diff --git a/arm/Microsoft.Insights/metricAlerts/readme.md b/modules/Microsoft.Insights/metricAlerts/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/readme.md
rename to modules/Microsoft.Insights/metricAlerts/readme.md
diff --git a/arm/Microsoft.Insights/metricAlerts/version.json b/modules/Microsoft.Insights/metricAlerts/version.json
similarity index 100%
rename from arm/Microsoft.Insights/metricAlerts/version.json
rename to modules/Microsoft.Insights/metricAlerts/version.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json b/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
rename to modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep b/modules/Microsoft.Insights/privateLinkScopes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/deploy.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/readme.md b/modules/Microsoft.Insights/privateLinkScopes/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/readme.md
rename to modules/Microsoft.Insights/privateLinkScopes/readme.md
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
rename to modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
diff --git a/arm/Microsoft.Insights/privateLinkScopes/version.json b/modules/Microsoft.Insights/privateLinkScopes/version.json
similarity index 100%
rename from arm/Microsoft.Insights/privateLinkScopes/version.json
rename to modules/Microsoft.Insights/privateLinkScopes/version.json
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json b/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
rename to modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep b/modules/Microsoft.Insights/scheduledQueryRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
rename to modules/Microsoft.Insights/scheduledQueryRules/deploy.bicep
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/readme.md b/modules/Microsoft.Insights/scheduledQueryRules/readme.md
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/readme.md
rename to modules/Microsoft.Insights/scheduledQueryRules/readme.md
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/version.json b/modules/Microsoft.Insights/scheduledQueryRules/version.json
similarity index 100%
rename from arm/Microsoft.Insights/scheduledQueryRules/version.json
rename to modules/Microsoft.Insights/scheduledQueryRules/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/.parameters/min.parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KeyVault/vaults/.parameters/parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/.parameters/parameters.json
rename to modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep b/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json b/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
rename to modules/Microsoft.KeyVault/vaults/accessPolicies/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/deploy.bicep b/modules/Microsoft.KeyVault/vaults/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep b/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/keys/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/keys/readme.md b/modules/Microsoft.KeyVault/vaults/keys/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/readme.md
rename to modules/Microsoft.KeyVault/vaults/keys/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/keys/version.json b/modules/Microsoft.KeyVault/vaults/keys/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/keys/version.json
rename to modules/Microsoft.KeyVault/vaults/keys/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/readme.md b/modules/Microsoft.KeyVault/vaults/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/readme.md
rename to modules/Microsoft.KeyVault/vaults/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
rename to modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/readme.md b/modules/Microsoft.KeyVault/vaults/secrets/readme.md
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/readme.md
rename to modules/Microsoft.KeyVault/vaults/secrets/readme.md
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/version.json b/modules/Microsoft.KeyVault/vaults/secrets/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/secrets/version.json
rename to modules/Microsoft.KeyVault/vaults/secrets/version.json
diff --git a/arm/Microsoft.KeyVault/vaults/version.json b/modules/Microsoft.KeyVault/vaults/version.json
similarity index 100%
rename from arm/Microsoft.KeyVault/vaults/version.json
rename to modules/Microsoft.KeyVault/vaults/version.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/deploy.bicep b/modules/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
rename to modules/Microsoft.KubernetesConfiguration/extensions/deploy.bicep
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/readme.md b/modules/Microsoft.KubernetesConfiguration/extensions/readme.md
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/readme.md
rename to modules/Microsoft.KubernetesConfiguration/extensions/readme.md
diff --git a/arm/Microsoft.KubernetesConfiguration/extensions/version.json b/modules/Microsoft.KubernetesConfiguration/extensions/version.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/extensions/version.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/version.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/deploy.bicep
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md
diff --git a/arm/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json
diff --git a/arm/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Logic/workflows/.parameters/parameters.json b/modules/Microsoft.Logic/workflows/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Logic/workflows/.parameters/parameters.json
rename to modules/Microsoft.Logic/workflows/.parameters/parameters.json
diff --git a/arm/Microsoft.Logic/workflows/deploy.bicep b/modules/Microsoft.Logic/workflows/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Logic/workflows/deploy.bicep
rename to modules/Microsoft.Logic/workflows/deploy.bicep
diff --git a/arm/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
similarity index 100%
rename from arm/Microsoft.Logic/workflows/readme.md
rename to modules/Microsoft.Logic/workflows/readme.md
diff --git a/arm/Microsoft.Logic/workflows/version.json b/modules/Microsoft.Logic/workflows/version.json
similarity index 100%
rename from arm/Microsoft.Logic/workflows/version.json
rename to modules/Microsoft.Logic/workflows/version.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep b/modules/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/deploy.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/readme.md b/modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/readme.md
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/computes/version.json b/modules/Microsoft.MachineLearningServices/workspaces/computes/version.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/computes/version.json
rename to modules/Microsoft.MachineLearningServices/workspaces/computes/version.json
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep b/modules/Microsoft.MachineLearningServices/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep
rename to modules/Microsoft.MachineLearningServices/workspaces/deploy.bicep
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/readme.md b/modules/Microsoft.MachineLearningServices/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/readme.md
rename to modules/Microsoft.MachineLearningServices/workspaces/readme.md
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/version.json b/modules/Microsoft.MachineLearningServices/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.MachineLearningServices/workspaces/version.json
rename to modules/Microsoft.MachineLearningServices/workspaces/version.json
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
similarity index 100%
rename from arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep b/modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep b/modules/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
rename to modules/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md b/modules/Microsoft.ManagedServices/registrationDefinitions/readme.md
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
rename to modules/Microsoft.ManagedServices/registrationDefinitions/readme.md
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json b/modules/Microsoft.ManagedServices/registrationDefinitions/version.json
similarity index 100%
rename from arm/Microsoft.ManagedServices/registrationDefinitions/version.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/version.json
diff --git a/arm/Microsoft.Management/managementGroups/.parameters/parameters.json b/modules/Microsoft.Management/managementGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/.parameters/parameters.json
rename to modules/Microsoft.Management/managementGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Management/managementGroups/deploy.bicep b/modules/Microsoft.Management/managementGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/deploy.bicep
rename to modules/Microsoft.Management/managementGroups/deploy.bicep
diff --git a/arm/Microsoft.Management/managementGroups/readme.md b/modules/Microsoft.Management/managementGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/readme.md
rename to modules/Microsoft.Management/managementGroups/readme.md
diff --git a/arm/Microsoft.Management/managementGroups/version.json b/modules/Microsoft.Management/managementGroups/version.json
similarity index 100%
rename from arm/Microsoft.Management/managementGroups/version.json
rename to modules/Microsoft.Management/managementGroups/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
diff --git a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep b/modules/Microsoft.NetApp/netAppAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/deploy.bicep
rename to modules/Microsoft.NetApp/netAppAccounts/deploy.bicep
diff --git a/arm/Microsoft.NetApp/netAppAccounts/readme.md b/modules/Microsoft.NetApp/netAppAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/readme.md
rename to modules/Microsoft.NetApp/netAppAccounts/readme.md
diff --git a/arm/Microsoft.NetApp/netAppAccounts/version.json b/modules/Microsoft.NetApp/netAppAccounts/version.json
similarity index 100%
rename from arm/Microsoft.NetApp/netAppAccounts/version.json
rename to modules/Microsoft.NetApp/netAppAccounts/version.json
diff --git a/arm/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json b/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/applicationGateways/deploy.bicep b/modules/Microsoft.Network/applicationGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/deploy.bicep
rename to modules/Microsoft.Network/applicationGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/applicationGateways/readme.md b/modules/Microsoft.Network/applicationGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/readme.md
rename to modules/Microsoft.Network/applicationGateways/readme.md
diff --git a/arm/Microsoft.Network/applicationGateways/version.json b/modules/Microsoft.Network/applicationGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/applicationGateways/version.json
rename to modules/Microsoft.Network/applicationGateways/version.json
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep b/modules/Microsoft.Network/applicationSecurityGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep
rename to modules/Microsoft.Network/applicationSecurityGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/readme.md b/modules/Microsoft.Network/applicationSecurityGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/readme.md
rename to modules/Microsoft.Network/applicationSecurityGroups/readme.md
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/version.json b/modules/Microsoft.Network/applicationSecurityGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/applicationSecurityGroups/version.json
rename to modules/Microsoft.Network/applicationSecurityGroups/version.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/.parameters/parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/.parameters/parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/azureFirewalls/deploy.bicep b/modules/Microsoft.Network/azureFirewalls/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/deploy.bicep
rename to modules/Microsoft.Network/azureFirewalls/deploy.bicep
diff --git a/arm/Microsoft.Network/azureFirewalls/readme.md b/modules/Microsoft.Network/azureFirewalls/readme.md
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/readme.md
rename to modules/Microsoft.Network/azureFirewalls/readme.md
diff --git a/arm/Microsoft.Network/azureFirewalls/version.json b/modules/Microsoft.Network/azureFirewalls/version.json
similarity index 100%
rename from arm/Microsoft.Network/azureFirewalls/version.json
rename to modules/Microsoft.Network/azureFirewalls/version.json
diff --git a/arm/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/min.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/.parameters/parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/.parameters/parameters.json
rename to modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/bastionHosts/deploy.bicep b/modules/Microsoft.Network/bastionHosts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/deploy.bicep
rename to modules/Microsoft.Network/bastionHosts/deploy.bicep
diff --git a/arm/Microsoft.Network/bastionHosts/readme.md b/modules/Microsoft.Network/bastionHosts/readme.md
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/readme.md
rename to modules/Microsoft.Network/bastionHosts/readme.md
diff --git a/arm/Microsoft.Network/bastionHosts/version.json b/modules/Microsoft.Network/bastionHosts/version.json
similarity index 100%
rename from arm/Microsoft.Network/bastionHosts/version.json
rename to modules/Microsoft.Network/bastionHosts/version.json
diff --git a/arm/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
rename to modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
diff --git a/arm/Microsoft.Network/connections/deploy.bicep b/modules/Microsoft.Network/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/connections/deploy.bicep
rename to modules/Microsoft.Network/connections/deploy.bicep
diff --git a/arm/Microsoft.Network/connections/readme.md b/modules/Microsoft.Network/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/connections/readme.md
rename to modules/Microsoft.Network/connections/readme.md
diff --git a/arm/Microsoft.Network/connections/version.json b/modules/Microsoft.Network/connections/version.json
similarity index 100%
rename from arm/Microsoft.Network/connections/version.json
rename to modules/Microsoft.Network/connections/version.json
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json b/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
rename to modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep b/modules/Microsoft.Network/ddosProtectionPlans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep
rename to modules/Microsoft.Network/ddosProtectionPlans/deploy.bicep
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/readme.md b/modules/Microsoft.Network/ddosProtectionPlans/readme.md
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/readme.md
rename to modules/Microsoft.Network/ddosProtectionPlans/readme.md
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/version.json b/modules/Microsoft.Network/ddosProtectionPlans/version.json
similarity index 100%
rename from arm/Microsoft.Network/ddosProtectionPlans/version.json
rename to modules/Microsoft.Network/ddosProtectionPlans/version.json
diff --git a/arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json b/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
rename to modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/modules/Microsoft.Network/expressRouteCircuits/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/deploy.bicep
rename to modules/Microsoft.Network/expressRouteCircuits/deploy.bicep
diff --git a/arm/Microsoft.Network/expressRouteCircuits/readme.md b/modules/Microsoft.Network/expressRouteCircuits/readme.md
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/readme.md
rename to modules/Microsoft.Network/expressRouteCircuits/readme.md
diff --git a/arm/Microsoft.Network/expressRouteCircuits/version.json b/modules/Microsoft.Network/expressRouteCircuits/version.json
similarity index 100%
rename from arm/Microsoft.Network/expressRouteCircuits/version.json
rename to modules/Microsoft.Network/expressRouteCircuits/version.json
diff --git a/arm/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/firewallPolicies/.parameters/parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/.parameters/parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/firewallPolicies/deploy.bicep b/modules/Microsoft.Network/firewallPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/deploy.bicep
rename to modules/Microsoft.Network/firewallPolicies/deploy.bicep
diff --git a/arm/Microsoft.Network/firewallPolicies/readme.md b/modules/Microsoft.Network/firewallPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/readme.md
rename to modules/Microsoft.Network/firewallPolicies/readme.md
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
rename to modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
diff --git a/arm/Microsoft.Network/firewallPolicies/version.json b/modules/Microsoft.Network/firewallPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Network/firewallPolicies/version.json
rename to modules/Microsoft.Network/firewallPolicies/version.json
diff --git a/arm/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/frontDoors/.parameters/parameters.json b/modules/Microsoft.Network/frontDoors/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/.parameters/parameters.json
rename to modules/Microsoft.Network/frontDoors/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/frontDoors/deploy.bicep b/modules/Microsoft.Network/frontDoors/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/deploy.bicep
rename to modules/Microsoft.Network/frontDoors/deploy.bicep
diff --git a/arm/Microsoft.Network/frontDoors/readme.md b/modules/Microsoft.Network/frontDoors/readme.md
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/readme.md
rename to modules/Microsoft.Network/frontDoors/readme.md
diff --git a/arm/Microsoft.Network/frontDoors/version.json b/modules/Microsoft.Network/frontDoors/version.json
similarity index 100%
rename from arm/Microsoft.Network/frontDoors/version.json
rename to modules/Microsoft.Network/frontDoors/version.json
diff --git a/arm/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/ipGroups/.parameters/parameters.json b/modules/Microsoft.Network/ipGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/ipGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/modules/Microsoft.Network/ipGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/deploy.bicep
rename to modules/Microsoft.Network/ipGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/ipGroups/readme.md b/modules/Microsoft.Network/ipGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/readme.md
rename to modules/Microsoft.Network/ipGroups/readme.md
diff --git a/arm/Microsoft.Network/ipGroups/version.json b/modules/Microsoft.Network/ipGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/ipGroups/version.json
rename to modules/Microsoft.Network/ipGroups/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/.parameters/parameters.json
rename to modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep b/modules/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
rename to modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/deploy.bicep b/modules/Microsoft.Network/loadBalancers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep b/modules/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
rename to modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json
diff --git a/arm/Microsoft.Network/loadBalancers/readme.md b/modules/Microsoft.Network/loadBalancers/readme.md
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/readme.md
rename to modules/Microsoft.Network/loadBalancers/readme.md
diff --git a/arm/Microsoft.Network/loadBalancers/version.json b/modules/Microsoft.Network/loadBalancers/version.json
similarity index 100%
rename from arm/Microsoft.Network/loadBalancers/version.json
rename to modules/Microsoft.Network/loadBalancers/version.json
diff --git a/arm/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/localNetworkGateways/.parameters/parameters.json b/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep b/modules/Microsoft.Network/localNetworkGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/deploy.bicep
rename to modules/Microsoft.Network/localNetworkGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/localNetworkGateways/readme.md b/modules/Microsoft.Network/localNetworkGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/readme.md
rename to modules/Microsoft.Network/localNetworkGateways/readme.md
diff --git a/arm/Microsoft.Network/localNetworkGateways/version.json b/modules/Microsoft.Network/localNetworkGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/localNetworkGateways/version.json
rename to modules/Microsoft.Network/localNetworkGateways/version.json
diff --git a/arm/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/natGateways/.parameters/parameters.json b/modules/Microsoft.Network/natGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/natGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/natGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/natGateways/deploy.bicep b/modules/Microsoft.Network/natGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/natGateways/deploy.bicep
rename to modules/Microsoft.Network/natGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/natGateways/readme.md b/modules/Microsoft.Network/natGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/natGateways/readme.md
rename to modules/Microsoft.Network/natGateways/readme.md
diff --git a/arm/Microsoft.Network/natGateways/version.json b/modules/Microsoft.Network/natGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/natGateways/version.json
rename to modules/Microsoft.Network/natGateways/version.json
diff --git a/arm/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkInterfaces/.parameters/parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/.parameters/parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkInterfaces/deploy.bicep b/modules/Microsoft.Network/networkInterfaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/deploy.bicep
rename to modules/Microsoft.Network/networkInterfaces/deploy.bicep
diff --git a/arm/Microsoft.Network/networkInterfaces/readme.md b/modules/Microsoft.Network/networkInterfaces/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/readme.md
rename to modules/Microsoft.Network/networkInterfaces/readme.md
diff --git a/arm/Microsoft.Network/networkInterfaces/version.json b/modules/Microsoft.Network/networkInterfaces/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkInterfaces/version.json
rename to modules/Microsoft.Network/networkInterfaces/version.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep b/modules/Microsoft.Network/networkSecurityGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/deploy.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/readme.md b/modules/Microsoft.Network/networkSecurityGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/readme.md
rename to modules/Microsoft.Network/networkSecurityGroups/readme.md
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep b/modules/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/deploy.bicep
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/readme.md b/modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md
diff --git a/arm/Microsoft.Network/networkSecurityGroups/securityRules/version.json b/modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/securityRules/version.json
rename to modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json
diff --git a/arm/Microsoft.Network/networkSecurityGroups/version.json b/modules/Microsoft.Network/networkSecurityGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkSecurityGroups/version.json
rename to modules/Microsoft.Network/networkSecurityGroups/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/.parameters/min.parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/.parameters/parameters.json
rename to modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep b/modules/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
rename to modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/deploy.bicep b/modules/Microsoft.Network/networkWatchers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep b/modules/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
rename to modules/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md b/modules/Microsoft.Network/networkWatchers/flowLogs/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/readme.md
rename to modules/Microsoft.Network/networkWatchers/flowLogs/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json b/modules/Microsoft.Network/networkWatchers/flowLogs/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/flowLogs/version.json
rename to modules/Microsoft.Network/networkWatchers/flowLogs/version.json
diff --git a/arm/Microsoft.Network/networkWatchers/readme.md b/modules/Microsoft.Network/networkWatchers/readme.md
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/readme.md
rename to modules/Microsoft.Network/networkWatchers/readme.md
diff --git a/arm/Microsoft.Network/networkWatchers/version.json b/modules/Microsoft.Network/networkWatchers/version.json
similarity index 100%
rename from arm/Microsoft.Network/networkWatchers/version.json
rename to modules/Microsoft.Network/networkWatchers/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/A/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/A/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/A/readme.md b/modules/Microsoft.Network/privateDnsZones/A/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/readme.md
rename to modules/Microsoft.Network/privateDnsZones/A/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/A/version.json b/modules/Microsoft.Network/privateDnsZones/A/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/A/version.json
rename to modules/Microsoft.Network/privateDnsZones/A/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md b/modules/Microsoft.Network/privateDnsZones/AAAA/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/readme.md
rename to modules/Microsoft.Network/privateDnsZones/AAAA/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/version.json b/modules/Microsoft.Network/privateDnsZones/AAAA/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/AAAA/version.json
rename to modules/Microsoft.Network/privateDnsZones/AAAA/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md b/modules/Microsoft.Network/privateDnsZones/CNAME/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/readme.md
rename to modules/Microsoft.Network/privateDnsZones/CNAME/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/version.json b/modules/Microsoft.Network/privateDnsZones/CNAME/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/CNAME/version.json
rename to modules/Microsoft.Network/privateDnsZones/CNAME/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/MX/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/MX/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/readme.md b/modules/Microsoft.Network/privateDnsZones/MX/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/readme.md
rename to modules/Microsoft.Network/privateDnsZones/MX/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/MX/version.json b/modules/Microsoft.Network/privateDnsZones/MX/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/MX/version.json
rename to modules/Microsoft.Network/privateDnsZones/MX/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/PTR/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/readme.md b/modules/Microsoft.Network/privateDnsZones/PTR/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/readme.md
rename to modules/Microsoft.Network/privateDnsZones/PTR/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/version.json b/modules/Microsoft.Network/privateDnsZones/PTR/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/PTR/version.json
rename to modules/Microsoft.Network/privateDnsZones/PTR/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/SOA/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/readme.md b/modules/Microsoft.Network/privateDnsZones/SOA/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/readme.md
rename to modules/Microsoft.Network/privateDnsZones/SOA/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/version.json b/modules/Microsoft.Network/privateDnsZones/SOA/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SOA/version.json
rename to modules/Microsoft.Network/privateDnsZones/SOA/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/SRV/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/readme.md b/modules/Microsoft.Network/privateDnsZones/SRV/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/readme.md
rename to modules/Microsoft.Network/privateDnsZones/SRV/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/version.json b/modules/Microsoft.Network/privateDnsZones/SRV/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/SRV/version.json
rename to modules/Microsoft.Network/privateDnsZones/SRV/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/TXT/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/readme.md b/modules/Microsoft.Network/privateDnsZones/TXT/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/readme.md
rename to modules/Microsoft.Network/privateDnsZones/TXT/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/version.json b/modules/Microsoft.Network/privateDnsZones/TXT/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/TXT/version.json
rename to modules/Microsoft.Network/privateDnsZones/TXT/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/readme.md b/modules/Microsoft.Network/privateDnsZones/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/readme.md
rename to modules/Microsoft.Network/privateDnsZones/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/version.json b/modules/Microsoft.Network/privateDnsZones/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/version.json
rename to modules/Microsoft.Network/privateDnsZones/version.json
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
rename to modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
diff --git a/arm/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/privateEndpoints/.parameters/parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/.parameters/parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/privateEndpoints/deploy.bicep b/modules/Microsoft.Network/privateEndpoints/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/deploy.bicep
rename to modules/Microsoft.Network/privateEndpoints/deploy.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
rename to modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
diff --git a/arm/Microsoft.Network/privateEndpoints/readme.md b/modules/Microsoft.Network/privateEndpoints/readme.md
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/readme.md
rename to modules/Microsoft.Network/privateEndpoints/readme.md
diff --git a/arm/Microsoft.Network/privateEndpoints/version.json b/modules/Microsoft.Network/privateEndpoints/version.json
similarity index 100%
rename from arm/Microsoft.Network/privateEndpoints/version.json
rename to modules/Microsoft.Network/privateEndpoints/version.json
diff --git a/arm/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/publicIPAddresses/.parameters/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep b/modules/Microsoft.Network/publicIPAddresses/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/deploy.bicep
rename to modules/Microsoft.Network/publicIPAddresses/deploy.bicep
diff --git a/arm/Microsoft.Network/publicIPAddresses/readme.md b/modules/Microsoft.Network/publicIPAddresses/readme.md
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/readme.md
rename to modules/Microsoft.Network/publicIPAddresses/readme.md
diff --git a/arm/Microsoft.Network/publicIPAddresses/version.json b/modules/Microsoft.Network/publicIPAddresses/version.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPAddresses/version.json
rename to modules/Microsoft.Network/publicIPAddresses/version.json
diff --git a/arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json b/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep b/modules/Microsoft.Network/publicIPPrefixes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/deploy.bicep
rename to modules/Microsoft.Network/publicIPPrefixes/deploy.bicep
diff --git a/arm/Microsoft.Network/publicIPPrefixes/readme.md b/modules/Microsoft.Network/publicIPPrefixes/readme.md
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/readme.md
rename to modules/Microsoft.Network/publicIPPrefixes/readme.md
diff --git a/arm/Microsoft.Network/publicIPPrefixes/version.json b/modules/Microsoft.Network/publicIPPrefixes/version.json
similarity index 100%
rename from arm/Microsoft.Network/publicIPPrefixes/version.json
rename to modules/Microsoft.Network/publicIPPrefixes/version.json
diff --git a/arm/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/routeTables/.parameters/parameters.json b/modules/Microsoft.Network/routeTables/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/routeTables/.parameters/parameters.json
rename to modules/Microsoft.Network/routeTables/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/routeTables/deploy.bicep b/modules/Microsoft.Network/routeTables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/routeTables/deploy.bicep
rename to modules/Microsoft.Network/routeTables/deploy.bicep
diff --git a/arm/Microsoft.Network/routeTables/readme.md b/modules/Microsoft.Network/routeTables/readme.md
similarity index 100%
rename from arm/Microsoft.Network/routeTables/readme.md
rename to modules/Microsoft.Network/routeTables/readme.md
diff --git a/arm/Microsoft.Network/routeTables/version.json b/modules/Microsoft.Network/routeTables/version.json
similarity index 100%
rename from arm/Microsoft.Network/routeTables/version.json
rename to modules/Microsoft.Network/routeTables/version.json
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json b/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/modules/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
rename to modules/Microsoft.Network/trafficmanagerprofiles/deploy.bicep
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md b/modules/Microsoft.Network/trafficmanagerprofiles/readme.md
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/readme.md
rename to modules/Microsoft.Network/trafficmanagerprofiles/readme.md
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/version.json b/modules/Microsoft.Network/trafficmanagerprofiles/version.json
similarity index 100%
rename from arm/Microsoft.Network/trafficmanagerprofiles/version.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualHubs/.parameters/parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualHubs/deploy.bicep b/modules/Microsoft.Network/virtualHubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep b/modules/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md b/modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/version.json b/modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubRouteTables/version.json
rename to modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json b/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
rename to modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json
diff --git a/arm/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/readme.md
rename to modules/Microsoft.Network/virtualHubs/readme.md
diff --git a/arm/Microsoft.Network/virtualHubs/version.json b/modules/Microsoft.Network/virtualHubs/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualHubs/version.json
rename to modules/Microsoft.Network/virtualHubs/version.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep b/modules/Microsoft.Network/virtualNetworkGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworkGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/readme.md b/modules/Microsoft.Network/virtualNetworkGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/readme.md
rename to modules/Microsoft.Network/virtualNetworkGateways/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/version.json b/modules/Microsoft.Network/virtualNetworkGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworkGateways/version.json
rename to modules/Microsoft.Network/virtualNetworkGateways/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/readme.md b/modules/Microsoft.Network/virtualNetworks/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/readme.md
rename to modules/Microsoft.Network/virtualNetworks/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md b/modules/Microsoft.Network/virtualNetworks/subnets/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/readme.md
rename to modules/Microsoft.Network/virtualNetworks/subnets/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/version.json b/modules/Microsoft.Network/virtualNetworks/subnets/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/subnets/version.json
rename to modules/Microsoft.Network/virtualNetworks/subnets/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/version.json b/modules/Microsoft.Network/virtualNetworks/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/version.json
rename to modules/Microsoft.Network/virtualNetworks/version.json
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
rename to modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
diff --git a/arm/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/virtualWans/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/virtualWans/.parameters/parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualWans/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/virtualWans/deploy.bicep b/modules/Microsoft.Network/virtualWans/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/deploy.bicep
rename to modules/Microsoft.Network/virtualWans/deploy.bicep
diff --git a/arm/Microsoft.Network/virtualWans/readme.md b/modules/Microsoft.Network/virtualWans/readme.md
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/readme.md
rename to modules/Microsoft.Network/virtualWans/readme.md
diff --git a/arm/Microsoft.Network/virtualWans/version.json b/modules/Microsoft.Network/virtualWans/version.json
similarity index 100%
rename from arm/Microsoft.Network/virtualWans/version.json
rename to modules/Microsoft.Network/virtualWans/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/vpnGateways/.parameters/parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep b/modules/Microsoft.Network/vpnGateways/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/connections/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/connections/readme.md b/modules/Microsoft.Network/vpnGateways/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/readme.md
rename to modules/Microsoft.Network/vpnGateways/connections/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/connections/version.json b/modules/Microsoft.Network/vpnGateways/connections/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/connections/version.json
rename to modules/Microsoft.Network/vpnGateways/connections/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/deploy.bicep b/modules/Microsoft.Network/vpnGateways/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep b/modules/Microsoft.Network/vpnGateways/natRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep
rename to modules/Microsoft.Network/vpnGateways/natRules/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/readme.md b/modules/Microsoft.Network/vpnGateways/natRules/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/readme.md
rename to modules/Microsoft.Network/vpnGateways/natRules/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/natRules/version.json b/modules/Microsoft.Network/vpnGateways/natRules/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/natRules/version.json
rename to modules/Microsoft.Network/vpnGateways/natRules/version.json
diff --git a/arm/Microsoft.Network/vpnGateways/readme.md b/modules/Microsoft.Network/vpnGateways/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/readme.md
rename to modules/Microsoft.Network/vpnGateways/readme.md
diff --git a/arm/Microsoft.Network/vpnGateways/version.json b/modules/Microsoft.Network/vpnGateways/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnGateways/version.json
rename to modules/Microsoft.Network/vpnGateways/version.json
diff --git a/arm/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Network/vpnSites/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Network/vpnSites/.parameters/parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnSites/.parameters/parameters.json
diff --git a/arm/Microsoft.Network/vpnSites/deploy.bicep b/modules/Microsoft.Network/vpnSites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/deploy.bicep
rename to modules/Microsoft.Network/vpnSites/deploy.bicep
diff --git a/arm/Microsoft.Network/vpnSites/readme.md b/modules/Microsoft.Network/vpnSites/readme.md
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/readme.md
rename to modules/Microsoft.Network/vpnSites/readme.md
diff --git a/arm/Microsoft.Network/vpnSites/version.json b/modules/Microsoft.Network/vpnSites/version.json
similarity index 100%
rename from arm/Microsoft.Network/vpnSites/version.json
rename to modules/Microsoft.Network/vpnSites/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md b/modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/modules/Microsoft.OperationalInsights/workspaces/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
diff --git a/arm/Microsoft.OperationalInsights/workspaces/version.json b/modules/Microsoft.OperationalInsights/workspaces/version.json
similarity index 100%
rename from arm/Microsoft.OperationalInsights/workspaces/version.json
rename to modules/Microsoft.OperationalInsights/workspaces/version.json
diff --git a/arm/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
diff --git a/arm/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
diff --git a/arm/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
diff --git a/arm/Microsoft.OperationsManagement/solutions/deploy.bicep b/modules/Microsoft.OperationsManagement/solutions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/deploy.bicep
rename to modules/Microsoft.OperationsManagement/solutions/deploy.bicep
diff --git a/arm/Microsoft.OperationsManagement/solutions/readme.md b/modules/Microsoft.OperationsManagement/solutions/readme.md
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/readme.md
rename to modules/Microsoft.OperationsManagement/solutions/readme.md
diff --git a/arm/Microsoft.OperationsManagement/solutions/version.json b/modules/Microsoft.OperationsManagement/solutions/version.json
similarity index 100%
rename from arm/Microsoft.OperationsManagement/solutions/version.json
rename to modules/Microsoft.OperationsManagement/solutions/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/.parameters/parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
rename to modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
rename to modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/readme.md b/modules/Microsoft.RecoveryServices/vaults/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/deploy.bicep
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md
diff --git a/arm/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json b/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
rename to modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json
diff --git a/arm/Microsoft.RecoveryServices/vaults/version.json b/modules/Microsoft.RecoveryServices/vaults/version.json
similarity index 100%
rename from arm/Microsoft.RecoveryServices/vaults/version.json
rename to modules/Microsoft.RecoveryServices/vaults/version.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
diff --git a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep b/modules/Microsoft.Resources/deploymentScripts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/deploy.bicep
rename to modules/Microsoft.Resources/deploymentScripts/deploy.bicep
diff --git a/arm/Microsoft.Resources/deploymentScripts/readme.md b/modules/Microsoft.Resources/deploymentScripts/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/readme.md
rename to modules/Microsoft.Resources/deploymentScripts/readme.md
diff --git a/arm/Microsoft.Resources/deploymentScripts/version.json b/modules/Microsoft.Resources/deploymentScripts/version.json
similarity index 100%
rename from arm/Microsoft.Resources/deploymentScripts/version.json
rename to modules/Microsoft.Resources/deploymentScripts/version.json
diff --git a/arm/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Resources/resourceGroups/.parameters/parameters.json b/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/.parameters/parameters.json
rename to modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
diff --git a/arm/Microsoft.Resources/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/resourceGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/deploy.bicep
rename to modules/Microsoft.Resources/resourceGroups/deploy.bicep
diff --git a/arm/Microsoft.Resources/resourceGroups/readme.md b/modules/Microsoft.Resources/resourceGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/readme.md
rename to modules/Microsoft.Resources/resourceGroups/readme.md
diff --git a/arm/Microsoft.Resources/resourceGroups/version.json b/modules/Microsoft.Resources/resourceGroups/version.json
similarity index 100%
rename from arm/Microsoft.Resources/resourceGroups/version.json
rename to modules/Microsoft.Resources/resourceGroups/version.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/min.parameters.json b/modules/Microsoft.Resources/tags/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/min.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/rg.parameters.json b/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/rg.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
diff --git a/arm/Microsoft.Resources/tags/.parameters/sub.parameters.json b/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/.parameters/sub.parameters.json
rename to modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
diff --git a/arm/Microsoft.Resources/tags/deploy.bicep b/modules/Microsoft.Resources/tags/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/deploy.bicep
rename to modules/Microsoft.Resources/tags/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/readme.md b/modules/Microsoft.Resources/tags/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/readme.md
rename to modules/Microsoft.Resources/tags/readme.md
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep b/modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
rename to modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/tags/resourceGroups/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/deploy.bicep
rename to modules/Microsoft.Resources/tags/resourceGroups/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/readme.md b/modules/Microsoft.Resources/tags/resourceGroups/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/readme.md
rename to modules/Microsoft.Resources/tags/resourceGroups/readme.md
diff --git a/arm/Microsoft.Resources/tags/resourceGroups/version.json b/modules/Microsoft.Resources/tags/resourceGroups/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/resourceGroups/version.json
rename to modules/Microsoft.Resources/tags/resourceGroups/version.json
diff --git a/arm/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep b/modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
rename to modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep
diff --git a/arm/Microsoft.Resources/tags/subscriptions/deploy.bicep b/modules/Microsoft.Resources/tags/subscriptions/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/deploy.bicep
rename to modules/Microsoft.Resources/tags/subscriptions/deploy.bicep
diff --git a/arm/Microsoft.Resources/tags/subscriptions/readme.md b/modules/Microsoft.Resources/tags/subscriptions/readme.md
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/readme.md
rename to modules/Microsoft.Resources/tags/subscriptions/readme.md
diff --git a/arm/Microsoft.Resources/tags/subscriptions/version.json b/modules/Microsoft.Resources/tags/subscriptions/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/subscriptions/version.json
rename to modules/Microsoft.Resources/tags/subscriptions/version.json
diff --git a/arm/Microsoft.Resources/tags/version.json b/modules/Microsoft.Resources/tags/version.json
similarity index 100%
rename from arm/Microsoft.Resources/tags/version.json
rename to modules/Microsoft.Resources/tags/version.json
diff --git a/arm/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep b/modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
rename to modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep
diff --git a/arm/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json b/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
rename to modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
diff --git a/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep b/modules/Microsoft.Security/azureSecurityCenter/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/deploy.bicep
rename to modules/Microsoft.Security/azureSecurityCenter/deploy.bicep
diff --git a/arm/Microsoft.Security/azureSecurityCenter/readme.md b/modules/Microsoft.Security/azureSecurityCenter/readme.md
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/readme.md
rename to modules/Microsoft.Security/azureSecurityCenter/readme.md
diff --git a/arm/Microsoft.Security/azureSecurityCenter/version.json b/modules/Microsoft.Security/azureSecurityCenter/version.json
similarity index 100%
rename from arm/Microsoft.Security/azureSecurityCenter/version.json
rename to modules/Microsoft.Security/azureSecurityCenter/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/.parameters/parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
rename to modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json b/modules/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
rename to modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/queues/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/readme.md b/modules/Microsoft.ServiceBus/namespaces/queues/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/queues/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/version.json b/modules/Microsoft.ServiceBus/namespaces/queues/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/queues/version.json
rename to modules/Microsoft.ServiceBus/namespaces/queues/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/readme.md b/modules/Microsoft.ServiceBus/namespaces/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json b/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/topics/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/readme.md b/modules/Microsoft.ServiceBus/namespaces/topics/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/topics/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/version.json b/modules/Microsoft.ServiceBus/namespaces/topics/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/topics/version.json
rename to modules/Microsoft.ServiceBus/namespaces/topics/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/version.json b/modules/Microsoft.ServiceBus/namespaces/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/version.json
rename to modules/Microsoft.ServiceBus/namespaces/version.json
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json b/modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
similarity index 100%
rename from arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
rename to modules/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
rename to modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
diff --git a/arm/Microsoft.ServiceFabric/clusters/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/deploy.bicep
rename to modules/Microsoft.ServiceFabric/clusters/deploy.bicep
diff --git a/arm/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/readme.md
rename to modules/Microsoft.ServiceFabric/clusters/readme.md
diff --git a/arm/Microsoft.ServiceFabric/clusters/version.json b/modules/Microsoft.ServiceFabric/clusters/version.json
similarity index 100%
rename from arm/Microsoft.ServiceFabric/clusters/version.json
rename to modules/Microsoft.ServiceFabric/clusters/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json b/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/.parameters/parameters.json
rename to modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep b/modules/Microsoft.Sql/managedInstances/administrators/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/administrators/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/readme.md b/modules/Microsoft.Sql/managedInstances/administrators/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/readme.md
rename to modules/Microsoft.Sql/managedInstances/administrators/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/version.json b/modules/Microsoft.Sql/managedInstances/administrators/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/administrators/version.json
rename to modules/Microsoft.Sql/managedInstances/administrators/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep b/modules/Microsoft.Sql/managedInstances/databases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/databases/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/databases/readme.md b/modules/Microsoft.Sql/managedInstances/databases/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/readme.md
rename to modules/Microsoft.Sql/managedInstances/databases/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/databases/version.json b/modules/Microsoft.Sql/managedInstances/databases/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/databases/version.json
rename to modules/Microsoft.Sql/managedInstances/databases/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/deploy.bicep b/modules/Microsoft.Sql/managedInstances/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep b/modules/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md b/modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
rename to modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep b/modules/Microsoft.Sql/managedInstances/keys/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/keys/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/keys/readme.md b/modules/Microsoft.Sql/managedInstances/keys/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/readme.md
rename to modules/Microsoft.Sql/managedInstances/keys/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/keys/version.json b/modules/Microsoft.Sql/managedInstances/keys/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/keys/version.json
rename to modules/Microsoft.Sql/managedInstances/keys/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/readme.md b/modules/Microsoft.Sql/managedInstances/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/readme.md
rename to modules/Microsoft.Sql/managedInstances/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
rename to modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/version.json b/modules/Microsoft.Sql/managedInstances/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/version.json
rename to modules/Microsoft.Sql/managedInstances/version.json
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
similarity index 100%
rename from arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
rename to modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Sql/servers/.parameters/admin.parameters.json b/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/.parameters/admin.parameters.json
rename to modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/modules/Microsoft.Sql/servers/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/.parameters/parameters.json
rename to modules/Microsoft.Sql/servers/.parameters/parameters.json
diff --git a/arm/Microsoft.Sql/servers/databases/deploy.bicep b/modules/Microsoft.Sql/servers/databases/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/deploy.bicep
rename to modules/Microsoft.Sql/servers/databases/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/modules/Microsoft.Sql/servers/databases/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/readme.md
rename to modules/Microsoft.Sql/servers/databases/readme.md
diff --git a/arm/Microsoft.Sql/servers/databases/version.json b/modules/Microsoft.Sql/servers/databases/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/databases/version.json
rename to modules/Microsoft.Sql/servers/databases/version.json
diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/modules/Microsoft.Sql/servers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/deploy.bicep
rename to modules/Microsoft.Sql/servers/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep b/modules/Microsoft.Sql/servers/firewallRules/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/deploy.bicep
rename to modules/Microsoft.Sql/servers/firewallRules/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/firewallRules/readme.md b/modules/Microsoft.Sql/servers/firewallRules/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/readme.md
rename to modules/Microsoft.Sql/servers/firewallRules/readme.md
diff --git a/arm/Microsoft.Sql/servers/firewallRules/version.json b/modules/Microsoft.Sql/servers/firewallRules/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/firewallRules/version.json
rename to modules/Microsoft.Sql/servers/firewallRules/version.json
diff --git a/arm/Microsoft.Sql/servers/readme.md b/modules/Microsoft.Sql/servers/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/readme.md
rename to modules/Microsoft.Sql/servers/readme.md
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep b/modules/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md b/modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json b/modules/Microsoft.Sql/servers/securityAlertPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
rename to modules/Microsoft.Sql/servers/securityAlertPolicies/version.json
diff --git a/arm/Microsoft.Sql/servers/version.json b/modules/Microsoft.Sql/servers/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/version.json
rename to modules/Microsoft.Sql/servers/version.json
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/deploy.bicep
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md
diff --git a/arm/Microsoft.Sql/servers/vulnerabilityAssessments/version.json b/modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
similarity index 100%
rename from arm/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
rename to modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md b/modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/blobServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/modules/Microsoft.Storage/storageAccounts/blobServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/blobServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/blobServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md b/modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/fileServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
rename to modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json b/modules/Microsoft.Storage/storageAccounts/fileServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/fileServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/fileServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md b/modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
rename to modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
rename to modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md b/modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/queueServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/modules/Microsoft.Storage/storageAccounts/queueServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/queueServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/queueServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/readme.md b/modules/Microsoft.Storage/storageAccounts/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/readme.md
rename to modules/Microsoft.Storage/storageAccounts/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md b/modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/readme.md
rename to modules/Microsoft.Storage/storageAccounts/tableServices/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
rename to modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/modules/Microsoft.Storage/storageAccounts/tableServices/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/tableServices/version.json
rename to modules/Microsoft.Storage/storageAccounts/tableServices/version.json
diff --git a/arm/Microsoft.Storage/storageAccounts/version.json b/modules/Microsoft.Storage/storageAccounts/version.json
similarity index 100%
rename from arm/Microsoft.Storage/storageAccounts/version.json
rename to modules/Microsoft.Storage/storageAccounts/version.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep b/modules/Microsoft.Synapse/privateLinkHubs/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep
rename to modules/Microsoft.Synapse/privateLinkHubs/deploy.bicep
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/readme.md b/modules/Microsoft.Synapse/privateLinkHubs/readme.md
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/readme.md
rename to modules/Microsoft.Synapse/privateLinkHubs/readme.md
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/version.json b/modules/Microsoft.Synapse/privateLinkHubs/version.json
similarity index 100%
rename from arm/Microsoft.Synapse/privateLinkHubs/version.json
rename to modules/Microsoft.Synapse/privateLinkHubs/version.json
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep b/modules/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md b/modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/version.json
similarity index 100%
rename from arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/version.json
diff --git a/arm/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Web/connections/.parameters/parameters.json b/modules/Microsoft.Web/connections/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/connections/.parameters/parameters.json
rename to modules/Microsoft.Web/connections/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/connections/deploy.bicep b/modules/Microsoft.Web/connections/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/connections/deploy.bicep
rename to modules/Microsoft.Web/connections/deploy.bicep
diff --git a/arm/Microsoft.Web/connections/readme.md b/modules/Microsoft.Web/connections/readme.md
similarity index 100%
rename from arm/Microsoft.Web/connections/readme.md
rename to modules/Microsoft.Web/connections/readme.md
diff --git a/arm/Microsoft.Web/connections/version.json b/modules/Microsoft.Web/connections/version.json
similarity index 100%
rename from arm/Microsoft.Web/connections/version.json
rename to modules/Microsoft.Web/connections/version.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
diff --git a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep b/modules/Microsoft.Web/hostingEnvironments/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/deploy.bicep
rename to modules/Microsoft.Web/hostingEnvironments/deploy.bicep
diff --git a/arm/Microsoft.Web/hostingEnvironments/readme.md b/modules/Microsoft.Web/hostingEnvironments/readme.md
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/readme.md
rename to modules/Microsoft.Web/hostingEnvironments/readme.md
diff --git a/arm/Microsoft.Web/hostingEnvironments/version.json b/modules/Microsoft.Web/hostingEnvironments/version.json
similarity index 100%
rename from arm/Microsoft.Web/hostingEnvironments/version.json
rename to modules/Microsoft.Web/hostingEnvironments/version.json
diff --git a/arm/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Web/serverfarms/.parameters/parameters.json b/modules/Microsoft.Web/serverfarms/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/.parameters/parameters.json
rename to modules/Microsoft.Web/serverfarms/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/serverfarms/deploy.bicep b/modules/Microsoft.Web/serverfarms/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/deploy.bicep
rename to modules/Microsoft.Web/serverfarms/deploy.bicep
diff --git a/arm/Microsoft.Web/serverfarms/readme.md b/modules/Microsoft.Web/serverfarms/readme.md
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/readme.md
rename to modules/Microsoft.Web/serverfarms/readme.md
diff --git a/arm/Microsoft.Web/serverfarms/version.json b/modules/Microsoft.Web/serverfarms/version.json
similarity index 100%
rename from arm/Microsoft.Web/serverfarms/version.json
rename to modules/Microsoft.Web/serverfarms/version.json
diff --git a/arm/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Web/sites/.parameters/fa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/fa.min.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/fa.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/fa.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/fa.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/wa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/wa.min.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
diff --git a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/sites/.parameters/wa.parameters.json
rename to modules/Microsoft.Web/sites/.parameters/wa.parameters.json
diff --git a/arm/Microsoft.Web/sites/config-appsettings/deploy.bicep b/modules/Microsoft.Web/sites/config-appsettings/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/deploy.bicep
rename to modules/Microsoft.Web/sites/config-appsettings/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/config-appsettings/readme.md b/modules/Microsoft.Web/sites/config-appsettings/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/readme.md
rename to modules/Microsoft.Web/sites/config-appsettings/readme.md
diff --git a/arm/Microsoft.Web/sites/config-appsettings/version.json b/modules/Microsoft.Web/sites/config-appsettings/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/config-appsettings/version.json
rename to modules/Microsoft.Web/sites/config-appsettings/version.json
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep b/modules/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
rename to modules/Microsoft.Web/sites/config-authsettingsv2/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/readme.md b/modules/Microsoft.Web/sites/config-authsettingsv2/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/readme.md
rename to modules/Microsoft.Web/sites/config-authsettingsv2/readme.md
diff --git a/arm/Microsoft.Web/sites/config-authsettingsv2/version.json b/modules/Microsoft.Web/sites/config-authsettingsv2/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/config-authsettingsv2/version.json
rename to modules/Microsoft.Web/sites/config-authsettingsv2/version.json
diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/modules/Microsoft.Web/sites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/sites/deploy.bicep
rename to modules/Microsoft.Web/sites/deploy.bicep
diff --git a/arm/Microsoft.Web/sites/readme.md b/modules/Microsoft.Web/sites/readme.md
similarity index 100%
rename from arm/Microsoft.Web/sites/readme.md
rename to modules/Microsoft.Web/sites/readme.md
diff --git a/arm/Microsoft.Web/sites/version.json b/modules/Microsoft.Web/sites/version.json
similarity index 100%
rename from arm/Microsoft.Web/sites/version.json
rename to modules/Microsoft.Web/sites/version.json
diff --git a/arm/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep
rename to modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep
diff --git a/arm/Microsoft.Web/staticSites/.parameters/min.parameters.json b/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.parameters/min.parameters.json
rename to modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
diff --git a/arm/Microsoft.Web/staticSites/.parameters/parameters.json b/modules/Microsoft.Web/staticSites/.parameters/parameters.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/.parameters/parameters.json
rename to modules/Microsoft.Web/staticSites/.parameters/parameters.json
diff --git a/arm/Microsoft.Web/staticSites/deploy.bicep b/modules/Microsoft.Web/staticSites/deploy.bicep
similarity index 100%
rename from arm/Microsoft.Web/staticSites/deploy.bicep
rename to modules/Microsoft.Web/staticSites/deploy.bicep
diff --git a/arm/Microsoft.Web/staticSites/readme.md b/modules/Microsoft.Web/staticSites/readme.md
similarity index 100%
rename from arm/Microsoft.Web/staticSites/readme.md
rename to modules/Microsoft.Web/staticSites/readme.md
diff --git a/arm/Microsoft.Web/staticSites/version.json b/modules/Microsoft.Web/staticSites/version.json
similarity index 100%
rename from arm/Microsoft.Web/staticSites/version.json
rename to modules/Microsoft.Web/staticSites/version.json
diff --git a/modules/README.md b/modules/README.md
new file mode 100644
index 0000000000..23e4b05592
--- /dev/null
+++ b/modules/README.md
@@ -0,0 +1,107 @@
+In this section you can find useful information regarding the Modules that are contained in this repository.
+
+## Available Resource Modules
+
+| Name | Provider namespace | Resource Type |
+| - | - | - |
+| [Azure Active Directory Domain Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) | `MS.AAD` | [DomainServices](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AAD/DomainServices) |
+| [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) | `MS.AnalysisServices` | [servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) |
+| [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | `MS.ApiManagement` | [service](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) |
+| [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | `MS.AppConfiguration` | [configurationStores](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) |
+| [Authorization Locks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/locks) | `MS.Authorization` | [locks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/locks) |
+| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |  | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |
+| [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |  | [policyDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |
+| [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |  | [policyExemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |
+| [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |  | [policySetDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |
+| [Role Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) |  | [roleAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleAssignments) |
+| [Role Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) |  | [roleDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/roleDefinitions) |
+| [Automation Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) | `MS.Automation` | [automationAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Automation/automationAccounts) |
+| [Batch Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) | `MS.Batch` | [batchAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts) |
+| [Cognitive Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) | `MS.CognitiveServices` | [accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.CognitiveServices/accounts) |
+| [Availability Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) | `MS.Compute` | [availabilitySets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/availabilitySets) |
+| [Disk Encryption Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) |  | [diskEncryptionSets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/diskEncryptionSets) |
+| [Compute Disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) |  | [disks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/disks) |
+| [Azure Compute Galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) |  | [galleries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/galleries) |
+| [Images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) |  | [images](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/images) |
+| [Proximity Placement Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) |  | [proximityPlacementGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/proximityPlacementGroups) |
+| [Virtual Machines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) |  | [virtualMachines](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachines) |
+| [Virtual Machine Scale Sets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) |  | [virtualMachineScaleSets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Compute/virtualMachineScaleSets) |
+| [Budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) | `MS.Consumption` | [budgets](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Consumption/budgets) |
+| [Container Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) | `MS.ContainerInstance` | [containerGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerInstance/containerGroups) |
+| [Container Registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) | `MS.ContainerRegistry` | [registries](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerRegistry/registries) |
+| [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) | `MS.ContainerService` | [managedClusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) |
+| [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) | `MS.Databricks` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) |
+| [Data Factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) | `MS.DataFactory` | [factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) |
+| [DataProtection BackupVaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataProtection/backupVaults) | `MS.DataProtection` | [backupVaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataProtection/backupVaults) |
+| [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) | `MS.DesktopVirtualization` | [applicationgroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) |
+| [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |  | [hostpools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |
+| [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |  | [scalingplans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |
+| [AVD Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) |  | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/workspaces) |
+| [DocumentDB Database Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) | `MS.DocumentDB` | [databaseAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DocumentDB/databaseAccounts) |
+| [Event Grid System Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) | `MS.EventGrid` | [systemTopics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/systemTopics) |
+| [Event Grid Topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) |  | [topics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventGrid/topics) |
+| [Event Hub Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) | `MS.EventHub` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.EventHub/namespaces) |
+| [Azure Health Bots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) | `MS.HealthBot` | [healthBots](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.HealthBot/healthBots) |
+| [Action Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) | `MS.Insights` | [actionGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/actionGroups) |
+| [Activity Log Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) |  | [activityLogAlerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/activityLogAlerts) |
+| [Application Insights](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) |  | [components](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/components) |
+| [Activity Logs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) |  | [diagnosticSettings](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/diagnosticSettings) |
+| [Metric Alerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) |  | [metricAlerts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/metricAlerts) |
+| [Azure Monitor Private Link Scopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) |  | [privateLinkScopes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/privateLinkScopes) |
+| [Scheduled Query Rules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) |  | [scheduledQueryRules](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Insights/scheduledQueryRules) |
+| [Key Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) | `MS.KeyVault` | [vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KeyVault/vaults) |
+| [Kubernetes Configuration Extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) | `MS.KubernetesConfiguration` | [extensions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/extensions) |
+| [Kubernetes Configuration Flux Configurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) |  | [fluxConfigurations](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.KubernetesConfiguration/fluxConfigurations) |
+| [Logic Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) | `MS.Logic` | [workflows](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Logic/workflows) |
+| [Machine Learning Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) | `MS.achineLearningServices` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.MachineLearningServices/workspaces) |
+| [User Assigned Identities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) | `MS.anagedIdentity` | [userAssignedIdentities](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedIdentity/userAssignedIdentities) |
+| [Registration Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) | `MS.anagedServices` | [registrationDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ManagedServices/registrationDefinitions) |
+| [Management Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) | `MS.anagement` | [managementGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Management/managementGroups) |
+| [Azure NetApp Files](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) | `MS.NetApp` | [netAppAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.NetApp/netAppAccounts) |
+| [Network Application Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) | `MS.Network` | [applicationGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationGateways) |
+| [Application Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) |  | [applicationSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/applicationSecurityGroups) |
+| [Azure Firewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) |  | [azureFirewalls](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/azureFirewalls) |
+| [Bastion Hosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) |  | [bastionHosts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/bastionHosts) |
+| [Virtual Network Gateway Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) |  | [connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/connections) |
+| [DDoS Protection Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) |  | [ddosProtectionPlans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ddosProtectionPlans) |
+| [ExpressRoute Circuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) |  | [expressRouteCircuits](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/expressRouteCircuits) |
+| [Firewall Policies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) |  | [firewallPolicies](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/firewallPolicies) |
+| [Front Doors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) |  | [frontDoors](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/frontDoors) |
+| [IP Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) |  | [ipGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/ipGroups) |
+| [Load Balancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) |  | [loadBalancers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/loadBalancers) |
+| [Local Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) |  | [localNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/localNetworkGateways) |
+| [NAT Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) |  | [natGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/natGateways) |
+| [Network Interface](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) |  | [networkInterfaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkInterfaces) |
+| [Network Security Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) |  | [networkSecurityGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkSecurityGroups) |
+| [Network Watchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) |  | [networkWatchers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/networkWatchers) |
+| [Private DNS Zones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) |  | [privateDnsZones](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateDnsZones) |
+| [Private Endpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) |  | [privateEndpoints](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/privateEndpoints) |
+| [Public IP Addresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) |  | [publicIPAddresses](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPAddresses) |
+| [Public IP Prefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) |  | [publicIPPrefixes](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/publicIPPrefixes) |
+| [Route Tables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) |  | [routeTables](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/routeTables) |
+| [Traffic Manager Profiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) |  | [trafficmanagerprofiles](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/trafficmanagerprofiles) |
+| [Virtual Hubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) |  | [virtualHubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualHubs) |
+| [Virtual Network Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) |  | [virtualNetworkGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworkGateways) |
+| [Virtual Networks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) |  | [virtualNetworks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualNetworks) |
+| [Virtual WANs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) |  | [virtualWans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/virtualWans) |
+| [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |  | [vpnGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |
+| [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |  | [vpnSites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |
+| [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) | `MS.OperationalInsights` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) |
+| [OperationsManagement Solutions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationsManagement/solutions) | `MS.OperationsManagement` | [solutions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationsManagement/solutions) |
+| [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) | `MS.RecoveryServices` | [vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) |
+| [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) | `MS.Resources` | [deploymentScripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) |
+| [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |  | [resourceGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |
+| [Resources Tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) |  | [tags](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/tags) |
+| [Azure Security Center](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) | `MS.Security` | [azureSecurityCenter](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Security/azureSecurityCenter) |
+| [Service Bus Namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) | `MS.ServiceBus` | [namespaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceBus/namespaces) |
+| [Service Fabric Clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) | `MS.ServiceFabric` | [clusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ServiceFabric/clusters) |
+| [SQL Managed Instances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) | `MS.Sql` | [managedInstances](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/managedInstances) |
+| [SQL Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) |  | [servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Sql/servers) |
+| [Storage Accounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) | `MS.Storage` | [storageAccounts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Storage/storageAccounts) |
+| [Azure Synapse Analytics](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) | `MS.Synapse` | [privateLinkHubs](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Synapse/privateLinkHubs) |
+| [Image Templates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) | `MS.VirtualMachineImages` | [imageTemplates](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.VirtualMachineImages/imageTemplates) |
+| [API Connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) | `MS.Web` | [connections](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/connections) |
+| [App Service Environments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) |  | [hostingEnvironments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/hostingEnvironments) |
+| [App Service Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) |  | [serverfarms](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/serverfarms) |
+| [Web/Function Apps](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) |  | [sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/sites) |
+| [Static Web Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) |  | [staticSites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Web/staticSites) |
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
index 57c18ff75e..7993734f5a 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\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep"
+Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep"
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
@@ -98,7 +98,7 @@ function Find-TemplateFile {
 
     $FolderPath = Split-Path $Path -Parent
     $FolderName = Split-Path $Path -Leaf
-    if ($FolderName -eq 'arm') {
+    if ($FolderName -eq 'modules') {
         return $null
     }
 
@@ -126,9 +126,9 @@ Find the closest deploy.bicep/json file to the changed files in the module folde
 Mandatory. Path to the main/parent module folder.
 
 .EXAMPLE
-Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"
+Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\"
 
-C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
+C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
 
 Gets the closest deploy.bicep/json file to the changed files in the module folder structure.
 Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables'
@@ -142,7 +142,7 @@ function Get-TemplateFileToPublish {
         [Parameter(Mandatory)]
         [string] $ModuleFolderPath
     )
-    $ModuleFolderRelPath = $ModuleFolderPath.Split('/arm/')[-1]
+    $ModuleFolderRelPath = $ModuleFolderPath.Split('/modules/')[-1]
     $ModifiedFiles = Get-ModifiedFileList -Verbose
     Write-Verbose "Looking for modified files under: [$ModuleFolderRelPath]" -Verbose
     $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
@@ -157,7 +157,7 @@ function Get-TemplateFileToPublish {
 
     Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToPublish.count) -Verbose
     $TemplateFilesToPublish | ForEach-Object {
-        $RelPath = ($_.FullName).Split('/arm/')[-1]
+        $RelPath = ($_.FullName).Split('/modules/')[-1]
         $RelPath = $RelPath.Split('/deploy.')[0]
         Write-Verbose " - [$RelPath]" -Verbose
     }
@@ -179,15 +179,15 @@ Mandatory. Path to a deploy.bicep/json file.
 Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
 
 .EXAMPLE
-Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
+Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices
 
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
 la---          05.12.2021    22:45           1427 deploy.bicep
 
-    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts
+    Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.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 deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.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 deploy.bicep/json file.
 
 .EXAMPLE
-Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
 
 0.3.630
 
@@ -347,16 +347,16 @@ Generates a hashtable with template file paths to publish with a new version.
 Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep'
+Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep'
 
 
 Name               Value
 ----               -----
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
 Version            0.3.848-prerelease
-TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep
+TemplateFilePath   C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\deploy.bicep
 Version            0.3.848-prerelease
 
 Generates a hashtable with template file paths to publish and their new versions.
@@ -429,7 +429,7 @@ function Get-ModulesToPublish {
     if ($ModulesToPublish.count -gt 0) {
         Write-Verbose 'Publish the following modules:'-Verbose
         $ModulesToPublish | ForEach-Object {
-            $RelPath = ($_.TemplateFilePath).Split('/arm/')[-1]
+            $RelPath = ($_.TemplateFilePath).Split('/modules/')[-1]
             $RelPath = $RelPath.Split('/deploy.')[0]
             Write-Verbose (' - [{0}] [{1}] ' -f $RelPath, $_.Version) -Verbose
         }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 584582b4e1..319c73b919 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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -76,8 +76,8 @@ function Publish-ModuleToPrivateBicepRegistry {
             }
         }
 
-        # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        # Extracts Microsoft.KeyVault/vaults from e.g. C:\modules\Microsoft.KeyVault\vaults\deploy.bicep
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/modules/')[1]
         $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 1a0a883a5f..df821bd8d8 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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-ModuleToTemplateSpec -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
+Publish-ModuleToTemplateSpec -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -56,7 +56,7 @@ function Publish-ModuleToTemplateSpec {
     }
 
     process {
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/modules/')[1]
         $templateSpecIdentifier = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 7868fe45fa..0dd3549f87 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.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:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+Example: 'C:\modules\Microsoft.KeyVault\vaults\deploy.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-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\deploy.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'.
 #>
@@ -102,9 +102,9 @@ function Publish-ModuleToUniversalArtifactFeed {
         #################################
 
         # Universal package names => lowercase alphanumerics, dashes, dots or underscores, under 256 characters.
-        # 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
+        # 'C:\modules\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
         $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
-        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/modules/')[1]
         $universalPackageModuleName = ($universalPackageModuleName.Replace('\', '.').Replace('/', '.').toLower() -Replace '[^a-z0-9\.\-_]')[0..255] -join ''
         Write-Verbose "The universal package name is [$universalPackageModuleName]" -Verbose
 
diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index c826ed26d9..af78109452 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -18,9 +18,9 @@ Optional. The name of the resource group the deployment was happening in. Releva
 Optional. The ID of the management group to fetch deployments from. Relevant for management-group level deployments.
 
 .EXAMPLE
-Initialize-DeploymentRemoval -DeploymentName 'virtualWans-20211204T1812029146Z' -TemplateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
+Initialize-DeploymentRemoval -DeploymentName 'virtualWans-20211204T1812029146Z' -TemplateFilePath "$home/ResourceModules/modules/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
 
-Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep"
+Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/modules/Microsoft.Network/virtualWans/deploy.bicep"
 #>
 function Initialize-DeploymentRemoval {
 
diff --git a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
index bb5cef5dd6..b13d619e7b 100644
--- a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
@@ -10,7 +10,7 @@ The relative path is returned instead of the full one to make paths easier to re
 Mandatory. The module path to search in.
 
 .EXAMPLE
-Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\arm\Microsoft.Compute\virtualMachines'
+Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines'
 
 Returns the relative file paths of all parameter files of the virtual machines module.
 #>
diff --git a/utilities/tools/ConvertTo-ARMTemplate.ps1 b/utilities/tools/ConvertTo-ARMTemplate.ps1
index ed3150bef3..7c18192af5 100644
--- a/utilities/tools/ConvertTo-ARMTemplate.ps1
+++ b/utilities/tools/ConvertTo-ARMTemplate.ps1
@@ -56,7 +56,7 @@ param (
 )
 
 $rootPath = Get-Item -Path $Path | Select-Object -ExpandProperty 'FullName'
-$armFolderPath = Join-Path -Path $rootPath -ChildPath 'arm'
+$armFolderPath = Join-Path -Path $rootPath -ChildPath 'modules'
 if ($ConvertChildren) {
     $BicepFilesToConvert = Get-ChildItem -Path $armFolderPath -Filter 'deploy.bicep' -Recurse -Force
 } else {
diff --git a/utilities/tools/Get-LinkedLocalModuleList.ps1 b/utilities/tools/Get-LinkedLocalModuleList.ps1
index 347997b8e9..23d23d798c 100644
--- a/utilities/tools/Get-LinkedLocalModuleList.ps1
+++ b/utilities/tools/Get-LinkedLocalModuleList.ps1
@@ -6,14 +6,14 @@ Print a list of all local references for the modules in a given path
 The result will be a list of all modules in the given path alongside their individual references to other modules in the folder structure
 
 .PARAMETER path
-Optional. The path to search in. Defaults to the 'arm' folder
+Optional. The path to search in. Defaults to the 'modules' folder
 
 .EXAMPLE
 Get-LinkedLocalModuleList
 
 Invoke the function with the default path. Prints a list such as:
 
-> The modules in path [C:\dev\ip\Azure-ResourceModules\ResourceModules\arm] have the following local folder dependencies:
+> The modules in path [C:\dev\ip\Azure-ResourceModules\ResourceModules\modules] have the following local folder dependencies:
 >
 > Resource: Microsoft.EventGrid/topics
 > - Microsoft.EventGrid/Microsoft.Network/privateEndpoints
@@ -26,7 +26,7 @@ Get-LinkedLocalModuleList -Path './Microsoft.Sql'
 
 Get only the references of the modules in folder path './Microsoft.Sql'
 
-> The modules in path [..\..\arm\Microsoft.Sql\] have the following local folder dependencies:
+> The modules in path [..\..\modules\Microsoft.Sql\] have the following local folder dependencies:
 >
 > Resource: Microsoft.Sql/servers
 > - Microsoft.Sql/Microsoft.Network/privateEndpoints
@@ -36,7 +36,7 @@ function Get-LinkedLocalModuleList {
     [CmdletBinding()]
     param (
         [Parameter()]
-        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'arm')
+        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'modules')
     )
 
     # Load used functions
diff --git a/utilities/tools/Get-LinkedModuleList.ps1 b/utilities/tools/Get-LinkedModuleList.ps1
index 2d6a8608e1..221924185e 100644
--- a/utilities/tools/Get-LinkedModuleList.ps1
+++ b/utilities/tools/Get-LinkedModuleList.ps1
@@ -9,7 +9,7 @@ As an output you will receive a hashtable that (for each provider namespace) lis
 - Linked remote module tempaltes (e.g. via "module rg 'br/modules:(..):(..)'")
 
 .PARAMETER path
-Optional. The path to search in. Defaults to the 'arm' folder
+Optional. The path to search in. Defaults to the 'modules' folder
 
 .EXAMPLE
 Get-LinkedModuleList
@@ -40,7 +40,7 @@ function Get-LinkedModuleList {
     [CmdletBinding()]
     param (
         [Parameter()]
-        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'arm')
+        [string] $path = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'modules')
     )
 
     $resultSet = @{}
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index e169bd984a..96bfe0e955 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -350,7 +350,7 @@ function Set-DeploymentExamplesSection {
     $SectionContent = [System.Collections.ArrayList]@()
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
-    $resourceTypeIdentifier = $moduleRoot.Split('arm')[1].Replace('\', '/').TrimStart('/')
+    $resourceTypeIdentifier = $moduleRoot.Split('modules')[1].Replace('\', '/').TrimStart('/')
     $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.parameters') -Filter '*parameters.json' -Recurse
 
     $index = 1
@@ -639,7 +639,7 @@ function Set-ModuleReadMe {
         throw "Failed to compile [$TemplateFilePath]"
     }
 
-    $fullResourcePath = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/arm/')[1]
+    $fullResourcePath = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').split('/modules/')[1]
 
     # Check readme
     if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) {
@@ -674,7 +674,7 @@ function Set-ModuleReadMe {
     }
 
     # Update title
-    if ($TemplateFilePath.Replace('\', '/') -like '*/arm/*') {
+    if ($TemplateFilePath.Replace('\', '/') -like '*/modules/*') {
 
         if ($readMeFileContent[0] -notlike "*``[$fullResourcePath]``") {
             # Cut outdated
diff --git a/utilities/tools/Set-ReadMeModuleTable.ps1 b/utilities/tools/Set-ReadMeModuleTable.ps1
index 9ebb1235ea..937d1e4605 100644
--- a/utilities/tools/Set-ReadMeModuleTable.ps1
+++ b/utilities/tools/Set-ReadMeModuleTable.ps1
@@ -25,7 +25,7 @@ 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:\arm' -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'
 #>
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index dced7d66d2..4ae454ba9b 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -166,7 +166,7 @@ function Test-ModuleLocally {
 
                 Invoke-Pester -Configuration @{
                     Run    = @{
-                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'arm/.global/global.module.tests.ps1') -Data @{
+                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'modulesules/.global/global.module.tests.ps1') -Data @{
                             moduleFolderPaths = Split-Path $TemplateFilePath -Parent
                             enforcedTokenList = $enforcedTokenList
                         }
diff --git a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
index 5ac8682b7a..fb41024aaf 100644
--- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
+++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
@@ -340,10 +340,10 @@ function Get-ResolvedSubServiceRow {
                 'Name' {
                     switch ($Environment) {
                         'ADO' {
-                            $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                         'GitHub' {
-                            $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f (Get-ResourceModuleName -path $subfolder), $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                     }
 
@@ -365,10 +365,10 @@ function Get-ResolvedSubServiceRow {
                 'ResourceType' {
                     switch ($Environment) {
                         'ADO' {
-                            $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f $subName, $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f $subName, $Organization, $ProjectName, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                         'GitHub' {
-                            $row['ResourceType'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f $subName, $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
+                            $row['ResourceType'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f $subName, $Organization, $RepositoryName, $relativePath.Replace('\', '/'))
                         }
                     }
 
@@ -451,7 +451,7 @@ Get-ModulesAsMarkdownTable -path 'C:\dev\Modules' -ColumnsInOrder @('Resource Ty
 Generate a markdown table for all modules in path 'C:\dev\Modules' with only the 'Resource Type' & 'Name' columns, , sorted by 'Name'
 
 .EXAMPLE
-Get-ModulesAsMarkdownTable -path 'C:\dev\ip\Azure-Modules\ResourceModules\arm' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','TemplateType','Status','Deploy')
+Get-ModulesAsMarkdownTable -path 'C:\dev\ip\Azure-Modules\ResourceModules\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','TemplateType','Status','Deploy')
 
 Generate a markdown table for all modules in path 'C:\dev\Modules' with only the 'Name','TemplateType','Status' &'Deploy' columns, sorted by 'Name'
 #>
@@ -544,10 +544,10 @@ function Get-ModulesAsMarkdownTable {
                         'Name' {
                             switch ($Environment) {
                                 'ADO' {
-                                    $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['Name'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                                 'GitHub' {
-                                    $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['Name'] = ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                             }
                         }
@@ -568,10 +568,10 @@ function Get-ModulesAsMarkdownTable {
                         'ResourceType' {
                             switch ($Environment) {
                                 'ADO' {
-                                    $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/arm/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['ResourceType'] = ('[{0}](https://dev.azure.com/{1}/{2}/_git/{3}?path=/modules/{4})' -f (Get-ResourceModuleName -path $containedFolder), $Organization, $ProjectName, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                                 'GitHub' {
-                                    $row['ResourceType'] += ('[{0}](https://github.com/{1}/{2}/tree/main/arm/{3})' -f $containedFolderName, $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
+                                    $row['ResourceType'] += ('[{0}](https://github.com/{1}/{2}/tree/main/modules/{3})' -f $containedFolderName, $Organization, $RepositoryName, $concatedBase.Replace('\', '/'))
                                 }
                             }
 
diff --git a/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1 b/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
index 422bba1b51..b27620e05d 100644
--- a/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
+++ b/utilities/tools/tests/ConvertTo-ARMTemplate.Tests.ps1
@@ -7,7 +7,7 @@ param ()
 BeforeAll {
     # Define paths
     $rootPath = (Get-Item $PSScriptRoot).Parent.Parent.Parent.FullName
-    $armFolderPath = Join-Path $rootPath 'arm'
+    $armFolderPath = Join-Path $rootPath 'modules'
     $toolsPath = Join-Path $rootPath 'utilities' 'tools'
 
     # Collect original files

From b6890de2429401551a2036ff8014f5c4f0c6967c Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 25 Jun 2022 23:28:01 +0200
Subject: [PATCH 13/16] Cleanup rbac files

---
 .../DomainServices/.bicep/nested_rbac.bicep   |  70 ------
 .../servers/.bicep/nested_rbac.bicep          |  53 -----
 .../service/.bicep/nested_rbac.bicep          |  56 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../.bicep/nested_rbac.bicep                  |  57 -----
 .../accounts/.bicep/nested_rbac.bicep         |  70 ------
 .../availabilitySets/.bicep/nested_rbac.bicep |  61 -----
 .../.bicep/nested_rbac.bicep                  |  59 -----
 .../disks/.bicep/nested_rbac.bicep            |  60 -----
 .../galleries/.bicep/nested_rbac.bicep        |  55 -----
 .../galleries/images/.bicep/nested_rbac.bicep |  57 -----
 .../images/.bicep/nested_rbac.bicep           |  57 -----
 .../.bicep/nested_rbac.bicep                  |  59 -----
 .../.bicep/nested_rbac.bicep                  |  60 -----
 .../virtualMachines/.bicep/nested_rbac.bicep  |  61 -----
 .../registries/.bicep/nested_rbac.bicep       |  62 ------
 .../managedClusters/.bicep/nested_rbac.bicep  |  62 ------
 .../factories/.bicep/nested_rbac.bicep        |  54 -----
 .../backupVaults/.bicep/nested_rbac.bicep     |  43 ----
 .../workspaces/.bicep/nested_rbac.bicep       |  55 -----
 .../.bicep/nested_rbac.bicep                  |  61 -----
 .../hostpools/.bicep/nested_rbac.bicep        |  62 ------
 .../scalingplans/.bicep/nested_rbac.bicep     |  62 ------
 .../workspaces/.bicep/nested_rbac.bicep       |  58 -----
 .../databaseAccounts/.bicep/nested_rbac.bicep |  57 -----
 .../systemTopics/.bicep/nested_rbac.bicep     |  55 -----
 .../topics/.bicep/nested_rbac.bicep           |  55 -----
 .../namespaces/.bicep/nested_rbac.bicep       |  58 -----
 .../eventhubs/.bicep/nested_rbac.bicep        |  56 -----
 .../healthBots/.bicep/nested_rbac.bicep       |  53 -----
 .../actionGroups/.bicep/nested_rbac.bicep     |  54 -----
 .../.bicep/nested_rbac.bicep                  |  54 -----
 .../components/.bicep/nested_rbac.bicep       |  57 -----
 .../metricAlerts/.bicep/nested_rbac.bicep     |  57 -----
 .../.bicep/nested_rbac.bicep                  |  53 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../vaults/.bicep/nested_rbac.bicep           |  62 ------
 .../vaults/keys/.bicep/nested_rbac.bicep      |  61 -----
 .../vaults/secrets/.bicep/nested_rbac.bicep   |  60 -----
 .../workflows/.bicep/nested_rbac.bicep        |  56 -----
 .../workspaces/.bicep/nested_rbac.bicep       |  54 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../netAppAccounts/.bicep/nested_rbac.bicep   |  53 -----
 .../capacityPools/.bicep/nested_rbac.bicep    |  53 -----
 .../volumes/.bicep/nested_rbac.bicep          |  53 -----
 .../.bicep/nested_rbac.bicep                  |  61 -----
 .../.bicep/nested_rbac.bicep                  |  60 -----
 .../azureFirewalls/.bicep/nested_rbac.bicep   |  60 -----
 .../bastionHosts/.bicep/nested_rbac.bicep     |  60 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../frontDoors/.bicep/nested_rbac.bicep       |  56 -----
 .../ipGroups/.bicep/nested_rbac.bicep         |  55 -----
 .../loadBalancers/.bicep/nested_rbac.bicep    |  59 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../natGateways/.bicep/nested_rbac.bicep      |  55 -----
 .../.bicep/nested_rbac.bicep                  |  63 ------
 .../.bicep/nested_rbac.bicep                  |  58 -----
 .../networkWatchers/.bicep/nested_rbac.bicep  |  55 -----
 .../privateDnsZones/.bicep/nested_rbac.bicep  |  56 -----
 .../A/.bicep/nested_rbac.bicep                |  56 -----
 .../AAAA/.bicep/nested_rbac.bicep             |  56 -----
 .../CNAME/.bicep/nested_rbac.bicep            |  58 -----
 .../MX/.bicep/nested_rbac.bicep               |  56 -----
 .../PTR/.bicep/nested_rbac.bicep              |  56 -----
 .../SOA/.bicep/nested_rbac.bicep              |  56 -----
 .../SRV/.bicep/nested_rbac.bicep              |  56 -----
 .../TXT/.bicep/nested_rbac.bicep              |  56 -----
 .../privateEndpoints/.bicep/nested_rbac.bicep |  55 -----
 .../.bicep/nested_rbac.bicep                  |  59 -----
 .../publicIPPrefixes/.bicep/nested_rbac.bicep |  55 -----
 .../routeTables/.bicep/nested_rbac.bicep      |  56 -----
 .../.bicep/nested_rbac.bicep                  |  56 -----
 .../.bicep/nested_rbac.bicep                  |  55 -----
 .../virtualNetworks/.bicep/nested_rbac.bicep  |  70 ------
 .../subnets/.bicep/nested_rbac.bicep          |  70 ------
 .../virtualWans/.bicep/nested_rbac.bicep      |  55 -----
 .../vpnSites/.bicep/nested_rbac.bicep         |  37 ----
 .../workspaces/.bicep/nested_rbac.bicep       |  60 -----
 .../vaults/.bicep/nested_rbac.bicep           |  60 -----
 .../resourceGroups/.bicep/nested_rbac.bicep   | 208 ------------------
 .../namespaces/.bicep/nested_rbac.bicep       |  56 -----
 .../queues/.bicep/nested_rbac.bicep           |  56 -----
 .../topics/.bicep/nested_rbac.bicep           |  56 -----
 .../clusters/.bicep/nested_rbac.bicep         |  53 -----
 .../managedInstances/.bicep/nested_rbac.bicep |  56 -----
 .../servers/.bicep/nested_rbac.bicep          |  57 -----
 .../storageAccounts/.bicep/nested_rbac.bicep  |  80 -------
 .../containers/.bicep/nested_rbac.bicep       |  71 ------
 .../shares/.bicep/nested_rbac.bicep           |  80 -------
 .../queues/.bicep/nested_rbac.bicep           |  77 -------
 .../privateLinkHubs/.bicep/nested_rbac.bicep  |  53 -----
 .../imageTemplates/.bicep/nested_rbac.bicep   |  53 -----
 .../connections/.bicep/nested_rbac.bicep      |  55 -----
 .../.bicep/nested_rbac.bicep                  |  54 -----
 .../serverfarms/.bicep/nested_rbac.bicep      |  57 -----
 .../sites/.bicep/nested_rbac.bicep            |  55 -----
 .../staticSites/.bicep/nested_rbac.bicep      |  34 ---
 98 files changed, 5792 deletions(-)
 delete mode 100644 modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep
 delete mode 100644 modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep

diff --git a/modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep b/modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4e34d1e5d3..0000000000
--- a/modules/Microsoft.AAD/DomainServices/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,70 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'Cosmos DB Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '230815da-be43-4aae-9cb4-875f7bd000aa')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'DocumentDB Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5bd9cd88-fe45-4216-938b-f97437e15450')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource AzureADDS 'Microsoft.AAD/DomainServices@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(AzureADDS.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: AzureADDS
-}]
diff --git a/modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep b/modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
deleted file mode 100644
index 5325be4d3d..0000000000
--- a/modules/Microsoft.AnalysisServices/servers/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource server 'Microsoft.AnalysisServices/servers@2017-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(server.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: server
-}]
diff --git a/modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep b/modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
deleted file mode 100644
index 1679432ec9..0000000000
--- a/modules/Microsoft.ApiManagement/service/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'API Management Service Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '312a565d-c81f-4fd8-895a-4e21e48d571c')
-  'API Management Service Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e022efe7-f5ba-4159-bbe4-b44f577e9b61')
-  'API Management Service Reader Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '71522526-b88f-4d52-b57f-d31fc3546d0d')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource service 'Microsoft.ApiManagement/service@2020-12-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(service.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: service
-}]
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
deleted file mode 100644
index 18eec47fac..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'App Configuration Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5ae67dd6-50cb-40e7-96ff-dc2bfa4b606b')
-  'App Configuration Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '516239f1-63e1-4d78-a4de-a74fb236a071')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource appConfiguration 'Microsoft.AppConfiguration/configurationStores@2021-10-01-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appConfiguration.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: appConfiguration
-}]
diff --git a/modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0207272a1e..0000000000
--- a/modules/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Automation Job Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4fe576fe-1146-4730-92eb-48519fa6bf9f')
-  'Automation Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd3881f73-407a-4167-8283-e981cbba0404')
-  'Automation Runbook Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5fb5aef8-1081-4b8e-bb16-9d5d0385bab5')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(automationAccount.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: automationAccount
-}]
diff --git a/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep b/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
deleted file mode 100644
index f7c047dd19..0000000000
--- a/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,70 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'Cognitive Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '25fbc0a9-bd7c-42a3-aa1a-3b75d497ee68')
-  'Cognitive Services Custom Vision Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c1ff6cc2-c111-46fe-8896-e0ef812ad9f3')
-  'Cognitive Services Custom Vision Deployment': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5c4089e1-6d96-4d2f-b296-c1bc7137275f')
-  'Cognitive Services Custom Vision Labeler': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '88424f51-ebe7-446f-bc41-7fa16989e96c')
-  'Cognitive Services Custom Vision Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '93586559-c37d-4a6b-ba08-b9f0940c2d73')
-  'Cognitive Services Custom Vision Trainer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a5ae4ab-0d65-4eeb-be61-29fc9b54394b')
-  'Cognitive Services Data Reader (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b59867f0-fa02-499b-be73-45a86b5b3e1c')
-  'Cognitive Services Face Recognizer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9894cab4-e18a-44aa-828b-cb588cd6f2d7')
-  'Cognitive Services Metrics Advisor Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'cb43c632-a144-4ec5-977c-e80c4affc34a')
-  'Cognitive Services Metrics Advisor User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3b20f47b-3825-43cb-8114-4bd2201156a8')
-  'Cognitive Services QnA Maker Editor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f4cc2bf9-21be-47a1-bdf1-5c5804381025')
-  'Cognitive Services QnA Maker Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '466ccd10-b268-4a11-b098-b4849f024126')
-  'Cognitive Services Speech Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0e75ca1e-0464-4b4d-8b93-68208a576181')
-  'Cognitive Services Speech User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f2dc8367-1007-4938-bd23-fe263f013447')
-  'Cognitive Services User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a97b65f3-24c7-4388-baec-2e87135dc908')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource account 'Microsoft.CognitiveServices/accounts@2017-04-18' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(account.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: account
-}]
diff --git a/modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
deleted file mode 100644
index 943e72d9a7..0000000000
--- a/modules/Microsoft.Compute/availabilitySets/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,61 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(availabilitySet.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: availabilitySet
-}]
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0a30936aa6..0000000000
--- a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,59 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2020-12-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(diskEncryptionSet.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: diskEncryptionSet
-}]
diff --git a/modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0e70664573..0000000000
--- a/modules/Microsoft.Compute/disks/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Disk Backup Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3e5e47e6-65f7-47ef-90b5-e5dd4d455f24')
-  'Disk Pool Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '60fc6e62-5479-42d4-8bf4-67625fcc2840')
-  'Disk Restore Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b50d9833-a0cb-478e-945f-707fcc997c13')
-  'Disk Snapshot Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7efff54f-a5b4-42b5-a1c5-5411624893ce')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource disk 'Microsoft.Compute/disks@2021-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(disk.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: disk
-}]
diff --git a/modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0186f68665..0000000000
--- a/modules/Microsoft.Compute/galleries/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource gallery 'Microsoft.Compute/galleries@2021-10-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(gallery.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: gallery
-}]
diff --git a/modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
deleted file mode 100644
index caa9501f85..0000000000
--- a/modules/Microsoft.Compute/galleries/images/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'myCustomRoleAtSub': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '60cb79d9-783a-50a4-9f05-d4c579fb8ce3')
-}
-
-resource galleryImage 'Microsoft.Compute/galleries/images@2021-10-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(galleryImage.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: galleryImage
-}]
diff --git a/modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep
deleted file mode 100644
index 95f8211862..0000000000
--- a/modules/Microsoft.Compute/images/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'myCustomRoleAtSub': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '60cb79d9-783a-50a4-9f05-d4c579fb8ce3')
-}
-
-resource image 'Microsoft.Compute/images@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(image.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: image
-}]
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index 883e781c21..0000000000
--- a/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,59 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource proximityPlacementGroup 'Microsoft.Compute/proximityPlacementGroups@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(proximityPlacementGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: proximityPlacementGroup
-}]
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
deleted file mode 100644
index a82b2c3b0d..0000000000
--- a/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource vmss 'Microsoft.Compute/virtualMachineScaleSets@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(vmss.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: vmss
-}]
diff --git a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep b/modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
deleted file mode 100644
index 71948a0ce9..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,61 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Microsoft OneAsset Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fd1bb084-1503-4bd2-99c0-630220046786')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource virtualMachine 'Microsoft.Compute/virtualMachines@2021-07-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(virtualMachine.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: virtualMachine
-}]
diff --git a/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep b/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4536d502de..0000000000
--- a/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,62 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'AcrDelete': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c2f4ef07-c644-48eb-af81-4b1b4947fb11')
-  'AcrImageSigner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6cef56e8-d556-48e5-a04f-b8e64114680f')
-  'AcrPull': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
-  'AcrPush': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8311e382-0749-4cb8-b61a-304f252e45ec')
-  'AcrQuarantineReader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'cdda3590-29a3-44f6-95f2-9f980659eb04')
-  'AcrQuarantineWriter': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c8d4ff99-41c3-41a8-9f60-21dfdad59608')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource registry 'Microsoft.ContainerRegistry/registries@2021-09-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(registry.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: registry
-}]
diff --git a/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep b/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
deleted file mode 100644
index f583ab3791..0000000000
--- a/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,62 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'AcrPull': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
-  'Azure Kubernetes Service Cluster Admin Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0ab0b1a8-8aac-4efd-b8c2-3ee1fb270be8')
-  'Azure Kubernetes Service Cluster User Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4abbcc35-e782-43d8-92c5-2d3f1bd2253f')
-  'Azure Kubernetes Service Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ed7f3fbd-7b88-4dd4-9017-9adb7ce333f8')
-  'Azure Kubernetes Service RBAC Admin': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3498e952-d568-435e-9b2c-8d77e338d7f7')
-  'Azure Kubernetes Service RBAC Cluster Admin': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b1ff04bb-8a4e-4dc4-8eb5-8693973ce19b')
-  'Azure Kubernetes Service RBAC Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f6c6a51-bcf8-42ba-9220-52d62157d7db')
-  'Azure Kubernetes Service RBAC Writer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7ffa36f-339b-4b5c-8bdf-e2c188b2c0eb')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Managed Identity Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f1a07417-d97a-45cb-824c-7a7467783830')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(managedCluster.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: managedCluster
-}]
diff --git a/modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep b/modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9ec94ace90..0000000000
--- a/modules/Microsoft.DataFactory/factories/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,54 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Data Factory Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '673868aa-7521-48a0-acc6-0f60742d39f5')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(dataFactory.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: dataFactory
-}]
diff --git a/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep b/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
deleted file mode 100644
index 2f52129333..0000000000
--- a/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,43 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-}
-
-resource bv 'Microsoft.DataProtection/backupVaults@2022-03-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(bv.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: bv
-}]
diff --git a/modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index 1f7cd94516..0000000000
--- a/modules/Microsoft.Databricks/workspaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource workspace 'Microsoft.Databricks/workspaces@2018-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(workspace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: workspace
-}]
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0af2eb4e13..0000000000
--- a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,61 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b')
-  'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8')
-  'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55')
-  'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387')
-  'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868')
-  'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63')
-  'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b')
-  'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource appGroup 'Microsoft.DesktopVirtualization/applicationgroups@2021-07-12' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: appGroup
-}]
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4add31f03d..0000000000
--- a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,62 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b')
-  'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8')
-  'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55')
-  'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387')
-  'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc')
-  'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822')
-  'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868')
-  'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408')
-  'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource hostPool 'Microsoft.DesktopVirtualization/hostpools@2021-07-12' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(hostPool.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: hostPool
-}]
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4add31f03d..0000000000
--- a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,62 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b')
-  'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8')
-  'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55')
-  'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387')
-  'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc')
-  'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822')
-  'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868')
-  'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408')
-  'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource hostPool 'Microsoft.DesktopVirtualization/hostpools@2021-07-12' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(hostPool.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: hostPool
-}]
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4aa5b62342..0000000000
--- a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,58 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b')
-  'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387')
-  'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868')
-  'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b')
-  'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource workspace 'Microsoft.DesktopVirtualization/workspaces@2021-07-12' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(workspace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: workspace
-}]
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0b05979bde..0000000000
--- a/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Cosmos DB Account Reader Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fbdf93bf-df7d-467e-a4d2-9458aa1360c8')
-  'Cosmos DB Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '230815da-be43-4aae-9cb4-875f7bd000aa')
-  'CosmosBackupOperator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db7b14f2-5adf-42da-9f96-f2ee17bab5cb')
-  'DocumentDB Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5bd9cd88-fe45-4216-938b-f97437e15450')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-06-15' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(databaseAccount.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: databaseAccount
-}]
diff --git a/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep b/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
deleted file mode 100644
index bba6460f24..0000000000
--- a/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'EventGrid Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1e241071-0855-49ea-94dc-649edcd759de')
-  'EventGrid Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd5a91429-5739-47e2-a06b-3470a27159e7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(systemTopic.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: systemTopic
-}]
diff --git a/modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep b/modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
deleted file mode 100644
index 44af3022cf..0000000000
--- a/modules/Microsoft.EventGrid/topics/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'EventGrid Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1e241071-0855-49ea-94dc-649edcd759de')
-  'EventGrid Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd5a91429-5739-47e2-a06b-3470a27159e7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource eventGrid 'Microsoft.EventGrid/topics@2020-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(eventGrid.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: eventGrid
-}]
diff --git a/modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep b/modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9fa7d807dd..0000000000
--- a/modules/Microsoft.EventHub/namespaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,58 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Event Hubs Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec')
-  'Azure Event Hubs Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')
-  'Azure Event Hubs Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Schema Registry Contributor (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5dffeca3-4936-4216-b2bc-10343a5abb25')
-  'Schema Registry Reader (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2c56ea50-c6b3-40a6-83c0-9d98858bc7d2')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource eventHubNamespace 'Microsoft.EventHub/namespaces@2021-11-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(eventHubNamespace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: eventHubNamespace
-}]
diff --git a/modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep b/modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
deleted file mode 100644
index fd0146583f..0000000000
--- a/modules/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Event Hubs Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec')
-  'Azure Event Hubs Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')
-  'Azure Event Hubs Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource eventHub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(split(resourceId, '/')[0], split(resourceId, '/')[1], principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: eventHub
-}]
diff --git a/modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep b/modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
deleted file mode 100644
index 7895eb9e5a..0000000000
--- a/modules/Microsoft.HealthBot/healthBots/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource healthBot 'Microsoft.HealthBot/healthBots@2021-06-10' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(healthBot.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: healthBot
-}]
diff --git a/modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index 476058f9a4..0000000000
--- a/modules/Microsoft.Insights/actionGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,54 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource actionGroup 'microsoft.insights/actionGroups@2019-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(actionGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: actionGroup
-}]
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 5694033cdc..0000000000
--- a/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,54 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(activityLogAlert.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: activityLogAlert
-}]
diff --git a/modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep
deleted file mode 100644
index b95fcf74f1..0000000000
--- a/modules/Microsoft.Insights/components/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Insights Component Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ae349356-3a1b-4a5e-921d-050484c6347e')
-  'Application Insights Snapshot Debugger': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '08954f03-6346-4c2e-81c0-ec3a5cfae23b')
-  'Data Purger': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '150f5e0c-0603-4f03-8c7f-cf70034c4e90')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Website Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'de139f84-1756-47ae-9be6-808fbbe84772')
-}
-
-resource appInsights 'Microsoft.Insights/components@2020-02-02' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appInsights.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: appInsights
-}]
diff --git a/modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
deleted file mode 100644
index ec5e914fc0..0000000000
--- a/modules/Microsoft.Insights/metricAlerts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Insights Component Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ae349356-3a1b-4a5e-921d-050484c6347e')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Logic App Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '515c2055-d9d4-4321-b1b9-bd0c9a0f79fe')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(metricAlert.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: metricAlert
-}]
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
deleted file mode 100644
index 71c903ae40..0000000000
--- a/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(privateLinkScope.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: privateLinkScope
-}]
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep b/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
deleted file mode 100644
index 3c37c05305..0000000000
--- a/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Application Insights Component Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ae349356-3a1b-4a5e-921d-050484c6347e')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource queryAlert 'microsoft.insights/scheduledQueryRules@2018-04-16' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(queryAlert.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: queryAlert
-}]
diff --git a/modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
deleted file mode 100644
index b03611076e..0000000000
--- a/modules/Microsoft.KeyVault/vaults/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,62 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Key Vault Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')
-  'Key Vault Certificates Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a4417e6f-fecd-4de8-b567-7b0420556985')
-  'Key Vault Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f25e0fa2-a7c8-4377-a976-54943a77a395')
-  'Key Vault Crypto Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '14b46e9e-c2b7-41b4-b07b-48a6ebf60603')
-  'Key Vault Crypto Service Encryption User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e147488a-f6f5-4113-8e2d-b22465e65bf6')
-  'Key Vault Crypto User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '12338af0-0e69-4776-bea7-57ae8d297424')
-  'Key Vault Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21090545-7ca7-4776-b22c-e363652d74d2')
-  'Key Vault Secrets Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b86a8fe4-44ce-4948-aee5-eccb2c155cd7')
-  'Key Vault Secrets User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4633458b-17de-408a-b874-0445c86b69e6')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(keyVault.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: keyVault
-}]
diff --git a/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
deleted file mode 100644
index 7eafd1c2d8..0000000000
--- a/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,61 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Key Vault Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')
-  'Key Vault Certificates Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a4417e6f-fecd-4de8-b567-7b0420556985')
-  'Key Vault Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f25e0fa2-a7c8-4377-a976-54943a77a395')
-  'Key Vault Crypto Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '14b46e9e-c2b7-41b4-b07b-48a6ebf60603')
-  'Key Vault Crypto Service Encryption User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e147488a-f6f5-4113-8e2d-b22465e65bf6')
-  'Key Vault Crypto User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '12338af0-0e69-4776-bea7-57ae8d297424')
-  'Key Vault Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21090545-7ca7-4776-b22c-e363652d74d2')
-  'Key Vault Secrets Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b86a8fe4-44ce-4948-aee5-eccb2c155cd7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource key 'Microsoft.KeyVault/vaults/keys@2021-06-01-preview' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(key.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: key
-}]
diff --git a/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep b/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
deleted file mode 100644
index d80da03d4d..0000000000
--- a/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Key Vault Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')
-  'Key Vault Certificates Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a4417e6f-fecd-4de8-b567-7b0420556985')
-  'Key Vault Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f25e0fa2-a7c8-4377-a976-54943a77a395')
-  'Key Vault Crypto Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '14b46e9e-c2b7-41b4-b07b-48a6ebf60603')
-  'Key Vault Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21090545-7ca7-4776-b22c-e363652d74d2')
-  'Key Vault Secrets Officer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b86a8fe4-44ce-4948-aee5-eccb2c155cd7')
-  'Key Vault Secrets User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4633458b-17de-408a-b874-0445c86b69e6')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource secret 'Microsoft.KeyVault/vaults/secrets@2021-06-01-preview' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(secret.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: secret
-}]
diff --git a/modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep b/modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9427c50737..0000000000
--- a/modules/Microsoft.Logic/workflows/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Sentinel Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f4c81013-99ee-4d62-a7ee-b3f1f648599a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Logic App Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '515c2055-d9d4-4321-b1b9-bd0c9a0f79fe')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource logicApp 'Microsoft.Logic/workflows@2019-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(logicApp.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: logicApp
-}]
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index 1bd860393a..0000000000
--- a/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,54 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'AzureML Metrics Writer (preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '635dd51f-9968-44d3-b7fb-6d9a6bd613ae')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource workspace 'Microsoft.MachineLearningServices/workspaces@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(workspace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: workspace
-}]
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
deleted file mode 100644
index 85fdd4d9ab..0000000000
--- a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Managed Identity Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e40ec5ca-96e0-45a2-b4ff-59039f2c2b59')
-  'Managed Identity Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f1a07417-d97a-45cb-824c-7a7467783830')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource userMsi 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(userMsi.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: userMsi
-}]
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 20782d86b7..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2021-04-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(netAppAccount.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: netAppAccount
-}]
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9ef2d1f9f0..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2021-04-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(capacityPool.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: capacityPool
-}]
diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep b/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
deleted file mode 100644
index fc4003f377..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2021-04-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}/${split(resourceId, '/')[12]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(volume.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: volume
-}]
diff --git a/modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
deleted file mode 100644
index 2b47534cd3..0000000000
--- a/modules/Microsoft.Network/applicationGateways/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,61 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'ExpressRoute Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7896-14b4-4889-afef-fbb65a96e5a2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource applicationGateway 'Microsoft.Network/applicationGateways@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(applicationGateway.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: applicationGateway
-}]
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index 3d8f643e52..0000000000
--- a/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'ExpressRoute Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7896-14b4-4889-afef-fbb65a96e5a2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource applicationSecurityGroup 'Microsoft.Network/applicationSecurityGroups@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(applicationSecurityGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: applicationSecurityGroup
-}]
diff --git a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
deleted file mode 100644
index faa2d91941..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'ExpressRoute Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7896-14b4-4889-afef-fbb65a96e5a2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource azureFirewall 'Microsoft.Network/azureFirewalls@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(azureFirewall.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: azureFirewall
-}]
diff --git a/modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 86871886fd..0000000000
--- a/modules/Microsoft.Network/bastionHosts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'ExpressRoute Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7896-14b4-4889-afef-fbb65a96e5a2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource azureBastion 'Microsoft.Network/bastionHosts@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(azureBastion.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: azureBastion
-}]
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
deleted file mode 100644
index 52f9158a47..0000000000
--- a/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource ddosProtectionPlan 'Microsoft.Network/ddosProtectionPlans@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(ddosProtectionPlan.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: ddosProtectionPlan
-}]
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0ff9bad986..0000000000
--- a/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource expressRouteCircuits 'Microsoft.Network/expressRouteCircuits@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(expressRouteCircuits.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: expressRouteCircuits
-}]
diff --git a/modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9a72de9cc3..0000000000
--- a/modules/Microsoft.Network/frontDoors/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Domain Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'eeaeda52-9324-47f6-8069-5d5bade478b2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource frontDoor 'Microsoft.Network/frontDoors@2020-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(frontDoor.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: frontDoor
-}]
diff --git a/modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index 7ba5a78310..0000000000
--- a/modules/Microsoft.Network/ipGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource ipGroup 'Microsoft.Network/ipGroups@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(ipGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: ipGroup
-}]
diff --git a/modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
deleted file mode 100644
index cfde136ee4..0000000000
--- a/modules/Microsoft.Network/loadBalancers/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,59 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource loadBalancer 'Microsoft.Network/loadBalancers@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(loadBalancer.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: loadBalancer
-}]
diff --git a/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
deleted file mode 100644
index 13456f25a4..0000000000
--- a/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource localNetworkGateway 'Microsoft.Network/localNetworkGateways@2021-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(localNetworkGateway.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: localNetworkGateway
-}]
diff --git a/modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
deleted file mode 100644
index f39bd3d187..0000000000
--- a/modules/Microsoft.Network/natGateways/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource natGateway 'Microsoft.Network/natGateways@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(natGateway.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: natGateway
-}]
diff --git a/modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index e66a728227..0000000000
--- a/modules/Microsoft.Network/networkInterfaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,63 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Domain Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'eeaeda52-9324-47f6-8069-5d5bade478b2')
-  'Domain Services Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '361898ef-9ed1-48c2-849c-a832951106bb')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-  'Windows Admin Center Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a6333a3e-0164-44c3-b281-7a577aff287f')
-}
-
-resource networkInterface 'Microsoft.Network/networkInterfaces@2021-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(networkInterface.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: any(!empty(principalType) ? principalType : null)
-  }
-  scope: networkInterface
-}]
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index c25e77324b..0000000000
--- a/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,58 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(networkSecurityGroup.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: networkSecurityGroup
-}]
diff --git a/modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
deleted file mode 100644
index e958197039..0000000000
--- a/modules/Microsoft.Network/networkWatchers/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(networkWatcher.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: networkWatcher
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
deleted file mode 100644
index b75bab676a..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(privateDnsZone.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: privateDnsZone
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
deleted file mode 100644
index e7c72f0a22..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource A 'Microsoft.Network/privateDnsZones/A@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(A.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: A
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4c1d7a8055..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource AAAA 'Microsoft.Network/privateDnsZones/AAAA@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(AAAA.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: AAAA
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
deleted file mode 100644
index f35b9ecb27..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,58 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource CNAME 'Microsoft.Network/privateDnsZones/CNAME@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(CNAME.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: CNAME
-}]
-
-output id string = roleAssignment[0].name
diff --git a/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
deleted file mode 100644
index ba3a2d0b69..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource MX 'Microsoft.Network/privateDnsZones/MX@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(MX.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: MX
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
deleted file mode 100644
index 1b57ee386f..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource PTR 'Microsoft.Network/privateDnsZones/PTR@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(PTR.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: PTR
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9181915040..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource SOA 'Microsoft.Network/privateDnsZones/SOA@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(SOA.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: SOA
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
deleted file mode 100644
index f77b4b0736..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource SRV 'Microsoft.Network/privateDnsZones/SRV@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(SRV.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: SRV
-}]
diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
deleted file mode 100644
index 8635e9dd44..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource TXT 'Microsoft.Network/privateDnsZones/TXT@2018-09-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(TXT.name, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: TXT
-}]
diff --git a/modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
deleted file mode 100644
index a6cc5bf005..0000000000
--- a/modules/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(privateEndpoint.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: privateEndpoint
-}]
diff --git a/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
deleted file mode 100644
index 4a612c4c1a..0000000000
--- a/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,59 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(publicIpAddress.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: publicIpAddress
-}]
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
deleted file mode 100644
index dc6c41bb2e..0000000000
--- a/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource publicIpPrefix 'Microsoft.Network/publicIPPrefixes@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(publicIpPrefix.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: publicIpPrefix
-}]
diff --git a/modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
deleted file mode 100644
index 0d6e78fcec..0000000000
--- a/modules/Microsoft.Network/routeTables/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource routeTable 'Microsoft.Network/routeTables@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(routeTable.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: routeTable
-}]
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
deleted file mode 100644
index 10e6217855..0000000000
--- a/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Traffic Manager Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a4b10055-b0c7-44c2-b00f-c7b5b3550cf7')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource trafficmanagerprofile 'Microsoft.Network/trafficmanagerprofiles@2018-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(trafficmanagerprofile.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: trafficmanagerprofile
-}]
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
deleted file mode 100644
index b9a18dde5a..0000000000
--- a/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(virtualNetworkGateway.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: virtualNetworkGateway
-}]
diff --git a/modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
deleted file mode 100644
index ed41068198..0000000000
--- a/modules/Microsoft.Network/virtualNetworks/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,70 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'Cosmos DB Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '230815da-be43-4aae-9cb4-875f7bd000aa')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'DocumentDB Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5bd9cd88-fe45-4216-938b-f97437e15450')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(virtualNetwork.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: virtualNetwork
-}]
diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
deleted file mode 100644
index 36751d8e3a..0000000000
--- a/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,70 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'Cosmos DB Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '230815da-be43-4aae-9cb4-875f7bd000aa')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'DocumentDB Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5bd9cd88-fe45-4216-938b-f97437e15450')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-}
-
-resource subnet 'Microsoft.Network/virtualNetworks/subnets@2021-03-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(subnet.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: subnet
-}]
diff --git a/modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
deleted file mode 100644
index d5b4eb8c6b..0000000000
--- a/modules/Microsoft.Network/virtualWans/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(virtualWan.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: virtualWan
-}]
diff --git a/modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep b/modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
deleted file mode 100644
index 52b018b360..0000000000
--- a/modules/Microsoft.Network/vpnSites/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,37 +0,0 @@
-param principalIds array
-param principalType string = ''
-param roleDefinitionIdOrName string
-param resourceId string
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Domain Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'eeaeda52-9324-47f6-8069-5d5bade478b2')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource vpnSite 'Microsoft.Network/vpnSites@2021-05-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(vpnSite.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: vpnSite
-}]
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep b/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index e2c0ea3228..0000000000
--- a/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Automation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f353d9bd-d4a6-484e-a77a-8050b599b867')
-  'Azure Sentinel Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ab8e14d6-4a74-4a29-9ba8-549422addade')
-  'Azure Sentinel Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8d289c81-5878-46d4-8554-54e1e3d8b5cb')
-  'Azure Sentinel Responder': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3e150937-b8fe-4cfb-8069-0eaf05ecd056')
-  'Data Purger': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '150f5e0c-0603-4f03-8c7f-cf70034c4e90')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Security Admin': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb1c8493-542b-48eb-b624-b4c8fea62acd')
-  'Security Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '39bc4728-0917-49c7-9d2c-d95423bc2eb4')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(logAnalyticsWorkspace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: logAnalyticsWorkspace
-}]
diff --git a/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep b/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
deleted file mode 100644
index a16c2390fa..0000000000
--- a/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,60 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'Backup Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a795c7a0-d4a2-40c1-ae25-d81f01202912')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Site Recovery Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'dbaa88c4-0c30-4179-9fb3-46319faa6149')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(rsv.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: rsv
-}]
diff --git a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
deleted file mode 100644
index aec6bf8af7..0000000000
--- a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,208 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'AcrDelete': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c2f4ef07-c644-48eb-af81-4b1b4947fb11')
-  'AcrImageSigner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6cef56e8-d556-48e5-a04f-b8e64114680f')
-  'AcrPull': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
-  'AcrPush': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8311e382-0749-4cb8-b61a-304f252e45ec')
-  'AcrQuarantineReader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'cdda3590-29a3-44f6-95f2-9f980659eb04')
-  'AcrQuarantineWriter': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c8d4ff99-41c3-41a8-9f60-21dfdad59608')
-  'API Management Service Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '312a565d-c81f-4fd8-895a-4e21e48d571c')
-  'API Management Service Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e022efe7-f5ba-4159-bbe4-b44f577e9b61')
-  'API Management Service Reader Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '71522526-b88f-4d52-b57f-d31fc3546d0d')
-  'App Configuration Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5ae67dd6-50cb-40e7-96ff-dc2bfa4b606b')
-  'App Configuration Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '516239f1-63e1-4d78-a4de-a74fb236a071')
-  'Application Insights Component Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ae349356-3a1b-4a5e-921d-050484c6347e')
-  'Application Insights Snapshot Debugger': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '08954f03-6346-4c2e-81c0-ec3a5cfae23b')
-  'Attestation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'bbf86eb8-f7b4-4cce-96e4-18cddf81d86e')
-  'Attestation Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fd1bd22b-8476-40bc-a0bc-69b95687b9f3')
-  'Automation Job Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4fe576fe-1146-4730-92eb-48519fa6bf9f')
-  'Automation Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd3881f73-407a-4167-8283-e981cbba0404')
-  'Automation Runbook Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5fb5aef8-1081-4b8e-bb16-9d5d0385bab5')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Azure Connected Machine Onboarding': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b64e21ea-ac4e-4cdf-9dc9-5b892992bee7')
-  'Azure Connected Machine Resource Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'cd570a14-e51a-42ad-bac8-bafd67325302')
-  'Azure Digital Twins Owner (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'bcd981a7-7f74-457b-83e1-cceb9e632ffe')
-  'Azure Digital Twins Reader (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd57506d4-4c8d-48b1-8587-93c323f6a5a3')
-  'Azure Event Hubs Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec')
-  'Azure Event Hubs Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')
-  'Azure Event Hubs Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')
-  'Azure Kubernetes Service Cluster Admin Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0ab0b1a8-8aac-4efd-b8c2-3ee1fb270be8')
-  'Azure Kubernetes Service Cluster User Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4abbcc35-e782-43d8-92c5-2d3f1bd2253f')
-  'Azure Kubernetes Service Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ed7f3fbd-7b88-4dd4-9017-9adb7ce333f8')
-  'Azure Maps Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8f5e0ce6-4f7b-4dcf-bddf-e6f48634a204')
-  'Azure Maps Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '423170ca-a8f6-4b0f-8487-9e4eb8f49bfa')
-  'Azure Sentinel Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ab8e14d6-4a74-4a29-9ba8-549422addade')
-  'Azure Sentinel Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8d289c81-5878-46d4-8554-54e1e3d8b5cb')
-  'Azure Sentinel Responder': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3e150937-b8fe-4cfb-8069-0eaf05ecd056')
-  'Azure Service Bus Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
-  'Azure Service Bus Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f6d3b9b-027b-4f4c-9142-0e5a2a2247e0')
-  'Azure Service Bus Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '69a216fc-b8fb-44d8-bc22-1f3c2cd27a39')
-  'Azure Stack Registration Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6f12a6df-dd06-4f3e-bcb1-ce8be600526a')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'Backup Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a795c7a0-d4a2-40c1-ae25-d81f01202912')
-  'Billing Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fa23ad8b-c56e-40d8-ac0c-ce449e1d2c64')
-  'BizTalk Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e3c6656-6cfa-4708-81fe-0de47ac73342')
-  'Blockchain Member Node Access (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '31a002a1-acaf-453e-8a5b-297c9ca1ea24')
-  'Blueprint Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '41077137-e803-4205-871c-5a86e6a753b4')
-  'Blueprint Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '437d2ced-4a38-4302-8479-ed2bcb43d090')
-  'CDN Endpoint Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '426e0c7f-0c7e-4658-b36f-ff54d6c29b45')
-  'CDN Endpoint Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '871e35f6-b5c1-49cc-a043-bde969a0f2cd')
-  'CDN Profile Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ec156ff8-a8d1-4d15-830c-5b80698ca432')
-  'CDN Profile Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8f96442b-4075-438f-813d-ad51ab4019af')
-  'Classic Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b34d265f-36f7-4a0d-a4d4-e158ca92e90f')
-  'Classic Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86e8f5dc-a6e9-4c67-9d15-de283e8eac25')
-  'Classic Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '985d6b00-f706-48f5-a6fe-d0ca12fb668d')
-  'Classic Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd73bb868-a0df-4d4d-bd69-98a00b01fccb')
-  'ClearDB MySQL DB Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9106cda0-8a86-4e81-b686-29a22c54effe')
-  'Cognitive Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '25fbc0a9-bd7c-42a3-aa1a-3b75d497ee68')
-  'Cognitive Services Custom Vision Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c1ff6cc2-c111-46fe-8896-e0ef812ad9f3')
-  'Cognitive Services Custom Vision Deployment': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5c4089e1-6d96-4d2f-b296-c1bc7137275f')
-  'Cognitive Services Custom Vision Labeler': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '88424f51-ebe7-446f-bc41-7fa16989e96c')
-  'Cognitive Services Custom Vision Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '93586559-c37d-4a6b-ba08-b9f0940c2d73')
-  'Cognitive Services Custom Vision Trainer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a5ae4ab-0d65-4eeb-be61-29fc9b54394b')
-  'Cognitive Services Data Reader (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b59867f0-fa02-499b-be73-45a86b5b3e1c')
-  'Cognitive Services QnA Maker Editor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f4cc2bf9-21be-47a1-bdf1-5c5804381025')
-  'Cognitive Services QnA Maker Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '466ccd10-b268-4a11-b098-b4849f024126')
-  'Cognitive Services User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a97b65f3-24c7-4388-baec-2e87135dc908')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Cosmos DB Account Reader Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fbdf93bf-df7d-467e-a4d2-9458aa1360c8')
-  'Cosmos DB Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '230815da-be43-4aae-9cb4-875f7bd000aa')
-  'CosmosBackupOperator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db7b14f2-5adf-42da-9f96-f2ee17bab5cb')
-  'Cost Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '434105ed-43f6-45c7-a02f-909b2ba83430')
-  'Cost Management Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '72fafb9e-0641-4937-9268-a91bfd8191a3')
-  'Data Box Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'add466c9-e687-43fc-8d98-dfcf8d720be5')
-  'Data Box Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '028f4ed7-e2a9-465e-a8f4-9c0ffdfdc027')
-  'Data Factory Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '673868aa-7521-48a0-acc6-0f60742d39f5')
-  'Data Lake Analytics Developer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '47b7735b-770e-4598-a7da-8b91488b4c88')
-  'Data Purger': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '150f5e0c-0603-4f03-8c7f-cf70034c4e90')
-  'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'befefa01-2a29-4197-83a8-272ff33ce314')
-  'DocumentDB Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5bd9cd88-fe45-4216-938b-f97437e15450')
-  'EventGrid EventSubscription Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '428e0ff0-5e57-4d9c-a221-2c70d0e0a443')
-  'EventGrid EventSubscription Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2414bbcf-6497-4faf-8c65-045460748405')
-  'Experimentation Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f646f1b-fa08-80eb-a33b-edd6ce5c915c')
-  'Experimentation Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f646f1b-fa08-80eb-a22b-edd6ce5c915c')
-  'Experimentation Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49632ef5-d9ac-41f4-b8e7-bbe587fa74a1')
-  'FHIR Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5a1fc7df-4bf1-4951-a576-89034ee01acd')
-  'FHIR Data Exporter': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3db33094-8700-4567-8da5-1501d4e7e843')
-  'FHIR Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4c8d0bbc-75d3-4935-991f-5f3c56d81508')
-  'FHIR Data Writer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3f88fce4-5892-4214-ae73-ba5294559913')
-  'Graph Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b60367af-1334-4454-b71e-769d9a4f83d9')
-  'HDInsight Cluster Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '61ed4efc-fab3-44fd-b111-e24485cc132a')
-  'HDInsight Domain Services Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8d8d5a11-05d3-4bda-a417-a08778121c7c')
-  'Hierarchy Settings Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '350f8d15-c687-4448-8ae1-157740a3936d')
-  'Hybrid Server Onboarding': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5d1e5ee4-7c68-4a71-ac8b-0739630a3dfb')
-  'Hybrid Server Resource Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '48b40c6e-82e0-4eb3-90d5-19e40f49b624')
-  'Integration Service Environment Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a41e2c5b-bd99-4a07-88f4-9bf657a760b8')
-  'Integration Service Environment Developer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7aa55d3-1abb-444a-a5ca-5e51e485d6ec')
-  'Intelligent Systems Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '03a6d094-3444-4b3d-88af-7477090a9e5e')
-  'Key Vault Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f25e0fa2-a7c8-4377-a976-54943a77a395')
-  'Knowledge Consumer': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ee361c5d-f7b5-4119-b4b6-892157c8f64c')
-  'Kubernetes Cluster - Azure Arc Onboarding': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '34e09817-6cbe-4d01-b1a2-e0eac5743d41')
-  'Lab Creator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b97fb8bc-a8b2-4522-a38b-dd33c7e65ead')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Logic App Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '515c2055-d9d4-4321-b1b9-bd0c9a0f79fe')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Managed Identity Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e40ec5ca-96e0-45a2-b4ff-59039f2c2b59')
-  'Managed Identity Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f1a07417-d97a-45cb-824c-7a7467783830')
-  'Managed Services Registration assignment Delete ': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '91c1777a-f3dc-4fae-b103-61d183457e46')
-  'Management Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5d58bcaf-24a5-4b20-bdb6-eed9f69fbe4c')
-  'Management Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ac63b705-f282-497d-ac71-919bf39d939d')
-  'Marketplace Admin': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'dd920d6d-f481-47f1-b461-f338c46b2d9f')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Network Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4d97b98b-1d4f-4787-a291-c67834d212e7')
-  'New Relic APM Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5d28c62d-5b37-4476-8438-e587778df237')
-  'Object Understanding Account Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4dd61c23-6743-42fe-a388-d8bdd41cb745')
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Policy Insights Data Writer (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '66bb4e9e-b016-4a94-8249-4c0511c2be84')
-  'Private DNS Zone Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b12aa53e-6015-4669-85d0-8515ebb3ae7f')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Reader and Data Access': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c12c1c16-33a1-487b-954d-41c89c60f349')
-  'Redis Cache Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e0f68234-74aa-48ed-b826-c38b57376e17')
-  'Remote Rendering Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3df8b902-2a6f-47c7-8cc5-360e9b272a7e')
-  'Remote Rendering Client': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'd39065c4-c120-43c9-ab0a-63eed9795f0a')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Scheduler Job Collections Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '188a0f2f-5c9e-469b-ae67-2aa5ce574b94')
-  'Search Service Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7ca78c08-252a-4471-8644-bb5ff32d4ba0')
-  'Security Admin': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb1c8493-542b-48eb-b624-b4c8fea62acd')
-  'Security Assessment Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '612c2aa1-cb24-443b-ac28-3ab7272de6f5')
-  'Security Manager (Legacy)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e3d13bf0-dd5a-482e-ba6b-9b8433878d10')
-  'Security Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '39bc4728-0917-49c7-9d2c-d95423bc2eb4')
-  'SignalR AccessKey Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '04165923-9d83-45d5-8227-78b77b0a687e')
-  'SignalR Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8cf5e20a-e4b2-4e9d-b3a1-5ceb692c2761')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Site Recovery Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'dbaa88c4-0c30-4179-9fb3-46319faa6149')
-  'Spatial Anchors Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8bbe83f1-e2a6-4df7-8cb4-4e04d4e5c827')
-  'Spatial Anchors Account Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '70bbe301-9835-447d-afdd-19eb3167307c')
-  'Spatial Anchors Account Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5d51204f-eb77-4b1c-b86a-2ec626c49413')
-  'SQL DB Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9b7fa17d-e63e-47b0-bb0a-15c516ac86ec')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'SQL Server Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6d8ee4ec-f05a-4a1d-8b00-a9b17e38b437')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '81a9662b-bebf-436f-a333-f67b29880f12')
-  'Storage Blob Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
-  'Storage Blob Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b7e6dc6d-f1e8-4753-8033-0f276bb0955b')
-  'Storage Blob Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1')
-  'Storage Blob Delegator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db58b8e5-c6ad-4a2a-8342-4190687cbf4a')
-  'Storage File Data SMB Share Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0c867c2a-1d8c-454a-a3db-ab2ea1bdc8bb')
-  'Storage File Data SMB Share Elevated Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7264617-510b-434b-a828-9731dc254ea7')
-  'Storage File Data SMB Share Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aba4ae5f-2193-4029-9191-0cb91df5e314')
-  'Storage Queue Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
-  'Storage Queue Data Message Processor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8a0f0c08-91a1-4084-bc3d-661d67233fed')
-  'Storage Queue Data Message Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c6a89b2d-59bc-44d0-9896-0f6e12d7b80a')
-  'Storage Queue Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '19e7f393-937e-4f77-808e-94535e297925')
-  'Support Request Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'cfd33db0-3dd1-45e3-aa9d-cdbdf3b6f24e')
-  'Tag Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4a9ae827-6dc8-4573-8ac7-8239d42aa03f')
-  'Traffic Manager Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a4b10055-b0c7-44c2-b00f-c7b5b3550cf7')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Administrator Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1c0163c0-47e6-4577-8991-ea5c82e286e4')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-  'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
-  'Web Plan Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2cc479cb-7b4d-49a8-b449-8c00fd0f0a4b')
-  'Website Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'de139f84-1756-47ae-9be6-808fbbe84772')
-  'Workbook Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e8ddcd69-c73f-4f9f-9844-4100522f16ad')
-  'Workbook Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b279062a-9be3-42a0-92ae-8b3cf002ec4d')
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(last(split(resourceId, '/')), principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-}]
diff --git a/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
deleted file mode 100644
index 24ee49e11f..0000000000
--- a/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Service Bus Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
-  'Azure Service Bus Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f6d3b9b-027b-4f4c-9142-0e5a2a2247e0')
-  'Azure Service Bus Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '69a216fc-b8fb-44d8-bc22-1f3c2cd27a39')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(namespace.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: namespace
-}]
diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
deleted file mode 100644
index 573648e0a5..0000000000
--- a/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Service Bus Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
-  'Azure Service Bus Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f6d3b9b-027b-4f4c-9142-0e5a2a2247e0')
-  'Azure Service Bus Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '69a216fc-b8fb-44d8-bc22-1f3c2cd27a39')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource queue 'Microsoft.ServiceBus/namespaces/queues@2021-06-01-preview' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssigment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(queue.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: queue
-}]
diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
deleted file mode 100644
index b67f08e3e0..0000000000
--- a/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Azure Service Bus Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
-  'Azure Service Bus Data Receiver': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f6d3b9b-027b-4f4c-9142-0e5a2a2247e0')
-  'Azure Service Bus Data Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '69a216fc-b8fb-44d8-bc22-1f3c2cd27a39')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}'
-}
-
-resource roleAssigment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(topic.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: topic
-}]
diff --git a/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep b/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
deleted file mode 100644
index b7325ee782..0000000000
--- a/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource serviceFabricCluster 'Microsoft.ServiceFabric/clusters@2021-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = [for principalId in principalIds: {
-  name: guid(serviceFabricCluster.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: serviceFabricCluster
-}]
diff --git a/modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep b/modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
deleted file mode 100644
index 63cd145815..0000000000
--- a/modules/Microsoft.Sql/managedInstances/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,56 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'SQL Managed Instance Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4939a1f6-9ae0-4e48-a1e0-f2cbe897382d')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource managedInstance 'Microsoft.Sql/managedInstances@2020-08-01-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(managedInstance.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: managedInstance
-}]
diff --git a/modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
deleted file mode 100644
index be5cfb01a9..0000000000
--- a/modules/Microsoft.Sql/servers/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reservation Purchaser': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f7b75c60-3036-4b75-91c3-6b41c27c1689')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'SQL DB Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9b7fa17d-e63e-47b0-bb0a-15c516ac86ec')
-  'SQL Security Manager': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '056cd41c-7e88-42e1-933e-88ba6a50c9c3')
-  'SQL Server Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6d8ee4ec-f05a-4a1d-8b00-a9b17e38b437')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource server 'Microsoft.Sql/servers@2020-02-02-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(server.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: server
-}]
diff --git a/modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
deleted file mode 100644
index 269332a976..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,80 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Disk Snapshot Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7efff54f-a5b4-42b5-a1c5-5411624893ce')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reader and Data Access': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c12c1c16-33a1-487b-954d-41c89c60f349')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Storage Account Backup Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e5e2a7ff-d759-4cd2-bb51-3152d37e2eb1')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '81a9662b-bebf-436f-a333-f67b29880f12')
-  'Storage Blob Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
-  'Storage Blob Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b7e6dc6d-f1e8-4753-8033-0f276bb0955b')
-  'Storage Blob Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1')
-  'Storage Blob Delegator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db58b8e5-c6ad-4a2a-8342-4190687cbf4a')
-  'Storage File Data SMB Share Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0c867c2a-1d8c-454a-a3db-ab2ea1bdc8bb')
-  'Storage File Data SMB Share Elevated Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7264617-510b-434b-a828-9731dc254ea7')
-  'Storage File Data SMB Share Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aba4ae5f-2193-4029-9191-0cb91df5e314')
-  'Storage Queue Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
-  'Storage Queue Data Message Processor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8a0f0c08-91a1-4084-bc3d-661d67233fed')
-  'Storage Queue Data Message Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c6a89b2d-59bc-44d0-9896-0f6e12d7b80a')
-  'Storage Queue Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '19e7f393-937e-4f77-808e-94535e297925')
-  'Storage Table Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3')
-  'Storage Table Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76199698-9eea-4c19-bc75-cec21354c6b6')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(storageAccount.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: storageAccount
-}]
diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
deleted file mode 100644
index b1efabf41c..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,71 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Disk Snapshot Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7efff54f-a5b4-42b5-a1c5-5411624893ce')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reader and Data Access': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c12c1c16-33a1-487b-954d-41c89c60f349')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Storage Account Backup Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e5e2a7ff-d759-4cd2-bb51-3152d37e2eb1')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '81a9662b-bebf-436f-a333-f67b29880f12')
-  'Storage Blob Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
-  'Storage Blob Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b7e6dc6d-f1e8-4753-8033-0f276bb0955b')
-  'Storage Blob Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1')
-  'Storage Blob Delegator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db58b8e5-c6ad-4a2a-8342-4190687cbf4a')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2019-06-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}/${split(resourceId, '/')[12]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(container.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: container
-}]
diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
deleted file mode 100644
index 9d211dd063..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,80 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Avere Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c025889f-8102-4ebf-b32c-fc0c6f0c6bd9')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Disk Snapshot Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7efff54f-a5b4-42b5-a1c5-5411624893ce')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reader and Data Access': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c12c1c16-33a1-487b-954d-41c89c60f349')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Storage Account Backup Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e5e2a7ff-d759-4cd2-bb51-3152d37e2eb1')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '81a9662b-bebf-436f-a333-f67b29880f12')
-  'Storage Blob Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
-  'Storage Blob Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b7e6dc6d-f1e8-4753-8033-0f276bb0955b')
-  'Storage Blob Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1')
-  'Storage Blob Delegator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'db58b8e5-c6ad-4a2a-8342-4190687cbf4a')
-  'Storage File Data SMB Share Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0c867c2a-1d8c-454a-a3db-ab2ea1bdc8bb')
-  'Storage File Data SMB Share Elevated Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7264617-510b-434b-a828-9731dc254ea7')
-  'Storage File Data SMB Share Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aba4ae5f-2193-4029-9191-0cb91df5e314')
-  'Storage Queue Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
-  'Storage Queue Data Message Processor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8a0f0c08-91a1-4084-bc3d-661d67233fed')
-  'Storage Queue Data Message Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c6a89b2d-59bc-44d0-9896-0f6e12d7b80a')
-  'Storage Queue Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '19e7f393-937e-4f77-808e-94535e297925')
-  'Storage Table Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3')
-  'Storage Table Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76199698-9eea-4c19-bc75-cec21354c6b6')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource fileShare 'Microsoft.Storage/storageAccounts/fileServices/shares@2019-06-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}/${split(resourceId, '/')[12]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(fileShare.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: fileShare
-}]
diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep b/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
deleted file mode 100644
index f1e85f9964..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,77 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Avere Cluster Create': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a7b1b19a-0e83-4fe5-935c-faaefbfd18c3')
-  'Avere Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '4f8fab4f-1852-4a58-a46a-8eaf358af14a')
-  'Azure Service Deploy Release Management Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21d96096-b162-414a-8302-d8354f9d91b2')
-  'Backup Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e467623-bb1f-42f4-a55d-6e525e11384b')
-  'Backup Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00c29273-979b-4161-815c-10b084fb9324')
-  'CAL-Custom-Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7b266cd7-0bba-4ae2-8423-90ede5e1e898')
-  'DevTest Labs User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '76283e04-6283-4c54-8f91-bcf1374a3c64')
-  'Disk Snapshot Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7efff54f-a5b4-42b5-a1c5-5411624893ce')
-  'Dsms Role (deprecated)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b91f4c0b-46e3-47bb-a242-eecfe23b3b5b')
-  'Dsms Role (do not use)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7aff565e-6c55-448d-83db-ccf482c6da2f')
-  'GenevaWarmPathResourceContributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9f15f5f5-77bd-413a-aa88-4b9c68b1e7bc')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'masterreader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a48d7796-14b4-4889-afef-fbb65a93e5a2')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Reader and Data Access': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c12c1c16-33a1-487b-954d-41c89c60f349')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'Site Recovery Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '6670b86e-a3f7-4917-ac9b-5d6ab1be4567')
-  'Site Recovery Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '494ae006-db33-4328-bf46-533a6560a3ca')
-  'Storage Account Backup Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e5e2a7ff-d759-4cd2-bb51-3152d37e2eb1')
-  'Storage Account Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '17d1049b-9a84-46fb-8f53-869881c3d3ab')
-  'Storage Account Key Operator Service Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '81a9662b-bebf-436f-a333-f67b29880f12')
-  'Storage Queue Data Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
-  'Storage Queue Data Message Processor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8a0f0c08-91a1-4084-bc3d-661d67233fed')
-  'Storage Queue Data Message Sender': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c6a89b2d-59bc-44d0-9896-0f6e12d7b80a')
-  'Storage Queue Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '19e7f393-937e-4f77-808e-94535e297925')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
-}
-
-resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2019-06-01' existing = {
-  name: '${split(resourceId, '/')[8]}/${split(resourceId, '/')[10]}/${split(resourceId, '/')[12]}'
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(queue.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: queue
-}]
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep b/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
deleted file mode 100644
index 810e105821..0000000000
--- a/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource privateLinkHub 'Microsoft.Synapse/privateLinkHubs@2021-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(privateLinkHub.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: privateLinkHub
-}]
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep b/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
deleted file mode 100644
index 1bd3d488bf..0000000000
--- a/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,53 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource imageTemplate 'Microsoft.VirtualMachineImages/imageTemplates@2020-02-14' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(imageTemplate.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: imageTemplate
-}]
diff --git a/modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep
deleted file mode 100644
index e34dc1dff1..0000000000
--- a/modules/Microsoft.Web/connections/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Logic App Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '515c2055-d9d4-4321-b1b9-bd0c9a0f79fe')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource connection 'Microsoft.Web/connections@2016-06-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(connection.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: connection
-}]
diff --git a/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
deleted file mode 100644
index 698394c2cf..0000000000
--- a/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,54 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Web Plan Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2cc479cb-7b4d-49a8-b449-8c00fd0f0a4b')
-}
-
-resource appServiceEnvironment 'Microsoft.Web/hostingEnvironments@2021-02-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appServiceEnvironment.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: appServiceEnvironment
-}]
diff --git a/modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
deleted file mode 100644
index 459ca0ee20..0000000000
--- a/modules/Microsoft.Web/serverfarms/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,57 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Logic App Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '515c2055-d9d4-4321-b1b9-bd0c9a0f79fe')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Web Plan Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2cc479cb-7b4d-49a8-b449-8c00fd0f0a4b')
-  'Website Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'de139f84-1756-47ae-9be6-808fbbe84772')
-}
-
-resource appServicePlan 'Microsoft.Web/serverfarms@2021-02-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appServicePlan.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: appServicePlan
-}]
diff --git a/modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep
deleted file mode 100644
index ff31a44080..0000000000
--- a/modules/Microsoft.Web/sites/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Logic App Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '87a39d53-fc1b-424a-814c-f7e04687dc9e')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-  'Website Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'de139f84-1756-47ae-9be6-808fbbe84772')
-}
-
-resource app 'Microsoft.Web/sites@2020-12-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(app.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: app
-}]
diff --git a/modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep b/modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep
deleted file mode 100644
index d8c01ae5d9..0000000000
--- a/modules/Microsoft.Web/staticSites/.bicep/nested_rbac.bicep
+++ /dev/null
@@ -1,34 +0,0 @@
-param principalIds array
-param principalType string = ''
-param roleDefinitionIdOrName string
-param resourceId string
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource staticSite 'Microsoft.Web/staticSites@2021-02-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(staticSite.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: staticSite
-}]

From d1737c5a046b38ca6c93f9351cc93b4ae85faf23 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 25 Jun 2022 23:46:50 +0200
Subject: [PATCH 14/16] Fix

---
 .../configurationStores/version.json                   |  4 ----
 .../workspaces/.parameters/min.parameters.json         |  4 ----
 modules/README.md                                      | 10 ----------
 3 files changed, 18 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/version.json b/modules/Microsoft.AppConfiguration/configurationStores/version.json
index adde06443e..09da9cf49c 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/version.json
+++ b/modules/Microsoft.AppConfiguration/configurationStores/version.json
@@ -1,8 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-<<<<<<< HEAD
     "version": "0.2"
-=======
-    "version": "0.1"
->>>>>>> cc920848f21b57e5f4f2dfbd39e040465d4e5dd6
 }
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
index 7e3b4ca2ad..97fc2fafe4 100644
--- a/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
+++ b/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
@@ -3,11 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-<<<<<<< HEAD
             "value": "<<namePrefix>>-az-law-min-001"
-=======
-            "value": "<<namePrefix>>-az-bv-min-001"
->>>>>>> cc920848f21b57e5f4f2dfbd39e040465d4e5dd6
         }
     }
 }
diff --git a/modules/README.md b/modules/README.md
index 13031be411..23e4b05592 100644
--- a/modules/README.md
+++ b/modules/README.md
@@ -8,12 +8,8 @@ In this section you can find useful information regarding the Modules that are c
 | [Analysis Services Servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) | `MS.AnalysisServices` | [servers](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AnalysisServices/servers) |
 | [API Management Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) | `MS.ApiManagement` | [service](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ApiManagement/service) |
 | [App Configuration](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) | `MS.AppConfiguration` | [configurationStores](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.AppConfiguration/configurationStores) |
-<<<<<<< HEAD
 | [Authorization Locks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/locks) | `MS.Authorization` | [locks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/locks) |
 | [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |  | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |
-=======
-| [Policy Assignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) | `MS.Authorization` | [policyAssignments](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyAssignments) |
->>>>>>> cc920848f21b57e5f4f2dfbd39e040465d4e5dd6
 | [Policy Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |  | [policyDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyDefinitions) |
 | [Policy Exemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |  | [policyExemptions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policyExemptions) |
 | [Policy Set Definitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |  | [policySetDefinitions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Authorization/policySetDefinitions) |
@@ -36,10 +32,7 @@ In this section you can find useful information regarding the Modules that are c
 | [Azure Kubernetes Services](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) | `MS.ContainerService` | [managedClusters](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.ContainerService/managedClusters) |
 | [Azure Databricks](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) | `MS.Databricks` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Databricks/workspaces) |
 | [Data Factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) | `MS.DataFactory` | [factories](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataFactory/factories) |
-<<<<<<< HEAD
 | [DataProtection BackupVaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataProtection/backupVaults) | `MS.DataProtection` | [backupVaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DataProtection/backupVaults) |
-=======
->>>>>>> cc920848f21b57e5f4f2dfbd39e040465d4e5dd6
 | [AVD Application Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) | `MS.DesktopVirtualization` | [applicationgroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/applicationgroups) |
 | [AVD Host Pools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |  | [hostpools](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/hostpools) |
 | [AVD Scaling Plans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |  | [scalingplans](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.DesktopVirtualization/scalingplans) |
@@ -94,10 +87,7 @@ In this section you can find useful information regarding the Modules that are c
 | [VPN Gateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |  | [vpnGateways](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnGateways) |
 | [VPN Sites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |  | [vpnSites](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Network/vpnSites) |
 | [Log Analytics Workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) | `MS.OperationalInsights` | [workspaces](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationalInsights/workspaces) |
-<<<<<<< HEAD
 | [OperationsManagement Solutions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationsManagement/solutions) | `MS.OperationsManagement` | [solutions](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.OperationsManagement/solutions) |
-=======
->>>>>>> cc920848f21b57e5f4f2dfbd39e040465d4e5dd6
 | [Recovery Services Vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) | `MS.RecoveryServices` | [vaults](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.RecoveryServices/vaults) |
 | [Deployment Scripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) | `MS.Resources` | [deploymentScripts](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/deploymentScripts) |
 | [Resource Groups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |  | [resourceGroups](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Resources/resourceGroups) |

From e2a8f020e8dcdc586d45dbf5f4883609fce65def Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 26 Jun 2022 00:07:31 +0200
Subject: [PATCH 15/16] Fix scripts

---
 utilities/tools/ConvertTo-ARMTemplate.ps1 |   6 +-
 utilities/tools/Test-ModuleLocally.ps1    | 184 +++++++++++-----------
 2 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/utilities/tools/ConvertTo-ARMTemplate.ps1 b/utilities/tools/ConvertTo-ARMTemplate.ps1
index fd4758af60..90fe651023 100644
--- a/utilities/tools/ConvertTo-ARMTemplate.ps1
+++ b/utilities/tools/ConvertTo-ARMTemplate.ps1
@@ -203,8 +203,8 @@ if (-not $SkipPipelineUpdate) {
                 $_ | Set-Content -Value $content
             }
         }
-    }Verbose 'Update#pipelineefilesn-dDone'
-    Invoke-History
-    #endregionegion
+    }
+
+    Write-Verbose 'Update pipeline files - Done'
 }
 #endregion
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index b4873c4ea2..081762ab77 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -165,116 +165,116 @@ function Test-ModuleLocally {
                 }
 
                 Invoke-Pester -Configuration @{
-                    Run = @{
+                    Run    = @{
                         Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'modules/.global/global.module.tests.ps1') -Data @{
-                            Output = @{
-                                Verbosity = 'Detailed'
-                            }
+                            moduleFolderPaths = Split-Path $TemplateFilePath -Parent
+                            enforcedTokenList = $enforcedTokenList
                         }
-                    } catch {
-                        $PSItem.Exception.Message
+                    }
+                    Output = @{
+                        Verbosity = 'Detailed'
                     }
                 }
+            } catch {
+                $PSItem.Exception.Message
+            }
+        }
 
-                #################################
-                # Validation & Deployment tests #
-                #################################
-                if (($ValidationTest -or $DeploymentTest) -and $ValidateOrDeployParameters) {
-
-                    # Find Test Parameter Files
-                    # -------------------------
-                    if ((Get-Item -Path $parameterFilePath) -is [System.IO.DirectoryInfo]) {
-                        $ModuleParameterFiles = (Get-ChildItem -Path $parameterFilePath).FullName
-                    } else {
-                        $ModuleParameterFiles = @($parameterFilePath)
-                    }
+        #################################
+        # Validation & Deployment tests #
+        #################################
+        if (($ValidationTest -or $DeploymentTest) -and $ValidateOrDeployParameters) {
+
+            # Find Test Parameter Files
+            # -------------------------
+            if ((Get-Item -Path $parameterFilePath) -is [System.IO.DirectoryInfo]) {
+                $ModuleParameterFiles = (Get-ChildItem -Path $parameterFilePath).FullName
+            } else {
+                $ModuleParameterFiles = @($parameterFilePath)
+            }
 
-                    # Replace parameter file tokens
-                    # -----------------------------
+            # Replace parameter file tokens
+            # -----------------------------
 
-                    # Default Tokens
-                    $ConvertTokensInputs = @{
-                        Tokens = @{
-                            subscriptionId    = $ValidateOrDeployParameters.SubscriptionId
-                            managementGroupId = $ValidateOrDeployParameters.ManagementGroupId
-                        }
-                    }
+            # Default Tokens
+            $ConvertTokensInputs = @{
+                Tokens = @{
+                    subscriptionId    = $ValidateOrDeployParameters.SubscriptionId
+                    managementGroupId = $ValidateOrDeployParameters.ManagementGroupId
+                }
+            }
 
-                    #Add Other Parameter File Tokens (For Testing)
-                    if ($AdditionalTokens) {
-                        $ConvertTokensInputs.Tokens += $AdditionalTokens
-                    }
+            #Add Other Parameter File Tokens (For Testing)
+            if ($AdditionalTokens) {
+                $ConvertTokensInputs.Tokens += $AdditionalTokens
+            }
 
-                    # Tokens in settings.json
-                    $settingsFilePath = Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'settings.json'
-                    if (Test-Path $settingsFilePath) {
-                        $Settings = Get-Content -Path $settingsFilePath -Raw | ConvertFrom-Json -AsHashtable
-                        $ConvertTokensInputs += @{
-                            TokenPrefix = $Settings.parameterFileTokens.tokenPrefix
-                            TokenSuffix = $Settings.parameterFileTokens.tokenSuffix
-                        }
+            # Tokens in settings.json
+            $settingsFilePath = Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'settings.json'
+            if (Test-Path $settingsFilePath) {
+                $Settings = Get-Content -Path $settingsFilePath -Raw | ConvertFrom-Json -AsHashtable
+                $ConvertTokensInputs += @{
+                    TokenPrefix = $Settings.parameterFileTokens.tokenPrefix
+                    TokenSuffix = $Settings.parameterFileTokens.tokenSuffix
+                }
 
-                        if ($Settings.parameterFileTokens.localTokens) {
-                            $tokenMap = @{}
-                            foreach ($token in $Settings.parameterFileTokens.localTokens) {
-                                $tokenMap += @{ $token.name = $token.value }
-                            }
-                            Write-Verbose ('Using local tokens [{0}]' -f ($tokenMap.Keys -join ', ')) -Verbose
-                            $ConvertTokensInputs.Tokens += $tokenMap
-                        }
+                if ($Settings.parameterFileTokens.localTokens) {
+                    $tokenMap = @{}
+                    foreach ($token in $Settings.parameterFileTokens.localTokens) {
+                        $tokenMap += @{ $token.name = $token.value }
                     }
+                    Write-Verbose ('Using local tokens [{0}]' -f ($tokenMap.Keys -join ', ')) -Verbose
+                    $ConvertTokensInputs.Tokens += $tokenMap
+                }
+            }
 
-                    # Invoke Token Replacement Functionality and Convert Tokens in Parameter Files
-                    $ModuleParameterFiles | ForEach-Object { $null = Convert-TokensInFile @ConvertTokensInputs -FilePath $_ }
-
-                    # Deployment & Validation Testing
-                    # -------------------------------
-                    $functionInput = @{
-                        TemplateFilePath  = $TemplateFilePath
-                        location          = $ValidateOrDeployParameters.Location
-                        resourceGroupName = $ValidateOrDeployParameters.ResourceGroupName
-                        subscriptionId    = $ValidateOrDeployParameters.SubscriptionId
-                        managementGroupId = $ValidateOrDeployParameters.ManagementGroupId
-                        Verbose           = $true
+            # Invoke Token Replacement Functionality and Convert Tokens in Parameter Files
+            $ModuleParameterFiles | ForEach-Object { $null = Convert-TokensInFile @ConvertTokensInputs -FilePath $_ }
+
+            # Deployment & Validation Testing
+            # -------------------------------
+            $functionInput = @{
+                TemplateFilePath  = $TemplateFilePath
+                location          = $ValidateOrDeployParameters.Location
+                resourceGroupName = $ValidateOrDeployParameters.ResourceGroupName
+                subscriptionId    = $ValidateOrDeployParameters.SubscriptionId
+                managementGroupId = $ValidateOrDeployParameters.ManagementGroupId
+                Verbose           = $true
+            }
+            try {
+                # Validate template
+                # -----------------
+                if ($ValidationTest) {
+                    # Loop through test parameter files
+                    foreach ($paramFilePath in $moduleParameterFiles) {
+                        Write-Verbose ('Validating module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)) -Verbose
+                        Test-TemplateDeployment @functionInput -ParameterFilePath $paramFilePath
                     }
-                    try {
-                        # Validate template
-                        # -----------------
-                        if ($ValidationTest) {
-                            # Loop through test parameter files
-                            foreach ($paramFilePath in $moduleParameterFiles) {
-                                Write-Verbose ('Validating module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)) -Verbose
-                                Test-TemplateDeployment @functionInput -ParameterFilePath $paramFilePath
-                            }
-                        }
+                }
 
 
-                        # Deploy template
-                        # ---------------
-                        if ($DeploymentTest) {
-                            $functionInput['retryLimit'] = 1 # Overwrite default of 3
-                            # Loop through test parameter files
-                            foreach ($paramFilePath in $moduleParameterFiles) {
-                                Write-Verbose ('Deploy module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)) -Verbose
-                                if ($PSCmdlet.ShouldProcess(('Module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)), 'Deploy')) {
-                                    New-TemplateDeployment @functionInput -ParameterFilePath $paramFilePath
-                                }
-                            }
-                        }
-                    } catch {
-                        Write-Error $_
-                    } finally {
-                        # Restore parameter files
-                        # -----------------------
-                        if (($ValidationTest -or $DeploymentTest) -and $ValidateOrDeployParameters) {
-                            # Replace Values with Tokens For Repo Updates
-                            Write-Verbose 'Restoring Tokens'
-                            $ModuleParameterFiles | ForEach-Object { $null = Convert-TokensInFile @ConvertTokensInputs -FilePath $_ -SwapValueWithName $true }
+                # Deploy template
+                # ---------------
+                if ($DeploymentTest) {
+                    $functionInput['retryLimit'] = 1 # Overwrite default of 3
+                    # Loop through test parameter files
+                    foreach ($paramFilePath in $moduleParameterFiles) {
+                        Write-Verbose ('Deploy module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)) -Verbose
+                        if ($PSCmdlet.ShouldProcess(('Module [{0}] with parameter file [{1}]' -f $ModuleName, (Split-Path $paramFilePath -Leaf)), 'Deploy')) {
+                            New-TemplateDeployment @functionInput -ParameterFilePath $paramFilePath
                         }
                     }
                 }
-            }
-            end {
+            } catch {
+                Write-Error $_
+            } finally {
+                # Restore parameter files
+                # -----------------------
+                if (($ValidationTest -or $DeploymentTest) -and $ValidateOrDeployParameters) {
+                    # Replace Values with Tokens For Repo Updates
+                    Write-Verbose 'Restoring Tokens'
+                    $ModuleParameterFiles | ForEach-Object { $null = Convert-TokensInFile @ConvertTokensInputs -FilePath $_ -SwapValueWithName $true }
+                }
             }
         }
     }

From b768d681ddc399c9d678eced696eeb3bab459dde Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 26 Jun 2022 00:17:55 +0200
Subject: [PATCH 16/16] fix

---
 .../.bicep/nested_roleAssignments.bicep       | 43 ---------------
 .../.bicep/nested_publicIPAddress_rbac.bicep  | 55 -------------------
 2 files changed, 98 deletions(-)
 delete mode 100644 arm/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep

diff --git a/arm/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep b/arm/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
deleted file mode 100644
index 2f52129333..0000000000
--- a/arm/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
+++ /dev/null
@@ -1,43 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-}
-
-resource bv 'Microsoft.DataProtection/backupVaults@2022-03-01' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(bv.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? any(principalType) : null
-  }
-  scope: bv
-}]
diff --git a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep b/modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
deleted file mode 100644
index 1a65e573d0..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
+++ /dev/null
@@ -1,55 +0,0 @@
-@sys.description('Required. The IDs of the principals to assign the role to.')
-param principalIds array
-
-@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.')
-param roleDefinitionIdOrName string
-
-@sys.description('Required. The resource ID of the resource to apply the role assignment to.')
-param resourceId string
-
-@sys.description('Optional. The principal type of the assigned principal ID.')
-@allowed([
-  'ServicePrincipal'
-  'Group'
-  'User'
-  'ForeignGroup'
-  'Device'
-  ''
-])
-param principalType string = ''
-
-@sys.description('Optional. The description of the role assignment.')
-param description string = ''
-
-var builtInRoleNames = {
-  'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
-  'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
-  'Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
-  'App Configuration Data Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5ae67dd6-50cb-40e7-96ff-dc2bfa4b606b')
-  'App Configuration Data Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '516239f1-63e1-4d78-a4de-a74fb236a071')
-  'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')
-  'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893')
-  'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e')
-  'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae')
-  'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44')
-  'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa')
-  'Monitoring Metrics Publisher': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '3913510d-42f4-4e42-8a64-420c390055eb')
-  'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05')
-  'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608')
-  'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
-}
-
-resource appConfiguration 'Microsoft.AppConfiguration/configurationStores@2021-10-01-preview' existing = {
-  name: last(split(resourceId, '/'))
-}
-
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in principalIds: {
-  name: guid(appConfiguration.id, principalId, roleDefinitionIdOrName)
-  properties: {
-    description: description
-    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
-    principalId: principalId
-    principalType: !empty(principalType) ? principalType : null
-  }
-  scope: appConfiguration
-}]