From 8f799585b95f2cdaa1bcb51bf53f51444b97d922 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 26 Jun 2022 00:37:26 +0200
Subject: [PATCH 01/36] [MAJOR/BREAKING] Renamed `arm` to `modules` (#1498)

* Renamed `arm` to `modules` (#1498)
---
 .../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             |   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  |   6 +-
 .../jobs.validateModulePester.yml             |  12 +-
 .../platform.dependencies.yml                 |   2 +-
 .../platform.updateReadMe.yml                 |  10 +-
 .../templates/publishModule/action.yml        |  30 +--
 .../validateModuleDeployment/action.yml       |  24 +--
 .../templates/validateModulePester/action.yml |  18 +-
 .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 +++++++++---------
 .../.bicep/nested_roleAssignments.bicep       |  43 ----
 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
 .../.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     |  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 +--
 1270 files changed, 1106 insertions(+), 1143 deletions(-)
 delete mode 100644 arm/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
 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/.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..45f197e830 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/*.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 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..8e36f369d8 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,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..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 2585707067..957b94643d 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'
 ##
 #########################################################
 ##
@@ -11,11 +11,11 @@
 ## ACTION PARAMETERS                         ##
 ##-------------------------------------------##
 ##
-##   |===========================================================================================================|
-##   | Parameter  | Required | Default | Description                     | Example                               |
-##   |------------|----------|---------|---------------------------------|---------------------------------------|
-##   | modulePath | true     | ''      | The path to the module's folder | 'arm/Microsoft.ApiManagement/service' |
-##   |===========================================================================================================|
+##   |===============================================================================================================|
+##   | Parameter  | Required | Default | Description                     | Example                                   |
+##   |------------|----------|---------|---------------------------------|-------------------------------------------|
+##   | 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/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/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..21437dd74f 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 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
@@ -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..a280f5bbd8 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`) 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 e48f49b75a..baa6bd150c 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 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 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 4871057553..714282abff 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/.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..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 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..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 27e87c1e30215511f66cf141c34507edd0002e00 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 20:01:29 +0200
Subject: [PATCH 02/36] Updated readme

---
 modules/Microsoft.OperationalInsights/workspaces/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Microsoft.OperationalInsights/workspaces/readme.md b/modules/Microsoft.OperationalInsights/workspaces/readme.md
index a59a80f2c1..7ab03028f1 100644
--- a/modules/Microsoft.OperationalInsights/workspaces/readme.md
+++ b/modules/Microsoft.OperationalInsights/workspaces/readme.md
@@ -15,7 +15,7 @@ This template deploys a log analytics workspace.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | [2017-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2020-10-01-preview](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-10-01-preview/roleAssignments) |
-| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/diagnosticSettings) |
+| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 | `Microsoft.OperationalInsights/workspaces` | [2020-08-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces) |
 | `Microsoft.OperationalInsights/workspaces/dataSources` | [2020-08-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataSources) |
 | `Microsoft.OperationalInsights/workspaces/linkedServices` | [2020-08-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedServices) |

From 60ec109118a3fd9eb682103dcccb6d52df24f19d Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 20:04:14 +0200
Subject: [PATCH 03/36] Updated readme

---
 modules/Microsoft.Web/serverfarms/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Microsoft.Web/serverfarms/readme.md b/modules/Microsoft.Web/serverfarms/readme.md
index f67d7dc3c0..72d0297048 100644
--- a/modules/Microsoft.Web/serverfarms/readme.md
+++ b/modules/Microsoft.Web/serverfarms/readme.md
@@ -260,8 +260,8 @@ tags: {
 <summary>via Bicep module</summary>
 
 ```bicep
-module serverf './Microsoft.Web/serverf/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-serverf'
+module serverfarms './Microsoft.Web/serverfarms/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-serverfarms'
   params: {
     name: '<<namePrefix>>-az-asp-x-001'
     lock: 'CanNotDelete'

From 3c60701f7d68b8c0c65f79b238f2c9b66d55d5e8 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 20:11:58 +0200
Subject: [PATCH 04/36] Minor update

---
 .../automationAccounts/modules/deploy.bicep                     | 2 +-
 .../Microsoft.Automation/automationAccounts/modules/readme.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
index 2927c87e94..4e9ce28d86 100644
--- a/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
+++ b/modules/Microsoft.Automation/automationAccounts/modules/deploy.bicep
@@ -4,7 +4,7 @@ param name string
 @description('Conditional. The name of the parent Automation Account. Required if the template is used in a standalone deployment.')
 param automationAccountName string
 
-@description('Required. Module package uri, e.g. https://www.powershellgallery.com/api/v2/package.')
+@description('Required. Module package URI, e.g. https://www.powershellgallery.com/api/v2/package.')
 param uri string
 
 @description('Optional. Module version or specify latest to get the latest version.')
diff --git a/modules/Microsoft.Automation/automationAccounts/modules/readme.md b/modules/Microsoft.Automation/automationAccounts/modules/readme.md
index c593272a90..9eb4ee8a5c 100644
--- a/modules/Microsoft.Automation/automationAccounts/modules/readme.md
+++ b/modules/Microsoft.Automation/automationAccounts/modules/readme.md
@@ -20,7 +20,7 @@ This module deploys an Azure Automation Account Module.
 | Parameter Name | Type | Description |
 | :-- | :-- | :-- |
 | `name` | string | Name of the Automation Account module. |
-| `uri` | string | Module package uri, e.g. https://www.powershellgallery.com/api/v2/package. |
+| `uri` | string | Module package URI, e.g. https://www.powershellgallery.com/api/v2/package. |
 
 **Conditional parameters**
 | Parameter Name | Type | Description |

From cd82aacfebd5c436110c6e1b5020f61585014441 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 20:51:48 +0200
Subject: [PATCH 05/36] Added trigger to arm convertion test

---
 .github/workflows/platform.convertToArmTemplate.tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/platform.convertToArmTemplate.tests.yml b/.github/workflows/platform.convertToArmTemplate.tests.yml
index abbce2b938..a17478ce75 100644
--- a/.github/workflows/platform.convertToArmTemplate.tests.yml
+++ b/.github/workflows/platform.convertToArmTemplate.tests.yml
@@ -1,6 +1,7 @@
 name: '.Platform: Test - ConvertTo-ARMTemplate.ps1'
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

From 1bcc7ed55f9d0f23dea85374714992e3ad24c003 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 21:49:23 +0200
Subject: [PATCH 06/36] Adjusted pester

---
 modules/.global/global.module.tests.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 3233d33690..389efe3eb4 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -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('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -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('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+            $moduleFolderPathKey = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Trim('/').Replace('/', '-')
             if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
                 if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                     $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
@@ -963,7 +963,7 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
         $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('modules')[1].Replace('\', '/').Trim('/').Replace('/', '-')
+        $moduleFolderPathKey = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1].Trim('/').Replace('/', '-')
         if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
             if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
                 $templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'

From 9832be2a8b5e9ad3c9bb12754d9a510799ff2562 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 22:08:27 +0200
Subject: [PATCH 07/36] Fixed in readme function

---
 utilities/tools/Set-ModuleReadMe.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index e06c53c970..cb564db51a 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('modules')[1].Replace('\', '/').TrimStart('/')
+    $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
     $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.parameters') -Filter '*parameters.json' -Recurse
 
     $index = 1

From c5e44572716d71ec9c3b88fb79c6ba1db010e0a1 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 26 Jun 2022 22:15:58 +0200
Subject: [PATCH 08/36] Re-added deleted template

---
 .../.bicep/nested_roleAssignments.bicep       | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep

diff --git a/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
new file mode 100644
index 0000000000..02cd494ea4
--- /dev/null
+++ b/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep
@@ -0,0 +1,43 @@
+@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 backupVault '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(backupVault.id, principalId, roleDefinitionIdOrName)
+  properties: {
+    description: description
+    roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName
+    principalId: principalId
+    principalType: !empty(principalType) ? any(principalType) : null
+  }
+  scope: backupVault
+}]

From 69cad602ace52f03eb60b552e42da96ab5d25a6c Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 10:05:10 +0200
Subject: [PATCH 09/36] Fixed pipeline reference

---
 .azuredevops/modulePipelines/ms.network.firewallpolicies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index d0628548a1..251c1eaa44 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -36,7 +36,7 @@ stages:
   - stage: Validation
     displayName: Static validation
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
   - stage: Deployment
     displayName: Deployment validation

From 436f8bbb6162d8c630ea3804d06c57fd5fad99fa Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 10:05:43 +0200
Subject: [PATCH 10/36] Fixed pipeline reference

---
 .azuredevops/modulePipelines/ms.network.firewallpolicies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 251c1eaa44..4fb1a0f264 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -41,7 +41,7 @@ stages:
   - stage: Deployment
     displayName: Deployment validation
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:

From fda28c21884ebf4bbad1e7ae8b222b2bc14214ab Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 10:12:20 +0200
Subject: [PATCH 11/36] Fixed pipeline title

---
 .azuredevops/modulePipelines/ms.network.virtualhubs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
index ff44ffc9cb..91fc5e736f 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
@@ -1,4 +1,4 @@
-name: 'Network: VirtualHubs'
+name: 'Network - VirtualHubs'
 
 parameters:
   - name: removeDeployment

From 80ba15b24cfd236f6fafc6ab45f6a1c91cc95dcc Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 10:39:19 +0200
Subject: [PATCH 12/36] Fixed another typo

---
 .../ms.kubernetesconfiguration.fluxconfigurations.yml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
index 75b300c5b6..80d647d747 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -1,4 +1,4 @@
-name: 'KubernetesConfiguration: FluxConfigurations'
+name: 'KubernetesConfiguration - FluxConfigurations'
 
 parameters:
   - name: removeDeployment

From 7a2135094d8c377e7f8cedc89868015fc5e3f4a1 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 10:45:05 +0200
Subject: [PATCH 13/36] Fixed another typo

---
 .azuredevops/modulePipelines/ms.network.vpngateways.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.network.vpngateways.yml b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
index 5375efbf13..18743ce83b 100644
--- a/.azuredevops/modulePipelines/ms.network.vpngateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
@@ -1,4 +1,4 @@
-name: 'Network: VPNGateways'
+name: 'Network - VPNGateways'
 
 parameters:
   - name: removeDeployment

From 908a8ab2c1d5863de81429de068ae49aa02a93ff Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 11:05:14 +0200
Subject: [PATCH 14/36] Fixed casing

---
 .azuredevops/modulePipelines/ms.network.firewallpolicies.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 4fb1a0f264..4e64acd136 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -21,7 +21,7 @@ trigger:
     include:
       - '/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml'
       - '/.azuredevops/pipelineTemplates/*.yml'
-      - '/modules/Microsoft.Network/firewallpolicies/*'
+      - '/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: '/modules/Microsoft.Network/firewallpolicies'
+    value: '/modules/Microsoft.Network/firewallPolicies'
 
 stages:
   - stage: Validation

From b7cee57c162f91f62916d35c445633af1e5a5d0c Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 11:14:14 +0200
Subject: [PATCH 15/36] Fixed service fabric pipeline reference

---
 .azuredevops/modulePipelines/ms.servicefabric.clusters.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 45f197e830..60b8563841 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -36,12 +36,12 @@ stages:
   - stage: Validation
     displayName: Static validation
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
   - stage: Deployment
     displayName: Deployment validation
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:

From a2571f096bc71864f90521b438336dd5fc8dd7c5 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 11:50:56 +0200
Subject: [PATCH 16/36] First batch of changes

---
 .../modulePipelines/ms.aad.domainservices.yml        |  2 +-
 .../modulePipelines/ms.analysisservices.servers.yml  |  6 +++---
 .../modulePipelines/ms.apimanagement.service.yml     |  6 +++---
 .../ms.appconfiguration.configurationstores.yml      |  4 ++--
 .../modulePipelines/ms.authorization.locks.yml       |  2 +-
 .../ms.authorization.policyassignments.yml           | 12 ++++++------
 .../ms.authorization.policydefinitions.yml           |  8 ++++----
 .../ms.authorization.policyexemptions.yml            | 12 ++++++------
 .../ms.authorization.policysetdefinitions.yml        |  8 ++++----
 .../ms.authorization.roleassignments.yml             | 12 ++++++------
 .../ms.authorization.roledefinitions.yml             | 12 ++++++------
 .../ms.automation.automationaccounts.yml             |  6 +++---
 .../modulePipelines/ms.batch.batchaccounts.yml       |  4 ++--
 .../ms.cognitiveservices.accounts.yml                |  8 ++++----
 .../modulePipelines/ms.compute.availabilitysets.yml  |  2 +-
 .../ms.compute.diskencryptionsets.yml                |  2 +-
 .azuredevops/modulePipelines/ms.compute.disks.yml    |  8 ++++----
 .../modulePipelines/ms.compute.galleries.yml         |  8 ++++----
 .azuredevops/modulePipelines/ms.compute.images.yml   |  2 +-
 .../ms.compute.proximityplacementgroups.yml          |  2 +-
 .../modulePipelines/ms.compute.virtualmachines.yml   | 12 ++++++------
 .../ms.compute.virtualmachinescalesets.yml           |  8 ++++----
 .../modulePipelines/ms.consumption.budgets.yml       |  2 +-
 .../ms.containerinstance.containergroups.yml         |  2 +-
 .../ms.containerregistry.registries.yml              |  6 +++---
 .../ms.containerservice.managedclusters.yml          |  4 ++--
 .../modulePipelines/ms.databricks.workspaces.yml     |  2 +-
 .../modulePipelines/ms.datafactory.factories.yml     |  2 +-
 .../ms.dataprotection.backupvaults.yml               |  4 ++--
 .../ms.desktopvirtualization.applicationgroups.yml   |  4 ++--
 .../ms.desktopvirtualization.hostpools.yml           |  2 +-
 .../ms.desktopvirtualization.scalingplans.yml        |  2 +-
 .../ms.desktopvirtualization.workspaces.yml          |  2 +-
 .../ms.documentdb.databaseaccounts.yml               |  6 +++---
 .../modulePipelines/ms.eventgrid.systemtopics.yml    |  4 ++--
 .azuredevops/modulePipelines/ms.eventgrid.topics.yml |  2 +-
 .../modulePipelines/ms.eventhub.namespaces.yml       |  4 ++--
 .../modulePipelines/ms.healthbot.healthbots.yml      |  2 +-
 .../modulePipelines/ms.insights.actiongroups.yml     |  2 +-
 .../ms.insights.activitylogalerts.yml                |  2 +-
 .../modulePipelines/ms.insights.components.yml       |  2 +-
 .../ms.insights.diagnosticsettings.yml               |  2 +-
 .../modulePipelines/ms.insights.metricalerts.yml     |  2 +-
 .../ms.insights.privatelinkscopes.yml                |  2 +-
 .../ms.insights.scheduledqueryrules.yml              |  2 +-
 .azuredevops/modulePipelines/ms.keyvault.vaults.yml  |  4 ++--
 .../ms.kubernetesconfiguration.extensions.yml        |  4 ++--
 ...ms.kubernetesconfiguration.fluxconfigurations.yml |  4 ++--
 .azuredevops/modulePipelines/ms.logic.workflows.yml  |  2 +-
 .../ms.machinelearningservices.workspaces.yml        |  4 ++--
 .../ms.managedidentity.userassignedidentities.yml    |  2 +-
 .../ms.managedservices.registrationdefinitions.yml   |  4 ++--
 .../ms.management.managementgroups.yml               |  2 +-
 .../modulePipelines/ms.netapp.netappaccounts.yml     |  6 +++---
 .../ms.network.applicationgateways.yml               |  2 +-
 .../ms.network.applicationsecuritygroups.yml         |  2 +-
 .../modulePipelines/ms.network.azurefirewalls.yml    |  2 +-
 .../modulePipelines/ms.network.bastionhosts.yml      |  4 ++--
 .../modulePipelines/ms.network.connections.yml       |  2 +-
 .../ms.network.ddosprotectionplans.yml               |  2 +-
 .../ms.network.expressroutecircuits.yml              |  2 +-
 .../modulePipelines/ms.network.firewallpolicies.yml  |  2 +-
 .../modulePipelines/ms.network.frontdoors.yml        |  2 +-
 .azuredevops/modulePipelines/ms.network.ipgroups.yml |  2 +-
 .../modulePipelines/ms.network.loadbalancers.yml     |  6 +++---
 .../ms.network.localnetworkgateways.yml              |  2 +-
 .../modulePipelines/ms.network.natgateways.yml       |  2 +-
 .../modulePipelines/ms.network.networkinterfaces.yml |  4 ++--
 .../ms.network.networksecuritygroups.yml             |  4 ++--
 .../modulePipelines/ms.network.networkwatchers.yml   |  4 ++--
 .../modulePipelines/ms.network.privatednszones.yml   |  4 ++--
 .../modulePipelines/ms.network.privateendpoints.yml  |  4 ++--
 .../modulePipelines/ms.network.publicipaddresses.yml |  2 +-
 .../modulePipelines/ms.network.publicipprefixes.yml  |  2 +-
 .../modulePipelines/ms.network.routetables.yml       |  2 +-
 .../ms.network.trafficmanagerprofiles.yml            |  2 +-
 .../modulePipelines/ms.network.virtualhubs.yml       |  4 ++--
 .../ms.network.virtualnetworkgateways.yml            |  4 ++--
 .../modulePipelines/ms.network.virtualnetworks.yml   |  4 ++--
 .../modulePipelines/ms.network.virtualwans.yml       |  4 ++--
 .../modulePipelines/ms.network.vpngateways.yml       |  4 ++--
 .azuredevops/modulePipelines/ms.network.vpnsites.yml |  4 ++--
 .../ms.operationalinsights.workspaces.yml            |  4 ++--
 .../ms.operationsmanagement.solutions.yml            |  6 +++---
 .../modulePipelines/ms.recoveryservices.vaults.yml   |  6 +++---
 .../ms.resources.deploymentscripts.yml               |  4 ++--
 .../modulePipelines/ms.resources.resourcegroups.yml  |  2 +-
 .azuredevops/modulePipelines/ms.resources.tags.yml   |  6 +++---
 .../ms.security.azuresecuritycenter.yml              |  2 +-
 .../modulePipelines/ms.servicebus.namespaces.yml     |  4 ++--
 .../modulePipelines/ms.servicefabric.clusters.yml    |  6 +++---
 .../modulePipelines/ms.sql.managedinstances.yml      |  2 +-
 .azuredevops/modulePipelines/ms.sql.servers.yml      |  4 ++--
 .../modulePipelines/ms.storage.storageaccounts.yml   | 10 +++++-----
 .../modulePipelines/ms.synapse.privatelinkhubs.yml   |  4 ++--
 .../ms.virtualmachineimages.imagetemplates.yml       |  2 +-
 .azuredevops/modulePipelines/ms.web.connections.yml  |  2 +-
 .../modulePipelines/ms.web.hostingenvironments.yml   |  4 ++--
 .azuredevops/modulePipelines/ms.web.serverfarms.yml  |  2 +-
 .azuredevops/modulePipelines/ms.web.sites.yml        |  8 ++++----
 .azuredevops/modulePipelines/ms.web.staticsites.yml  |  4 ++--
 .../templates/validateModuleDeployment/action.yml    |  2 +-
 .../linux.prefix.parameter.json                      |  0
 .../linux.vmnames.parameter.json                     |  0
 .../parameters.json                                  |  0
 .../max.parameters.json                              |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../max.parameters.json                              |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../rg.parameters.json                               |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../rg.min.parameters.json                           |  0
 .../rg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../rg.min.parameters.json                           |  0
 .../rg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../rg.min.parameters.json                           |  0
 .../rg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../mg.min.parameters.json                           |  0
 .../mg.parameters.json                               |  0
 .../rg.min.parameters.json                           |  0
 .../rg.parameters.json                               |  0
 .../sub.min.parameters.json                          |  0
 .../sub.parameters.json                              |  0
 .../encr.parameters.json                             |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../encr.parameters.json                             |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../speech.parameters.json                           |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../image.parameters.json                            |  0
 .../import.parameters.json                           |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../images.parameters.json                           |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../linux.min.parameters.json                        |  0
 .../linux.parameters.json                            |  0
 .../windows.min.parameters.json                      |  0
 .../windows.parameters.json                          |  0
 .../linux.autmg.parameters.json                      |  0
 .../linux.min.parameters.json                        |  0
 .../linux.parameters.json                            |  0
 .../windows.autmg.parameters.json                    |  0
 .../windows.min.parameters.json                      |  0
 .../windows.parameters.json                          |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../encr.parameters.json                             |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../azure.parameters.json                            |  0
 .../kubenet.parameters.json                          |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../mongodb.parameters.json                          |  0
 .../plain.parameters.json                            |  0
 .../sqldb.parameters.json                            |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../rg.parameters.json                               |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../nfs3.parameters.json                             |  0
 .../nfs41.parameters.json                            |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../addpip.parameters.json                           |  0
 .../custompip.parameters.json                        |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../addpip.parameters.json                           |  0
 .../custompip.parameters.json                        |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../vnet2vnet.parameters.json                        |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../internal.parameters.json                         |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../expressRoute.parameters.json                     |  0
 .../vpn.parameters.json                              |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../vnetPeering.parameters.json                      |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../ms.parameters.json                               |  0
 .../nonms.parameters.json                            |  0
 .../dr.parameters.json                               |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../cli.parameters.json                              |  0
 .../ps.parameters.json                               |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../rg.parameters.json                               |  0
 .../sub.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../cert.parameters.json                             |  0
 .../full.parameters.json                             |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../admin.parameters.json                            |  0
 .../parameters.json                                  |  0
 .../encr.parameters.json                             |  0
 .../min.parameters.json                              |  0
 .../nfs.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../v1.parameters.json                               |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../parameters.json                                  |  0
 .../asev2.parameters.json                            |  0
 .../asev3.parameters.json                            |  0
 .../parameters.json                                  |  0
 .../fa.min.parameters.json                           |  0
 .../fa.parameters.json                               |  0
 .../wa.min.parameters.json                           |  0
 .../wa.parameters.json                               |  0
 .../min.parameters.json                              |  0
 .../parameters.json                                  |  0
 .../resourceDeployment/New-TemplateDeployment.ps1    |  6 +++---
 .../resourceDeployment/Test-TemplateDeployment.ps1   |  4 ++--
 316 files changed, 210 insertions(+), 210 deletions(-)
 rename constructs/Microsoft.Compute/virtualMachinesMultiple/{.parameters => .deploymentTests}/linux.prefix.parameter.json (100%)
 rename constructs/Microsoft.Compute/virtualMachinesMultiple/{.parameters => .deploymentTests}/linux.vmnames.parameter.json (100%)
 rename modules/Microsoft.AAD/DomainServices/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.parameters => .deploymentTests}/max.parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.parameters => .deploymentTests}/max.parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.AppConfiguration/configurationStores/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.AppConfiguration/configurationStores/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Authorization/locks/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.parameters => .deploymentTests}/encr.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Batch/batchAccounts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Batch/batchAccounts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.parameters => .deploymentTests}/encr.parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.parameters => .deploymentTests}/speech.parameters.json (100%)
 rename modules/Microsoft.Compute/availabilitySets/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Compute/availabilitySets/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/diskEncryptionSets/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.parameters => .deploymentTests}/image.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.parameters => .deploymentTests}/import.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/galleries/{.parameters => .deploymentTests}/images.parameters.json (100%)
 rename modules/Microsoft.Compute/galleries/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/images/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/proximityPlacementGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.parameters => .deploymentTests}/linux.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.parameters => .deploymentTests}/linux.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.parameters => .deploymentTests}/windows.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.parameters => .deploymentTests}/windows.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/linux.autmg.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/linux.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/linux.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/windows.autmg.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/windows.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.parameters => .deploymentTests}/windows.parameters.json (100%)
 rename modules/Microsoft.Consumption/budgets/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ContainerInstance/containerGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.parameters => .deploymentTests}/encr.parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ContainerService/managedClusters/{.parameters => .deploymentTests}/azure.parameters.json (100%)
 rename modules/Microsoft.ContainerService/managedClusters/{.parameters => .deploymentTests}/kubenet.parameters.json (100%)
 rename modules/Microsoft.DataFactory/factories/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.DataProtection/backupVaults/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.DataProtection/backupVaults/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Databricks/workspaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/applicationgroups/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/applicationgroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/hostpools/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/scalingplans/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/workspaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.parameters => .deploymentTests}/mongodb.parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.parameters => .deploymentTests}/plain.parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.parameters => .deploymentTests}/sqldb.parameters.json (100%)
 rename modules/Microsoft.EventGrid/systemTopics/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.EventGrid/systemTopics/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.EventGrid/topics/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.EventHub/namespaces/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.EventHub/namespaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.HealthBot/healthBots/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/actionGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/activityLogAlerts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/components/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/diagnosticSettings/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/metricAlerts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/privateLinkScopes/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Insights/scheduledQueryRules/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.KeyVault/vaults/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.KeyVault/vaults/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/extensions/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/extensions/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/fluxConfigurations/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/fluxConfigurations/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Logic/workflows/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.MachineLearningServices/workspaces/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.MachineLearningServices/workspaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ManagedIdentity/userAssignedIdentities/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ManagedServices/registrationDefinitions/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ManagedServices/registrationDefinitions/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Management/managementGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.parameters => .deploymentTests}/nfs3.parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.parameters => .deploymentTests}/nfs41.parameters.json (100%)
 rename modules/Microsoft.Network/applicationGateways/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/applicationSecurityGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.parameters => .deploymentTests}/addpip.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.parameters => .deploymentTests}/custompip.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.parameters => .deploymentTests}/addpip.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.parameters => .deploymentTests}/custompip.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/connections/{.parameters => .deploymentTests}/vnet2vnet.parameters.json (100%)
 rename modules/Microsoft.Network/ddosProtectionPlans/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/expressRouteCircuits/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/firewallPolicies/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/firewallPolicies/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/frontDoors/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/ipGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.parameters => .deploymentTests}/internal.parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/localNetworkGateways/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/natGateways/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/networkInterfaces/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkInterfaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/networkSecurityGroups/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkSecurityGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/networkWatchers/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkWatchers/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/privateDnsZones/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/privateDnsZones/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/privateEndpoints/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/privateEndpoints/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/publicIPAddresses/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/publicIPPrefixes/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/routeTables/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/trafficmanagerprofiles/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualHubs/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualHubs/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworkGateways/{.parameters => .deploymentTests}/expressRoute.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworkGateways/{.parameters => .deploymentTests}/vpn.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.parameters => .deploymentTests}/vnetPeering.parameters.json (100%)
 rename modules/Microsoft.Network/virtualWans/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualWans/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/vpnGateways/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/vpnGateways/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Network/vpnSites/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Network/vpnSites/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.OperationalInsights/workspaces/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.OperationalInsights/workspaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.parameters => .deploymentTests}/ms.parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.parameters => .deploymentTests}/nonms.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.parameters => .deploymentTests}/dr.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Resources/deploymentScripts/{.parameters => .deploymentTests}/cli.parameters.json (100%)
 rename modules/Microsoft.Resources/deploymentScripts/{.parameters => .deploymentTests}/ps.parameters.json (100%)
 rename modules/Microsoft.Resources/resourceGroups/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.parameters => .deploymentTests}/rg.parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.parameters => .deploymentTests}/sub.parameters.json (100%)
 rename modules/Microsoft.Security/azureSecurityCenter/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ServiceBus/namespaces/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.ServiceBus/namespaces/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.parameters => .deploymentTests}/cert.parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.parameters => .deploymentTests}/full.parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Sql/managedInstances/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Sql/servers/{.parameters => .deploymentTests}/admin.parameters.json (100%)
 rename modules/Microsoft.Sql/servers/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.parameters => .deploymentTests}/encr.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.parameters => .deploymentTests}/nfs.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.parameters => .deploymentTests}/v1.parameters.json (100%)
 rename modules/Microsoft.Synapse/privateLinkHubs/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Synapse/privateLinkHubs/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.VirtualMachineImages/imageTemplates/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Web/connections/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Web/hostingEnvironments/{.parameters => .deploymentTests}/asev2.parameters.json (100%)
 rename modules/Microsoft.Web/hostingEnvironments/{.parameters => .deploymentTests}/asev3.parameters.json (100%)
 rename modules/Microsoft.Web/serverfarms/{.parameters => .deploymentTests}/parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.parameters => .deploymentTests}/fa.min.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.parameters => .deploymentTests}/fa.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.parameters => .deploymentTests}/wa.min.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.parameters => .deploymentTests}/wa.parameters.json (100%)
 rename modules/Microsoft.Web/staticSites/{.parameters => .deploymentTests}/min.parameters.json (100%)
 rename modules/Microsoft.Web/staticSites/{.parameters => .deploymentTests}/parameters.json (100%)

diff --git a/.azuredevops/modulePipelines/ms.aad.domainservices.yml b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
index 5d5aae952c..c6a5286cb9 100644
--- a/.azuredevops/modulePipelines/ms.aad.domainservices.yml
+++ b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index e2352cfa4f..8dcdee1813 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/max.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/max.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index eb9597d02c..b01fa1f753 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/max.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/max.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
index 0feb981ff2..1a05fe60c1 100644
--- a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
+++ b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.locks.yml b/.azuredevops/modulePipelines/ms.authorization.locks.yml
index 1422b4a4c6..d82db7ae5d 100644
--- a/.azuredevops/modulePipelines/ms.authorization.locks.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.locks.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index c58331ead5..b3036c35be 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index 93fd0f469f..a70b9ec8c4 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -45,13 +45,13 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index 50b00a7f08..2e59710782 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index e4c77a27b4..7b15303495 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -45,13 +45,13 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index fb6bba1d74..e62c9db947 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index 3129650057..dd7820dc95 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/mg.parameters.json
+            - path: $(modulePath)/.deploymentTests/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index f4bc5e919f..1d756263a2 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/encr.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/encr.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index 4013ce3b44..bd626999f3 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index f14fc92495..1bb16a4346 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/speech.parameters.json
-            - path: $(modulePath)/.parameters/encr.parameters.json
-            - path: $(modulePath)/.parameters/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/speech.parameters.json
+            - path: $(modulePath)/.deploymentTests/encr.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index edd9663f84..6e88d0794d 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 414b010e09..6b677414cb 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.disks.yml b/.azuredevops/modulePipelines/ms.compute.disks.yml
index 0aec061792..571805dddd 100644
--- a/.azuredevops/modulePipelines/ms.compute.disks.yml
+++ b/.azuredevops/modulePipelines/ms.compute.disks.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/image.parameters.json
-            - path: $(modulePath)/.parameters/import.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/image.parameters.json
+            - path: $(modulePath)/.deploymentTests/import.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index a20b15290c..ae2a381844 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -39,8 +39,8 @@ stages:
       - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
         parameters:
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/images.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/images.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Deployment
     displayName: Deployment validation
@@ -49,8 +49,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/images.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/images.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index 6209ee2c2c..c2b70fd6a8 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index d1371bccb5..6837787064 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index 4358c822fc..f4598a4622 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -45,12 +45,12 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/linux.min.parameters.json
-            - path: $(modulePath)/.parameters/linux.parameters.json
-            - path: $(modulePath)/.parameters/linux.autmg.parameters.json
-            - path: $(modulePath)/.parameters/windows.min.parameters.json
-            - path: $(modulePath)/.parameters/windows.parameters.json
-            - path: $(modulePath)/.parameters/windows.autmg.parameters.json
+            - path: $(modulePath)/.deploymentTests/linux.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/linux.parameters.json
+            - path: $(modulePath)/.deploymentTests/linux.autmg.parameters.json
+            - path: $(modulePath)/.deploymentTests/windows.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/windows.parameters.json
+            - path: $(modulePath)/.deploymentTests/windows.autmg.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 22028b3495..8a235e6434 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/linux.min.parameters.json
-            - path: $(modulePath)/.parameters/linux.parameters.json
-            - path: $(modulePath)/.parameters/windows.min.parameters.json
-            - path: $(modulePath)/.parameters/windows.parameters.json
+            - path: $(modulePath)/.deploymentTests/linux.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/linux.parameters.json
+            - path: $(modulePath)/.deploymentTests/windows.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/windows.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index 1c6a664daf..47edcbd603 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index 855d7dd391..fc9cf784c6 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index 7995ba5e46..3833f24356 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/encr.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/encr.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index 963ee36755..14748f8b77 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/azure.parameters.json
-            - path: $(modulePath)/.parameters/kubenet.parameters.json
+            - path: $(modulePath)/.deploymentTests/azure.parameters.json
+            - path: $(modulePath)/.deploymentTests/kubenet.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index 5f4c9bf50c..ba0e52746c 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index 97d4f2f0a6..02601e6748 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
index 82f6aa3685..aa1c74765e 100644
--- a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
+++ b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index 7f866f9e57..c0c4958ef2 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index 937f2f72b4..f7f724d63a 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
index 312bb14859..adf58c1395 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index 36306e9943..a850a151b3 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index 07d69002ee..c7e13c5efe 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/mongodb.parameters.json
-            - path: $(modulePath)/.parameters/plain.parameters.json
-            - path: $(modulePath)/.parameters/sqldb.parameters.json
+            - path: $(modulePath)/.deploymentTests/mongodb.parameters.json
+            - path: $(modulePath)/.deploymentTests/plain.parameters.json
+            - path: $(modulePath)/.deploymentTests/sqldb.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
index a5b5e4c51b..74b9ed4827 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index bce5557c01..618ee86540 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index 35755a6eab..5f2b4d4a37 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index 86e2587c59..08760e0264 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index 1d6b367fee..465d18b9d8 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index 0290432eeb..cffda42bac 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index 2ebf16d0f5..77ced33898 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index 68cbcd7a8b..aab087928e 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index e2c559ed99..5d3ca5ec25 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index 15d793c90a..e4d8eb0f2a 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index 3ec1537e46..8af9bffff7 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index 39f0e155c1..9defe0353a 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
index 7f53c0e67f..c638da8660 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
index 80d647d747..05c578d2e0 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 0935dfc17e..869220d3e2 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index 25d3dff698..79dfdc2be2 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index 1f00c7cfc7..05a656cf55 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index f32c9014d9..39c68df3c5 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 2b6835ee2b..3289daddc9 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index 51301ce92e..7ef1d4cbb5 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/nfs3.parameters.json
-            - path: $(modulePath)/.parameters/nfs41.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/nfs3.parameters.json
+            - path: $(modulePath)/.deploymentTests/nfs41.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index 94f69382f6..da48d2dac5 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index acd62eae47..f959c4795a 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index 2f54d10839..64abfd6e64 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index ffdb3bcbd4..6746220362 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index fb94033d50..1642c73684 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/vnet2vnet.parameters.json
+            - path: $(modulePath)/.deploymentTests/vnet2vnet.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index 0e31c7a082..4574f81457 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index 8cf0e657b8..8f86baa36a 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 4e64acd136..51a75ecb68 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.frontdoors.yml b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
index 60ec3ae34b..ec107160d9 100644
--- a/.azuredevops/modulePipelines/ms.network.frontdoors.yml
+++ b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index 68741237c9..47ac2b187a 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index 79a642a9a2..cc2769f764 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/internal.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/internal.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index 0ee1e4d5dc..862f64a093 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index c8c54a6b23..17cd3f4bee 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
index 774230b786..ed2ff73682 100644
--- a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index 508abc9800..a592dbf8d3 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index 70dbbd7165..a032607be9 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index fbdae8dbbe..d4f53eb438 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index 08c0110f53..55be935211 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index 8162834d2c..eff1b0250f 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index 0f4ac763e0..05a7e35e48 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index 3e7285e19b..15aeb0fff2 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index e3d4a02456..a064e45548 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
index 91fc5e736f..671a6d9457 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index f83662a85b..7d5fa11d44 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/expressRoute.parameters.json
-            - path: $(modulePath)/.parameters/vpn.parameters.json
+            - path: $(modulePath)/.deploymentTests/expressRoute.parameters.json
+            - path: $(modulePath)/.deploymentTests/vpn.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index 3afcc78e93..c4b4a3ea0a 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/vnetPeering.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/vnetPeering.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index 2f2aa5d2ab..32bfa7afd2 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.vpngateways.yml b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
index 18743ce83b..ee7ce830e8 100644
--- a/.azuredevops/modulePipelines/ms.network.vpngateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.vpnsites.yml b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
index 1671947a58..c6054542cc 100644
--- a/.azuredevops/modulePipelines/ms.network.vpnsites.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index 8b4b67de7d..f3b4863863 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
index ba8cdae0b1..05d4dae6cb 100644
--- a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
+++ b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/nonms.parameters.json
-            - path: $(modulePath)/.parameters/ms.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/nonms.parameters.json
+            - path: $(modulePath)/.deploymentTests/ms.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index cba2c234be..416413054e 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -45,11 +45,11 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.parameters/dr.parameters.json
+            - path: $(modulePath)/.deploymentTests/dr.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index d22921db65..2f5a850bea 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/cli.parameters.json
-            - path: $(modulePath)/.parameters/ps.parameters.json
+            - path: $(modulePath)/.deploymentTests/cli.parameters.json
+            - path: $(modulePath)/.deploymentTests/ps.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index d9dda35a3c..03b074bdb2 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.tags.yml b/.azuredevops/modulePipelines/ms.resources.tags.yml
index 2a63417b98..98316cfcfd 100644
--- a/.azuredevops/modulePipelines/ms.resources.tags.yml
+++ b/.azuredevops/modulePipelines/ms.resources.tags.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/rg.parameters.json
-            - path: $(modulePath)/.parameters/sub.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.deploymentTests/sub.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index ab25a3a0d5..4b6046d2e8 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index 8f7a938e6b..626e23d613 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 60b8563841..c7e516692f 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/full.parameters.json
-            - path: $(modulePath)/.parameters/cert.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/full.parameters.json
+            - path: $(modulePath)/.deploymentTests/cert.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index 8d238daff1..9d49a71ba7 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
           defaultJobTimeoutInMinutes: 360
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index ed0125f637..32d9b5e535 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/admin.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/admin.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index 5b4e07ed3b..62f98d6d33 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -45,11 +45,11 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/nfs.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
-            - path: $(modulePath)/.parameters/v1.parameters.json
-            - path: $(modulePath)/.parameters/encr.parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/nfs.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.deploymentTests/v1.parameters.json
+            - path: $(modulePath)/.deploymentTests/encr.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index 246865319c..295f5beb67 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 818ab369d5..8169a7e43d 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index ffba362d13..4a126a0ee8 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index 1cdbca5b71..a3b6da3f80 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/asev2.parameters.json
-            - path: $(modulePath)/.parameters/asev3.parameters.json
+            - path: $(modulePath)/.deploymentTests/asev2.parameters.json
+            - path: $(modulePath)/.deploymentTests/asev3.parameters.json
           defaultJobTimeoutInMinutes: 180
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index 4288d2a1e3..48d906fedc 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index 28173a7c34..e56f5c75eb 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/fa.min.parameters.json
-            - path: $(modulePath)/.parameters/fa.parameters.json
-            - path: $(modulePath)/.parameters/wa.min.parameters.json
-            - path: $(modulePath)/.parameters/wa.parameters.json
+            - path: $(modulePath)/.deploymentTests/fa.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/fa.parameters.json
+            - path: $(modulePath)/.deploymentTests/wa.min.parameters.json
+            - path: $(modulePath)/.deploymentTests/wa.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.staticsites.yml b/.azuredevops/modulePipelines/ms.web.staticsites.yml
index 23fed47790..e408ebbb15 100644
--- a/.azuredevops/modulePipelines/ms.web.staticsites.yml
+++ b/.azuredevops/modulePipelines/ms.web.staticsites.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.deploymentTests/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 9addde2a80..634e751be7 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -15,7 +15,7 @@
 ##   | 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' |
+##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'modules/Microsoft.ApiManagement/service/.deploymentTests/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/constructs/Microsoft.Compute/virtualMachinesMultiple/.parameters/linux.prefix.parameter.json b/constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.prefix.parameter.json
similarity index 100%
rename from constructs/Microsoft.Compute/virtualMachinesMultiple/.parameters/linux.prefix.parameter.json
rename to constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.prefix.parameter.json
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/.parameters/linux.vmnames.parameter.json b/constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.vmnames.parameter.json
similarity index 100%
rename from constructs/Microsoft.Compute/virtualMachinesMultiple/.parameters/linux.vmnames.parameter.json
rename to constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.vmnames.parameter.json
diff --git a/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json b/modules/Microsoft.AAD/DomainServices/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
rename to modules/Microsoft.AAD/DomainServices/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/modules/Microsoft.AnalysisServices/servers/.deploymentTests/max.parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.deploymentTests/max.parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json b/modules/Microsoft.AnalysisServices/servers/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json b/modules/Microsoft.AnalysisServices/servers/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json b/modules/Microsoft.ApiManagement/service/.deploymentTests/max.parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
rename to modules/Microsoft.ApiManagement/service/.deploymentTests/max.parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json b/modules/Microsoft.ApiManagement/service/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
rename to modules/Microsoft.ApiManagement/service/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/parameters.json b/modules/Microsoft.ApiManagement/service/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.parameters/parameters.json
rename to modules/Microsoft.ApiManagement/service/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/locks/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/locks/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Automation/automationAccounts/.deploymentTests/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.deploymentTests/encr.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/modules/Microsoft.Automation/automationAccounts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/modules/Microsoft.Automation/automationAccounts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json b/modules/Microsoft.Batch/batchAccounts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json b/modules/Microsoft.Batch/batchAccounts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.deploymentTests/encr.parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json b/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/speech.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.deploymentTests/speech.parameters.json
diff --git a/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json b/modules/Microsoft.Compute/availabilitySets/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json b/modules/Microsoft.Compute/availabilitySets/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json b/modules/Microsoft.Compute/diskEncryptionSets/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
rename to modules/Microsoft.Compute/diskEncryptionSets/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/disks/.parameters/image.parameters.json b/modules/Microsoft.Compute/disks/.deploymentTests/image.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.parameters/image.parameters.json
rename to modules/Microsoft.Compute/disks/.deploymentTests/image.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.parameters/import.parameters.json b/modules/Microsoft.Compute/disks/.deploymentTests/import.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.parameters/import.parameters.json
rename to modules/Microsoft.Compute/disks/.deploymentTests/import.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.parameters/min.parameters.json b/modules/Microsoft.Compute/disks/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.parameters/min.parameters.json
rename to modules/Microsoft.Compute/disks/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.parameters/parameters.json b/modules/Microsoft.Compute/disks/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.parameters/parameters.json
rename to modules/Microsoft.Compute/disks/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json b/modules/Microsoft.Compute/galleries/.deploymentTests/images.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
rename to modules/Microsoft.Compute/galleries/.deploymentTests/images.parameters.json
diff --git a/modules/Microsoft.Compute/galleries/.parameters/parameters.json b/modules/Microsoft.Compute/galleries/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.parameters/parameters.json
rename to modules/Microsoft.Compute/galleries/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/images/.parameters/parameters.json b/modules/Microsoft.Compute/images/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/images/.parameters/parameters.json
rename to modules/Microsoft.Compute/images/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json b/modules/Microsoft.Compute/proximityPlacementGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.autmg.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.autmg.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.autmg.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.autmg.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.parameters.json
diff --git a/modules/Microsoft.Consumption/budgets/.parameters/parameters.json b/modules/Microsoft.Consumption/budgets/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/.parameters/parameters.json
rename to modules/Microsoft.Consumption/budgets/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json b/modules/Microsoft.ContainerInstance/containerGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
rename to modules/Microsoft.ContainerInstance/containerGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.deploymentTests/encr.parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json b/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.deploymentTests/azure.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.deploymentTests/azure.parameters.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.deploymentTests/kubenet.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.deploymentTests/kubenet.parameters.json
diff --git a/modules/Microsoft.DataFactory/factories/.parameters/parameters.json b/modules/Microsoft.DataFactory/factories/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.parameters/parameters.json
rename to modules/Microsoft.DataFactory/factories/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json b/modules/Microsoft.DataProtection/backupVaults/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json b/modules/Microsoft.DataProtection/backupVaults/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json b/modules/Microsoft.Databricks/workspaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
rename to modules/Microsoft.Databricks/workspaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/hostpools/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/scalingplans/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/mongodb.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/mongodb.parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/plain.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/plain.parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/sqldb.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/sqldb.parameters.json
diff --git a/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json b/modules/Microsoft.EventGrid/systemTopics/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json b/modules/Microsoft.EventGrid/systemTopics/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.EventGrid/topics/.parameters/parameters.json b/modules/Microsoft.EventGrid/topics/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.parameters/parameters.json
rename to modules/Microsoft.EventGrid/topics/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.EventHub/namespaces/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json b/modules/Microsoft.EventHub/namespaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
rename to modules/Microsoft.EventHub/namespaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json b/modules/Microsoft.HealthBot/healthBots/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
rename to modules/Microsoft.HealthBot/healthBots/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json b/modules/Microsoft.Insights/actionGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
rename to modules/Microsoft.Insights/actionGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/activityLogAlerts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/activityLogAlerts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/components/.parameters/parameters.json b/modules/Microsoft.Insights/components/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/components/.parameters/parameters.json
rename to modules/Microsoft.Insights/components/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json b/modules/Microsoft.Insights/diagnosticSettings/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
rename to modules/Microsoft.Insights/diagnosticSettings/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/metricAlerts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
rename to modules/Microsoft.Insights/metricAlerts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json b/modules/Microsoft.Insights/privateLinkScopes/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
rename to modules/Microsoft.Insights/privateLinkScopes/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json b/modules/Microsoft.Insights/scheduledQueryRules/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
rename to modules/Microsoft.Insights/scheduledQueryRules/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json b/modules/Microsoft.KeyVault/vaults/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.KeyVault/vaults/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json b/modules/Microsoft.KeyVault/vaults/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
rename to modules/Microsoft.KeyVault/vaults/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Logic/workflows/.parameters/parameters.json b/modules/Microsoft.Logic/workflows/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.parameters/parameters.json
rename to modules/Microsoft.Logic/workflows/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Management/managementGroups/.parameters/parameters.json b/modules/Microsoft.Management/managementGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/.parameters/parameters.json
rename to modules/Microsoft.Management/managementGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs3.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs3.parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs41.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs41.parameters.json
diff --git a/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json b/modules/Microsoft.Network/applicationGateways/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationGateways/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/applicationSecurityGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/applicationSecurityGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.deploymentTests/addpip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.deploymentTests/addpip.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.deploymentTests/custompip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.deploymentTests/custompip.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json b/modules/Microsoft.Network/azureFirewalls/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json b/modules/Microsoft.Network/azureFirewalls/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json b/modules/Microsoft.Network/bastionHosts/.deploymentTests/addpip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.deploymentTests/addpip.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json b/modules/Microsoft.Network/bastionHosts/.deploymentTests/custompip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.deploymentTests/custompip.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json b/modules/Microsoft.Network/bastionHosts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json b/modules/Microsoft.Network/bastionHosts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
rename to modules/Microsoft.Network/bastionHosts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.deploymentTests/vnet2vnet.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
rename to modules/Microsoft.Network/connections/.deploymentTests/vnet2vnet.parameters.json
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json b/modules/Microsoft.Network/ddosProtectionPlans/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
rename to modules/Microsoft.Network/ddosProtectionPlans/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json b/modules/Microsoft.Network/expressRouteCircuits/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
rename to modules/Microsoft.Network/expressRouteCircuits/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json b/modules/Microsoft.Network/firewallPolicies/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json b/modules/Microsoft.Network/firewallPolicies/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/frontDoors/.parameters/parameters.json b/modules/Microsoft.Network/frontDoors/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.parameters/parameters.json
rename to modules/Microsoft.Network/frontDoors/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/ipGroups/.parameters/parameters.json b/modules/Microsoft.Network/ipGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/ipGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json b/modules/Microsoft.Network/loadBalancers/.deploymentTests/internal.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.deploymentTests/internal.parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json b/modules/Microsoft.Network/loadBalancers/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json b/modules/Microsoft.Network/loadBalancers/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
rename to modules/Microsoft.Network/loadBalancers/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json b/modules/Microsoft.Network/localNetworkGateways/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/localNetworkGateways/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/natGateways/.parameters/parameters.json b/modules/Microsoft.Network/natGateways/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/natGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/natGateways/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json b/modules/Microsoft.Network/networkInterfaces/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json b/modules/Microsoft.Network/networkInterfaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json b/modules/Microsoft.Network/networkWatchers/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
rename to modules/Microsoft.Network/networkWatchers/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json b/modules/Microsoft.Network/networkWatchers/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
rename to modules/Microsoft.Network/networkWatchers/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json b/modules/Microsoft.Network/privateDnsZones/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json b/modules/Microsoft.Network/privateEndpoints/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json b/modules/Microsoft.Network/privateEndpoints/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPAddresses/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json b/modules/Microsoft.Network/publicIPPrefixes/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
rename to modules/Microsoft.Network/publicIPPrefixes/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/routeTables/.parameters/parameters.json b/modules/Microsoft.Network/routeTables/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.parameters/parameters.json
rename to modules/Microsoft.Network/routeTables/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json b/modules/Microsoft.Network/trafficmanagerprofiles/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualHubs/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json b/modules/Microsoft.Network/virtualHubs/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualHubs/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/expressRoute.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/expressRoute.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/vpn.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/vpn.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualNetworks/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json b/modules/Microsoft.Network/virtualNetworks/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json b/modules/Microsoft.Network/virtualNetworks/.deploymentTests/vnetPeering.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.deploymentTests/vnetPeering.parameters.json
diff --git a/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualWans/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
rename to modules/Microsoft.Network/virtualWans/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualWans/.parameters/parameters.json b/modules/Microsoft.Network/virtualWans/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.parameters/parameters.json
rename to modules/Microsoft.Network/virtualWans/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnGateways/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnGateways/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json b/modules/Microsoft.Network/vpnGateways/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnGateways/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnSites/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
rename to modules/Microsoft.Network/vpnSites/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Network/vpnSites/.parameters/parameters.json b/modules/Microsoft.Network/vpnSites/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.parameters/parameters.json
rename to modules/Microsoft.Network/vpnSites/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/ms.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.deploymentTests/ms.parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/nonms.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.deploymentTests/nonms.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/dr.parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.deploymentTests/dr.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json b/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.deploymentTests/cli.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.deploymentTests/cli.parameters.json
diff --git a/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.deploymentTests/ps.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.deploymentTests/ps.parameters.json
diff --git a/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json b/modules/Microsoft.Resources/resourceGroups/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
rename to modules/Microsoft.Resources/resourceGroups/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Resources/tags/.parameters/min.parameters.json b/modules/Microsoft.Resources/tags/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.parameters/min.parameters.json
rename to modules/Microsoft.Resources/tags/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json b/modules/Microsoft.Resources/tags/.deploymentTests/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
rename to modules/Microsoft.Resources/tags/.deploymentTests/rg.parameters.json
diff --git a/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json b/modules/Microsoft.Resources/tags/.deploymentTests/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
rename to modules/Microsoft.Resources/tags/.deploymentTests/sub.parameters.json
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json b/modules/Microsoft.Security/azureSecurityCenter/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
rename to modules/Microsoft.Security/azureSecurityCenter/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json b/modules/Microsoft.ServiceBus/namespaces/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json b/modules/Microsoft.ServiceBus/namespaces/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/cert.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.deploymentTests/cert.parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/full.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.deploymentTests/full.parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json b/modules/Microsoft.Sql/managedInstances/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
rename to modules/Microsoft.Sql/managedInstances/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json b/modules/Microsoft.Sql/servers/.deploymentTests/admin.parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
rename to modules/Microsoft.Sql/servers/.deploymentTests/admin.parameters.json
diff --git a/modules/Microsoft.Sql/servers/.parameters/parameters.json b/modules/Microsoft.Sql/servers/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/.parameters/parameters.json
rename to modules/Microsoft.Sql/servers/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Storage/storageAccounts/.deploymentTests/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.deploymentTests/encr.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json b/modules/Microsoft.Storage/storageAccounts/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json b/modules/Microsoft.Storage/storageAccounts/.deploymentTests/nfs.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.deploymentTests/nfs.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json b/modules/Microsoft.Storage/storageAccounts/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json b/modules/Microsoft.Storage/storageAccounts/.deploymentTests/v1.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.deploymentTests/v1.parameters.json
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Web/connections/.parameters/parameters.json b/modules/Microsoft.Web/connections/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/connections/.parameters/parameters.json
rename to modules/Microsoft.Web/connections/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev2.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev2.parameters.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev3.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev3.parameters.json
diff --git a/modules/Microsoft.Web/serverfarms/.parameters/parameters.json b/modules/Microsoft.Web/serverfarms/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/.parameters/parameters.json
rename to modules/Microsoft.Web/serverfarms/.deploymentTests/parameters.json
diff --git a/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json b/modules/Microsoft.Web/sites/.deploymentTests/fa.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
rename to modules/Microsoft.Web/sites/.deploymentTests/fa.min.parameters.json
diff --git a/modules/Microsoft.Web/sites/.parameters/fa.parameters.json b/modules/Microsoft.Web/sites/.deploymentTests/fa.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.parameters/fa.parameters.json
rename to modules/Microsoft.Web/sites/.deploymentTests/fa.parameters.json
diff --git a/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json b/modules/Microsoft.Web/sites/.deploymentTests/wa.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
rename to modules/Microsoft.Web/sites/.deploymentTests/wa.min.parameters.json
diff --git a/modules/Microsoft.Web/sites/.parameters/wa.parameters.json b/modules/Microsoft.Web/sites/.deploymentTests/wa.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.parameters/wa.parameters.json
rename to modules/Microsoft.Web/sites/.deploymentTests/wa.parameters.json
diff --git a/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json b/modules/Microsoft.Web/staticSites/.deploymentTests/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
rename to modules/Microsoft.Web/staticSites/.deploymentTests/min.parameters.json
diff --git a/modules/Microsoft.Web/staticSites/.parameters/parameters.json b/modules/Microsoft.Web/staticSites/.deploymentTests/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.parameters/parameters.json
rename to modules/Microsoft.Web/staticSites/.deploymentTests/parameters.json
diff --git a/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
index c5fdb5244e..4aac14ad91 100644
--- a/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
@@ -102,7 +102,7 @@ Optional. Maximum retry limit if the deployment fails. Default is 3.
 Optional. Do not throw an exception if it failed. Still returns the error message though
 
 .EXAMPLE
-New-DeploymentWithParameterFile -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+New-DeploymentWithParameterFile -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Deploy the deploy.json of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -341,7 +341,7 @@ Optional. Maximum retry limit if the deployment fails. Default is 3.
 Optional. Do not throw an exception if it failed. Still returns the error message though
 
 .EXAMPLE
-New-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+New-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Deploy the deploy.bicep of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -351,7 +351,7 @@ New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.bicep' -locati
 Deploy the deploy.json of the ResourceGroup module in location 'WestEurope'
 
 .EXAMPLE
-New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.parameters/parameters.json' -location 'WestEurope'
+New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.deploymentTests/parameters.json' -location 'WestEurope'
 
 Deploy the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
 #>
diff --git a/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1 b/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
index 7ac7afeb97..ed5f56d23e 100644
--- a/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
@@ -31,7 +31,7 @@ Optional. Name of the management group to deploy into. Mandatory if deploying in
 Optional. Additional parameters you can provide with the deployment. E.g. @{ resourceGroupName = 'myResourceGroup' }
 
 .EXAMPLE
-Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Test the deploy.bicep of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -41,7 +41,7 @@ Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -location '
 Test the deploy.bicep of the KeyVault module using the resource group 'aLegendaryRg' in location 'WestEurope'
 
 .EXAMPLE
-Test-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.parameters/parameters.json' -location 'WestEurope'
+Test-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.deploymentTests/parameters.json' -location 'WestEurope'
 
 Test the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
 #>

From a2681ccf7a4d801781ec7fddcd0c5743aef014d1 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 11:57:10 +0200
Subject: [PATCH 17/36] Further renames

---
 ...board module library and CI environment.md | 20 +++++++++----------
 ... CI environment - Deployment validation.md |  2 +-
 docs/wiki/The library - Module design.md      |  4 ++--
 modules/.global/global.module.tests.ps1       | 18 ++++++++---------
 .../Get-ModuleParameterFiles.ps1              |  2 +-
 utilities/tools/Set-ModuleReadMe.ps1          |  2 +-
 utilities/tools/Test-ModuleLocally.ps1        |  6 +++---
 .../helper/Get-ModulesAsMarkdownTable.ps1     | 16 +++++++--------
 8 files changed, 35 insertions(+), 35 deletions(-)

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 52a5377a93..4bfa507ab4 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	
@@ -379,16 +379,16 @@ For this reason, make sure to update the references in the following modules onc
 
 | File | Parameter | Notes |
 | - | - | - |
-| `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 |
+| `modules\Microsoft.Compute\diskEncryptionSets\.deploymentTests\parameters.json` |`keyUrl.value` | |
+| `modules\Microsoft.Compute\virtualMachines\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachines\.deploymentTests\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.deploymentTests\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Sql\managedInstances\.deploymentTests\parameters.json` | `keys.value.uri` | |
+| `modules\Microsoft.Network\applicationGateways\.deploymentTests\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
+| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
+| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
+| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
 
 </details>
 
diff --git a/docs/wiki/The CI environment - Deployment validation.md b/docs/wiki/The CI environment - Deployment validation.md
index 25d45a3e34..76daa109f7 100644
--- a/docs/wiki/The CI environment - Deployment validation.md	
+++ b/docs/wiki/The CI environment - Deployment validation.md	
@@ -21,7 +21,7 @@ The deployment validation phase can be divided into three steps, running in sequ
 
 # Template validation
 
-The template validation step performs a dry-run with each parameter file in the module's `'.parameters'` folder
+The template validation step performs a dry-run with each parameter file in the module's `'.deploymentTests'` folder
 
 In particular, the step runs a `Test-AzDeployment` cmdlet (_the command may vary based on the template schema_) for each provided module parameter file to verify if the template could be deployed using them.
 
diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md
index 714282abff..2d9ade1b5e 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -109,7 +109,7 @@ Use the following naming standard for module files and folders:
   └─ <service>
       ├─ .bicep
       |  ├─ nested_extensionResource1.bicep
-      ├─ .parameters
+      ├─ .deploymentTests
       |  └─ parameters.json
       ├─ deploy.bicep
       └─ readme.md
@@ -121,7 +121,7 @@ Use the following naming standard for module files and folders:
   >└─ sites
   >    ├─ .bicep
   >    |  └─ nested_roleAssignments.bicep
-  >    ├─ .parameters
+  >    ├─ .deploymentTests
   >    |  └─ parameters.json
   >    ├─ deploy.bicep
   >    └─ readme.md
diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 389efe3eb4..bc962c4e48 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -89,10 +89,10 @@ Describe 'File/folder tests' -Tag Modules {
             (Test-Path (Join-Path -Path $moduleFolderPath 'readme.md')) | Should -Be $true
         }
 
-        It '[<moduleFolderName>] Module should contain a [.parameters] folder' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) {
+        It '[<moduleFolderName>] Module should contain a [.deploymentTests] folder' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) {
 
             param( [string] $moduleFolderPath )
-            Test-Path (Join-Path -Path $moduleFolderPath '.parameters') | Should -Be $true
+            Test-Path (Join-Path -Path $moduleFolderPath '.deploymentTests') | Should -Be $true
         }
 
         It '[<moduleFolderName>] Module should contain a [version.json] file' -TestCases $moduleFolderTestCases {
@@ -106,7 +106,7 @@ Describe 'File/folder tests' -Tag Modules {
 
         $folderTestCases = [System.Collections.ArrayList]@()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            if (Test-Path (Join-Path $moduleFolderPath '.parameters')) {
+            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
                 $folderTestCases += @{
                     moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                     moduleFolderPath = $moduleFolderPath
@@ -120,13 +120,13 @@ Describe 'File/folder tests' -Tag Modules {
                 [string] $moduleFolderName,
                 $moduleFolderPath
             )
-            $parameterFolderPath = Join-Path $moduleFolderPath '.parameters'
+            $parameterFolderPath = Join-Path $moduleFolderPath '.deploymentTests'
             (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force).Count | Should -BeGreaterThan 0
         }
 
         $parameterFolderFilesTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            $parameterFolderPath = Join-Path $moduleFolderPath '.parameters'
+            $parameterFolderPath = Join-Path $moduleFolderPath '.deploymentTests'
             if (Test-Path $parameterFolderPath) {
                 foreach ($parameterFile in (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force)) {
                     $parameterFolderFilesTestCases += @{
@@ -505,8 +505,8 @@ Describe 'Deployment template tests' -Tag Template {
             $TemplateFile_AllParameterNames = $templateFile_Parameters.Keys | Sort-Object
             $TemplateFile_RequiredParametersNames = ($templateFile_Parameters.Keys | Where-Object { -not $templateFile_Parameters[$_].ContainsKey('defaultValue') }) | Sort-Object
 
-            if (Test-Path (Join-Path $moduleFolderPath '.parameters')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.parameters' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
+            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
+                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.deploymentTests' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
                 foreach ($ParameterFilePath in $ParameterFilePaths) {
                     $parameterFile_AllParameterNames = ((Get-Content $ParameterFilePath) | ConvertFrom-Json -AsHashtable).parameters.Keys | Sort-Object
                     $parameterFileTestCases += @{
@@ -917,8 +917,8 @@ Describe 'Deployment template tests' -Tag Template {
         $parameterFileTokenTestCases = @()
 
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            if (Test-Path (Join-Path $moduleFolderPath '.parameters')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.parameters' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
+            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
+                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.deploymentTests' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
                 foreach ($ParameterFilePath in $ParameterFilePaths) {
                     foreach ($token in $enforcedTokenList.Keys) {
                         $parameterFileTokenTestCases += @{
diff --git a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
index b13d619e7b..79ffb5ca87 100644
--- a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
@@ -25,7 +25,7 @@ function Get-ModuleParameterFiles {
     # Note: Should be 'recurse', but is not working with powershell 7.2.1 on GitHub hosted agents but needs 7.2.2
     # $parameterFilePaths = (Get-ChildItem -Recurse -Path $ModulePath -Filter '*parameters.json' -File).FullName
 
-    $parameterFilePaths = (Get-ChildItem -Path "$ModulePath/.parameters" -Filter '*parameters.json' -File).FullName
+    $parameterFilePaths = (Get-ChildItem -Path "$ModulePath/.deploymentTests" -Filter '*parameters.json' -File).FullName
 
     if (-not $parameterFilePaths) {
         throw "No parameter files found for module [$ModulePath]"
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index cb564db51a..5b48b09872 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -351,7 +351,7 @@ function Set-DeploymentExamplesSection {
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
     $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
-    $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.parameters') -Filter '*parameters.json' -Recurse
+    $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.deploymentTests') -Filter '*parameters.json' -Recurse
 
     $index = 1
     foreach ($parameterFilePath in $parameterFiles.FullName) {
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index 081762ab77..92fe992e96 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -35,7 +35,7 @@ Optional. A hashtable parameter that contains custom tokens to be replaced in th
 
 $TestModuleLocallyInput = @{
     TemplateFilePath           = 'C:\Microsoft.Network\routeTables\deploy.bicep'
-    ParameterFilePath          = 'C:\Microsoft.Network\routeTables\.parameters\parameters.json'
+    ParameterFilePath          = 'C:\Microsoft.Network\routeTables\.deploymentTests\parameters.json'
     PesterTest                 = $false
     DeploymentTest             = $false
     ValidationTest             = $true
@@ -115,7 +115,7 @@ function Test-ModuleLocally {
         [string] $TemplateFilePath,
 
         [Parameter(Mandatory = $false)]
-        [string] $parameterFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.parameters'),
+        [string] $parameterFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.deploymentTests'),
 
         [Parameter(Mandatory = $false)]
         [Psobject] $ValidateOrDeployParameters = @{},
@@ -166,7 +166,7 @@ function Test-ModuleLocally {
 
                 Invoke-Pester -Configuration @{
                     Run    = @{
-                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'modules/.global/global.module.tests.ps1') -Data @{
+                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'araobal/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 fb41024aaf..eedb1c4fa6 100644
--- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
+++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
@@ -214,8 +214,8 @@ Check for the existens of any nested module levels
 
 .DESCRIPTION
 Check for the existens of any nested module levels.
-A module is identified by folders that do not contain module-specific folders such as '.parameters'.
-In other words, a module would contain a folder with e.g. a '.parameters' folder and would hence not count towards the hierarchy of parent folders.
+A module is identified by folders that do not contain module-specific folders such as '.deploymentTests'.
+In other words, a module would contain a folder with e.g. a '.deploymentTests' folder and would hence not count towards the hierarchy of parent folders.
 
 .PARAMETER path
 Mandatory. The path to search in.
@@ -234,10 +234,10 @@ function Measure-FolderHasNestedModule {
         [string] $Path
     )
 
-    # Get all folder paths that exist in the given path as long as they are not '.bicep' or '.parameters' folders
+    # Get all folder paths that exist in the given path as long as they are not '.bicep' or '.deploymentTests' folders
     # This works as long as the folder structure is consistent (e.g. no empty folders are created etc.)
-    $rawFoundFolders = Get-ChildItem $Path -Directory -Recurse -Exclude @('.bicep', '.parameters') -Force
-    $foundFolders = $rawFoundFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.parameters' -Force).count -gt 0 }
+    $rawFoundFolders = Get-ChildItem $Path -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Force
+    $foundFolders = $rawFoundFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.deploymentTests' -Force).count -gt 0 }
     if ($foundFolders) {
         return $true
     } else {
@@ -323,9 +323,9 @@ function Get-ResolvedSubServiceRow {
         [string]$ProjectName = ''
     )
 
-    $rawSubFolders = Get-ChildItem -Path $subPath -Directory -Recurse -Exclude @('.bicep', '.parameters') -Force
+    $rawSubFolders = Get-ChildItem -Path $subPath -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Force
     # Only consider those folders that have their own parameters, i.e. are top-level modules and not child-resource modules
-    $subFolders = $rawSubFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.parameters' -Force).count -gt 0 }
+    $subFolders = $rawSubFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.deploymentTests' -Force).count -gt 0 }
 
     foreach ($subfolder in $subFolders.FullName) {
 
@@ -517,7 +517,7 @@ function Get-ModulesAsMarkdownTable {
     foreach ($topLevelFolder in $topLevelFolders) {
         $provider = Split-Path $topLevelFolder -Leaf
 
-        $containedFolders = Get-ChildItem -Path $topLevelFolder -Directory -Recurse -Exclude @('.bicep', '.parameters') -Depth 0 -Force
+        $containedFolders = Get-ChildItem -Path $topLevelFolder -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Depth 0 -Force
 
         foreach ($containedFolder in $containedFolders.FullName) {
             $containedFolderName = (Split-Path $containedFolder -Leaf)

From aa43dfad245fe93c166d12e84e5e0be83816bf16 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 12:05:19 +0200
Subject: [PATCH 18/36] Updated parameter fetch function

---
 .../templates/getParameterFiles/action.yml    |  4 +-
 .../Get-DeploymentTestFileList.ps1            | 42 +++++++++++++++++++
 .../Get-ModuleParameterFiles.ps1              | 42 -------------------
 3 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
 delete mode 100644 utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1

diff --git a/.github/actions/templates/getParameterFiles/action.yml b/.github/actions/templates/getParameterFiles/action.yml
index cde9b10525..1bcb50e607 100644
--- a/.github/actions/templates/getParameterFiles/action.yml
+++ b/.github/actions/templates/getParameterFiles/action.yml
@@ -21,14 +21,14 @@ runs:
         # Grouping task logs
         Write-Output "::group::Get parameter files"
         # Load used functions
-        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'sharedScripts' 'Get-ModuleParameterFiles.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'sharedScripts' 'Get-DeploymentTestFileList.ps1')
         $functionInput = @{
           ModulePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.modulePath }}'
         }
         Write-Verbose "Invoke task with" -Verbose
         Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
         # Get the list of parameter file paths
-        $parameterFilePaths = Get-ModuleParameterFiles @functionInput -Verbose
+        $parameterFilePaths = Get-DeploymentTestFileList @functionInput -Verbose
         # Output values to be accessed by next jobs
         $compressedOutput = $parameterFilePaths | ConvertTo-Json -Compress
         if($compressedOutput -notmatch "\[.*\]") {
diff --git a/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1 b/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
new file mode 100644
index 0000000000..426d5efd81
--- /dev/null
+++ b/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
@@ -0,0 +1,42 @@
+<#
+.SYNOPSIS
+Get the relative file paths of all parameter files in the given module.
+
+.DESCRIPTION
+Get the relative file paths of all parameter files in the given module.
+The relative path is returned instead of the full one to make paths easier to read in the pipeline.
+
+.PARAMETER ModulePath
+Mandatory. The module path to search in.
+
+.EXAMPLE
+Get-DeploymentTestFileList -ModulePath 'C:\ResourceModules\arm\Microsoft.Compute\virtualMachines'
+
+Returns the relative file paths of all parameter files of the virtual machines module.
+#>
+function Get-DeploymentTestFileList {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $ModulePath
+    )
+
+    $deploymentTests = @()
+    if (Test-Path (Join-Path $ModulePath '.deploymentTests')) {
+        $deploymentTests += (Get-ChildItem -Path (Join-Path $ModulePath '.deploymentTests') -Depth 0 -Include ('*.json', '*.bicep') -File).FullName
+    }
+
+    if (-not $deploymentTests) {
+        throw "No deployment test files found for module [$ModulePath]"
+    }
+
+    $deploymentTests = $deploymentTests | ForEach-Object {
+        $_.Replace($ModulePath, '').Trim('\').Trim('/')
+    }
+
+    Write-Verbose 'Found parameter files'
+    $deploymentTests | ForEach-Object { Write-Verbose "- $_" }
+
+    return $deploymentTests
+}
diff --git a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
deleted file mode 100644
index 79ffb5ca87..0000000000
--- a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
+++ /dev/null
@@ -1,42 +0,0 @@
-<#
-.SYNOPSIS
-Get the relative file paths of all parameter files in the given module.
-
-.DESCRIPTION
-Get the relative file paths of all parameter files in the given module.
-The relative path is returned instead of the full one to make paths easier to read in the pipeline.
-
-.PARAMETER ModulePath
-Mandatory. The module path to search in.
-
-.EXAMPLE
-Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines'
-
-Returns the relative file paths of all parameter files of the virtual machines module.
-#>
-function Get-ModuleParameterFiles {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $ModulePath
-    )
-
-    # Note: Should be 'recurse', but is not working with powershell 7.2.1 on GitHub hosted agents but needs 7.2.2
-    # $parameterFilePaths = (Get-ChildItem -Recurse -Path $ModulePath -Filter '*parameters.json' -File).FullName
-
-    $parameterFilePaths = (Get-ChildItem -Path "$ModulePath/.deploymentTests" -Filter '*parameters.json' -File).FullName
-
-    if (-not $parameterFilePaths) {
-        throw "No parameter files found for module [$ModulePath]"
-    }
-
-    $parameterFilePaths = $parameterFilePaths | ForEach-Object {
-        $_.Replace($ModulePath, '').Trim('\').Trim('/')
-    }
-
-    Write-Verbose 'Found parameter files'
-    $parameterFilePaths | ForEach-Object { Write-Verbose "- $_" }
-
-    return $parameterFilePaths
-}

From 58cddcdce15e2819db849dc360c102e309312f63 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 12:05:48 +0200
Subject: [PATCH 19/36] Updated docs

---
 docs/wiki/The library - Module design.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md
index 2d9ade1b5e..0f5358a739 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -60,7 +60,7 @@ They can be deployed in different configurations just by changing the input para
 A **CARML module** consists of
 
 - The Bicep template deployment file (`deploy.bicep`).
-- One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.parameters` subfolder.
+- One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.deploymentTests` 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 `modules` folder.

From c8d442380cfbcdea2a0264d9ffc19ed753ab5d53 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 27 Jun 2022 12:07:05 +0200
Subject: [PATCH 20/36] Further rename

---
 modules/.global/global.module.tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index bc962c4e48..11507d46ca 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -102,7 +102,7 @@ Describe 'File/folder tests' -Tag Modules {
         }
     }
 
-    Context '.parameters folder' {
+    Context '.deploymentTests folder' {
 
         $folderTestCases = [System.Collections.ArrayList]@()
         foreach ($moduleFolderPath in $moduleFolderPaths) {

From 1c80d109088bfef78d50f0746846bd0d1a66d179 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 09:45:53 +0200
Subject: [PATCH 21/36] Resolved conflicts

---
 .../validateModuleDeployment/action.yml       | 26 ++++++++-----------
 README.md                                     |  4 ---
 ...board module library and CI environment.md | 14 ----------
 utilities/tools/Test-ModuleLocally.ps1        |  4 ---
 4 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 528d87f957..8f19453838 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -11,22 +11,18 @@
 ## ACTION PARAMETERS                         ##
 ##-------------------------------------------##
 ##
-##   |================================================================================================================================================================================|
-##   | Parameter                 | Required | Default | Description                                           | Example                                                               |
-##   |---------------------------|----------|---------|-------------------------------------------------------|-----------------------------------------------------------------------|
-##   | templateFilePath          | true     | ''      | The path to the template file to use for deployment   | 'modules/Microsoft.ApiManagement/service/deploy.bicep'                |
-<<<<<<< HEAD
+##   |=====================================================================================================================================================================================|
+##   | 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/.deploymentTests/parameters.json' |
-=======
-##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'modules/Microsoft.ApiManagement/service/.parameters/parameters.json' |
->>>>>>> main
-##   | 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'                                                                |
-##   |================================================================================================================================================================================|
+##   | 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/README.md b/README.md
index e8eec4c07e..69b56395ad 100644
--- a/README.md
+++ b/README.md
@@ -65,11 +65,7 @@ The CI environment supports both ARM and Bicep and can be leveraged using GitHub
 | [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) |
-<<<<<<< HEAD
-| [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) |
-=======
 | [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) |
->>>>>>> main
 | [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) |
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 a268e2868c..d578072844 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	
@@ -379,8 +379,6 @@ For this reason, make sure to update the references in the following modules onc
 
 | File | Parameter | Notes |
 | - | - | - |
-<<<<<<< HEAD
-| `modules\Microsoft.Compute\diskEncryptionSets\.deploymentTests\parameters.json` |`keyUrl.value` | |
 | `modules\Microsoft.Compute\virtualMachines\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
 | `modules\Microsoft.Compute\virtualMachines\.deploymentTests\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
 | `modules\Microsoft.Compute\virtualMachineScaleSets\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
@@ -390,18 +388,6 @@ For this reason, make sure to update the references in the following modules onc
 | `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
 | `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
 | `modules\Microsoft.Web\sites\.deploymentTests\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 |
->>>>>>> main
 
 </details>
 
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index 4f010b112c..aaa2461a04 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -166,11 +166,7 @@ function Test-ModuleLocally {
 
                 Invoke-Pester -Configuration @{
                     Run    = @{
-<<<<<<< HEAD
-                        Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'araobal/global.module.tests.ps1') -Data @{
-=======
                         Container = New-PesterContainer -Path (Join-Path (Get-Item $PSScriptRoot).Parent.Parent 'modules/.global/global.module.tests.ps1') -Data @{
->>>>>>> main
                             moduleFolderPaths = Split-Path $TemplateFilePath -Parent
                             enforcedTokenList = $enforcedTokenList
                         }

From 7471ec4d4f2592f7c7db1921a7fe8eebaecbb272 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 14:36:37 +0200
Subject: [PATCH 22/36] Resolved conflict

---
 utilities/tools/Set-ModuleReadMe.ps1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index 26c241328a..5b48b09872 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -351,11 +351,7 @@ function Set-DeploymentExamplesSection {
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
     $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
-<<<<<<< HEAD
     $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.deploymentTests') -Filter '*parameters.json' -Recurse
-=======
-    $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.parameters') -Filter '*parameters.json' -Recurse
->>>>>>> main
 
     $index = 1
     foreach ($parameterFilePath in $parameterFiles.FullName) {

From 80c8d3c968fdec9ecba939f6c568202cccdea0d2 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 14:43:23 +0200
Subject: [PATCH 23/36] Adjusted verbosity

---
 utilities/tools/Invoke-PipelinesForBranch.ps1 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/utilities/tools/Invoke-PipelinesForBranch.ps1 b/utilities/tools/Invoke-PipelinesForBranch.ps1
index 143c017c68..09e2c5badd 100644
--- a/utilities/tools/Invoke-PipelinesForBranch.ps1
+++ b/utilities/tools/Invoke-PipelinesForBranch.ps1
@@ -51,7 +51,7 @@ function Invoke-GitHubWorkflow {
     . (Join-Path (Split-Path $PSScriptRoot -Parent) 'pipelines' 'sharedScripts' 'Get-GitHubWorkflowDefaultInput.ps1')
 
     $workflowFileName = Split-Path $WorkflowFilePath -Leaf
-    $workflowParameters = Get-GitHubWorkflowDefaultInput -workflowPath $WorkflowFilePath -Verbose
+    $workflowParameters = Get-GitHubWorkflowDefaultInput -workflowPath $WorkflowFilePath
     $removeDeploymentFlag = $workflowParameters.removeDeployment
 
     $requestInputObject = @{
@@ -69,7 +69,7 @@ function Invoke-GitHubWorkflow {
         } | ConvertTo-Json
     }
     if ($PSCmdlet.ShouldProcess("GitHub workflow [$workflowFileName] for branch [$TargetBranch]", 'Invoke')) {
-        $response = Invoke-RestMethod @requestInputObject
+        $response = Invoke-RestMethod @requestInputObject -Verbose:$false
 
         if ($response) {
             Write-Error "Request failed. Reponse: [$response]"
@@ -257,8 +257,12 @@ function Invoke-PipelinesForBranch {
             $workflowFilePath = $workflow.path
             $WorkflowFileName = Split-Path $Workflow.path -Leaf
 
-            if ($PSCmdlet.ShouldProcess("GitHub workflow [$WorkflowFileName] for branch [$TargetBranch]", 'Invoke')) {
-                $null = Invoke-GitHubWorkflow @baseInputObject -TargetBranch $TargetBranch -WorkflowFilePath (Join-Path $RepositoryRoot $workflowFilePath)
+            if (Test-Path (Join-Path $RepositoryRoot $workflowFilePath)) {
+                if ($PSCmdlet.ShouldProcess("GitHub workflow [$WorkflowFileName] for branch [$TargetBranch]", 'Invoke')) {
+                    $null = Invoke-GitHubWorkflow @baseInputObject -TargetBranch $TargetBranch -WorkflowFilePath (Join-Path $RepositoryRoot $workflowFilePath)
+                }
+            } else {
+                Write-Warning ('Warning: Workflow [{0}] is registered, but no workflow file in the target branch [{1}] available' -f (Join-Path $RepositoryRoot $workflowFilePath), $TargetBranch) -Verbose
             }
 
             # Generate pipeline badges

From 3c373ced5fd09cff6c477c2a78ef6dffbcd877cc Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 22:36:00 +0200
Subject: [PATCH 24/36] Renamed [.deploymentTests] to [.test]

---
 .../modulePipelines/ms.aad.domainservices.yml |  2 +-
 .../ms.analysisservices.servers.yml           |  6 ++---
 .../ms.apimanagement.service.yml              |  6 ++---
 ...s.appconfiguration.configurationstores.yml |  4 ++--
 .../ms.authorization.locks.yml                |  2 +-
 .../ms.authorization.policyassignments.yml    | 12 +++++-----
 .../ms.authorization.policydefinitions.yml    |  8 +++----
 .../ms.authorization.policyexemptions.yml     | 12 +++++-----
 .../ms.authorization.policysetdefinitions.yml |  8 +++----
 .../ms.authorization.roleassignments.yml      | 12 +++++-----
 .../ms.authorization.roledefinitions.yml      | 12 +++++-----
 .../ms.automation.automationaccounts.yml      |  6 ++---
 .../ms.batch.batchaccounts.yml                |  4 ++--
 .../ms.cognitiveservices.accounts.yml         |  8 +++----
 .../ms.compute.availabilitysets.yml           |  2 +-
 .../ms.compute.diskencryptionsets.yml         |  2 +-
 .../modulePipelines/ms.compute.disks.yml      |  8 +++----
 .../modulePipelines/ms.compute.galleries.yml  |  8 +++----
 .../modulePipelines/ms.compute.images.yml     |  2 +-
 .../ms.compute.proximityplacementgroups.yml   |  2 +-
 .../ms.compute.virtualmachines.yml            | 12 +++++-----
 .../ms.compute.virtualmachinescalesets.yml    |  8 +++----
 .../ms.consumption.budgets.yml                |  2 +-
 .../ms.containerinstance.containergroups.yml  |  2 +-
 .../ms.containerregistry.registries.yml       |  6 ++---
 .../ms.containerservice.managedclusters.yml   |  4 ++--
 .../ms.databricks.workspaces.yml              |  2 +-
 .../ms.datafactory.factories.yml              |  2 +-
 .../ms.dataprotection.backupvaults.yml        |  4 ++--
 ...esktopvirtualization.applicationgroups.yml |  4 ++--
 .../ms.desktopvirtualization.hostpools.yml    |  2 +-
 .../ms.desktopvirtualization.scalingplans.yml |  2 +-
 .../ms.desktopvirtualization.workspaces.yml   |  2 +-
 .../ms.documentdb.databaseaccounts.yml        |  6 ++---
 .../ms.eventgrid.systemtopics.yml             |  4 ++--
 .../modulePipelines/ms.eventgrid.topics.yml   |  2 +-
 .../ms.eventhub.namespaces.yml                |  4 ++--
 .../ms.healthbot.healthbots.yml               |  2 +-
 .../ms.insights.actiongroups.yml              |  2 +-
 .../ms.insights.activitylogalerts.yml         |  2 +-
 .../ms.insights.components.yml                |  2 +-
 .../ms.insights.diagnosticsettings.yml        |  2 +-
 .../ms.insights.metricalerts.yml              |  2 +-
 .../ms.insights.privatelinkscopes.yml         |  2 +-
 .../ms.insights.scheduledqueryrules.yml       |  2 +-
 .../modulePipelines/ms.keyvault.vaults.yml    |  4 ++--
 .../ms.kubernetesconfiguration.extensions.yml |  4 ++--
 ...rnetesconfiguration.fluxconfigurations.yml |  4 ++--
 .../modulePipelines/ms.logic.workflows.yml    |  2 +-
 .../ms.machinelearningservices.workspaces.yml |  4 ++--
 ...managedidentity.userassignedidentities.yml |  2 +-
 ...anagedservices.registrationdefinitions.yml |  4 ++--
 .../ms.management.managementgroups.yml        |  2 +-
 .../ms.netapp.netappaccounts.yml              |  6 ++---
 .../ms.network.applicationgateways.yml        |  2 +-
 .../ms.network.applicationsecuritygroups.yml  |  2 +-
 .../ms.network.azurefirewalls.yml             |  2 +-
 .../ms.network.bastionhosts.yml               |  4 ++--
 .../ms.network.connections.yml                |  2 +-
 .../ms.network.ddosprotectionplans.yml        |  2 +-
 .../ms.network.expressroutecircuits.yml       |  2 +-
 .../ms.network.firewallpolicies.yml           |  2 +-
 .../modulePipelines/ms.network.frontdoors.yml |  2 +-
 .../modulePipelines/ms.network.ipgroups.yml   |  2 +-
 .../ms.network.loadbalancers.yml              |  6 ++---
 .../ms.network.localnetworkgateways.yml       |  2 +-
 .../ms.network.natgateways.yml                |  2 +-
 .../ms.network.networkinterfaces.yml          |  4 ++--
 .../ms.network.networksecuritygroups.yml      |  4 ++--
 .../ms.network.networkwatchers.yml            |  4 ++--
 .../ms.network.privatednszones.yml            |  4 ++--
 .../ms.network.privateendpoints.yml           |  4 ++--
 .../ms.network.publicipaddresses.yml          |  2 +-
 .../ms.network.publicipprefixes.yml           |  2 +-
 .../ms.network.routetables.yml                |  2 +-
 .../ms.network.trafficmanagerprofiles.yml     |  2 +-
 .../ms.network.virtualhubs.yml                |  4 ++--
 .../ms.network.virtualnetworkgateways.yml     |  4 ++--
 .../ms.network.virtualnetworks.yml            |  4 ++--
 .../ms.network.virtualwans.yml                |  4 ++--
 .../ms.network.vpngateways.yml                |  4 ++--
 .../modulePipelines/ms.network.vpnsites.yml   |  4 ++--
 .../ms.operationalinsights.workspaces.yml     |  4 ++--
 .../ms.operationsmanagement.solutions.yml     |  6 ++---
 .../ms.recoveryservices.vaults.yml            |  6 ++---
 .../ms.resources.deploymentscripts.yml        |  4 ++--
 .../ms.resources.resourcegroups.yml           |  2 +-
 .../modulePipelines/ms.resources.tags.yml     |  6 ++---
 .../ms.security.azuresecuritycenter.yml       |  2 +-
 .../ms.servicebus.namespaces.yml              |  4 ++--
 .../ms.servicefabric.clusters.yml             |  6 ++---
 .../ms.sql.managedinstances.yml               |  2 +-
 .../modulePipelines/ms.sql.servers.yml        |  4 ++--
 .../ms.storage.storageaccounts.yml            | 10 ++++----
 .../ms.synapse.privatelinkhubs.yml            |  4 ++--
 ...ms.virtualmachineimages.imagetemplates.yml |  2 +-
 .../modulePipelines/ms.web.connections.yml    |  2 +-
 .../ms.web.hostingenvironments.yml            |  4 ++--
 .../modulePipelines/ms.web.serverfarms.yml    |  2 +-
 .azuredevops/modulePipelines/ms.web.sites.yml |  8 +++----
 .../modulePipelines/ms.web.staticsites.yml    |  4 ++--
 .../validateModuleDeployment/action.yml       |  2 +-
 ...board module library and CI environment.md | 18 +++++++-------
 ... CI environment - Deployment validation.md |  2 +-
 docs/wiki/The library - Module design.md      |  6 ++---
 modules/.global/global.module.tests.ps1       | 24 +++++++++----------
 .../New-TemplateDeployment.ps1                |  6 ++---
 .../Test-TemplateDeployment.ps1               |  4 ++--
 .../Get-DeploymentTestFileList.ps1            |  4 ++--
 utilities/tools/Set-ModuleReadMe.ps1          |  2 +-
 utilities/tools/Test-ModuleLocally.ps1        |  4 ++--
 .../helper/Get-ModulesAsMarkdownTable.ps1     | 16 ++++++-------
 112 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.aad.domainservices.yml b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
index c6a5286cb9..f501cb6c38 100644
--- a/.azuredevops/modulePipelines/ms.aad.domainservices.yml
+++ b/.azuredevops/modulePipelines/ms.aad.domainservices.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index 8dcdee1813..d48caba9c9 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/max.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/max.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index b01fa1f753..601c5433c8 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/max.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.test/max.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
index 1a05fe60c1..9c3a6400a0 100644
--- a/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
+++ b/.azuredevops/modulePipelines/ms.appconfiguration.configurationstores.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.locks.yml b/.azuredevops/modulePipelines/ms.authorization.locks.yml
index d82db7ae5d..6f65bba089 100644
--- a/.azuredevops/modulePipelines/ms.authorization.locks.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.locks.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index b3036c35be..5bd90b5ec0 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
+            - path: $(modulePath)/.test/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index a70b9ec8c4..1c8e2fb3b3 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -45,13 +45,13 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index 2e59710782..55a78f36bd 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
+            - path: $(modulePath)/.test/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index 7b15303495..04fdf2cb3f 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -45,13 +45,13 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index e62c9db947..8fd83f7541 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
+            - path: $(modulePath)/.test/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index dd7820dc95..90141a1dd7 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -45,17 +45,17 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mg.min.parameters.json
+            - path: $(modulePath)/.test/mg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/mg.parameters.json
+            - path: $(modulePath)/.test/mg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.min.parameters.json
+            - path: $(modulePath)/.test/sub.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.min.parameters.json
+            - path: $(modulePath)/.test/rg.min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index 1d756263a2..aa3802eb39 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/encr.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/encr.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index bd626999f3..ff3b0a08ae 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index 1bb16a4346..9284b05c62 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/speech.parameters.json
-            - path: $(modulePath)/.deploymentTests/encr.parameters.json
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/speech.parameters.json
+            - path: $(modulePath)/.test/encr.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index 6e88d0794d..d4e8f41d2e 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 6b677414cb..1b85b43193 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.disks.yml b/.azuredevops/modulePipelines/ms.compute.disks.yml
index 571805dddd..55f92369e0 100644
--- a/.azuredevops/modulePipelines/ms.compute.disks.yml
+++ b/.azuredevops/modulePipelines/ms.compute.disks.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/image.parameters.json
-            - path: $(modulePath)/.deploymentTests/import.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/image.parameters.json
+            - path: $(modulePath)/.test/import.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index ae2a381844..69ebcc84b9 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -39,8 +39,8 @@ stages:
       - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
         parameters:
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/images.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/images.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Deployment
     displayName: Deployment validation
@@ -49,8 +49,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/images.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/images.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index c2b70fd6a8..bde31a29cf 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index 6837787064..ca01061c07 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index f4598a4622..a055b1ecd9 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -45,12 +45,12 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/linux.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/linux.parameters.json
-            - path: $(modulePath)/.deploymentTests/linux.autmg.parameters.json
-            - path: $(modulePath)/.deploymentTests/windows.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/windows.parameters.json
-            - path: $(modulePath)/.deploymentTests/windows.autmg.parameters.json
+            - path: $(modulePath)/.test/linux.min.parameters.json
+            - path: $(modulePath)/.test/linux.parameters.json
+            - path: $(modulePath)/.test/linux.autmg.parameters.json
+            - path: $(modulePath)/.test/windows.min.parameters.json
+            - path: $(modulePath)/.test/windows.parameters.json
+            - path: $(modulePath)/.test/windows.autmg.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 8a235e6434..90540c28b1 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/linux.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/linux.parameters.json
-            - path: $(modulePath)/.deploymentTests/windows.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/windows.parameters.json
+            - path: $(modulePath)/.test/linux.min.parameters.json
+            - path: $(modulePath)/.test/linux.parameters.json
+            - path: $(modulePath)/.test/windows.min.parameters.json
+            - path: $(modulePath)/.test/windows.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index 47edcbd603..3f75d14d30 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index fc9cf784c6..2f65ddba10 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index 3833f24356..b9a8bde689 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/encr.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/encr.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index 14748f8b77..80e5050d53 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/azure.parameters.json
-            - path: $(modulePath)/.deploymentTests/kubenet.parameters.json
+            - path: $(modulePath)/.test/azure.parameters.json
+            - path: $(modulePath)/.test/kubenet.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index ba0e52746c..787a630cb1 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index 02601e6748..a785ec79b4 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
index aa1c74765e..2812fd99b5 100644
--- a/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
+++ b/.azuredevops/modulePipelines/ms.dataprotection.backupvaults.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index c0c4958ef2..4970f874b9 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index f7f724d63a..33858c1424 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
index adf58c1395..99d4959d81 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index a850a151b3..7be7bc6201 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index c7e13c5efe..d9f7603fdd 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/mongodb.parameters.json
-            - path: $(modulePath)/.deploymentTests/plain.parameters.json
-            - path: $(modulePath)/.deploymentTests/sqldb.parameters.json
+            - path: $(modulePath)/.test/mongodb.parameters.json
+            - path: $(modulePath)/.test/plain.parameters.json
+            - path: $(modulePath)/.test/sqldb.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
index 74b9ed4827..5a1a19937c 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.systemtopics.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index 618ee86540..5602476795 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index 5f2b4d4a37..131a512a12 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index 08760e0264..327557c8ec 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index 465d18b9d8..8b328c6807 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index cffda42bac..1b2978f4de 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index 77ced33898..8a446df9d0 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index aab087928e..16f12fd4cd 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index 5d3ca5ec25..0bc39c3303 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index e4d8eb0f2a..20366954cd 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index 8af9bffff7..2ef79850c1 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index 9defe0353a..dbb8d08af1 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
index c638da8660..5db8205c19 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
index 05c578d2e0..1eb78653cc 100644
--- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
+++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 869220d3e2..b714053664 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index 79dfdc2be2..b4b74f62f2 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index 05a656cf55..95af46c4a4 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index 39c68df3c5..c09372673e 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 3289daddc9..1421222565 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index 7ef1d4cbb5..fc9cd95f0c 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/nfs3.parameters.json
-            - path: $(modulePath)/.deploymentTests/nfs41.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/nfs3.parameters.json
+            - path: $(modulePath)/.test/nfs41.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index da48d2dac5..1bb3ca433e 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index f959c4795a..41234d8952 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index 64abfd6e64..18869e1829 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index 6746220362..3b23931433 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index 1642c73684..8829c6f4f8 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/vnet2vnet.parameters.json
+            - path: $(modulePath)/.test/vnet2vnet.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index 4574f81457..0048290316 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index 8f86baa36a..67952d5124 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 51a75ecb68..d21c7e7891 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.frontdoors.yml b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
index ec107160d9..ef7e06e4d6 100644
--- a/.azuredevops/modulePipelines/ms.network.frontdoors.yml
+++ b/.azuredevops/modulePipelines/ms.network.frontdoors.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index 47ac2b187a..a669614273 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index cc2769f764..f2031b3c25 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/internal.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/internal.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index 862f64a093..b1cc96a7fa 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index 17cd3f4bee..2cdbdc925b 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
index ed2ff73682..3abd5d8e1b 100644
--- a/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkinterfaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index a592dbf8d3..79922a2bff 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index a032607be9..d0c9d12bdd 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index d4f53eb438..910a3db3fc 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index 55be935211..03a09207a2 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index eff1b0250f..a6444b9ba0 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index 05a7e35e48..a52f085e9b 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index 15aeb0fff2..358639097d 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index a064e45548..bcc9147522 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
index 671a6d9457..f04ecd43ca 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualhubs.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index 7d5fa11d44..761f2a5ea2 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/expressRoute.parameters.json
-            - path: $(modulePath)/.deploymentTests/vpn.parameters.json
+            - path: $(modulePath)/.test/expressRoute.parameters.json
+            - path: $(modulePath)/.test/vpn.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index c4b4a3ea0a..ef1e55e526 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/vnetPeering.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/vnetPeering.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index 32bfa7afd2..708578f3e8 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.vpngateways.yml b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
index ee7ce830e8..9c5ad45b58 100644
--- a/.azuredevops/modulePipelines/ms.network.vpngateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpngateways.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.network.vpnsites.yml b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
index c6054542cc..7f6c140d5d 100644
--- a/.azuredevops/modulePipelines/ms.network.vpnsites.yml
+++ b/.azuredevops/modulePipelines/ms.network.vpnsites.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index f3b4863863..00787f4534 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
index 05d4dae6cb..be56cbbb71 100644
--- a/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
+++ b/.azuredevops/modulePipelines/ms.operationsmanagement.solutions.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/nonms.parameters.json
-            - path: $(modulePath)/.deploymentTests/ms.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/nonms.parameters.json
+            - path: $(modulePath)/.test/ms.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index 416413054e..bde801688a 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -45,11 +45,11 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
-            - path: $(modulePath)/.deploymentTests/dr.parameters.json
+            - path: $(modulePath)/.test/dr.parameters.json
               templateFilePath: $(modulePath)/deploy.bicep
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index 2f5a850bea..274443cc66 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/cli.parameters.json
-            - path: $(modulePath)/.deploymentTests/ps.parameters.json
+            - path: $(modulePath)/.test/cli.parameters.json
+            - path: $(modulePath)/.test/ps.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index 03b074bdb2..658da84eec 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.resources.tags.yml b/.azuredevops/modulePipelines/ms.resources.tags.yml
index 98316cfcfd..a0f4452171 100644
--- a/.azuredevops/modulePipelines/ms.resources.tags.yml
+++ b/.azuredevops/modulePipelines/ms.resources.tags.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/rg.parameters.json
-            - path: $(modulePath)/.deploymentTests/sub.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/rg.parameters.json
+            - path: $(modulePath)/.test/sub.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index 4b6046d2e8..40df763f2c 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index 626e23d613..d4d9f1515c 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index c7e516692f..75b496efb3 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -45,9 +45,9 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/full.parameters.json
-            - path: $(modulePath)/.deploymentTests/cert.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/full.parameters.json
+            - path: $(modulePath)/.test/cert.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index 9d49a71ba7..5ac8c060d1 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
           defaultJobTimeoutInMinutes: 360
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index 32d9b5e535..68d627a3b8 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/admin.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/admin.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index 62f98d6d33..ee4f3a4065 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -45,11 +45,11 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/nfs.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
-            - path: $(modulePath)/.deploymentTests/v1.parameters.json
-            - path: $(modulePath)/.deploymentTests/encr.parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/nfs.parameters.json
+            - path: $(modulePath)/.test/parameters.json
+            - path: $(modulePath)/.test/v1.parameters.json
+            - path: $(modulePath)/.test/encr.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index 295f5beb67..6006a313e5 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 8169a7e43d..93aeaacb48 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index 4a126a0ee8..b19b3f5b70 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index a3b6da3f80..6595728739 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/asev2.parameters.json
-            - path: $(modulePath)/.deploymentTests/asev3.parameters.json
+            - path: $(modulePath)/.test/asev2.parameters.json
+            - path: $(modulePath)/.test/asev3.parameters.json
           defaultJobTimeoutInMinutes: 180
 
   - stage: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index 48d906fedc..aee87bf599 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -45,7 +45,7 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index e56f5c75eb..9d96269e76 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -45,10 +45,10 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/fa.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/fa.parameters.json
-            - path: $(modulePath)/.deploymentTests/wa.min.parameters.json
-            - path: $(modulePath)/.deploymentTests/wa.parameters.json
+            - path: $(modulePath)/.test/fa.min.parameters.json
+            - path: $(modulePath)/.test/fa.parameters.json
+            - path: $(modulePath)/.test/wa.min.parameters.json
+            - path: $(modulePath)/.test/wa.parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.azuredevops/modulePipelines/ms.web.staticsites.yml b/.azuredevops/modulePipelines/ms.web.staticsites.yml
index e408ebbb15..26c5b88e54 100644
--- a/.azuredevops/modulePipelines/ms.web.staticsites.yml
+++ b/.azuredevops/modulePipelines/ms.web.staticsites.yml
@@ -45,8 +45,8 @@ stages:
         parameters:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
-            - path: $(modulePath)/.deploymentTests/min.parameters.json
-            - path: $(modulePath)/.deploymentTests/parameters.json
+            - path: $(modulePath)/.test/min.parameters.json
+            - path: $(modulePath)/.test/parameters.json
 
   - stage: Publishing
     displayName: Publishing
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 8f19453838..5474bd2cb7 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -15,7 +15,7 @@
 ##   | 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/.deploymentTests/parameters.json' |
+##   | parameterFilePath         | true     | ''      | The path to the parameter file to use for deployment  | 'modules/Microsoft.ApiManagement/service/.test/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/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 69c6e62ff5..6ab4b95586 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	
@@ -379,15 +379,15 @@ For this reason, make sure to update the references in the following modules onc
 
 | File | Parameter | Notes |
 | - | - | - |
-| `modules\Microsoft.Compute\virtualMachines\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `modules\Microsoft.Compute\virtualMachines\.deploymentTests\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `modules\Microsoft.Compute\virtualMachineScaleSets\.deploymentTests\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `modules\Microsoft.Compute\virtualMachineScaleSets\.deploymentTests\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
-| `modules\Microsoft.Sql\managedInstances\.deploymentTests\parameters.json` | `keys.value.uri` | |
-| `modules\Microsoft.Network\applicationGateways\.deploymentTests\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
-| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
-| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
-| `modules\Microsoft.Web\sites\.deploymentTests\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
+| `modules\Microsoft.Compute\virtualMachines\.test\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachines\.test\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.test\linux.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Compute\virtualMachineScaleSets\.test\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | |
+| `modules\Microsoft.Sql\managedInstances\.test\parameters.json` | `keys.value.uri` | |
+| `modules\Microsoft.Network\applicationGateways\.test\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | |
+| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version |
+| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App |
+| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app |
 
 </details>
 
diff --git a/docs/wiki/The CI environment - Deployment validation.md b/docs/wiki/The CI environment - Deployment validation.md
index bb21183146..f4cba6334b 100644
--- a/docs/wiki/The CI environment - Deployment validation.md	
+++ b/docs/wiki/The CI environment - Deployment validation.md	
@@ -21,7 +21,7 @@ The deployment validation phase can be divided into three steps, running in sequ
 
 # Template validation
 
-The template validation step performs a dry-run with each parameter file in the module's `'.deploymentTests'` folder
+The template validation step performs a dry-run with each parameter file in the module's `'.test'` folder
 
 In particular, the step runs a `Test-AzDeployment` cmdlet (_the command may vary based on the template schema_) for each provided module parameter file to verify if the template could be deployed using them.
 
diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md
index 0f5358a739..1143c16a5a 100644
--- a/docs/wiki/The library - Module design.md	
+++ b/docs/wiki/The library - Module design.md	
@@ -60,7 +60,7 @@ They can be deployed in different configurations just by changing the input para
 A **CARML module** consists of
 
 - The Bicep template deployment file (`deploy.bicep`).
-- One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.deploymentTests` subfolder.
+- One or multiple template parameters files (`*parameters.json`) that will be used for testing, located in the `.test` 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 `modules` folder.
@@ -109,7 +109,7 @@ Use the following naming standard for module files and folders:
   └─ <service>
       ├─ .bicep
       |  ├─ nested_extensionResource1.bicep
-      ├─ .deploymentTests
+      ├─ .test
       |  └─ parameters.json
       ├─ deploy.bicep
       └─ readme.md
@@ -121,7 +121,7 @@ Use the following naming standard for module files and folders:
   >└─ sites
   >    ├─ .bicep
   >    |  └─ nested_roleAssignments.bicep
-  >    ├─ .deploymentTests
+  >    ├─ .test
   >    |  └─ parameters.json
   >    ├─ deploy.bicep
   >    └─ readme.md
diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 11507d46ca..7a36c7b56f 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -89,10 +89,10 @@ Describe 'File/folder tests' -Tag Modules {
             (Test-Path (Join-Path -Path $moduleFolderPath 'readme.md')) | Should -Be $true
         }
 
-        It '[<moduleFolderName>] Module should contain a [.deploymentTests] folder' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) {
+        It '[<moduleFolderName>] Module should contain a [.test] folder' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) {
 
             param( [string] $moduleFolderPath )
-            Test-Path (Join-Path -Path $moduleFolderPath '.deploymentTests') | Should -Be $true
+            Test-Path (Join-Path -Path $moduleFolderPath '.test') | Should -Be $true
         }
 
         It '[<moduleFolderName>] Module should contain a [version.json] file' -TestCases $moduleFolderTestCases {
@@ -102,11 +102,11 @@ Describe 'File/folder tests' -Tag Modules {
         }
     }
 
-    Context '.deploymentTests folder' {
+    Context '.test folder' {
 
         $folderTestCases = [System.Collections.ArrayList]@()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
+            if (Test-Path (Join-Path $moduleFolderPath '.test')) {
                 $folderTestCases += @{
                     moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                     moduleFolderPath = $moduleFolderPath
@@ -120,13 +120,13 @@ Describe 'File/folder tests' -Tag Modules {
                 [string] $moduleFolderName,
                 $moduleFolderPath
             )
-            $parameterFolderPath = Join-Path $moduleFolderPath '.deploymentTests'
+            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
             (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force).Count | Should -BeGreaterThan 0
         }
 
         $parameterFolderFilesTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            $parameterFolderPath = Join-Path $moduleFolderPath '.deploymentTests'
+            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
             if (Test-Path $parameterFolderPath) {
                 foreach ($parameterFile in (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force)) {
                     $parameterFolderFilesTestCases += @{
@@ -505,8 +505,8 @@ Describe 'Deployment template tests' -Tag Template {
             $TemplateFile_AllParameterNames = $templateFile_Parameters.Keys | Sort-Object
             $TemplateFile_RequiredParametersNames = ($templateFile_Parameters.Keys | Where-Object { -not $templateFile_Parameters[$_].ContainsKey('defaultValue') }) | Sort-Object
 
-            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.deploymentTests' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
+            if (Test-Path (Join-Path $moduleFolderPath '.test')) {
+                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
                 foreach ($ParameterFilePath in $ParameterFilePaths) {
                     $parameterFile_AllParameterNames = ((Get-Content $ParameterFilePath) | ConvertFrom-Json -AsHashtable).parameters.Keys | Sort-Object
                     $parameterFileTestCases += @{
@@ -917,8 +917,8 @@ Describe 'Deployment template tests' -Tag Template {
         $parameterFileTokenTestCases = @()
 
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            if (Test-Path (Join-Path $moduleFolderPath '.deploymentTests')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.deploymentTests' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
+            if (Test-Path (Join-Path $moduleFolderPath '.test')) {
+                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.testeters.json') -Recurse -Force).FullName
                 foreach ($ParameterFilePath in $ParameterFilePaths) {
                     foreach ($token in $enforcedTokenList.Keys) {
                         $parameterFileTokenTestCases += @{
@@ -948,7 +948,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             $incorrectReferencesFound = $ParameterFileContent | Select-String -Pattern $tokenValue -AllMatches
             if ($incorrectReferencesFound.Matches) {
-                $incorrectReferencesFound.Matches.Count | Should -Be 0 -Because ('Parameter file should not contain the [{0}] value, instead should reference the token value [{1}]. Please check the {2} lines: [{3}]' -f $tokenName, $ParameterFileTokenName, $incorrectReferencesFound.Matches.Count, ($incorrectReferencesFound.Line.Trim() -join ",`n"))
+                $incorrectReferencesFound.Matches.Count | Should -Be 0 -Because ('Parameter file should not contain the [ { 0 }] value, instead should reference the token value [ { 1 }]. Please check the { 2 } lines: [ { 3 }]' -f $tokenName, $ParameterFileTokenName, $incorrectReferencesFound.Matches.Count, ($incorrectReferencesFound.Line.Trim() -join ",`n"))
             }
         }
     }
@@ -1067,7 +1067,7 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
         $resourceTypeApiVersions = ($namespaceResourceTypes | Where-Object { $_.ResourceTypeName -eq $resourceType }).ApiVersions
 
         if (-not $resourceTypeApiVersions) {
-            Write-Warning ('[API Test] We are currently unable to determine the available API versions for resource type [{0}/{1}]' -f $ProviderNamespace, $resourceType)
+            Write-Warning ('[API Test] We are currently unable to determine the available API versions for resource type [ { 0 }/ { 1 }]' -f $ProviderNamespace, $resourceType)
             continue
         }
 
diff --git a/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
index 4aac14ad91..ea77202a1c 100644
--- a/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-TemplateDeployment.ps1
@@ -102,7 +102,7 @@ Optional. Maximum retry limit if the deployment fails. Default is 3.
 Optional. Do not throw an exception if it failed. Still returns the error message though
 
 .EXAMPLE
-New-DeploymentWithParameterFile -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+New-DeploymentWithParameterFile -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.test/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Deploy the deploy.json of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -341,7 +341,7 @@ Optional. Maximum retry limit if the deployment fails. Default is 3.
 Optional. Do not throw an exception if it failed. Still returns the error message though
 
 .EXAMPLE
-New-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+New-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.test/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Deploy the deploy.bicep of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -351,7 +351,7 @@ New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.bicep' -locati
 Deploy the deploy.json of the ResourceGroup module in location 'WestEurope'
 
 .EXAMPLE
-New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.deploymentTests/parameters.json' -location 'WestEurope'
+New-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.test/parameters.json' -location 'WestEurope'
 
 Deploy the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
 #>
diff --git a/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1 b/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
index ed5f56d23e..0601075f47 100644
--- a/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/Test-TemplateDeployment.ps1
@@ -31,7 +31,7 @@ Optional. Name of the management group to deploy into. Mandatory if deploying in
 Optional. Additional parameters you can provide with the deployment. E.g. @{ resourceGroupName = 'myResourceGroup' }
 
 .EXAMPLE
-Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.deploymentTests/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -parameterFilePath 'C:/KeyVault/.test/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Test the deploy.bicep of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
@@ -41,7 +41,7 @@ Test-TemplateDeployment -templateFilePath 'C:/KeyVault/deploy.bicep' -location '
 Test the deploy.bicep of the KeyVault module using the resource group 'aLegendaryRg' in location 'WestEurope'
 
 .EXAMPLE
-Test-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.deploymentTests/parameters.json' -location 'WestEurope'
+Test-TemplateDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.test/parameters.json' -location 'WestEurope'
 
 Test the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
 #>
diff --git a/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1 b/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
index 426d5efd81..e9a68bd65d 100644
--- a/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
+++ b/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
@@ -23,8 +23,8 @@ function Get-DeploymentTestFileList {
     )
 
     $deploymentTests = @()
-    if (Test-Path (Join-Path $ModulePath '.deploymentTests')) {
-        $deploymentTests += (Get-ChildItem -Path (Join-Path $ModulePath '.deploymentTests') -Depth 0 -Include ('*.json', '*.bicep') -File).FullName
+    if (Test-Path (Join-Path $ModulePath '.test')) {
+        $deploymentTests += (Get-ChildItem -Path (Join-Path $ModulePath '.test') -Depth 0 -Include ('*.json', '*.bicep') -File).FullName
     }
 
     if (-not $deploymentTests) {
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index 5b48b09872..390ec2413c 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -351,7 +351,7 @@ function Set-DeploymentExamplesSection {
 
     $moduleRoot = Split-Path $TemplateFilePath -Parent
     $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
-    $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.deploymentTests') -Filter '*parameters.json' -Recurse
+    $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.test') -Filter '*parameters.json' -Recurse
 
     $index = 1
     foreach ($parameterFilePath in $parameterFiles.FullName) {
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index aaa2461a04..34c40d59cd 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -35,7 +35,7 @@ Optional. A hashtable parameter that contains custom tokens to be replaced in th
 
 $TestModuleLocallyInput = @{
     TemplateFilePath           = 'C:\Microsoft.Network\routeTables\deploy.bicep'
-    ParameterFilePath          = 'C:\Microsoft.Network\routeTables\.deploymentTests\parameters.json'
+    ParameterFilePath          = 'C:\Microsoft.Network\routeTables\.test\parameters.json'
     PesterTest                 = $false
     DeploymentTest             = $false
     ValidationTest             = $true
@@ -115,7 +115,7 @@ function Test-ModuleLocally {
         [string] $TemplateFilePath,
 
         [Parameter(Mandatory = $false)]
-        [string] $parameterFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.deploymentTests'),
+        [string] $parameterFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.test'),
 
         [Parameter(Mandatory = $false)]
         [Psobject] $ValidateOrDeployParameters = @{},
diff --git a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
index eedb1c4fa6..b91c4e356a 100644
--- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
+++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1
@@ -214,8 +214,8 @@ Check for the existens of any nested module levels
 
 .DESCRIPTION
 Check for the existens of any nested module levels.
-A module is identified by folders that do not contain module-specific folders such as '.deploymentTests'.
-In other words, a module would contain a folder with e.g. a '.deploymentTests' folder and would hence not count towards the hierarchy of parent folders.
+A module is identified by folders that do not contain module-specific folders such as '.test'.
+In other words, a module would contain a folder with e.g. a '.test' folder and would hence not count towards the hierarchy of parent folders.
 
 .PARAMETER path
 Mandatory. The path to search in.
@@ -234,10 +234,10 @@ function Measure-FolderHasNestedModule {
         [string] $Path
     )
 
-    # Get all folder paths that exist in the given path as long as they are not '.bicep' or '.deploymentTests' folders
+    # Get all folder paths that exist in the given path as long as they are not '.bicep' or '.test' folders
     # This works as long as the folder structure is consistent (e.g. no empty folders are created etc.)
-    $rawFoundFolders = Get-ChildItem $Path -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Force
-    $foundFolders = $rawFoundFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.deploymentTests' -Force).count -gt 0 }
+    $rawFoundFolders = Get-ChildItem $Path -Directory -Recurse -Exclude @('.bicep', '.test') -Force
+    $foundFolders = $rawFoundFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.test' -Force).count -gt 0 }
     if ($foundFolders) {
         return $true
     } else {
@@ -323,9 +323,9 @@ function Get-ResolvedSubServiceRow {
         [string]$ProjectName = ''
     )
 
-    $rawSubFolders = Get-ChildItem -Path $subPath -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Force
+    $rawSubFolders = Get-ChildItem -Path $subPath -Directory -Recurse -Exclude @('.bicep', '.test') -Force
     # Only consider those folders that have their own parameters, i.e. are top-level modules and not child-resource modules
-    $subFolders = $rawSubFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.deploymentTests' -Force).count -gt 0 }
+    $subFolders = $rawSubFolders | Where-Object { (Get-ChildItem $_.FullName -Directory -Depth 0 -Include '.test' -Force).count -gt 0 }
 
     foreach ($subfolder in $subFolders.FullName) {
 
@@ -517,7 +517,7 @@ function Get-ModulesAsMarkdownTable {
     foreach ($topLevelFolder in $topLevelFolders) {
         $provider = Split-Path $topLevelFolder -Leaf
 
-        $containedFolders = Get-ChildItem -Path $topLevelFolder -Directory -Recurse -Exclude @('.bicep', '.deploymentTests') -Depth 0 -Force
+        $containedFolders = Get-ChildItem -Path $topLevelFolder -Directory -Recurse -Exclude @('.bicep', '.test') -Depth 0 -Force
 
         foreach ($containedFolder in $containedFolders.FullName) {
             $containedFolderName = (Split-Path $containedFolder -Leaf)

From 22f46a4045102fb4225bdcca8c94615f21aba2bf Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 23:55:19 +0200
Subject: [PATCH 25/36] Renamed folders

---
 .../DomainServices/{.deploymentTests => .test}/parameters.json    | 0
 .../servers/{.deploymentTests => .test}/max.parameters.json       | 0
 .../servers/{.deploymentTests => .test}/min.parameters.json       | 0
 .../servers/{.deploymentTests => .test}/parameters.json           | 0
 .../service/{.deploymentTests => .test}/max.parameters.json       | 0
 .../service/{.deploymentTests => .test}/min.parameters.json       | 0
 .../service/{.deploymentTests => .test}/parameters.json           | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../locks/{.deploymentTests => .test}/rg.parameters.json          | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/rg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/rg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/rg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/rg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/rg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/rg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/mg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/mg.parameters.json                | 0
 .../{.deploymentTests => .test}/rg.min.parameters.json            | 0
 .../{.deploymentTests => .test}/rg.parameters.json                | 0
 .../{.deploymentTests => .test}/sub.min.parameters.json           | 0
 .../{.deploymentTests => .test}/sub.parameters.json               | 0
 .../{.deploymentTests => .test}/encr.parameters.json              | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../batchAccounts/{.deploymentTests => .test}/min.parameters.json | 0
 .../batchAccounts/{.deploymentTests => .test}/parameters.json     | 0
 .../accounts/{.deploymentTests => .test}/encr.parameters.json     | 0
 .../accounts/{.deploymentTests => .test}/min.parameters.json      | 0
 .../accounts/{.deploymentTests => .test}/parameters.json          | 0
 .../accounts/{.deploymentTests => .test}/speech.parameters.json   | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../availabilitySets/{.deploymentTests => .test}/parameters.json  | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../disks/{.deploymentTests => .test}/image.parameters.json       | 0
 .../disks/{.deploymentTests => .test}/import.parameters.json      | 0
 .../disks/{.deploymentTests => .test}/min.parameters.json         | 0
 .../disks/{.deploymentTests => .test}/parameters.json             | 0
 .../galleries/{.deploymentTests => .test}/images.parameters.json  | 0
 .../galleries/{.deploymentTests => .test}/parameters.json         | 0
 .../images/{.deploymentTests => .test}/parameters.json            | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/linux.min.parameters.json         | 0
 .../{.deploymentTests => .test}/linux.parameters.json             | 0
 .../{.deploymentTests => .test}/windows.min.parameters.json       | 0
 .../{.deploymentTests => .test}/windows.parameters.json           | 0
 .../{.deploymentTests => .test}/linux.autmg.parameters.json       | 0
 .../{.deploymentTests => .test}/linux.min.parameters.json         | 0
 .../{.deploymentTests => .test}/linux.parameters.json             | 0
 .../{.deploymentTests => .test}/windows.autmg.parameters.json     | 0
 .../{.deploymentTests => .test}/windows.min.parameters.json       | 0
 .../{.deploymentTests => .test}/windows.parameters.json           | 0
 .../budgets/{.deploymentTests => .test}/parameters.json           | 0
 .../containerGroups/{.deploymentTests => .test}/parameters.json   | 0
 .../registries/{.deploymentTests => .test}/encr.parameters.json   | 0
 .../registries/{.deploymentTests => .test}/min.parameters.json    | 0
 .../registries/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/azure.parameters.json             | 0
 .../{.deploymentTests => .test}/kubenet.parameters.json           | 0
 .../factories/{.deploymentTests => .test}/parameters.json         | 0
 .../backupVaults/{.deploymentTests => .test}/min.parameters.json  | 0
 .../backupVaults/{.deploymentTests => .test}/parameters.json      | 0
 .../workspaces/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../applicationgroups/{.deploymentTests => .test}/parameters.json | 0
 .../hostpools/{.deploymentTests => .test}/parameters.json         | 0
 .../scalingplans/{.deploymentTests => .test}/min.parameters.json  | 0
 .../workspaces/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/mongodb.parameters.json           | 0
 .../{.deploymentTests => .test}/plain.parameters.json             | 0
 .../{.deploymentTests => .test}/sqldb.parameters.json             | 0
 .../systemTopics/{.deploymentTests => .test}/min.parameters.json  | 0
 .../systemTopics/{.deploymentTests => .test}/parameters.json      | 0
 .../topics/{.deploymentTests => .test}/parameters.json            | 0
 .../namespaces/{.deploymentTests => .test}/min.parameters.json    | 0
 .../namespaces/{.deploymentTests => .test}/parameters.json        | 0
 .../healthBots/{.deploymentTests => .test}/parameters.json        | 0
 .../actionGroups/{.deploymentTests => .test}/parameters.json      | 0
 .../activityLogAlerts/{.deploymentTests => .test}/parameters.json | 0
 .../components/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../metricAlerts/{.deploymentTests => .test}/parameters.json      | 0
 .../privateLinkScopes/{.deploymentTests => .test}/parameters.json | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../vaults/{.deploymentTests => .test}/min.parameters.json        | 0
 .../vaults/{.deploymentTests => .test}/parameters.json            | 0
 .../extensions/{.deploymentTests => .test}/min.parameters.json    | 0
 .../extensions/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../workflows/{.deploymentTests => .test}/parameters.json         | 0
 .../workspaces/{.deploymentTests => .test}/min.parameters.json    | 0
 .../workspaces/{.deploymentTests => .test}/parameters.json        | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/rg.parameters.json                | 0
 .../managementGroups/{.deploymentTests => .test}/parameters.json  | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/nfs3.parameters.json              | 0
 .../{.deploymentTests => .test}/nfs41.parameters.json             | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/addpip.parameters.json            | 0
 .../{.deploymentTests => .test}/custompip.parameters.json         | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../azureFirewalls/{.deploymentTests => .test}/parameters.json    | 0
 .../{.deploymentTests => .test}/addpip.parameters.json            | 0
 .../{.deploymentTests => .test}/custompip.parameters.json         | 0
 .../bastionHosts/{.deploymentTests => .test}/min.parameters.json  | 0
 .../bastionHosts/{.deploymentTests => .test}/parameters.json      | 0
 .../{.deploymentTests => .test}/vnet2vnet.parameters.json         | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../firewallPolicies/{.deploymentTests => .test}/parameters.json  | 0
 .../frontDoors/{.deploymentTests => .test}/parameters.json        | 0
 .../ipGroups/{.deploymentTests => .test}/parameters.json          | 0
 .../{.deploymentTests => .test}/internal.parameters.json          | 0
 .../loadBalancers/{.deploymentTests => .test}/min.parameters.json | 0
 .../loadBalancers/{.deploymentTests => .test}/parameters.json     | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../natGateways/{.deploymentTests => .test}/parameters.json       | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../networkInterfaces/{.deploymentTests => .test}/parameters.json | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../networkWatchers/{.deploymentTests => .test}/parameters.json   | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../privateDnsZones/{.deploymentTests => .test}/parameters.json   | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../privateEndpoints/{.deploymentTests => .test}/parameters.json  | 0
 .../publicIPAddresses/{.deploymentTests => .test}/parameters.json | 0
 .../publicIPPrefixes/{.deploymentTests => .test}/parameters.json  | 0
 .../routeTables/{.deploymentTests => .test}/parameters.json       | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../virtualHubs/{.deploymentTests => .test}/min.parameters.json   | 0
 .../virtualHubs/{.deploymentTests => .test}/parameters.json       | 0
 .../{.deploymentTests => .test}/expressRoute.parameters.json      | 0
 .../{.deploymentTests => .test}/vpn.parameters.json               | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../virtualNetworks/{.deploymentTests => .test}/parameters.json   | 0
 .../{.deploymentTests => .test}/vnetPeering.parameters.json       | 0
 .../virtualWans/{.deploymentTests => .test}/min.parameters.json   | 0
 .../virtualWans/{.deploymentTests => .test}/parameters.json       | 0
 .../vpnGateways/{.deploymentTests => .test}/min.parameters.json   | 0
 .../vpnGateways/{.deploymentTests => .test}/parameters.json       | 0
 .../vpnSites/{.deploymentTests => .test}/min.parameters.json      | 0
 .../vpnSites/{.deploymentTests => .test}/parameters.json          | 0
 .../workspaces/{.deploymentTests => .test}/min.parameters.json    | 0
 .../workspaces/{.deploymentTests => .test}/parameters.json        | 0
 .../solutions/{.deploymentTests => .test}/min.parameters.json     | 0
 .../solutions/{.deploymentTests => .test}/ms.parameters.json      | 0
 .../solutions/{.deploymentTests => .test}/nonms.parameters.json   | 0
 .../vaults/{.deploymentTests => .test}/dr.parameters.json         | 0
 .../vaults/{.deploymentTests => .test}/min.parameters.json        | 0
 .../vaults/{.deploymentTests => .test}/parameters.json            | 0
 .../{.deploymentTests => .test}/cli.parameters.json               | 0
 .../{.deploymentTests => .test}/ps.parameters.json                | 0
 .../resourceGroups/{.deploymentTests => .test}/parameters.json    | 0
 .../tags/{.deploymentTests => .test}/min.parameters.json          | 0
 .../tags/{.deploymentTests => .test}/rg.parameters.json           | 0
 .../tags/{.deploymentTests => .test}/sub.parameters.json          | 0
 .../{.deploymentTests => .test}/parameters.json                   | 0
 .../namespaces/{.deploymentTests => .test}/min.parameters.json    | 0
 .../namespaces/{.deploymentTests => .test}/parameters.json        | 0
 .../clusters/{.deploymentTests => .test}/cert.parameters.json     | 0
 .../clusters/{.deploymentTests => .test}/full.parameters.json     | 0
 .../clusters/{.deploymentTests => .test}/min.parameters.json      | 0
 .../managedInstances/{.deploymentTests => .test}/parameters.json  | 0
 .../servers/{.deploymentTests => .test}/admin.parameters.json     | 0
 .../servers/{.deploymentTests => .test}/parameters.json           | 0
 .../{.deploymentTests => .test}/encr.parameters.json              | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../{.deploymentTests => .test}/nfs.parameters.json               | 0
 .../storageAccounts/{.deploymentTests => .test}/parameters.json   | 0
 .../{.deploymentTests => .test}/v1.parameters.json                | 0
 .../{.deploymentTests => .test}/min.parameters.json               | 0
 .../privateLinkHubs/{.deploymentTests => .test}/parameters.json   | 0
 .../imageTemplates/{.deploymentTests => .test}/parameters.json    | 0
 .../connections/{.deploymentTests => .test}/parameters.json       | 0
 .../{.deploymentTests => .test}/asev2.parameters.json             | 0
 .../{.deploymentTests => .test}/asev3.parameters.json             | 0
 .../serverfarms/{.deploymentTests => .test}/parameters.json       | 0
 .../sites/{.deploymentTests => .test}/fa.min.parameters.json      | 0
 .../sites/{.deploymentTests => .test}/fa.parameters.json          | 0
 .../sites/{.deploymentTests => .test}/wa.min.parameters.json      | 0
 .../sites/{.deploymentTests => .test}/wa.parameters.json          | 0
 .../staticSites/{.deploymentTests => .test}/min.parameters.json   | 0
 .../staticSites/{.deploymentTests => .test}/parameters.json       | 0
 210 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/Microsoft.AAD/DomainServices/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.deploymentTests => .test}/max.parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.AnalysisServices/servers/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.deploymentTests => .test}/max.parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.ApiManagement/service/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.AppConfiguration/configurationStores/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.AppConfiguration/configurationStores/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Authorization/locks/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyAssignments/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyDefinitions/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policyExemptions/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/policySetDefinitions/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleAssignments/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/mg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/mg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/rg.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/sub.min.parameters.json (100%)
 rename modules/Microsoft.Authorization/roleDefinitions/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.deploymentTests => .test}/encr.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Automation/automationAccounts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Batch/batchAccounts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Batch/batchAccounts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.deploymentTests => .test}/encr.parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.CognitiveServices/accounts/{.deploymentTests => .test}/speech.parameters.json (100%)
 rename modules/Microsoft.Compute/availabilitySets/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Compute/availabilitySets/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/diskEncryptionSets/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.deploymentTests => .test}/image.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.deploymentTests => .test}/import.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Compute/disks/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/galleries/{.deploymentTests => .test}/images.parameters.json (100%)
 rename modules/Microsoft.Compute/galleries/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/images/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/proximityPlacementGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.deploymentTests => .test}/linux.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.deploymentTests => .test}/linux.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.deploymentTests => .test}/windows.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachineScaleSets/{.deploymentTests => .test}/windows.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/linux.autmg.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/linux.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/linux.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/windows.autmg.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/windows.min.parameters.json (100%)
 rename modules/Microsoft.Compute/virtualMachines/{.deploymentTests => .test}/windows.parameters.json (100%)
 rename modules/Microsoft.Consumption/budgets/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ContainerInstance/containerGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.deploymentTests => .test}/encr.parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.ContainerRegistry/registries/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ContainerService/managedClusters/{.deploymentTests => .test}/azure.parameters.json (100%)
 rename modules/Microsoft.ContainerService/managedClusters/{.deploymentTests => .test}/kubenet.parameters.json (100%)
 rename modules/Microsoft.DataFactory/factories/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.DataProtection/backupVaults/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.DataProtection/backupVaults/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Databricks/workspaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/applicationgroups/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/applicationgroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/hostpools/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/scalingplans/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.DesktopVirtualization/workspaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.deploymentTests => .test}/mongodb.parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.deploymentTests => .test}/plain.parameters.json (100%)
 rename modules/Microsoft.DocumentDB/databaseAccounts/{.deploymentTests => .test}/sqldb.parameters.json (100%)
 rename modules/Microsoft.EventGrid/systemTopics/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.EventGrid/systemTopics/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.EventGrid/topics/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.EventHub/namespaces/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.EventHub/namespaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.HealthBot/healthBots/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/actionGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/activityLogAlerts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/components/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/diagnosticSettings/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/metricAlerts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/privateLinkScopes/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Insights/scheduledQueryRules/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.KeyVault/vaults/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.KeyVault/vaults/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/extensions/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/extensions/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/fluxConfigurations/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.KubernetesConfiguration/fluxConfigurations/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Logic/workflows/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.MachineLearningServices/workspaces/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.MachineLearningServices/workspaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ManagedIdentity/userAssignedIdentities/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ManagedServices/registrationDefinitions/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ManagedServices/registrationDefinitions/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Management/managementGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.deploymentTests => .test}/nfs3.parameters.json (100%)
 rename modules/Microsoft.NetApp/netAppAccounts/{.deploymentTests => .test}/nfs41.parameters.json (100%)
 rename modules/Microsoft.Network/applicationGateways/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/applicationSecurityGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.deploymentTests => .test}/addpip.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.deploymentTests => .test}/custompip.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/azureFirewalls/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.deploymentTests => .test}/addpip.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.deploymentTests => .test}/custompip.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/bastionHosts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/connections/{.deploymentTests => .test}/vnet2vnet.parameters.json (100%)
 rename modules/Microsoft.Network/ddosProtectionPlans/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/expressRouteCircuits/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/firewallPolicies/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/firewallPolicies/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/frontDoors/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/ipGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.deploymentTests => .test}/internal.parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/loadBalancers/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/localNetworkGateways/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/natGateways/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/networkInterfaces/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkInterfaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/networkSecurityGroups/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkSecurityGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/networkWatchers/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/networkWatchers/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/privateDnsZones/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/privateDnsZones/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/privateEndpoints/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/privateEndpoints/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/publicIPAddresses/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/publicIPPrefixes/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/routeTables/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/trafficmanagerprofiles/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualHubs/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualHubs/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworkGateways/{.deploymentTests => .test}/expressRoute.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworkGateways/{.deploymentTests => .test}/vpn.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/virtualNetworks/{.deploymentTests => .test}/vnetPeering.parameters.json (100%)
 rename modules/Microsoft.Network/virtualWans/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/virtualWans/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/vpnGateways/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/vpnGateways/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Network/vpnSites/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Network/vpnSites/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.OperationalInsights/workspaces/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.OperationalInsights/workspaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.deploymentTests => .test}/ms.parameters.json (100%)
 rename modules/Microsoft.OperationsManagement/solutions/{.deploymentTests => .test}/nonms.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.deploymentTests => .test}/dr.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.RecoveryServices/vaults/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Resources/deploymentScripts/{.deploymentTests => .test}/cli.parameters.json (100%)
 rename modules/Microsoft.Resources/deploymentScripts/{.deploymentTests => .test}/ps.parameters.json (100%)
 rename modules/Microsoft.Resources/resourceGroups/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.deploymentTests => .test}/rg.parameters.json (100%)
 rename modules/Microsoft.Resources/tags/{.deploymentTests => .test}/sub.parameters.json (100%)
 rename modules/Microsoft.Security/azureSecurityCenter/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ServiceBus/namespaces/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.ServiceBus/namespaces/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.deploymentTests => .test}/cert.parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.deploymentTests => .test}/full.parameters.json (100%)
 rename modules/Microsoft.ServiceFabric/clusters/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Sql/managedInstances/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Sql/servers/{.deploymentTests => .test}/admin.parameters.json (100%)
 rename modules/Microsoft.Sql/servers/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.deploymentTests => .test}/encr.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.deploymentTests => .test}/nfs.parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Storage/storageAccounts/{.deploymentTests => .test}/v1.parameters.json (100%)
 rename modules/Microsoft.Synapse/privateLinkHubs/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Synapse/privateLinkHubs/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.VirtualMachineImages/imageTemplates/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Web/connections/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Web/hostingEnvironments/{.deploymentTests => .test}/asev2.parameters.json (100%)
 rename modules/Microsoft.Web/hostingEnvironments/{.deploymentTests => .test}/asev3.parameters.json (100%)
 rename modules/Microsoft.Web/serverfarms/{.deploymentTests => .test}/parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.deploymentTests => .test}/fa.min.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.deploymentTests => .test}/fa.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.deploymentTests => .test}/wa.min.parameters.json (100%)
 rename modules/Microsoft.Web/sites/{.deploymentTests => .test}/wa.parameters.json (100%)
 rename modules/Microsoft.Web/staticSites/{.deploymentTests => .test}/min.parameters.json (100%)
 rename modules/Microsoft.Web/staticSites/{.deploymentTests => .test}/parameters.json (100%)

diff --git a/modules/Microsoft.AAD/DomainServices/.deploymentTests/parameters.json b/modules/Microsoft.AAD/DomainServices/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.AAD/DomainServices/.deploymentTests/parameters.json
rename to modules/Microsoft.AAD/DomainServices/.test/parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.deploymentTests/max.parameters.json b/modules/Microsoft.AnalysisServices/servers/.test/max.parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.deploymentTests/max.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.test/max.parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.deploymentTests/min.parameters.json b/modules/Microsoft.AnalysisServices/servers/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.deploymentTests/min.parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.test/min.parameters.json
diff --git a/modules/Microsoft.AnalysisServices/servers/.deploymentTests/parameters.json b/modules/Microsoft.AnalysisServices/servers/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.AnalysisServices/servers/.deploymentTests/parameters.json
rename to modules/Microsoft.AnalysisServices/servers/.test/parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.deploymentTests/max.parameters.json b/modules/Microsoft.ApiManagement/service/.test/max.parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.deploymentTests/max.parameters.json
rename to modules/Microsoft.ApiManagement/service/.test/max.parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.deploymentTests/min.parameters.json b/modules/Microsoft.ApiManagement/service/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.deploymentTests/min.parameters.json
rename to modules/Microsoft.ApiManagement/service/.test/min.parameters.json
diff --git a/modules/Microsoft.ApiManagement/service/.deploymentTests/parameters.json b/modules/Microsoft.ApiManagement/service/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ApiManagement/service/.deploymentTests/parameters.json
rename to modules/Microsoft.ApiManagement/service/.test/parameters.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/min.parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.deploymentTests/parameters.json
rename to modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json
diff --git a/modules/Microsoft.Authorization/locks/.deploymentTests/rg.parameters.json b/modules/Microsoft.Authorization/locks/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/locks/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Authorization/locks/.test/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyAssignments/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/policyAssignments/.test/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyDefinitions/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/policyDefinitions/.test/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policyExemptions/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/policyExemptions/.test/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/policySetDefinitions/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/policySetDefinitions/.test/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleAssignments/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/roleAssignments/.test/sub.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/mg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/mg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/mg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/rg.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/rg.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.min.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/sub.min.parameters.json
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Authorization/roleDefinitions/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Authorization/roleDefinitions/.test/sub.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.deploymentTests/encr.parameters.json b/modules/Microsoft.Automation/automationAccounts/.test/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.deploymentTests/encr.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.test/encr.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.deploymentTests/min.parameters.json b/modules/Microsoft.Automation/automationAccounts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.test/min.parameters.json
diff --git a/modules/Microsoft.Automation/automationAccounts/.deploymentTests/parameters.json b/modules/Microsoft.Automation/automationAccounts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Automation/automationAccounts/.deploymentTests/parameters.json
rename to modules/Microsoft.Automation/automationAccounts/.test/parameters.json
diff --git a/modules/Microsoft.Batch/batchAccounts/.deploymentTests/min.parameters.json b/modules/Microsoft.Batch/batchAccounts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.test/min.parameters.json
diff --git a/modules/Microsoft.Batch/batchAccounts/.deploymentTests/parameters.json b/modules/Microsoft.Batch/batchAccounts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Batch/batchAccounts/.deploymentTests/parameters.json
rename to modules/Microsoft.Batch/batchAccounts/.test/parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/encr.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.test/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.deploymentTests/encr.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.test/encr.parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/min.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.test/min.parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/parameters.json b/modules/Microsoft.CognitiveServices/accounts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.deploymentTests/parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.test/parameters.json
diff --git a/modules/Microsoft.CognitiveServices/accounts/.deploymentTests/speech.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.test/speech.parameters.json
similarity index 100%
rename from modules/Microsoft.CognitiveServices/accounts/.deploymentTests/speech.parameters.json
rename to modules/Microsoft.CognitiveServices/accounts/.test/speech.parameters.json
diff --git a/modules/Microsoft.Compute/availabilitySets/.deploymentTests/min.parameters.json b/modules/Microsoft.Compute/availabilitySets/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.test/min.parameters.json
diff --git a/modules/Microsoft.Compute/availabilitySets/.deploymentTests/parameters.json b/modules/Microsoft.Compute/availabilitySets/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/availabilitySets/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/availabilitySets/.test/parameters.json
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.deploymentTests/parameters.json b/modules/Microsoft.Compute/diskEncryptionSets/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/diskEncryptionSets/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/diskEncryptionSets/.test/parameters.json
diff --git a/modules/Microsoft.Compute/disks/.deploymentTests/image.parameters.json b/modules/Microsoft.Compute/disks/.test/image.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.deploymentTests/image.parameters.json
rename to modules/Microsoft.Compute/disks/.test/image.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.deploymentTests/import.parameters.json b/modules/Microsoft.Compute/disks/.test/import.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.deploymentTests/import.parameters.json
rename to modules/Microsoft.Compute/disks/.test/import.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.deploymentTests/min.parameters.json b/modules/Microsoft.Compute/disks/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Compute/disks/.test/min.parameters.json
diff --git a/modules/Microsoft.Compute/disks/.deploymentTests/parameters.json b/modules/Microsoft.Compute/disks/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/disks/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/disks/.test/parameters.json
diff --git a/modules/Microsoft.Compute/galleries/.deploymentTests/images.parameters.json b/modules/Microsoft.Compute/galleries/.test/images.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.deploymentTests/images.parameters.json
rename to modules/Microsoft.Compute/galleries/.test/images.parameters.json
diff --git a/modules/Microsoft.Compute/galleries/.deploymentTests/parameters.json b/modules/Microsoft.Compute/galleries/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/galleries/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/galleries/.test/parameters.json
diff --git a/modules/Microsoft.Compute/images/.deploymentTests/parameters.json b/modules/Microsoft.Compute/images/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/images/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/images/.test/parameters.json
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.deploymentTests/parameters.json b/modules/Microsoft.Compute/proximityPlacementGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/proximityPlacementGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Compute/proximityPlacementGroups/.test/parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachineScaleSets/.deploymentTests/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/linux.autmg.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/linux.autmg.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/linux.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/linux.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/linux.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/linux.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/linux.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/windows.autmg.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.autmg.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/windows.autmg.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/windows.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.min.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/windows.min.parameters.json
diff --git a/modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.parameters.json b/modules/Microsoft.Compute/virtualMachines/.test/windows.parameters.json
similarity index 100%
rename from modules/Microsoft.Compute/virtualMachines/.deploymentTests/windows.parameters.json
rename to modules/Microsoft.Compute/virtualMachines/.test/windows.parameters.json
diff --git a/modules/Microsoft.Consumption/budgets/.deploymentTests/parameters.json b/modules/Microsoft.Consumption/budgets/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Consumption/budgets/.deploymentTests/parameters.json
rename to modules/Microsoft.Consumption/budgets/.test/parameters.json
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.deploymentTests/parameters.json b/modules/Microsoft.ContainerInstance/containerGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerInstance/containerGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.ContainerInstance/containerGroups/.test/parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/encr.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.test/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.deploymentTests/encr.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.test/encr.parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/min.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.deploymentTests/min.parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.test/min.parameters.json
diff --git a/modules/Microsoft.ContainerRegistry/registries/.deploymentTests/parameters.json b/modules/Microsoft.ContainerRegistry/registries/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerRegistry/registries/.deploymentTests/parameters.json
rename to modules/Microsoft.ContainerRegistry/registries/.test/parameters.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/.deploymentTests/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.deploymentTests/azure.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json
diff --git a/modules/Microsoft.ContainerService/managedClusters/.deploymentTests/kubenet.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.test/kubenet.parameters.json
similarity index 100%
rename from modules/Microsoft.ContainerService/managedClusters/.deploymentTests/kubenet.parameters.json
rename to modules/Microsoft.ContainerService/managedClusters/.test/kubenet.parameters.json
diff --git a/modules/Microsoft.DataFactory/factories/.deploymentTests/parameters.json b/modules/Microsoft.DataFactory/factories/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.DataFactory/factories/.deploymentTests/parameters.json
rename to modules/Microsoft.DataFactory/factories/.test/parameters.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/.deploymentTests/min.parameters.json b/modules/Microsoft.DataProtection/backupVaults/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.deploymentTests/min.parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.test/min.parameters.json
diff --git a/modules/Microsoft.DataProtection/backupVaults/.deploymentTests/parameters.json b/modules/Microsoft.DataProtection/backupVaults/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.DataProtection/backupVaults/.deploymentTests/parameters.json
rename to modules/Microsoft.DataProtection/backupVaults/.test/parameters.json
diff --git a/modules/Microsoft.Databricks/workspaces/.deploymentTests/parameters.json b/modules/Microsoft.Databricks/workspaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Databricks/workspaces/.deploymentTests/parameters.json
rename to modules/Microsoft.Databricks/workspaces/.test/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/min.parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min.parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.deploymentTests/parameters.json
rename to modules/Microsoft.DesktopVirtualization/applicationgroups/.test/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.deploymentTests/parameters.json b/modules/Microsoft.DesktopVirtualization/hostpools/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/hostpools/.deploymentTests/parameters.json
rename to modules/Microsoft.DesktopVirtualization/hostpools/.test/parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.deploymentTests/min.parameters.json b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/scalingplans/.deploymentTests/min.parameters.json
rename to modules/Microsoft.DesktopVirtualization/scalingplans/.test/min.parameters.json
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.deploymentTests/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.DesktopVirtualization/workspaces/.deploymentTests/parameters.json
rename to modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/mongodb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/mongodb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb.parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/plain.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.test/plain.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/plain.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.test/plain.parameters.json
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/sqldb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb.parameters.json
similarity index 100%
rename from modules/Microsoft.DocumentDB/databaseAccounts/.deploymentTests/sqldb.parameters.json
rename to modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb.parameters.json
diff --git a/modules/Microsoft.EventGrid/systemTopics/.deploymentTests/min.parameters.json b/modules/Microsoft.EventGrid/systemTopics/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.deploymentTests/min.parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.test/min.parameters.json
diff --git a/modules/Microsoft.EventGrid/systemTopics/.deploymentTests/parameters.json b/modules/Microsoft.EventGrid/systemTopics/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/systemTopics/.deploymentTests/parameters.json
rename to modules/Microsoft.EventGrid/systemTopics/.test/parameters.json
diff --git a/modules/Microsoft.EventGrid/topics/.deploymentTests/parameters.json b/modules/Microsoft.EventGrid/topics/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.EventGrid/topics/.deploymentTests/parameters.json
rename to modules/Microsoft.EventGrid/topics/.test/parameters.json
diff --git a/modules/Microsoft.EventHub/namespaces/.deploymentTests/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.deploymentTests/min.parameters.json
rename to modules/Microsoft.EventHub/namespaces/.test/min.parameters.json
diff --git a/modules/Microsoft.EventHub/namespaces/.deploymentTests/parameters.json b/modules/Microsoft.EventHub/namespaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.EventHub/namespaces/.deploymentTests/parameters.json
rename to modules/Microsoft.EventHub/namespaces/.test/parameters.json
diff --git a/modules/Microsoft.HealthBot/healthBots/.deploymentTests/parameters.json b/modules/Microsoft.HealthBot/healthBots/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.HealthBot/healthBots/.deploymentTests/parameters.json
rename to modules/Microsoft.HealthBot/healthBots/.test/parameters.json
diff --git a/modules/Microsoft.Insights/actionGroups/.deploymentTests/parameters.json b/modules/Microsoft.Insights/actionGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/actionGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/actionGroups/.test/parameters.json
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.deploymentTests/parameters.json b/modules/Microsoft.Insights/activityLogAlerts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/activityLogAlerts/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/activityLogAlerts/.test/parameters.json
diff --git a/modules/Microsoft.Insights/components/.deploymentTests/parameters.json b/modules/Microsoft.Insights/components/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/components/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/components/.test/parameters.json
diff --git a/modules/Microsoft.Insights/diagnosticSettings/.deploymentTests/parameters.json b/modules/Microsoft.Insights/diagnosticSettings/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/diagnosticSettings/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/diagnosticSettings/.test/parameters.json
diff --git a/modules/Microsoft.Insights/metricAlerts/.deploymentTests/parameters.json b/modules/Microsoft.Insights/metricAlerts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/metricAlerts/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/metricAlerts/.test/parameters.json
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.deploymentTests/parameters.json b/modules/Microsoft.Insights/privateLinkScopes/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/privateLinkScopes/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/privateLinkScopes/.test/parameters.json
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.deploymentTests/parameters.json b/modules/Microsoft.Insights/scheduledQueryRules/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Insights/scheduledQueryRules/.deploymentTests/parameters.json
rename to modules/Microsoft.Insights/scheduledQueryRules/.test/parameters.json
diff --git a/modules/Microsoft.KeyVault/vaults/.deploymentTests/min.parameters.json b/modules/Microsoft.KeyVault/vaults/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.deploymentTests/min.parameters.json
rename to modules/Microsoft.KeyVault/vaults/.test/min.parameters.json
diff --git a/modules/Microsoft.KeyVault/vaults/.deploymentTests/parameters.json b/modules/Microsoft.KeyVault/vaults/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.KeyVault/vaults/.deploymentTests/parameters.json
rename to modules/Microsoft.KeyVault/vaults/.test/parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.test/min.parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/extensions/.deploymentTests/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/extensions/.test/parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/min.parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min.parameters.json
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.deploymentTests/parameters.json
rename to modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/parameters.json
diff --git a/modules/Microsoft.Logic/workflows/.deploymentTests/parameters.json b/modules/Microsoft.Logic/workflows/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.deploymentTests/parameters.json
rename to modules/Microsoft.Logic/workflows/.test/parameters.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/min.parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/min.parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.test/min.parameters.json
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.MachineLearningServices/workspaces/.deploymentTests/parameters.json
rename to modules/Microsoft.MachineLearningServices/workspaces/.test/parameters.json
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.deploymentTests/parameters.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.deploymentTests/parameters.json
rename to modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/parameters.json
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.test/parameters.json
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/rg.parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.ManagedServices/registrationDefinitions/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg.parameters.json
diff --git a/modules/Microsoft.Management/managementGroups/.deploymentTests/parameters.json b/modules/Microsoft.Management/managementGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Management/managementGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Management/managementGroups/.test/parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.test/min.parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs3.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.test/nfs3.parameters.json
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json
similarity index 100%
rename from modules/Microsoft.NetApp/netAppAccounts/.deploymentTests/nfs41.parameters.json
rename to modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json
diff --git a/modules/Microsoft.Network/applicationGateways/.deploymentTests/parameters.json b/modules/Microsoft.Network/applicationGateways/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/applicationGateways/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/applicationGateways/.test/parameters.json
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.deploymentTests/parameters.json b/modules/Microsoft.Network/applicationSecurityGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/applicationSecurityGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/applicationSecurityGroups/.test/parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.deploymentTests/addpip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.test/addpip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.deploymentTests/addpip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.test/addpip.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.deploymentTests/custompip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.test/custompip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.deploymentTests/custompip.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.test/custompip.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/azureFirewalls/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/azureFirewalls/.deploymentTests/parameters.json b/modules/Microsoft.Network/azureFirewalls/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/azureFirewalls/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/azureFirewalls/.test/parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.deploymentTests/addpip.parameters.json b/modules/Microsoft.Network/bastionHosts/.test/addpip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.deploymentTests/addpip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.test/addpip.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.deploymentTests/custompip.parameters.json b/modules/Microsoft.Network/bastionHosts/.test/custompip.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.deploymentTests/custompip.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.test/custompip.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/bastionHosts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/bastionHosts/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/bastionHosts/.deploymentTests/parameters.json b/modules/Microsoft.Network/bastionHosts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/bastionHosts/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/bastionHosts/.test/parameters.json
diff --git a/modules/Microsoft.Network/connections/.deploymentTests/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/connections/.deploymentTests/vnet2vnet.parameters.json
rename to modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.deploymentTests/parameters.json b/modules/Microsoft.Network/ddosProtectionPlans/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/ddosProtectionPlans/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/ddosProtectionPlans/.test/parameters.json
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.deploymentTests/parameters.json b/modules/Microsoft.Network/expressRouteCircuits/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/expressRouteCircuits/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/expressRouteCircuits/.test/parameters.json
diff --git a/modules/Microsoft.Network/firewallPolicies/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/firewallPolicies/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/firewallPolicies/.deploymentTests/parameters.json b/modules/Microsoft.Network/firewallPolicies/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/firewallPolicies/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/firewallPolicies/.test/parameters.json
diff --git a/modules/Microsoft.Network/frontDoors/.deploymentTests/parameters.json b/modules/Microsoft.Network/frontDoors/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/frontDoors/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/frontDoors/.test/parameters.json
diff --git a/modules/Microsoft.Network/ipGroups/.deploymentTests/parameters.json b/modules/Microsoft.Network/ipGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/ipGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/ipGroups/.test/parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.deploymentTests/internal.parameters.json b/modules/Microsoft.Network/loadBalancers/.test/internal.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.deploymentTests/internal.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.test/internal.parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/loadBalancers/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/loadBalancers/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/loadBalancers/.deploymentTests/parameters.json b/modules/Microsoft.Network/loadBalancers/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/loadBalancers/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/loadBalancers/.test/parameters.json
diff --git a/modules/Microsoft.Network/localNetworkGateways/.deploymentTests/parameters.json b/modules/Microsoft.Network/localNetworkGateways/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/localNetworkGateways/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/localNetworkGateways/.test/parameters.json
diff --git a/modules/Microsoft.Network/natGateways/.deploymentTests/parameters.json b/modules/Microsoft.Network/natGateways/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/natGateways/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/natGateways/.test/parameters.json
diff --git a/modules/Microsoft.Network/networkInterfaces/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/networkInterfaces/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/networkInterfaces/.deploymentTests/parameters.json b/modules/Microsoft.Network/networkInterfaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkInterfaces/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/networkInterfaces/.test/parameters.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkSecurityGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/networkSecurityGroups/.test/parameters.json
diff --git a/modules/Microsoft.Network/networkWatchers/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/networkWatchers/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/networkWatchers/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/networkWatchers/.deploymentTests/parameters.json b/modules/Microsoft.Network/networkWatchers/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/networkWatchers/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/networkWatchers/.test/parameters.json
diff --git a/modules/Microsoft.Network/privateDnsZones/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/privateDnsZones/.deploymentTests/parameters.json b/modules/Microsoft.Network/privateDnsZones/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateDnsZones/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/privateDnsZones/.test/parameters.json
diff --git a/modules/Microsoft.Network/privateEndpoints/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/privateEndpoints/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/privateEndpoints/.deploymentTests/parameters.json b/modules/Microsoft.Network/privateEndpoints/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/privateEndpoints/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/privateEndpoints/.test/parameters.json
diff --git a/modules/Microsoft.Network/publicIPAddresses/.deploymentTests/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPAddresses/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/publicIPAddresses/.test/parameters.json
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.deploymentTests/parameters.json b/modules/Microsoft.Network/publicIPPrefixes/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/publicIPPrefixes/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/publicIPPrefixes/.test/parameters.json
diff --git a/modules/Microsoft.Network/routeTables/.deploymentTests/parameters.json b/modules/Microsoft.Network/routeTables/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/routeTables/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/routeTables/.test/parameters.json
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.deploymentTests/parameters.json b/modules/Microsoft.Network/trafficmanagerprofiles/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/trafficmanagerprofiles/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/trafficmanagerprofiles/.test/parameters.json
diff --git a/modules/Microsoft.Network/virtualHubs/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/virtualHubs/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualHubs/.deploymentTests/parameters.json b/modules/Microsoft.Network/virtualHubs/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualHubs/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/virtualHubs/.test/parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/expressRoute.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/expressRoute.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/vpn.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworkGateways/.deploymentTests/vpn.parameters.json
rename to modules/Microsoft.Network/virtualNetworkGateways/.test/vpn.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/virtualNetworks/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.deploymentTests/parameters.json b/modules/Microsoft.Network/virtualNetworks/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.test/parameters.json
diff --git a/modules/Microsoft.Network/virtualNetworks/.deploymentTests/vnetPeering.parameters.json b/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualNetworks/.deploymentTests/vnetPeering.parameters.json
rename to modules/Microsoft.Network/virtualNetworks/.test/vnetPeering.parameters.json
diff --git a/modules/Microsoft.Network/virtualWans/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/virtualWans/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/virtualWans/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/virtualWans/.deploymentTests/parameters.json b/modules/Microsoft.Network/virtualWans/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/virtualWans/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/virtualWans/.test/parameters.json
diff --git a/modules/Microsoft.Network/vpnGateways/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/vpnGateways/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/vpnGateways/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/vpnGateways/.deploymentTests/parameters.json b/modules/Microsoft.Network/vpnGateways/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnGateways/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/vpnGateways/.test/parameters.json
diff --git a/modules/Microsoft.Network/vpnSites/.deploymentTests/min.parameters.json b/modules/Microsoft.Network/vpnSites/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Network/vpnSites/.test/min.parameters.json
diff --git a/modules/Microsoft.Network/vpnSites/.deploymentTests/parameters.json b/modules/Microsoft.Network/vpnSites/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Network/vpnSites/.deploymentTests/parameters.json
rename to modules/Microsoft.Network/vpnSites/.test/parameters.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/min.parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.test/min.parameters.json
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.OperationalInsights/workspaces/.deploymentTests/parameters.json
rename to modules/Microsoft.OperationalInsights/workspaces/.test/parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/min.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.deploymentTests/min.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.test/min.parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/ms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.test/ms.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.deploymentTests/ms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.test/ms.parameters.json
diff --git a/modules/Microsoft.OperationsManagement/solutions/.deploymentTests/nonms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.test/nonms.parameters.json
similarity index 100%
rename from modules/Microsoft.OperationsManagement/solutions/.deploymentTests/nonms.parameters.json
rename to modules/Microsoft.OperationsManagement/solutions/.test/nonms.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/dr.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.test/dr.parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.deploymentTests/dr.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.test/dr.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/min.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.deploymentTests/min.parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.test/min.parameters.json
diff --git a/modules/Microsoft.RecoveryServices/vaults/.deploymentTests/parameters.json b/modules/Microsoft.RecoveryServices/vaults/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.RecoveryServices/vaults/.deploymentTests/parameters.json
rename to modules/Microsoft.RecoveryServices/vaults/.test/parameters.json
diff --git a/modules/Microsoft.Resources/deploymentScripts/.deploymentTests/cli.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.test/cli.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.deploymentTests/cli.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.test/cli.parameters.json
diff --git a/modules/Microsoft.Resources/deploymentScripts/.deploymentTests/ps.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.test/ps.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/deploymentScripts/.deploymentTests/ps.parameters.json
rename to modules/Microsoft.Resources/deploymentScripts/.test/ps.parameters.json
diff --git a/modules/Microsoft.Resources/resourceGroups/.deploymentTests/parameters.json b/modules/Microsoft.Resources/resourceGroups/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/resourceGroups/.deploymentTests/parameters.json
rename to modules/Microsoft.Resources/resourceGroups/.test/parameters.json
diff --git a/modules/Microsoft.Resources/tags/.deploymentTests/min.parameters.json b/modules/Microsoft.Resources/tags/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Resources/tags/.test/min.parameters.json
diff --git a/modules/Microsoft.Resources/tags/.deploymentTests/rg.parameters.json b/modules/Microsoft.Resources/tags/.test/rg.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.deploymentTests/rg.parameters.json
rename to modules/Microsoft.Resources/tags/.test/rg.parameters.json
diff --git a/modules/Microsoft.Resources/tags/.deploymentTests/sub.parameters.json b/modules/Microsoft.Resources/tags/.test/sub.parameters.json
similarity index 100%
rename from modules/Microsoft.Resources/tags/.deploymentTests/sub.parameters.json
rename to modules/Microsoft.Resources/tags/.test/sub.parameters.json
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.deploymentTests/parameters.json b/modules/Microsoft.Security/azureSecurityCenter/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Security/azureSecurityCenter/.deploymentTests/parameters.json
rename to modules/Microsoft.Security/azureSecurityCenter/.test/parameters.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/.deploymentTests/min.parameters.json b/modules/Microsoft.ServiceBus/namespaces/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.deploymentTests/min.parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.test/min.parameters.json
diff --git a/modules/Microsoft.ServiceBus/namespaces/.deploymentTests/parameters.json b/modules/Microsoft.ServiceBus/namespaces/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceBus/namespaces/.deploymentTests/parameters.json
rename to modules/Microsoft.ServiceBus/namespaces/.test/parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.deploymentTests/cert.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.deploymentTests/full.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json
diff --git a/modules/Microsoft.ServiceFabric/clusters/.deploymentTests/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.ServiceFabric/clusters/.deploymentTests/min.parameters.json
rename to modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json
diff --git a/modules/Microsoft.Sql/managedInstances/.deploymentTests/parameters.json b/modules/Microsoft.Sql/managedInstances/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/managedInstances/.deploymentTests/parameters.json
rename to modules/Microsoft.Sql/managedInstances/.test/parameters.json
diff --git a/modules/Microsoft.Sql/servers/.deploymentTests/admin.parameters.json b/modules/Microsoft.Sql/servers/.test/admin.parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/.deploymentTests/admin.parameters.json
rename to modules/Microsoft.Sql/servers/.test/admin.parameters.json
diff --git a/modules/Microsoft.Sql/servers/.deploymentTests/parameters.json b/modules/Microsoft.Sql/servers/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Sql/servers/.deploymentTests/parameters.json
rename to modules/Microsoft.Sql/servers/.test/parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.deploymentTests/encr.parameters.json b/modules/Microsoft.Storage/storageAccounts/.test/encr.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.deploymentTests/encr.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.test/encr.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.deploymentTests/min.parameters.json b/modules/Microsoft.Storage/storageAccounts/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.test/min.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.deploymentTests/nfs.parameters.json b/modules/Microsoft.Storage/storageAccounts/.test/nfs.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.deploymentTests/nfs.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.test/nfs.parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.deploymentTests/parameters.json b/modules/Microsoft.Storage/storageAccounts/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.deploymentTests/parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.test/parameters.json
diff --git a/modules/Microsoft.Storage/storageAccounts/.deploymentTests/v1.parameters.json b/modules/Microsoft.Storage/storageAccounts/.test/v1.parameters.json
similarity index 100%
rename from modules/Microsoft.Storage/storageAccounts/.deploymentTests/v1.parameters.json
rename to modules/Microsoft.Storage/storageAccounts/.test/v1.parameters.json
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/min.parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.test/min.parameters.json
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Synapse/privateLinkHubs/.deploymentTests/parameters.json
rename to modules/Microsoft.Synapse/privateLinkHubs/.test/parameters.json
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.deploymentTests/parameters.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.deploymentTests/parameters.json
rename to modules/Microsoft.VirtualMachineImages/imageTemplates/.test/parameters.json
diff --git a/modules/Microsoft.Web/connections/.deploymentTests/parameters.json b/modules/Microsoft.Web/connections/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/connections/.deploymentTests/parameters.json
rename to modules/Microsoft.Web/connections/.test/parameters.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev2.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.test/asev2.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev2.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.test/asev2.parameters.json
diff --git a/modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev3.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.test/asev3.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/hostingEnvironments/.deploymentTests/asev3.parameters.json
rename to modules/Microsoft.Web/hostingEnvironments/.test/asev3.parameters.json
diff --git a/modules/Microsoft.Web/serverfarms/.deploymentTests/parameters.json b/modules/Microsoft.Web/serverfarms/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/serverfarms/.deploymentTests/parameters.json
rename to modules/Microsoft.Web/serverfarms/.test/parameters.json
diff --git a/modules/Microsoft.Web/sites/.deploymentTests/fa.min.parameters.json b/modules/Microsoft.Web/sites/.test/fa.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.deploymentTests/fa.min.parameters.json
rename to modules/Microsoft.Web/sites/.test/fa.min.parameters.json
diff --git a/modules/Microsoft.Web/sites/.deploymentTests/fa.parameters.json b/modules/Microsoft.Web/sites/.test/fa.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.deploymentTests/fa.parameters.json
rename to modules/Microsoft.Web/sites/.test/fa.parameters.json
diff --git a/modules/Microsoft.Web/sites/.deploymentTests/wa.min.parameters.json b/modules/Microsoft.Web/sites/.test/wa.min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.deploymentTests/wa.min.parameters.json
rename to modules/Microsoft.Web/sites/.test/wa.min.parameters.json
diff --git a/modules/Microsoft.Web/sites/.deploymentTests/wa.parameters.json b/modules/Microsoft.Web/sites/.test/wa.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/sites/.deploymentTests/wa.parameters.json
rename to modules/Microsoft.Web/sites/.test/wa.parameters.json
diff --git a/modules/Microsoft.Web/staticSites/.deploymentTests/min.parameters.json b/modules/Microsoft.Web/staticSites/.test/min.parameters.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.deploymentTests/min.parameters.json
rename to modules/Microsoft.Web/staticSites/.test/min.parameters.json
diff --git a/modules/Microsoft.Web/staticSites/.deploymentTests/parameters.json b/modules/Microsoft.Web/staticSites/.test/parameters.json
similarity index 100%
rename from modules/Microsoft.Web/staticSites/.deploymentTests/parameters.json
rename to modules/Microsoft.Web/staticSites/.test/parameters.json

From e1b331268de401505e8032478201449dd77d9c29 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 28 Jun 2022 23:58:07 +0200
Subject: [PATCH 26/36] Adjusted verbosity

---
 .../pipelines/sharedScripts/Get-GitHubWorkflowDefaultInput.ps1  | 2 +-
 utilities/tools/Invoke-PipelinesForBranch.ps1                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/sharedScripts/Get-GitHubWorkflowDefaultInput.ps1 b/utilities/pipelines/sharedScripts/Get-GitHubWorkflowDefaultInput.ps1
index 5449674308..2c8ba351a9 100644
--- a/utilities/pipelines/sharedScripts/Get-GitHubWorkflowDefaultInput.ps1
+++ b/utilities/pipelines/sharedScripts/Get-GitHubWorkflowDefaultInput.ps1
@@ -121,7 +121,7 @@ function Get-GitHubWorkflowDefaultInput {
         $workflowContent = Get-Content -Path $workflowPath -Raw
 
         $workflowParameters = @{
-            removeDeployment = Get-DefaultValue -InputName 'removeDeployment' -Content $workflowContent -Verbose
+            removeDeployment = Get-DefaultValue -InputName 'removeDeployment' -Content $workflowContent
         }
 
         Write-Verbose 'Get workflow default input complete'
diff --git a/utilities/tools/Invoke-PipelinesForBranch.ps1 b/utilities/tools/Invoke-PipelinesForBranch.ps1
index 09e2c5badd..9bd6059dd2 100644
--- a/utilities/tools/Invoke-PipelinesForBranch.ps1
+++ b/utilities/tools/Invoke-PipelinesForBranch.ps1
@@ -51,7 +51,7 @@ function Invoke-GitHubWorkflow {
     . (Join-Path (Split-Path $PSScriptRoot -Parent) 'pipelines' 'sharedScripts' 'Get-GitHubWorkflowDefaultInput.ps1')
 
     $workflowFileName = Split-Path $WorkflowFilePath -Leaf
-    $workflowParameters = Get-GitHubWorkflowDefaultInput -workflowPath $WorkflowFilePath
+    $workflowParameters = Get-GitHubWorkflowDefaultInput -workflowPath $WorkflowFilePath -Verbose:$false
     $removeDeploymentFlag = $workflowParameters.removeDeployment
 
     $requestInputObject = @{

From 5ed567b60df2d6c7e10f70c1d3fdf1195bd51e6b Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 00:26:58 +0200
Subject: [PATCH 27/36] Fixed format

---
 modules/.global/global.module.tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 7a36c7b56f..b44e87e8e7 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -1067,7 +1067,7 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
         $resourceTypeApiVersions = ($namespaceResourceTypes | Where-Object { $_.ResourceTypeName -eq $resourceType }).ApiVersions
 
         if (-not $resourceTypeApiVersions) {
-            Write-Warning ('[API Test] We are currently unable to determine the available API versions for resource type [ { 0 }/ { 1 }]' -f $ProviderNamespace, $resourceType)
+            Write-Warning ('[API Test] We are currently unable to determine the available API versions for resource type [{0}/{1}]' -f $ProviderNamespace, $resourceType)
             continue
         }
 

From c6de8d7df904947f784372e1232d7198c6c56755 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 07:42:12 +0200
Subject: [PATCH 28/36] Cleanup param files

---
 .../.parameters/azure.parameters.json         | 123 ------------------
 .../.parameters/kubenet.parameters.json       | 116 -----------------
 .../.test/azure.parameters.json               |   3 +
 .../servers/.parameters/admin.parameters.json |  18 ---
 .../servers/.parameters/parameters.json       | 109 ----------------
 .../servers/.test/parameters.json             |   3 +
 6 files changed, 6 insertions(+), 366 deletions(-)
 delete mode 100644 modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
 delete mode 100644 modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
 delete mode 100644 modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
 delete mode 100644 modules/Microsoft.Sql/servers/.parameters/parameters.json

diff --git a/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
deleted file mode 100644
index 327780a374..0000000000
--- a/modules/Microsoft.ContainerService/managedClusters/.parameters/azure.parameters.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-aks-azure-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "diskEncryptionSetID": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/diskEncryptionSets/adp-<<namePrefix>>-az-des-x-001"
-        },
-        "primaryAgentPoolProfile": {
-            "value": [
-                {
-                    "name": "systempool",
-                    "osDiskSizeGB": 0,
-                    "count": 1,
-                    "enableAutoScaling": true,
-                    "minCount": 1,
-                    "maxCount": 3,
-                    "vmSize": "Standard_DS2_v2",
-                    "osType": "Linux",
-                    "storageProfile": "ManagedDisks",
-                    "type": "VirtualMachineScaleSets",
-                    "mode": "System",
-                    "vnetSubnetID": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-aks/subnets/Primary",
-                    "serviceCidr": "",
-                    "maxPods": 30,
-                    "availabilityZones": [
-                        "1"
-                    ]
-                }
-            ]
-        },
-        "aksClusterNetworkPlugin": {
-            "value": "azure"
-        },
-        "agentPools": {
-            "value": [
-                {
-                    "name": "userpool1",
-                    "vmSize": "Standard_DS2_v2",
-                    "osDiskSizeGB": 128,
-                    "count": 2,
-                    "osType": "Linux",
-                    "maxCount": 3,
-                    "minCount": 1,
-                    "enableAutoScaling": true,
-                    "scaleSetPriority": "Regular",
-                    "scaleSetEvictionPolicy": "Delete",
-                    "nodeLabels": {},
-                    "nodeTaints": [
-                        "CriticalAddonsOnly=true:NoSchedule"
-                    ],
-                    "type": "VirtualMachineScaleSets",
-                    "availabilityZones": [
-                        "1"
-                    ],
-                    "minPods": 2,
-                    "maxPods": 30,
-                    "storageProfile": "ManagedDisks",
-                    "mode": "User",
-                    "vnetSubnetID": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-aks/subnets/Secondary"
-                },
-                {
-                    "name": "userpool2",
-                    "vmSize": "Standard_DS2_v2",
-                    "osDiskSizeGB": 128,
-                    "count": 2,
-                    "osType": "Linux",
-                    "maxCount": 3,
-                    "minCount": 1,
-                    "enableAutoScaling": true,
-                    "scaleSetPriority": "Regular",
-                    "scaleSetEvictionPolicy": "Delete",
-                    "nodeLabels": {},
-                    "nodeTaints": [
-                        "CriticalAddonsOnly=true:NoSchedule"
-                    ],
-                    "type": "VirtualMachineScaleSets",
-                    "availabilityZones": [
-                        "1"
-                    ],
-                    "minPods": 2,
-                    "maxPods": 30,
-                    "storageProfile": "ManagedDisks",
-                    "mode": "User",
-                    "vnetSubnetID": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-aks/subnets/Tertiary"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
deleted file mode 100644
index 3e274f46ca..0000000000
--- a/modules/Microsoft.ContainerService/managedClusters/.parameters/kubenet.parameters.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-aks-kubenet-001"
-        },
-        "primaryAgentPoolProfile": {
-            "value": [
-                {
-                    "name": "systempool",
-                    "osDiskSizeGB": 0,
-                    "count": 1,
-                    "enableAutoScaling": true,
-                    "minCount": 1,
-                    "maxCount": 3,
-                    "vmSize": "Standard_DS2_v2",
-                    "osType": "Linux",
-                    "storageProfile": "ManagedDisks",
-                    "type": "VirtualMachineScaleSets",
-                    "mode": "System",
-                    "serviceCidr": "",
-                    "maxPods": 30,
-                    "availabilityZones": [
-                        "1"
-                    ]
-                }
-            ]
-        },
-        "aksClusterNetworkPlugin": {
-            "value": "kubenet"
-        },
-        "agentPools": {
-            "value": [
-                {
-                    "name": "userpool1",
-                    "vmSize": "Standard_DS2_v2",
-                    "osDiskSizeGB": 128,
-                    "count": 2,
-                    "osType": "Linux",
-                    "maxCount": 3,
-                    "minCount": 1,
-                    "enableAutoScaling": true,
-                    "scaleSetPriority": "Regular",
-                    "scaleSetEvictionPolicy": "Delete",
-                    "nodeLabels": {},
-                    "nodeTaints": [
-                        "CriticalAddonsOnly=true:NoSchedule"
-                    ],
-                    "type": "VirtualMachineScaleSets",
-                    "availabilityZones": [
-                        "1"
-                    ],
-                    "minPods": 2,
-                    "maxPods": 30,
-                    "storageProfile": "ManagedDisks",
-                    "mode": "User"
-                },
-                {
-                    "name": "userpool2",
-                    "vmSize": "Standard_DS2_v2",
-                    "osDiskSizeGB": 128,
-                    "count": 2,
-                    "osType": "Linux",
-                    "maxCount": 3,
-                    "minCount": 1,
-                    "enableAutoScaling": true,
-                    "scaleSetPriority": "Regular",
-                    "scaleSetEvictionPolicy": "Delete",
-                    "nodeLabels": {},
-                    "nodeTaints": [
-                        "CriticalAddonsOnly=true:NoSchedule"
-                    ],
-                    "type": "VirtualMachineScaleSets",
-                    "availabilityZones": [
-                        "1"
-                    ],
-                    "minPods": 2,
-                    "maxPods": 30,
-                    "storageProfile": "ManagedDisks",
-                    "mode": "User"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json b/modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json
index b9406ba122..327780a374 100644
--- a/modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json
+++ b/modules/Microsoft.ContainerService/managedClusters/.test/azure.parameters.json
@@ -8,6 +8,9 @@
         "lock": {
             "value": "CanNotDelete"
         },
+        "diskEncryptionSetID": {
+            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/diskEncryptionSets/adp-<<namePrefix>>-az-des-x-001"
+        },
         "primaryAgentPoolProfile": {
             "value": [
                 {
diff --git a/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json b/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
deleted file mode 100644
index eadb38deec..0000000000
--- a/modules/Microsoft.Sql/servers/.parameters/admin.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sqlsrv-admin-001"
-        },
-        "administrators": {
-            "value": {
-                "azureADOnlyAuthentication": true,
-                "login": "myspn",
-                "sid": "<<deploymentSpId>>",
-                "principalType": "Application",
-                "tenantId": "<<tenantId>>"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Sql/servers/.parameters/parameters.json b/modules/Microsoft.Sql/servers/.parameters/parameters.json
deleted file mode 100644
index 13ec2f832b..0000000000
--- a/modules/Microsoft.Sql/servers/.parameters/parameters.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sqlsrv-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "administratorLogin": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "administratorLogin"
-            }
-        },
-        "administratorLoginPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "administratorLoginPassword"
-            }
-        },
-        "location": {
-            "value": "westeurope"
-        },
-        "minimalTlsVersion": {
-            "value": "1.2"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "vulnerabilityAssessmentsObj": {
-            "value": {
-                "name": "default",
-                "emailSubscriptionAdmins": true,
-                "recurringScansIsEnabled": true,
-                "recurringScansEmails": [
-                    "test1@contoso.com",
-                    "test2@contoso.com"
-                ],
-                "vulnerabilityAssessmentsStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-            }
-        },
-        "databases": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-sqldb-x-001",
-                    "collation": "SQL_Latin1_General_CP1_CI_AS",
-                    "skuTier": "BusinessCritical",
-                    "skuName": "BC_Gen5",
-                    "skuCapacity": 12,
-                    "skuFamily": "Gen5",
-                    "maxSizeBytes": 34359738368,
-                    "licenseType": "LicenseIncluded",
-                    "diagnosticLogsRetentionInDays": 7,
-                    "diagnosticStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                    "diagnosticWorkspaceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                    "diagnosticEventHubAuthorizationRuleId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey",
-                    "diagnosticEventHubName": "adp-<<namePrefix>>-az-evh-x-001"
-                }
-            ]
-        },
-        "firewallRules": {
-            "value": [
-                {
-                    "name": "AllowAllWindowsAzureIps",
-                    "endIpAddress": "0.0.0.0",
-                    "startIpAddress": "0.0.0.0"
-                }
-            ]
-        },
-        "securityAlertPolicies": {
-            "value": [
-                {
-                    "name": "Default",
-                    "state": "Enabled",
-                    "emailAccountAdmins": true
-                }
-            ]
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "sqlServer"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Sql/servers/.test/parameters.json b/modules/Microsoft.Sql/servers/.test/parameters.json
index 091333e683..13ec2f832b 100644
--- a/modules/Microsoft.Sql/servers/.test/parameters.json
+++ b/modules/Microsoft.Sql/servers/.test/parameters.json
@@ -27,6 +27,9 @@
         "location": {
             "value": "westeurope"
         },
+        "minimalTlsVersion": {
+            "value": "1.2"
+        },
         "roleAssignments": {
             "value": [
                 {

From f02256a218017ec1a19d0adaf9a3a83e4c52f15a Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 08:38:39 +0200
Subject: [PATCH 29/36] Removed outdated param file

---
 .../.parameters/parameters.json               |  56 ---
 .../servers/.parameters/max.parameters.json   |  66 ----
 .../servers/.parameters/min.parameters.json   |   9 -
 .../servers/.parameters/parameters.json       |  40 --
 .../service/.parameters/max.parameters.json   | 177 ---------
 .../service/.parameters/min.parameters.json   |  15 -
 .../service/.parameters/parameters.json       |  56 ---
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               |  80 ----
 .../locks/.parameters/rg.parameters.json      |  15 -
 .../.parameters/mg.min.parameters.json        |  12 -
 .../.parameters/mg.parameters.json            |  59 ---
 .../.parameters/rg.min.parameters.json        |  18 -
 .../.parameters/rg.parameters.json            |  65 ----
 .../.parameters/sub.min.parameters.json       |  15 -
 .../.parameters/sub.parameters.json           |  62 ---
 .../.parameters/mg.min.parameters.json        |  35 --
 .../.parameters/mg.parameters.json            |  72 ----
 .../.parameters/sub.min.parameters.json       |  38 --
 .../.parameters/sub.parameters.json           |  72 ----
 .../.parameters/mg.min.parameters.json        |  12 -
 .../.parameters/mg.parameters.json            |  29 --
 .../.parameters/rg.min.parameters.json        |  18 -
 .../.parameters/rg.parameters.json            |  32 --
 .../.parameters/sub.min.parameters.json       |  15 -
 .../.parameters/sub.parameters.json           |  29 --
 .../.parameters/mg.min.parameters.json        |  23 --
 .../.parameters/mg.parameters.json            |  66 ----
 .../.parameters/sub.min.parameters.json       |  26 --
 .../.parameters/sub.parameters.json           |  66 ----
 .../.parameters/mg.min.parameters.json        |  12 -
 .../.parameters/mg.parameters.json            |  21 -
 .../.parameters/rg.min.parameters.json        |  18 -
 .../.parameters/rg.parameters.json            |  24 --
 .../.parameters/sub.min.parameters.json       |  15 -
 .../.parameters/sub.parameters.json           |  21 -
 .../.parameters/mg.min.parameters.json        |  15 -
 .../.parameters/mg.parameters.json            |  43 --
 .../.parameters/rg.min.parameters.json        |  21 -
 .../.parameters/rg.parameters.json            |  46 ---
 .../.parameters/sub.min.parameters.json       |  18 -
 .../.parameters/sub.parameters.json           |  43 --
 .../.parameters/encr.parameters.json          |  29 --
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               | 199 ----------
 .../.parameters/min.parameters.json           |  12 -
 .../batchAccounts/.parameters/parameters.json |  42 --
 .../accounts/.parameters/encr.parameters.json |  34 --
 .../accounts/.parameters/min.parameters.json  |  12 -
 .../accounts/.parameters/parameters.json      |  65 ----
 .../.parameters/speech.parameters.json        |  34 --
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               |  25 --
 .../.parameters/parameters.json               |  25 --
 .../disks/.parameters/image.parameters.json   |  28 --
 .../disks/.parameters/import.parameters.json  |  31 --
 .../disks/.parameters/min.parameters.json     |  25 --
 .../disks/.parameters/parameters.json         |  43 --
 .../.parameters/images.parameters.json        |  50 ---
 .../galleries/.parameters/parameters.json     |  22 --
 .../images/.parameters/parameters.json        |  37 --
 .../.parameters/parameters.json               |  22 --
 .../.parameters/linux.min.parameters.json     |  63 ---
 .../.parameters/linux.parameters.json         | 189 ---------
 .../.parameters/windows.min.parameters.json   |  65 ----
 .../.parameters/windows.parameters.json       | 185 ---------
 .../.parameters/linux.autmg.parameters.json   |  64 ---
 .../.parameters/linux.min.parameters.json     |  61 ---
 .../.parameters/linux.parameters.json         | 218 -----------
 .../.parameters/windows.autmg.parameters.json |  58 ---
 .../.parameters/windows.min.parameters.json   |  55 ---
 .../.parameters/windows.parameters.json       | 235 -----------
 .../budgets/.parameters/parameters.json       |  23 --
 .../.parameters/parameters.json               |  38 --
 .../.parameters/encr.parameters.json          |  29 --
 .../.parameters/min.parameters.json           |   9 -
 .../registries/.parameters/parameters.json    |  87 -----
 .../factories/.parameters/parameters.json     |  66 ----
 .../.parameters/min.parameters.json           |   9 -
 .../backupVaults/.parameters/parameters.json  |  76 ----
 .../workspaces/.parameters/parameters.json    |  37 --
 .../.parameters/min.parameters.json           |  15 -
 .../.parameters/parameters.json               |  72 ----
 .../hostpools/.parameters/parameters.json     |  80 ----
 .../.parameters/min.parameters.json           |   9 -
 .../workspaces/.parameters/parameters.json    |  51 ---
 .../.parameters/mongodb.parameters.json       | 240 ------------
 .../.parameters/plain.parameters.json         |  51 ---
 .../.parameters/sqldb.parameters.json         |  76 ----
 .../.parameters/min.parameters.json           |  15 -
 .../systemTopics/.parameters/parameters.json  |  43 --
 .../topics/.parameters/parameters.json        |  45 ---
 .../.parameters/min.parameters.json           |   5 -
 .../namespaces/.parameters/parameters.json    | 145 -------
 .../healthBots/.parameters/parameters.json    |  22 --
 .../actionGroups/.parameters/parameters.json  |  45 ---
 .../.parameters/parameters.json               |  47 ---
 .../components/.parameters/parameters.json    |  22 --
 .../.parameters/parameters.json               |  24 --
 .../metricAlerts/.parameters/parameters.json  |  49 ---
 .../.parameters/parameters.json               |  38 --
 .../.parameters/parameters.json               |  71 ----
 .../vaults/.parameters/min.parameters.json    |   5 -
 .../vaults/.parameters/parameters.json        | 133 -------
 .../.parameters/min.parameters.json           |  21 -
 .../extensions/.parameters/parameters.json    |  34 --
 .../.parameters/min.parameters.json           |  32 --
 .../.parameters/parameters.json               |  44 ---
 .../workflows/.parameters/parameters.json     |  78 ----
 .../.parameters/min.parameters.json           |  24 --
 .../workspaces/.parameters/parameters.json    | 119 ------
 .../.parameters/parameters.json               |  22 --
 .../.parameters/parameters.json               |  34 --
 .../.parameters/rg.parameters.json            |  37 --
 .../.parameters/parameters.json               |  15 -
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/nfs3.parameters.json          |  99 -----
 .../.parameters/nfs41.parameters.json         | 106 -----
 .../.parameters/parameters.json               | 367 ------------------
 .../.parameters/parameters.json               |  22 --
 .../.parameters/addpip.parameters.json        |  20 -
 .../.parameters/custompip.parameters.json     |  37 --
 .../.parameters/min.parameters.json           |  12 -
 .../.parameters/parameters.json               | 135 -------
 .../.parameters/addpip.parameters.json        |  20 -
 .../.parameters/custompip.parameters.json     |  37 --
 .../.parameters/min.parameters.json           |  12 -
 .../bastionHosts/.parameters/parameters.json  |  49 ---
 .../.parameters/vnet2vnet.parameters.json     |  39 --
 .../.parameters/parameters.json               |  22 --
 .../.parameters/parameters.json               |  52 ---
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               |  49 ---
 .../frontDoors/.parameters/parameters.json    | 115 ------
 .../ipGroups/.parameters/parameters.json      |  28 --
 .../.parameters/internal.parameters.json      | 101 -----
 .../.parameters/min.parameters.json           |  17 -
 .../loadBalancers/.parameters/parameters.json | 129 ------
 .../.parameters/parameters.json               |  36 --
 .../natGateways/.parameters/parameters.json   |  40 --
 .../.parameters/min.parameters.json           |  17 -
 .../.parameters/parameters.json               |  55 ---
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               | 103 -----
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               |  92 -----
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               | 198 ----------
 .../.parameters/min.parameters.json           |  20 -
 .../.parameters/parameters.json               |  42 --
 .../.parameters/parameters.json               |  50 ---
 .../.parameters/parameters.json               |  25 --
 .../routeTables/.parameters/parameters.json   |  34 --
 .../.parameters/parameters.json               |  40 --
 .../.parameters/min.parameters.json           |  15 -
 .../virtualHubs/.parameters/parameters.json   |  48 ---
 .../.parameters/expressRoute.parameters.json  |  61 ---
 .../.parameters/vpn.parameters.json           |  62 ---
 .../.parameters/min.parameters.json           |  14 -
 .../.parameters/parameters.json               |  96 -----
 .../.parameters/vnetPeering.parameters.json   |  52 ---
 .../.parameters/min.parameters.json           |   9 -
 .../virtualWans/.parameters/parameters.json   |  34 --
 .../.parameters/min.parameters.json           |  12 -
 .../vpnGateways/.parameters/parameters.json   |  68 ----
 .../vpnSites/.parameters/min.parameters.json  |  20 -
 .../vpnSites/.parameters/parameters.json      |  77 ----
 .../.parameters/min.parameters.json           |   9 -
 .../workspaces/.parameters/parameters.json    | 171 --------
 .../solutions/.parameters/min.parameters.json |  12 -
 .../solutions/.parameters/ms.parameters.json  |  18 -
 .../.parameters/nonms.parameters.json         |  18 -
 .../vaults/.parameters/dr.parameters.json     |  68 ----
 .../vaults/.parameters/min.parameters.json    |   9 -
 .../vaults/.parameters/parameters.json        | 289 --------------
 .../.parameters/cli.parameters.json           |  35 --
 .../.parameters/ps.parameters.json            |  38 --
 .../.parameters/parameters.json               |  27 --
 .../tags/.parameters/min.parameters.json      |   5 -
 .../tags/.parameters/rg.parameters.json       |  18 -
 .../tags/.parameters/sub.parameters.json      |  15 -
 .../.parameters/parameters.json               |  20 -
 .../.parameters/min.parameters.json           |   5 -
 .../namespaces/.parameters/parameters.json    | 167 --------
 .../clusters/.parameters/cert.parameters.json |  40 --
 .../clusters/.parameters/full.parameters.json | 208 ----------
 .../clusters/.parameters/min.parameters.json  |  34 --
 .../.parameters/parameters.json               | 150 -------
 .../.parameters/encr.parameters.json          |  38 --
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/nfs.parameters.json           |  64 ---
 .../.parameters/parameters.json               | 192 ---------
 .../.parameters/v1.parameters.json            |  12 -
 .../.parameters/min.parameters.json           |   9 -
 .../.parameters/parameters.json               |  36 --
 .../.parameters/parameters.json               |  69 ----
 .../connections/.parameters/parameters.json   |  30 --
 .../.parameters/asev2.parameters.json         |  54 ---
 .../.parameters/asev3.parameters.json         |  48 ---
 .../serverfarms/.parameters/parameters.json   |  46 ---
 .../sites/.parameters/fa.min.parameters.json  |  20 -
 .../sites/.parameters/fa.parameters.json      | 146 -------
 .../sites/.parameters/wa.min.parameters.json  |  15 -
 .../sites/.parameters/wa.parameters.json      |  70 ----
 .../.parameters/min.parameters.json           |   9 -
 .../staticSites/.parameters/parameters.json   |  50 ---
 206 files changed, 10773 deletions(-)
 delete mode 100644 modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
 delete mode 100644 modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
 delete mode 100644 modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.ApiManagement/service/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
 delete mode 100644 modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
 delete mode 100644 modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
 delete mode 100644 modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
 delete mode 100644 modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/disks/.parameters/image.parameters.json
 delete mode 100644 modules/Microsoft.Compute/disks/.parameters/import.parameters.json
 delete mode 100644 modules/Microsoft.Compute/disks/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/disks/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
 delete mode 100644 modules/Microsoft.Compute/galleries/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/images/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
 delete mode 100644 modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
 delete mode 100644 modules/Microsoft.Consumption/budgets/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
 delete mode 100644 modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DataFactory/factories/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
 delete mode 100644 modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
 delete mode 100644 modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
 delete mode 100644 modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.EventGrid/topics/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/components/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Logic/workflows/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Management/managementGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
 delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
 delete mode 100644 modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
 delete mode 100644 modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
 delete mode 100644 modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
 delete mode 100644 modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/frontDoors/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/ipGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
 delete mode 100644 modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/natGateways/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/routeTables/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/virtualWans/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Network/vpnSites/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
 delete mode 100644 modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
 delete mode 100644 modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
 delete mode 100644 modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
 delete mode 100644 modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
 delete mode 100644 modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Resources/tags/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
 delete mode 100644 modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
 delete mode 100644 modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
 delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
 delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
 delete mode 100644 modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Web/connections/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
 delete mode 100644 modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
 delete mode 100644 modules/Microsoft.Web/serverfarms/.parameters/parameters.json
 delete mode 100644 modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
 delete mode 100644 modules/Microsoft.Web/sites/.parameters/fa.parameters.json
 delete mode 100644 modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
 delete mode 100644 modules/Microsoft.Web/sites/.parameters/wa.parameters.json
 delete mode 100644 modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
 delete mode 100644 modules/Microsoft.Web/staticSites/.parameters/parameters.json

diff --git a/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json b/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
deleted file mode 100644
index 6166d322e2..0000000000
--- a/modules/Microsoft.AAD/DomainServices/.parameters/parameters.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "domainName": {
-            "value": "<<namePrefix>>.onmicrosoft.com"
-        },
-        "sku": {
-            "value": "Standard"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "replicaSets": {
-            "value": [
-                {
-                    "location": "WestEurope",
-                    "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-aadds-001/subnets/AADDSSubnet"
-                }
-            ]
-        },
-        "pfxCertificate": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "pfxBase64Certificate"
-            }
-        },
-        "pfxCertificatePassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "pfxCertificatePassword"
-            }
-        },
-        "additionalRecipients": {
-            "value": [
-                "<<namePrefix>>@noreply.github.com"
-            ]
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
deleted file mode 100644
index 54abf71cc2..0000000000
--- a/modules/Microsoft.AnalysisServices/servers/.parameters/max.parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azasweumax001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "skuName": {
-            "value": "S0"
-        },
-        "skuCapacity": {
-            "value": 1
-        },
-        "firewallSettings": {
-            "value": {
-                "firewallRules": [
-                    {
-                        "firewallRuleName": "AllowFromAll",
-                        "rangeStart": "0.0.0.0",
-                        "rangeEnd": "255.255.255.255"
-                    }
-                ],
-                "enablePowerBIService": true
-            }
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 365
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogCategoriesToEnable": {
-            "value": [
-                "Engine",
-                "Service"
-            ]
-        },
-        "diagnosticMetricsToEnable": {
-            "value": [
-                "AllMetrics"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
deleted file mode 100644
index 33c06055de..0000000000
--- a/modules/Microsoft.AnalysisServices/servers/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azasweumin001"
-        }
-    }
-}
diff --git a/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json b/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
deleted file mode 100644
index 592ffff258..0000000000
--- a/modules/Microsoft.AnalysisServices/servers/.parameters/parameters.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azasweux001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "skuName": {
-            "value": "S0"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
deleted file mode 100644
index f760ecf1d4..0000000000
--- a/modules/Microsoft.ApiManagement/service/.parameters/max.parameters.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-apim-max-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "publisherEmail": {
-            "value": "apimgmt-noreply@mail.windowsazure.com"
-        },
-        "publisherName": {
-            "value": "<<namePrefix>>-az-amorg-x-001"
-        },
-        "apis": {
-            "value": [
-                {
-                    "name": "echo-api",
-                    "displayName": "Echo API",
-                    "path": "echo",
-                    "serviceUrl": "http://echoapi.cloudapp.net/api",
-                    "apiVersionSet": {
-                        "name": "echo-version-set",
-                        "properties": {
-                            "description": "echo-version-set",
-                            "displayName": "echo-version-set",
-                            "versioningScheme": "Segment"
-                        }
-                    }
-                }
-            ]
-        },
-        "authorizationServers": {
-            "value": [
-                {
-                    "name": "AuthServer1",
-                    "authorizationEndpoint": "https://login.microsoftonline.com/651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/authorize",
-                    "grantTypes": [
-                        "authorizationCode"
-                    ],
-                    "clientCredentialsKeyVaultId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "clientIdSecretName": "apimclientid",
-                    "clientSecretSecretName": "apimclientsecret",
-                    "clientRegistrationEndpoint": "http://localhost",
-                    "tokenEndpoint": "https://login.microsoftonline.com/651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/token"
-                }
-            ]
-        },
-        "backends": {
-            "value": [
-                {
-                    "name": "backend",
-                    "url": "http://echoapi.cloudapp.net/api",
-                    "tls": {
-                        "validateCertificateChain": false,
-                        "validateCertificateName": false
-                    }
-                }
-            ]
-        },
-        "caches": {
-            "value": [
-                {
-                    "name": "westeurope",
-                    "connectionString": "connectionstringtest",
-                    "useFromLocation": "westeurope"
-                }
-            ]
-        },
-        "identityProviders": {
-            "value": [
-                {
-                    "name": "aadProvider"
-                }
-            ]
-        },
-        "namedValues": {
-            "value": [
-                {
-                    "name": "apimkey",
-                    "displayName": "apimkey",
-                    "secret": true
-                }
-            ]
-        },
-        "policies": {
-            "value": [
-                {
-                    "value": "<policies> <inbound> <rate-limit-by-key calls='250' renewal-period='60' counter-key='@(context.Request.IpAddress)' /> </inbound> <backend> <forward-request /> </backend> <outbound> </outbound> </policies>",
-                    "format": "xml"
-                }
-            ]
-        },
-        "portalSettings": {
-            "value": [
-                {
-                    "name": "signin",
-                    "properties": {
-                        "enabled": false
-                    }
-                },
-                {
-                    "name": "signup",
-                    "properties": {
-                        "enabled": false,
-                        "termsOfService": {
-                            "enabled": false,
-                            "consentRequired": false
-                        }
-                    }
-                }
-            ]
-        },
-        "products": {
-            "value": [
-                {
-                    "name": "Starter",
-                    "subscriptionRequired": false,
-                    "approvalRequired": false,
-                    "apis": [
-                        {
-                            "name": "echo-api"
-                        }
-                    ],
-                    "groups": [
-                        {
-                            "name": "developers"
-                        }
-                    ]
-                }
-            ]
-        },
-        "subscriptions": {
-            "value": [
-                {
-                    "scope": "/apis",
-                    "name": "testArmSubscriptionAllApis"
-                }
-            ]
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
deleted file mode 100644
index d71e822cc5..0000000000
--- a/modules/Microsoft.ApiManagement/service/.parameters/min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-apim-min-001"
-        },
-        "publisherEmail": {
-            "value": "apimgmt-noreply@mail.windowsazure.com"
-        },
-        "publisherName": {
-            "value": "<<namePrefix>>-az-amorg-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.ApiManagement/service/.parameters/parameters.json b/modules/Microsoft.ApiManagement/service/.parameters/parameters.json
deleted file mode 100644
index 8f73097f17..0000000000
--- a/modules/Microsoft.ApiManagement/service/.parameters/parameters.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-apim-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "publisherEmail": {
-            "value": "apimgmt-noreply@mail.windowsazure.com"
-        },
-        "publisherName": {
-            "value": "<<namePrefix>>-az-amorg-x-001"
-        },
-        "portalSettings": {
-            "value": [
-                {
-                    "name": "signin",
-                    "properties": {
-                        "enabled": false
-                    }
-                },
-                {
-                    "name": "signup",
-                    "properties": {
-                        "enabled": false,
-                        "termsOfService": {
-                            "enabled": false,
-                            "consentRequired": false
-                        }
-                    }
-                }
-            ]
-        },
-        "policies": {
-            "value": [
-                {
-                    "value": "<policies> <inbound> <rate-limit-by-key calls='250' renewal-period='60' counter-key='@(context.Request.IpAddress)' /> </inbound> <backend> <forward-request /> </backend> <outbound> </outbound> </policies>",
-                    "format": "xml"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
deleted file mode 100644
index d93330feb1..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appcs-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
deleted file mode 100644
index 81fee88944..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.parameters/parameters.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appcs-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "keyValues": {
-            "value": [
-                {
-                    "name": "keyName",
-                    "value": "valueName",
-                    "contentType": "contentType",
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "createMode": {
-            "value": "Default"
-        },
-        "disableLocalAuth": {
-            "value": false
-        },
-        "enablePurgeProtection": {
-            "value": false
-        },
-        "publicNetworkAccess": {
-            "value": "Enabled"
-        },
-        "softDeleteRetentionInDays": {
-            "value": 1
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "configurationStores"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
deleted file mode 100644
index dc4870ce99..0000000000
--- a/modules/Microsoft.Authorization/locks/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "level": {
-            "value": "CanNotDelete"
-        },
-        "resourceGroupName": {
-            "value": "adp-<<namePrefix>>-az-locks-rg-001"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
deleted file mode 100644
index 7271e1d839..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-mg-polAss"
-        },
-        "policyDefinitionID": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/06a78e20-9358-41c9-923c-fb736d382a4d"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
deleted file mode 100644
index f140b8c7ed..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-polAss"
-        },
-        "displayName": {
-            "value": "[Display Name] Policy Assignment at the management group scope"
-        },
-        "description": {
-            "value": "[Description] Policy Assignment at the management group scope"
-        },
-        "policyDefinitionId": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26"
-        },
-        "parameters": {
-            "value": {
-                "tagName": {
-                    "value": "env"
-                },
-                "tagValue": {
-                    "value": "prod"
-                }
-            }
-        },
-        "nonComplianceMessage": {
-            "value": "Violated Policy Assignment - This is a Non Compliance Message"
-        },
-        "enforcementMode": {
-            "value": "DoNotEnforce"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security",
-                "version": "1.0"
-            }
-        },
-        "location": {
-            "value": "australiaeast"
-        },
-        "notScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg"
-            ]
-        },
-        "identity": {
-            "value": "SystemAssigned"
-        },
-        "roleDefinitionIds": {
-            "value": [
-                "/providers/microsoft.authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
-            ]
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
deleted file mode 100644
index 8dd48a8dd7..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.min.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-rg-polAss"
-        },
-        "policyDefinitionID": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/06a78e20-9358-41c9-923c-fb736d382a4d"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "validation-rg"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
deleted file mode 100644
index f1f4a19d74..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-rg-polAss"
-        },
-        "displayName": {
-            "value": "[Display Name] Policy Assignment at the resource group scope"
-        },
-        "description": {
-            "value": "[Description] Policy Assignment at the resource group scope"
-        },
-        "policyDefinitionId": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26"
-        },
-        "parameters": {
-            "value": {
-                "tagName": {
-                    "value": "env"
-                },
-                "tagValue": {
-                    "value": "prod"
-                }
-            }
-        },
-        "nonComplianceMessage": {
-            "value": "Violated Policy Assignment - This is a Non Compliance Message"
-        },
-        "enforcementMode": {
-            "value": "DoNotEnforce"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security",
-                "version": "1.0"
-            }
-        },
-        "location": {
-            "value": "australiaeast"
-        },
-        "notScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-            ]
-        },
-        "identity": {
-            "value": "UserAssigned"
-        },
-        "userAssignedIdentityId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "roleDefinitionIds": {
-            "value": [
-                "/providers/microsoft.authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "validation-rg"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
deleted file mode 100644
index ebadf2e43b..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-sub-polAss"
-        },
-        "policyDefinitionID": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/06a78e20-9358-41c9-923c-fb736d382a4d"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
deleted file mode 100644
index 420a48df1d..0000000000
--- a/modules/Microsoft.Authorization/policyAssignments/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-polAss"
-        },
-        "displayName": {
-            "value": "[Display Name] Policy Assignment at the subscription scope"
-        },
-        "description": {
-            "value": "[Description] Policy Assignment at the subscription scope"
-        },
-        "policyDefinitionId": {
-            "value": "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26"
-        },
-        "parameters": {
-            "value": {
-                "tagName": {
-                    "value": "env"
-                },
-                "tagValue": {
-                    "value": "prod"
-                }
-            }
-        },
-        "nonComplianceMessage": {
-            "value": "Violated Policy Assignment - This is a Non Compliance Message"
-        },
-        "enforcementMode": {
-            "value": "DoNotEnforce"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security",
-                "version": "1.0"
-            }
-        },
-        "location": {
-            "value": "australiaeast"
-        },
-        "notScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg"
-            ]
-        },
-        "identity": {
-            "value": "UserAssigned"
-        },
-        "userAssignedIdentityId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "roleDefinitionIds": {
-            "value": [
-                "/providers/microsoft.authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
deleted file mode 100644
index 431a0f6f5e..0000000000
--- a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-min-policyDef"
-        },
-        "policyRule": {
-            "value": {
-                "if": {
-                    "allOf": [
-                        {
-                            "equals": "Microsoft.KeyVault/vaults",
-                            "field": "type"
-                        }
-                    ]
-                },
-                "then": {
-                    "effect": "[parameters('effect')]"
-                }
-            }
-        },
-        "parameters": {
-            "value": {
-                "effect": {
-                    "allowedValues": [
-                        "Audit"
-                    ],
-                    "defaultValue": "Audit",
-                    "type": "String"
-                }
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
deleted file mode 100644
index 7196de6154..0000000000
--- a/modules/Microsoft.Authorization/policyDefinitions/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-policyDef"
-        },
-        "displayName": {
-            "value": "[DisplayName] This policy definition is deployed at the management group scope"
-        },
-        "description": {
-            "value": "[Description] This policy definition is deployed at the management group scope"
-        },
-        "policyRule": {
-            "value": {
-                "if": {
-                    "allOf": [
-                        {
-                            "field": "type",
-                            "equals": "Microsoft.Resources/subscriptions"
-                        },
-                        {
-                            "field": "[concat('tags[', parameters('tagName'), ']')]",
-                            "exists": "false"
-                        }
-                    ]
-                },
-                "then": {
-                    "effect": "modify",
-                    "details": {
-                        "roleDefinitionIds": [
-                            "/providers/microsoft.authorization/roleDefinitions/4a9ae827-6dc8-4573-8ac7-8239d42aa03f"
-                        ],
-                        "operations": [
-                            {
-                                "operation": "add",
-                                "field": "[concat('tags[', parameters('tagName'), ']')]",
-                                "value": "[parameters('tagValue')]"
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "parameters": {
-            "value": {
-                "tagName": {
-                    "type": "String",
-                    "metadata": {
-                        "displayName": "Tag Name",
-                        "description": "Name of the tag, such as 'environment'"
-                    }
-                },
-                "tagValue": {
-                    "type": "String",
-                    "metadata": {
-                        "displayName": "Tag Value",
-                        "description": "Value of the tag, such as 'production'"
-                    }
-                }
-            }
-        },
-        "metadata": {
-            "value": {
-                "category": "Security"
-            }
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
deleted file mode 100644
index f2cd03cfb5..0000000000
--- a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-min-policyDef"
-        },
-        "policyRule": {
-            "value": {
-                "if": {
-                    "allOf": [
-                        {
-                            "equals": "Microsoft.KeyVault/vaults",
-                            "field": "type"
-                        }
-                    ]
-                },
-                "then": {
-                    "effect": "[parameters('effect')]"
-                }
-            }
-        },
-        "parameters": {
-            "value": {
-                "effect": {
-                    "allowedValues": [
-                        "Audit"
-                    ],
-                    "defaultValue": "Audit",
-                    "type": "String"
-                }
-            }
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
deleted file mode 100644
index e445127518..0000000000
--- a/modules/Microsoft.Authorization/policyDefinitions/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-policyDef"
-        },
-        "displayName": {
-            "value": "[DisplayName] This policy definition is deployed at subscription scope"
-        },
-        "description": {
-            "value": "[Description] This policy definition is deployed at subscription scope"
-        },
-        "policyRule": {
-            "value": {
-                "if": {
-                    "allOf": [
-                        {
-                            "field": "type",
-                            "equals": "Microsoft.Resources/subscriptions"
-                        },
-                        {
-                            "field": "[concat('tags[', parameters('tagName'), ']')]",
-                            "exists": "false"
-                        }
-                    ]
-                },
-                "then": {
-                    "effect": "modify",
-                    "details": {
-                        "roleDefinitionIds": [
-                            "/providers/microsoft.authorization/roleDefinitions/4a9ae827-6dc8-4573-8ac7-8239d42aa03f"
-                        ],
-                        "operations": [
-                            {
-                                "operation": "add",
-                                "field": "[concat('tags[', parameters('tagName'), ']')]",
-                                "value": "[parameters('tagValue')]"
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "parameters": {
-            "value": {
-                "tagName": {
-                    "type": "String",
-                    "metadata": {
-                        "displayName": "Tag Name",
-                        "description": "Name of the tag, such as 'environment'"
-                    }
-                },
-                "tagValue": {
-                    "type": "String",
-                    "metadata": {
-                        "displayName": "Tag Value",
-                        "description": "Value of the tag, such as 'production'"
-                    }
-                }
-            }
-        },
-        "metadata": {
-            "value": {
-                "category": "Security"
-            }
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
deleted file mode 100644
index f5816fcd6d..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-mg-polexem"
-        },
-        "policyAssignmentId": {
-            "value": "/providers/Microsoft.Management/managementGroups/<<managementGroupId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-mg-pass-loc-rg"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
deleted file mode 100644
index 2c76ecb64a..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-polexem"
-        },
-        "displayName": {
-            "value": "[Display Name] policy exempt (management group scope)"
-        },
-        "policyAssignmentId": {
-            "value": "/providers/Microsoft.Management/managementGroups/<<managementGroupId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-mg-pass-loc-rg"
-        },
-        "exemptionCategory": {
-            "value": "Waiver"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security"
-            }
-        },
-        "expiresOn": {
-            "value": "2025-10-02T03:57:00.000Z"
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
deleted file mode 100644
index 2573b17fe7..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.min.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-rg-polexem"
-        },
-        "policyAssignmentId": {
-            "value": "/subscriptions/<<subscriptionId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-sb-pass-loc-rg"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
deleted file mode 100644
index 68fda77deb..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-rg-polexem"
-        },
-        "displayName": {
-            "value": "[Display Name] policy exempt (resource group scope)"
-        },
-        "policyAssignmentId": {
-            "value": "/subscriptions/<<subscriptionId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-sb-pass-loc-rg"
-        },
-        "exemptionCategory": {
-            "value": "Waiver"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security"
-            }
-        },
-        "expiresOn": {
-            "value": "2025-10-02T03:57:00.000Z"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
deleted file mode 100644
index 920e7d2add..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-min-sub-polexem"
-        },
-        "policyAssignmentId": {
-            "value": "/subscriptions/<<subscriptionId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-sb-pass-loc-rg"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
deleted file mode 100644
index 02b3e9037c..0000000000
--- a/modules/Microsoft.Authorization/policyExemptions/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-polexem"
-        },
-        "displayName": {
-            "value": "[Display Name] policy exempt (subscription scope)"
-        },
-        "policyAssignmentId": {
-            "value": "/subscriptions/<<subscriptionId>>/providers/Microsoft.Authorization/policyAssignments/adp-<<namePrefix>>-sb-pass-loc-rg"
-        },
-        "exemptionCategory": {
-            "value": "Waiver"
-        },
-        "metadata": {
-            "value": {
-                "category": "Security"
-            }
-        },
-        "expiresOn": {
-            "value": "2025-10-02T03:57:00.000Z"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
deleted file mode 100644
index 92f9d4ac2f..0000000000
--- a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-min-policySet"
-        },
-        "policyDefinitions": {
-            "value": [
-                {
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
deleted file mode 100644
index 029e2d47c8..0000000000
--- a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-mg-policySet"
-        },
-        "displayName": {
-            "value": "[DisplayName] This policy set definition is deployed at management group scope"
-        },
-        "description": {
-            "value": "[Description] This policy set definition is deployed at management group scope"
-        },
-        "policyDefinitionGroups": {
-            "value": [
-                {
-                    "name": "Network"
-                },
-                {
-                    "name": "ARM"
-                }
-            ]
-        },
-        "policyDefinitions": {
-            "value": [
-                {
-                    "groupNames": [
-                        "ARM"
-                    ],
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c",
-                    "policyDefinitionReferenceId": "Allowed locations_1"
-                },
-                {
-                    "groupNames": [
-                        "ARM"
-                    ],
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e765b5de-1225-4ba3-bd56-1ac6695af988",
-                    "policyDefinitionReferenceId": "Allowed locations for resource groups_1"
-                }
-            ]
-        },
-        "metadata": {
-            "value": {
-                "category": "Security",
-                "version": "1"
-            }
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
deleted file mode 100644
index f6a7e68f64..0000000000
--- a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-min-policySet"
-        },
-        "policyDefinitions": {
-            "value": [
-                {
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c"
-                }
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
deleted file mode 100644
index 16a92428b1..0000000000
--- a/modules/Microsoft.Authorization/policySetDefinitions/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-sub-policySet"
-        },
-        "displayName": {
-            "value": "[DisplayName] This policy set definition is deployed at subscription scope"
-        },
-        "description": {
-            "value": "[Description] This policy set definition is deployed at subscription scope"
-        },
-        "policyDefinitionGroups": {
-            "value": [
-                {
-                    "name": "Network"
-                },
-                {
-                    "name": "ARM"
-                }
-            ]
-        },
-        "policyDefinitions": {
-            "value": [
-                {
-                    "groupNames": [
-                        "ARM"
-                    ],
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c",
-                    "policyDefinitionReferenceId": "Allowed locations_1"
-                },
-                {
-                    "groupNames": [
-                        "ARM"
-                    ],
-                    "parameters": {
-                        "listOfAllowedLocations": {
-                            "value": [
-                                "australiaeast"
-                            ]
-                        }
-                    },
-                    "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e765b5de-1225-4ba3-bd56-1ac6695af988",
-                    "policyDefinitionReferenceId": "Allowed locations for resource groups_1"
-                }
-            ]
-        },
-        "metadata": {
-            "value": {
-                "category": "Security",
-                "version": "1"
-            }
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
deleted file mode 100644
index 02a409875c..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Storage Queue Data Reader"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
deleted file mode 100644
index e6362b62aa..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Backup Reader"
-        },
-        "description": {
-            "value": "Role Assignment (management group scope)"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        },
-        "principalType": {
-            "value": "ServicePrincipal"
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
deleted file mode 100644
index 6011dc7e99..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.min.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Storage Queue Data Reader"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
deleted file mode 100644
index faf9fc3d90..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Backup Reader"
-        },
-        "description": {
-            "value": "Role Assignment (resource group scope)"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        },
-        "principalType": {
-            "value": "ServicePrincipal"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
deleted file mode 100644
index 2a90f97fb7..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Storage Queue Data Reader"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
deleted file mode 100644
index 346ba64c04..0000000000
--- a/modules/Microsoft.Authorization/roleAssignments/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleDefinitionIdOrName": {
-            "value": "Backup Reader"
-        },
-        "description": {
-            "value": "Role Assignment (subscription scope)"
-        },
-        "principalId": {
-            "value": "<<deploymentSpId>>"
-        },
-        "principalType": {
-            "value": "ServicePrincipal"
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
deleted file mode 100644
index c4a88ba9e8..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-mg-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
deleted file mode 100644
index d49ce1cae3..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/mg.parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-mg"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (management group scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/providers/Microsoft.Management/managementGroups/<<managementGroupId>>"
-            ]
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
deleted file mode 100644
index cf6825cc02..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.min.parameters.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-rg-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
deleted file mode 100644
index c27ff2f862..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-rg"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (resource group scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
deleted file mode 100644
index 87bbbc20b7..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.min.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-sub-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
deleted file mode 100644
index 62e03ca98d..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-sub"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (subscription scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
deleted file mode 100644
index de787fa3bb..0000000000
--- a/modules/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-aut-encr-001"
-        },
-        "encryptionKeySource": {
-            "value": "Microsoft.Keyvault"
-        },
-        "encryptionUserAssignedIdentity": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001" // this identity needs to be one of the identities defined in userAssignedIdentities section
-        },
-        "keyName": {
-            "value": "keyEncryptionKey"
-        },
-        "keyvaultUri": {
-            "value": "https://adp-<<namePrefix>>-az-kv-nopr-002.vault.azure.net/"
-        },
-        "keyVersion": {
-            "value": "9917c14be51d4d93b37218de7d326f60"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
deleted file mode 100644
index c76e891806..0000000000
--- a/modules/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-aut-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
deleted file mode 100644
index ae5e51517b..0000000000
--- a/modules/Microsoft.Automation/automationAccounts/.parameters/parameters.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-aut-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "schedules": {
-            "value": [
-                {
-                    "name": "TestSchedule",
-                    "startTime": "",
-                    "expiryTime": "9999-12-31T13:00",
-                    "interval": 15,
-                    "frequency": "Minute",
-                    "timeZone": "Europe/Berlin",
-                    "advancedSchedule": {}
-                }
-            ]
-        },
-        "modules": {
-            "value": [
-                {
-                    "name": "PSWindowsUpdate",
-                    "version": "latest",
-                    "uri": "https://www.powershellgallery.com/api/v2/package"
-                }
-            ]
-        },
-        "runbooks": {
-            "value": [
-                {
-                    "name": "TestRunbook",
-                    "runbookType": "PowerShell",
-                    "description": "Test runbook",
-                    "uri": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.automation/101-automation/scripts/AzureAutomationTutorial.ps1",
-                    "version": "1.0.0.0"
-                }
-            ]
-        },
-        "jobSchedules": {
-            "value": [
-                {
-                    "scheduleName": "TestSchedule",
-                    "runbookName": "TestRunbook"
-                }
-            ]
-        },
-        "variables": {
-            "value": [
-                {
-                    "name": "TestString",
-                    "value": "\"TestString\"",
-                    "description": "TestStringDescription"
-                },
-                {
-                    "name": "TestInteger",
-                    "value": "500",
-                    "description": "TestIntegerDescription"
-                },
-                {
-                    "name": "TestBoolean",
-                    "value": "false",
-                    "description": "TestBooleanDescription"
-                },
-                {
-                    "name": "TestDateTime",
-                    "value": "\"\\/Date(1637934042656)\\/\"",
-                    "description": "TestDateTimeDescription",
-                    "isEncrypted": false
-                },
-                {
-                    "name": "TestEncryptedVariable",
-                    "value": "\"TestEncryptedValue\"",
-                    "description": "TestEncryptedDescription"
-                }
-            ]
-        },
-        "linkedWorkspaceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-aut-001"
-        },
-        "gallerySolutions": {
-            "value": [
-                {
-                    "name": "Updates",
-                    "product": "OMSGallery",
-                    "publisher": "Microsoft"
-                }
-            ]
-        },
-        "softwareUpdateConfigurations": {
-            "value": [
-                {
-                    "name": "Windows_ZeroDay",
-                    "frequency": "Month",
-                    "operatingSystem": "Windows",
-                    "rebootSetting": "IfRequired",
-                    "scopeByTags": {
-                        "Update": [
-                            "Automatic-Wave1"
-                        ]
-                    },
-                    "maintenanceWindow": "PT4H",
-                    "updateClassifications": [
-                        "Critical",
-                        "Security",
-                        "UpdateRollup",
-                        "FeaturePack",
-                        "ServicePack",
-                        "Definition",
-                        "Tools",
-                        "Updates"
-                    ],
-                    "includeUpdates": [
-                        "654321"
-                    ],
-                    "excludeUpdates": [
-                        "123456"
-                    ],
-                    "interval": 1,
-                    "monthlyOccurrences": [
-                        {
-                            "occurrence": 3,
-                            "day": "Friday"
-                        }
-                    ],
-                    "startTime": "22:00"
-                },
-                {
-                    "name": "Linux_ZeroDay",
-                    "frequency": "OneTime",
-                    "operatingSystem": "Linux",
-                    "rebootSetting": "IfRequired",
-                    "maintenanceWindow": "PT4H",
-                    "updateClassifications": [
-                        "Critical",
-                        "Security",
-                        "Other"
-                    ],
-                    "includeUpdates": [
-                        "kernel"
-                    ],
-                    "excludeUpdates": [
-                        "icacls"
-                    ],
-                    "startTime": "22:00"
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "Webhook"
-                },
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "DSCAndHybridWorker"
-                }
-            ]
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
deleted file mode 100644
index 5528a0d14c..0000000000
--- a/modules/Microsoft.Batch/batchAccounts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azbaweumin001"
-        },
-        "storageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json b/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
deleted file mode 100644
index d87ce3fd34..0000000000
--- a/modules/Microsoft.Batch/batchAccounts/.parameters/parameters.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azbaweux001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "poolAllocationMode": {
-            "value": "BatchService"
-        },
-        "storageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "storageAuthenticationMode": {
-            "value": "BatchAccountManagedIdentity"
-        },
-        "storageAccessIdentity": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
deleted file mode 100644
index 082120732a..0000000000
--- a/modules/Microsoft.CognitiveServices/accounts/.parameters/encr.parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cgs-encr-001"
-        },
-        "kind": {
-            "value": "SpeechServices"
-        },
-        "sku": {
-            "value": "S0"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "publicNetworkAccess": {
-            "value": "Enabled"
-        },
-        "encryption": {
-            "value": {
-                "keySource": "Microsoft.KeyVault",
-                "keyVaultProperties": {
-                    "identityClientId": "c907a696-36f4-49fe-b926-39e3aabba814", // ID must be updated for new identity
-                    "keyVaultUri": "https://adp-<<namePrefix>>-az-kv-nopr-002.vault.azure.net/",
-                    "keyName": "keyEncryptionKey",
-                    "keyversion": "4570a207ec394a0bbbe4fc9adc663a51" // Version must be updated for new keys
-                }
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
deleted file mode 100644
index 0f4f624c48..0000000000
--- a/modules/Microsoft.CognitiveServices/accounts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cgs-min-001"
-        },
-        "kind": {
-            "value": "SpeechServices"
-        }
-    }
-}
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
deleted file mode 100644
index c12f36aac5..0000000000
--- a/modules/Microsoft.CognitiveServices/accounts/.parameters/parameters.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cgs-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "kind": {
-            "value": "Face"
-        },
-        "sku": {
-            "value": "S0"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "networkAcls": {
-            "value": {
-                "defaultAction": "deny",
-                "virtualNetworkRules": [
-                    {
-                        "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                        "action": "Allow"
-                    }
-                ]
-            }
-        },
-        "customSubDomainName": {
-            "value": "<<namePrefix>>xdomain"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json b/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
deleted file mode 100644
index 7903268ccd..0000000000
--- a/modules/Microsoft.CognitiveServices/accounts/.parameters/speech.parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cgs-speech-001"
-        },
-        "kind": {
-            "value": "SpeechServices"
-        },
-        "sku": {
-            "value": "S0"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "customSubDomainName": {
-            "value": "<<namePrefix>>speechdomain"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "account"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
deleted file mode 100644
index 99d2414f76..0000000000
--- a/modules/Microsoft.Compute/availabilitySets/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avs-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json b/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
deleted file mode 100644
index f7d8be50c6..0000000000
--- a/modules/Microsoft.Compute/availabilitySets/.parameters/parameters.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avs-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "proximityPlacementGroupId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/proximityPlacementGroups/adp-<<namePrefix>>-az-ppg-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json b/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
deleted file mode 100644
index 58ec4d9a2a..0000000000
--- a/modules/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-des-x-001"
-        },
-        "keyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-        },
-        "keyName": {
-            "value": "keyEncryptionKey"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/disks/.parameters/image.parameters.json b/modules/Microsoft.Compute/disks/.parameters/image.parameters.json
deleted file mode 100644
index d6934ac643..0000000000
--- a/modules/Microsoft.Compute/disks/.parameters/image.parameters.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-disk-image-001"
-        },
-        "sku": {
-            "value": "Standard_LRS"
-        },
-        "createOption": {
-            "value": "FromImage"
-        },
-        "imageReferenceId": {
-            "value": "/Subscriptions/<<subscriptionId>>/Providers/Microsoft.Compute/Locations/westeurope/Publishers/MicrosoftWindowsServer/ArtifactTypes/VMImage/Offers/WindowsServer/Skus/2016-Datacenter/Versions/14393.4906.2112080838"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/disks/.parameters/import.parameters.json b/modules/Microsoft.Compute/disks/.parameters/import.parameters.json
deleted file mode 100644
index a09908e110..0000000000
--- a/modules/Microsoft.Compute/disks/.parameters/import.parameters.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-disk-import-001"
-        },
-        "sku": {
-            "value": "Standard_LRS"
-        },
-        "createOption": {
-            "value": "Import"
-        },
-        "sourceUri": {
-            "value": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/vhds/adp-<<namePrefix>>-az-imgt-x-001.vhd"
-        },
-        "storageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/disks/.parameters/min.parameters.json b/modules/Microsoft.Compute/disks/.parameters/min.parameters.json
deleted file mode 100644
index d19f33a37d..0000000000
--- a/modules/Microsoft.Compute/disks/.parameters/min.parameters.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-disk-min-001"
-        },
-        "sku": {
-            "value": "Standard_LRS"
-        },
-        "diskSizeGB": {
-            "value": 1
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/disks/.parameters/parameters.json b/modules/Microsoft.Compute/disks/.parameters/parameters.json
deleted file mode 100644
index 833336ee1e..0000000000
--- a/modules/Microsoft.Compute/disks/.parameters/parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-disk-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "sku": {
-            "value": "UltraSSD_LRS"
-        },
-        "diskSizeGB": {
-            "value": 128
-        },
-        "logicalSectorSize": {
-            "value": 512
-        },
-        "diskIOPSReadWrite": {
-            "value": 500
-        },
-        "diskMBpsReadWrite": {
-            "value": 60
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "publicNetworkAccess": {
-            "value": "Enabled"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json b/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
deleted file mode 100644
index 78a802c198..0000000000
--- a/modules/Microsoft.Compute/galleries/.parameters/images.parameters.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azsigweuimages001"
-        },
-        "images": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-imgd-x-003"
-                },
-                {
-                    "name": "<<namePrefix>>-az-imgd-x-001",
-                    "osType": "Windows",
-                    "osState": "Generalized",
-                    "publisher": "MicrosoftWindowsServer",
-                    "offer": "WindowsServer",
-                    "sku": "2022-datacenter-azure-edition",
-                    "minRecommendedvCPUs": 2,
-                    "maxRecommendedvCPUs": 8,
-                    "minRecommendedMemory": 4,
-                    "maxRecommendedMemory": 16,
-                    "hyperVGeneration": "V1",
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-imgd-x-002",
-                    "osType": "Linux",
-                    "osState": "Generalized",
-                    "publisher": "canonical",
-                    "offer": "0001-com-ubuntu-server-focal",
-                    "sku": "20_04-lts-gen2",
-                    "minRecommendedvCPUs": 1,
-                    "maxRecommendedvCPUs": 4,
-                    "minRecommendedMemory": 4,
-                    "maxRecommendedMemory": 32,
-                    "hyperVGeneration": "V2"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/galleries/.parameters/parameters.json b/modules/Microsoft.Compute/galleries/.parameters/parameters.json
deleted file mode 100644
index 960e0365b2..0000000000
--- a/modules/Microsoft.Compute/galleries/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azsigweux001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/images/.parameters/parameters.json b/modules/Microsoft.Compute/images/.parameters/parameters.json
deleted file mode 100644
index 85e8b306ec..0000000000
--- a/modules/Microsoft.Compute/images/.parameters/parameters.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-img-x-001"
-        },
-        "osAccountType": {
-            "value": "Premium_LRS"
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "osDiskBlobUri": {
-            "value": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/vhds/adp-<<namePrefix>>-az-imgt-x-001.vhd"
-        },
-        "osDiskCaching": {
-            "value": "ReadWrite"
-        },
-        "zoneResilient": {
-            "value": true
-        },
-        "hyperVGeneration": {
-            "value": "V1"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json b/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
deleted file mode 100644
index 48ab4ed9c9..0000000000
--- a/modules/Microsoft.Compute/proximityPlacementGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ppg-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
deleted file mode 100644
index 0c3f3189b9..0000000000
--- a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.min.parameters.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-scaleset-linux-min-001"
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "osType": {
-            "value": "Linux"
-        },
-        "skuName": {
-            "value": "Standard_B2s"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "Canonical",
-                "offer": "UbuntuServer",
-                "sku": "18.04-LTS",
-                "version": "latest"
-            }
-        },
-        "adminUsername": {
-            "value": "scaleSetAdmin"
-        },
-        "disablePasswordAuthentication": {
-            "value": true
-        },
-        "publicKeys": {
-            "value": [
-                {
-                    "path": "/home/scaleSetAdmin/.ssh/authorized_keys",
-                    "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdOir5eO28EBwxU0Dyra7g9h0HUXDyMNFp2z8PhaTUQgHjrimkMxjYRwEOG/lxnYL7+TqZk+HcPTfbZOunHBw0Wx2CITzILt6531vmIYZGfq5YyYXbxZa5MON7L/PVivoRlPj5Z/t4RhqMhyfR7EPcZ516LJ8lXPTo8dE/bkOCS+kFBEYHvPEEKAyLs19sRcK37SeHjpX04zdg62nqtuRr00Tp7oeiTXA1xn5K5mxeAswotmd8CU0lWUcJuPBWQedo649b+L2cm52kTncOBI6YChAeyEc1PDF0Tn9FmpdOWKtI9efh+S3f8qkcVEtSTXoTeroBd31nzjAunMrZeM8Ut6dre+XeQQIjT7I8oEm+ZkIuIyq0x2fls8JXP2YJDWDqu8v1+yLGTQ3Z9XVt2lMti/7bIgYxS0JvwOr5n5L4IzKvhb4fm13LLDGFa3o7Nsfe3fPb882APE0bLFCmfyIeiPh7go70WqZHakpgIr6LCWTyePez9CsI/rfWDb6eAM8= generated-by-azure"
-                }
-            ]
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig1",
-                            "properties": {
-                                "subnet": {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-002"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
deleted file mode 100644
index b17e54d583..0000000000
--- a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-scaleset-linux-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "vmNamePrefix": {
-            "value": "vmsslinvm"
-        },
-        "skuName": {
-            "value": "Standard_B2s"
-        },
-        "skuCapacity": {
-            "value": 1
-        },
-        "upgradePolicyMode": {
-            "value": "Manual"
-        },
-        "vmPriority": {
-            "value": "Regular"
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "availabilityZones": {
-            "value": [
-                "2"
-            ]
-        },
-        "scaleSetFaultDomain": {
-            "value": 1
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "bootDiagnosticStorageAccountName": {
-            "value": "adp<<namePrefix>>azsax001"
-        },
-        "osType": {
-            "value": "Linux"
-        },
-        "encryptionAtHost": {
-            "value": false
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "Canonical",
-                "offer": "UbuntuServer",
-                "sku": "18.04-LTS",
-                "version": "latest"
-            }
-        },
-        "adminUsername": {
-            "value": "scaleSetAdmin"
-        },
-        "disablePasswordAuthentication": {
-            "value": true
-        },
-        "publicKeys": {
-            "value": [
-                {
-                    "path": "/home/scaleSetAdmin/.ssh/authorized_keys",
-                    "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdOir5eO28EBwxU0Dyra7g9h0HUXDyMNFp2z8PhaTUQgHjrimkMxjYRwEOG/lxnYL7+TqZk+HcPTfbZOunHBw0Wx2CITzILt6531vmIYZGfq5YyYXbxZa5MON7L/PVivoRlPj5Z/t4RhqMhyfR7EPcZ516LJ8lXPTo8dE/bkOCS+kFBEYHvPEEKAyLs19sRcK37SeHjpX04zdg62nqtuRr00Tp7oeiTXA1xn5K5mxeAswotmd8CU0lWUcJuPBWQedo649b+L2cm52kTncOBI6YChAeyEc1PDF0Tn9FmpdOWKtI9efh+S3f8qkcVEtSTXoTeroBd31nzjAunMrZeM8Ut6dre+XeQQIjT7I8oEm+ZkIuIyq0x2fls8JXP2YJDWDqu8v1+yLGTQ3Z9XVt2lMti/7bIgYxS0JvwOr5n5L4IzKvhb4fm13LLDGFa3o7Nsfe3fPb882APE0bLFCmfyIeiPh7go70WqZHakpgIr6LCWTyePez9CsI/rfWDb6eAM8= generated-by-azure"
-                }
-            ]
-        },
-        "dataDisks": {
-            "value": [
-                {
-                    "caching": "ReadOnly",
-                    "createOption": "Empty",
-                    "diskSizeGB": "256",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                },
-                {
-                    "caching": "ReadOnly",
-                    "createOption": "Empty",
-                    "diskSizeGB": "128",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                }
-            ]
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig1",
-                            "properties": {
-                                "subnet": {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-002"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "extensionMonitoringAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDependencyAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionNetworkWatcherAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDiskEncryptionConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "EncryptionOperation": "EnableEncryption",
-                    "KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
-                    "KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
-                    "KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionAlgorithm": "RSA-OAEP",
-                    "VolumeType": "All",
-                    "ResizeOSDisk": "false"
-                }
-            }
-        },
-        "extensionCustomScriptConfig": {
-            "value": {
-                "enabled": true,
-                "fileData": [
-                    {
-                        "uri": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/scripts/scriptExtensionMasterInstaller.ps1",
-                        "storageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-                    }
-                ],
-                "protectedSettings": {
-                    "commandToExecute": "sudo apt-get update"
-                }
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
deleted file mode 100644
index 5444ff7955..0000000000
--- a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.min.parameters.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-scaleset-win-min-001"
-        },
-        "skuName": {
-            "value": "Standard_B2s"
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "MicrosoftWindowsServer",
-                "offer": "WindowsServer",
-                "sku": "2016-Datacenter",
-                "version": "latest"
-            }
-        },
-        "adminUsername": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminUsername"
-            }
-        },
-        "adminPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminPassword"
-            }
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig1",
-                            "properties": {
-                                "subnet": {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-002"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
deleted file mode 100644
index 6eed374c0f..0000000000
--- a/modules/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-scaleset-win-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "vmNamePrefix": {
-            "value": "vmsswinvm"
-        },
-        "skuName": {
-            "value": "Standard_B2s"
-        },
-        "skuCapacity": {
-            "value": 1
-        },
-        "upgradePolicyMode": {
-            "value": "Manual"
-        },
-        "vmPriority": {
-            "value": "Regular"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "encryptionAtHost": {
-            "value": false
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "MicrosoftWindowsServer",
-                "offer": "WindowsServer",
-                "sku": "2016-Datacenter",
-                "version": "latest"
-            }
-        },
-        "adminUsername": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminUsername"
-            }
-        },
-        "adminPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminPassword"
-            }
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig1",
-                            "properties": {
-                                "subnet": {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-002"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "extensionAntiMalwareConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "AntimalwareEnabled": true,
-                    "Exclusions": {
-                        "Extensions": ".log;.ldf",
-                        "Paths": "D:\\IISlogs;D:\\DatabaseLogs",
-                        "Processes": "mssence.svc"
-                    },
-                    "RealtimeProtectionEnabled": true,
-                    "ScheduledScanSettings": {
-                        "isEnabled": "true",
-                        "scanType": "Quick",
-                        "day": "7",
-                        "time": "120"
-                    }
-                }
-            }
-        },
-        "extensionMonitoringAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDependencyAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionNetworkWatcherAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDiskEncryptionConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "EncryptionOperation": "EnableEncryption",
-                    "KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
-                    "KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
-                    "KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionAlgorithm": "RSA-OAEP",
-                    "VolumeType": "All",
-                    "ResizeOSDisk": "false"
-                }
-            }
-        },
-        "extensionDSCConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionCustomScriptConfig": {
-            "value": {
-                "enabled": true,
-                "fileData": [
-                    {
-                        "uri": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/scripts/scriptExtensionMasterInstaller.ps1",
-                        "storageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-                    }
-                ],
-                "protectedSettings": {
-                    "commandToExecute": "powershell -ExecutionPolicy Unrestricted -Command \"& .\\scriptExtensionMasterInstaller.ps1\""
-                }
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
deleted file mode 100644
index 0a90e2dfde..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.autmg.parameters.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-linux-autmg-01"
-        },
-        "osType": {
-            "value": "Linux"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "Canonical",
-                "offer": "UbuntuServer",
-                "sku": "18.04-LTS",
-                "version": "latest"
-            }
-        },
-        "osDisk": {
-            "value": {
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "disablePasswordAuthentication": {
-            "value": true
-        },
-        "publicKeys": {
-            "value": [
-                {
-                    "path": "/home/localAdminUser/.ssh/authorized_keys",
-                    "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdOir5eO28EBwxU0Dyra7g9h0HUXDyMNFp2z8PhaTUQgHjrimkMxjYRwEOG/lxnYL7+TqZk+HcPTfbZOunHBw0Wx2CITzILt6531vmIYZGfq5YyYXbxZa5MON7L/PVivoRlPj5Z/t4RhqMhyfR7EPcZ516LJ8lXPTo8dE/bkOCS+kFBEYHvPEEKAyLs19sRcK37SeHjpX04zdg62nqtuRr00Tp7oeiTXA1xn5K5mxeAswotmd8CU0lWUcJuPBWQedo649b+L2cm52kTncOBI6YChAeyEc1PDF0Tn9FmpdOWKtI9efh+S3f8qkcVEtSTXoTeroBd31nzjAunMrZeM8Ut6dre+XeQQIjT7I8oEm+ZkIuIyq0x2fls8JXP2YJDWDqu8v1+yLGTQ3Z9XVt2lMti/7bIgYxS0JvwOr5n5L4IzKvhb4fm13LLDGFa3o7Nsfe3fPb882APE0bLFCmfyIeiPh7go70WqZHakpgIr6LCWTyePez9CsI/rfWDb6eAM8= generated-by-azure"
-                }
-            ]
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                            "pipConfiguration": {
-                                "publicIpNameSuffix": "-pip-01"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        "configurationProfile": {
-            "value": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction"
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
deleted file mode 100644
index 2faa09d2f9..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-linux-min-01"
-        },
-        "osType": {
-            "value": "Linux"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "Canonical",
-                "offer": "UbuntuServer",
-                "sku": "18.04-LTS",
-                "version": "latest"
-            }
-        },
-        "osDisk": {
-            "value": {
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "disablePasswordAuthentication": {
-            "value": true
-        },
-        "publicKeys": {
-            "value": [
-                {
-                    "path": "/home/localAdminUser/.ssh/authorized_keys",
-                    "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdOir5eO28EBwxU0Dyra7g9h0HUXDyMNFp2z8PhaTUQgHjrimkMxjYRwEOG/lxnYL7+TqZk+HcPTfbZOunHBw0Wx2CITzILt6531vmIYZGfq5YyYXbxZa5MON7L/PVivoRlPj5Z/t4RhqMhyfR7EPcZ516LJ8lXPTo8dE/bkOCS+kFBEYHvPEEKAyLs19sRcK37SeHjpX04zdg62nqtuRr00Tp7oeiTXA1xn5K5mxeAswotmd8CU0lWUcJuPBWQedo649b+L2cm52kTncOBI6YChAeyEc1PDF0Tn9FmpdOWKtI9efh+S3f8qkcVEtSTXoTeroBd31nzjAunMrZeM8Ut6dre+XeQQIjT7I8oEm+ZkIuIyq0x2fls8JXP2YJDWDqu8v1+yLGTQ3Z9XVt2lMti/7bIgYxS0JvwOr5n5L4IzKvhb4fm13LLDGFa3o7Nsfe3fPb882APE0bLFCmfyIeiPh7go70WqZHakpgIr6LCWTyePez9CsI/rfWDb6eAM8= generated-by-azure"
-                }
-            ]
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                            "pipConfiguration": {
-                                "publicIpNameSuffix": "-pip-01"
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
deleted file mode 100644
index 1c42eef982..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
+++ /dev/null
@@ -1,218 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-linux-01"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "osType": {
-            "value": "Linux"
-        },
-        "encryptionAtHost": {
-            "value": false
-        },
-        "availabilityZone": {
-            "value": 1
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "Canonical",
-                "offer": "UbuntuServer",
-                "sku": "18.04-LTS",
-                "version": "latest"
-            }
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "deleteOption": "Delete",
-                "caching": "ReadOnly",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "dataDisks": {
-            "value": [
-                {
-                    "createOption": "Empty",
-                    "deleteOption": "Delete",
-                    "caching": "ReadWrite",
-                    "diskSizeGB": "128",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                },
-                {
-                    "createOption": "Empty",
-                    "deleteOption": "Delete",
-                    "caching": "ReadWrite",
-                    "diskSizeGB": "128",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                }
-            ]
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "disablePasswordAuthentication": {
-            "value": true
-        },
-        "publicKeys": {
-            "value": [
-                {
-                    "path": "/home/localAdminUser/.ssh/authorized_keys",
-                    "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdOir5eO28EBwxU0Dyra7g9h0HUXDyMNFp2z8PhaTUQgHjrimkMxjYRwEOG/lxnYL7+TqZk+HcPTfbZOunHBw0Wx2CITzILt6531vmIYZGfq5YyYXbxZa5MON7L/PVivoRlPj5Z/t4RhqMhyfR7EPcZ516LJ8lXPTo8dE/bkOCS+kFBEYHvPEEKAyLs19sRcK37SeHjpX04zdg62nqtuRr00Tp7oeiTXA1xn5K5mxeAswotmd8CU0lWUcJuPBWQedo649b+L2cm52kTncOBI6YChAeyEc1PDF0Tn9FmpdOWKtI9efh+S3f8qkcVEtSTXoTeroBd31nzjAunMrZeM8Ut6dre+XeQQIjT7I8oEm+ZkIuIyq0x2fls8JXP2YJDWDqu8v1+yLGTQ3Z9XVt2lMti/7bIgYxS0JvwOr5n5L4IzKvhb4fm13LLDGFa3o7Nsfe3fPb882APE0bLFCmfyIeiPh7go70WqZHakpgIr6LCWTyePez9CsI/rfWDb6eAM8= generated-by-azure"
-                }
-            ]
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "deleteOption": "Delete",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                            "pipConfiguration": {
-                                "publicIpNameSuffix": "-pip-01",
-                                "roleAssignments": [
-                                    {
-                                        "roleDefinitionIdOrName": "Reader",
-                                        "principalIds": [
-                                            "<<deploymentSpId>>"
-                                        ]
-                                    }
-                                ]
-                            },
-                            "loadBalancerBackendAddressPools": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/loadBalancers/adp-<<namePrefix>>-az-lb-internal-001/backendAddressPools/servers"
-                                }
-                            ],
-                            "applicationSecurityGroups": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
-                                }
-                            ]
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "backupVaultName": {
-            "value": "adp-<<namePrefix>>-az-rsv-x-001"
-        },
-        "backupVaultResourceGroup": {
-            "value": "validation-rg"
-        },
-        "backupPolicyName": {
-            "value": "VMpolicy"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "extensionMonitoringAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "monitoringWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "extensionDependencyAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionNetworkWatcherAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDiskEncryptionConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "EncryptionOperation": "EnableEncryption",
-                    "KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
-                    "KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
-                    "KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionAlgorithm": "RSA-OAEP",
-                    "VolumeType": "All",
-                    "ResizeOSDisk": "false"
-                }
-            }
-        },
-        "extensionDSCConfig": {
-            "value": {
-                "enabled": false
-            }
-        },
-        "extensionCustomScriptConfig": {
-            "value": {
-                "enabled": true,
-                "fileData": [
-                    {
-                        "uri": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/scripts/scriptExtensionMasterInstaller.ps1",
-                        "storageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-                    }
-                ]
-            }
-        },
-        "extensionCustomScriptProtectedSetting": {
-            "value": {
-                "commandToExecute": "sudo apt-get update"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
deleted file mode 100644
index 29bbcb51ad..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.autmg.parameters.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-win-03"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "MicrosoftWindowsServer",
-                "offer": "WindowsServer",
-                "sku": "2019-Datacenter",
-                "version": "latest"
-            }
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "osDisk": {
-            "value": {
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "adminPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminPassword"
-            }
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001"
-                        }
-                    ]
-                }
-            ]
-        },
-        "configurationProfile": {
-            "value": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction"
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
deleted file mode 100644
index d181987411..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.min.parameters.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-win-02"
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "MicrosoftWindowsServer",
-                "offer": "WindowsServer",
-                "sku": "2022-datacenter-azure-edition",
-                "version": "latest"
-            }
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "osDisk": {
-            "value": {
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "adminPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminPassword"
-            }
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001"
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json b/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
deleted file mode 100644
index 3a3de41959..0000000000
--- a/modules/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-vm-win-01"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "encryptionAtHost": {
-            "value": false
-        },
-        "imageReference": {
-            "value": {
-                "publisher": "MicrosoftWindowsServer",
-                "offer": "WindowsServer",
-                "sku": "2019-Datacenter",
-                "version": "latest"
-            }
-        },
-        "osType": {
-            "value": "Windows"
-        },
-        "vmSize": {
-            "value": "Standard_B12ms"
-        },
-        "osDisk": {
-            "value": {
-                "createOption": "fromImage",
-                "deleteOption": "Delete",
-                "caching": "None",
-                "diskSizeGB": "128",
-                "managedDisk": {
-                    "storageAccountType": "Premium_LRS"
-                }
-            }
-        },
-        "dataDisks": {
-            "value": [
-                {
-                    "createOption": "Empty",
-                    "deleteOption": "Delete",
-                    "caching": "None",
-                    "diskSizeGB": "128",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                },
-                {
-                    "createOption": "Empty",
-                    "deleteOption": "Delete",
-                    "caching": "None",
-                    "diskSizeGB": "128",
-                    "managedDisk": {
-                        "storageAccountType": "Premium_LRS"
-                    }
-                }
-            ]
-        },
-        "availabilityZone": {
-            "value": 2
-        },
-        "adminUsername": {
-            "value": "localAdminUser"
-        },
-        "adminPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "adminPassword"
-            }
-        },
-        "nicConfigurations": {
-            "value": [
-                {
-                    "nicSuffix": "-nic-01",
-                    "deleteOption": "Delete",
-                    "ipConfigurations": [
-                        {
-                            "name": "ipconfig01",
-                            "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                            "pipConfiguration": {
-                                "publicIpNameSuffix": "-pip-01",
-                                "roleAssignments": [
-                                    {
-                                        "roleDefinitionIdOrName": "Reader",
-                                        "principalIds": [
-                                            "<<deploymentSpId>>"
-                                        ]
-                                    }
-                                ]
-                            },
-                            "loadBalancerBackendAddressPools": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/loadBalancers/adp-<<namePrefix>>-az-lb-internal-001/backendAddressPools/servers"
-                                }
-                            ],
-                            "applicationSecurityGroups": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
-                                }
-                            ]
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "backupVaultName": {
-            "value": "adp-<<namePrefix>>-az-rsv-x-001"
-        },
-        "backupVaultResourceGroup": {
-            "value": "validation-rg"
-        },
-        "backupPolicyName": {
-            "value": "VMpolicy"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "extensionAntiMalwareConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "AntimalwareEnabled": "true",
-                    "Exclusions": {
-                        "Extensions": ".ext1;.ext2",
-                        "Paths": "c:\\excluded-path-1;c:\\excluded-path-2",
-                        "Processes": "excludedproc1.exe;excludedproc2.exe"
-                    },
-                    "RealtimeProtectionEnabled": "true",
-                    "ScheduledScanSettings": {
-                        "isEnabled": "true",
-                        "scanType": "Quick",
-                        "day": "7",
-                        "time": "120"
-                    }
-                }
-            }
-        },
-        "extensionMonitoringAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "monitoringWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "extensionDependencyAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionNetworkWatcherAgentConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionDiskEncryptionConfig": {
-            "value": {
-                "enabled": true,
-                "settings": {
-                    "EncryptionOperation": "EnableEncryption",
-                    "KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
-                    "KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
-                    "KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
-                    "KeyEncryptionAlgorithm": "RSA-OAEP",
-                    "VolumeType": "All",
-                    "ResizeOSDisk": "false"
-                }
-            }
-        },
-        "extensionDSCConfig": {
-            "value": {
-                "enabled": true
-            }
-        },
-        "extensionCustomScriptConfig": {
-            "value": {
-                "enabled": true,
-                "fileData": [
-                    {
-                        "uri": "https://adp<<namePrefix>>azsax001.blob.core.windows.net/scripts/scriptExtensionMasterInstaller.ps1",
-                        "storageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-                    }
-                ]
-            }
-        },
-        "extensionCustomScriptProtectedSetting": {
-            "value": {
-                "commandToExecute": "powershell -ExecutionPolicy Unrestricted -Command \"& .\\scriptExtensionMasterInstaller.ps1\""
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Consumption/budgets/.parameters/parameters.json b/modules/Microsoft.Consumption/budgets/.parameters/parameters.json
deleted file mode 100644
index 4ab50cd80e..0000000000
--- a/modules/Microsoft.Consumption/budgets/.parameters/parameters.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "amount": {
-            "value": 500
-        },
-        "thresholds": {
-            "value": [
-                50,
-                75,
-                90,
-                100,
-                110
-            ]
-        },
-        "contactEmails": {
-            "value": [
-                "dummy@contoso.com"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json b/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
deleted file mode 100644
index cdbb1078cd..0000000000
--- a/modules/Microsoft.ContainerInstance/containerGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-acg-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "containerName": {
-            "value": "<<namePrefix>>-az-aci-x-001"
-        },
-        "image": {
-            "value": "mcr.microsoft.com/azuredocs/aci-helloworld"
-        },
-        "ports": {
-            "value": [
-                {
-                    "protocol": "Tcp",
-                    "port": "80"
-                },
-                {
-                    "protocol": "Tcp",
-                    "port": "443"
-                }
-            ]
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
deleted file mode 100644
index 2ed76c34cb..0000000000
--- a/modules/Microsoft.ContainerRegistry/registries/.parameters/encr.parameters.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azacrencr001"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "publicNetworkAccess": {
-            "value": "Disabled"
-        },
-        "acrSku": {
-            "value": "Premium"
-        },
-        "cMKUserAssignedIdentityResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "cMKKeyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-nopr-002"
-        },
-        "cMKKeyName": {
-            "value": "keyEncryptionKey"
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
deleted file mode 100644
index 255a9ddfcf..0000000000
--- a/modules/Microsoft.ContainerRegistry/registries/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azacrmin001"
-        }
-    }
-}
diff --git a/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json b/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
deleted file mode 100644
index ca1df52de6..0000000000
--- a/modules/Microsoft.ContainerRegistry/registries/.parameters/parameters.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azacrx001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "acrAdminUserEnabled": {
-            "value": false
-        },
-        "acrSku": {
-            "value": "Premium"
-        },
-        "exportPolicyStatus": {
-            "value": "enabled"
-        },
-        "quarantinePolicyStatus": {
-            "value": "enabled"
-        },
-        "trustPolicyStatus": {
-            "value": "enabled"
-        },
-        "replications": {
-            "value": [
-                {
-                    "name": "northeurope",
-                    "location": "northeurope"
-                }
-            ]
-        },
-        "webhooks": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>azacrx001webhook",
-                    "serviceUri": "https://www.contoso.com/webhook"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "publicNetworkAccess": {
-            "value": "Disabled"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "registry"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.DataFactory/factories/.parameters/parameters.json b/modules/Microsoft.DataFactory/factories/.parameters/parameters.json
deleted file mode 100644
index f686b88025..0000000000
--- a/modules/Microsoft.DataFactory/factories/.parameters/parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-adf-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "managedVirtualNetworkName": {
-            "value": "default"
-        },
-        "integrationRuntime": {
-            "value": {
-                "name": "AutoResolveIntegrationRuntime",
-                "type": "Managed",
-                "managedVirtualNetworkName": "default",
-                "typeProperties": {
-                    "computeProperties": {
-                        "location": "AutoResolve"
-                    }
-                }
-            }
-        },
-        "publicNetworkAccess": {
-            "value": true
-        },
-        "gitConfigureLater": {
-            "value": true
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json b/modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
deleted file mode 100644
index 6b44ecfa38..0000000000
--- a/modules/Microsoft.DataProtection/backupVaults/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bv-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json b/modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
deleted file mode 100644
index bad76a8a40..0000000000
--- a/modules/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bv-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "backupPolicies": {
-            "value": [
-                {
-                    "name": "DefaultPolicy",
-                    "properties": {
-                        "policyRules": [
-                            {
-                                "backupParameters": {
-                                    "backupType": "Incremental",
-                                    "objectType": "AzureBackupParams"
-                                },
-                                "trigger": {
-                                    "schedule": {
-                                        "repeatingTimeIntervals": [
-                                            "R/2022-05-31T23:30:00+01:00/P1D"
-                                        ],
-                                        "timeZone": "W. Europe Standard Time"
-                                    },
-                                    "taggingCriteria": [
-                                        {
-                                            "tagInfo": {
-                                                "tagName": "Default",
-                                                "id": "Default_"
-                                            },
-                                            "taggingPriority": 99,
-                                            "isDefault": true
-                                        }
-                                    ],
-                                    "objectType": "ScheduleBasedTriggerContext"
-                                },
-                                "dataStore": {
-                                    "dataStoreType": "OperationalStore",
-                                    "objectType": "DataStoreInfoBase"
-                                },
-                                "name": "BackupDaily",
-                                "objectType": "AzureBackupRule"
-                            },
-                            {
-                                "lifecycles": [
-                                    {
-                                        "deleteAfter": {
-                                            "objectType": "AbsoluteDeleteOption",
-                                            "duration": "P7D"
-                                        },
-                                        "targetDataStoreCopySettings": [],
-                                        "sourceDataStore": {
-                                            "dataStoreType": "OperationalStore",
-                                            "objectType": "DataStoreInfoBase"
-                                        }
-                                    }
-                                ],
-                                "isDefault": true,
-                                "name": "Default",
-                                "objectType": "AzureRetentionRule"
-                            }
-                        ],
-                        "datasourceTypes": [
-                            "Microsoft.Compute/disks"
-                        ],
-                        "objectType": "BackupPolicy"
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json b/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
deleted file mode 100644
index dc327499f5..0000000000
--- a/modules/Microsoft.Databricks/workspaces/.parameters/parameters.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-adb-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
deleted file mode 100644
index ecf7a145e6..0000000000
--- a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avdag-min-001"
-        },
-        "applicationGroupType": {
-            "value": "RemoteApp"
-        },
-        "hostpoolName": {
-            "value": "adp-<<namePrefix>>-az-avdhp-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
deleted file mode 100644
index 7e71ce4904..0000000000
--- a/modules/Microsoft.DesktopVirtualization/applicationgroups/.parameters/parameters.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avdag-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "location": {
-            "value": "westeurope"
-        },
-        "applicationGroupType": {
-            "value": "RemoteApp"
-        },
-        "hostpoolName": {
-            "value": "adp-<<namePrefix>>-az-avdhp-x-001"
-        },
-        "friendlyName": {
-            "value": "Remote Applications 1"
-        },
-        "description": {
-            "value": "This is my first Remote Applications bundle"
-        },
-        "applications": {
-            "value": [
-                {
-                    "name": "notepad",
-                    "description": "Notepad by ARM template",
-                    "friendlyName": "Notepad",
-                    "filePath": "C:\\Windows\\System32\\notepad.exe",
-                    "commandLineSetting": "DoNotAllow",
-                    "commandLineArguments": "",
-                    "showInPortal": true,
-                    "iconPath": "C:\\Windows\\System32\\notepad.exe",
-                    "iconIndex": 0
-                },
-                {
-                    "name": "wordpad",
-                    "filePath": "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe",
-                    "friendlyName": "Wordpad"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
deleted file mode 100644
index 076213824f..0000000000
--- a/modules/Microsoft.DesktopVirtualization/hostpools/.parameters/parameters.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avdhp-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "location": {
-            "value": "westeurope"
-        },
-        "hostpoolFriendlyName": {
-            "value": "AVDv2"
-        },
-        "hostpoolDescription": {
-            "value": "My first AVD Host Pool"
-        },
-        "hostpoolType": {
-            "value": "Pooled"
-        },
-        "personalDesktopAssignmentType": {
-            "value": "Automatic"
-        },
-        "maxSessionLimit": {
-            "value": 99999
-        },
-        "loadBalancerType": {
-            "value": "BreadthFirst"
-        },
-        "customRdpProperty": {
-            "value": "audiocapturemode:i:1;audiomode:i:0;drivestoredirect:s:;redirectclipboard:i:1;redirectcomports:i:1;redirectprinters:i:1;redirectsmartcards:i:1;screen mode id:i:2;"
-        },
-        "vmTemplate": {
-            "value": {
-                "domain": "domainname.onmicrosoft.com",
-                "galleryImageOffer": "office-365",
-                "galleryImagePublisher": "microsoftwindowsdesktop",
-                "galleryImageSKU": "20h1-evd-o365pp",
-                "imageType": "Gallery",
-                "imageUri": null,
-                "customImageId": null,
-                "namePrefix": "avdv2",
-                "osDiskType": "StandardSSD_LRS",
-                "useManagedDisks": true,
-                "vmSize": {
-                    "id": "Standard_D2s_v3",
-                    "cores": 2,
-                    "ram": 8
-                }
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json b/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
deleted file mode 100644
index e576bf3707..0000000000
--- a/modules/Microsoft.DesktopVirtualization/scalingplans/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avdsp-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
deleted file mode 100644
index 5ffb007078..0000000000
--- a/modules/Microsoft.DesktopVirtualization/workspaces/.parameters/parameters.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-avdws-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "location": {
-            "value": "westeurope"
-        },
-        "appGroupResourceIds": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.DesktopVirtualization/applicationgroups/adp-<<namePrefix>>-az-avdag-x-001"
-            ]
-        },
-        "workspaceFriendlyName": {
-            "value": "My first AVD Workspace"
-        },
-        "workspaceDescription": {
-            "value": "This is my first AVD Workspace"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
deleted file mode 100644
index c9c6465b30..0000000000
--- a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/mongodb.parameters.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cdb-mongodb-001"
-        },
-        "location": {
-            "value": "West Europe"
-        },
-        "locations": {
-            "value": [
-                {
-                    "locationName": "West Europe",
-                    "failoverPriority": 0,
-                    "isZoneRedundant": false
-                },
-                {
-                    "locationName": "North Europe",
-                    "failoverPriority": 1,
-                    "isZoneRedundant": false
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "mongodbDatabases": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-mdb-x-001",
-                    "collections": [
-                        {
-                            "name": "car_collection",
-                            "indexes": [
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_id"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "$**"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "car_id",
-                                            "car_model"
-                                        ]
-                                    },
-                                    "options": {
-                                        "unique": true
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_ts"
-                                        ]
-                                    },
-                                    "options": {
-                                        "expireAfterSeconds": 2629746
-                                    }
-                                }
-                            ],
-                            "shardKey": {
-                                "car_id": "Hash"
-                            }
-                        },
-                        {
-                            "name": "truck_collection",
-                            "indexes": [
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_id"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "$**"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "truck_id",
-                                            "truck_model"
-                                        ]
-                                    },
-                                    "options": {
-                                        "unique": true
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_ts"
-                                        ]
-                                    },
-                                    "options": {
-                                        "expireAfterSeconds": 2629746
-                                    }
-                                }
-                            ],
-                            "shardKey": {
-                                "truck_id": "Hash"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-mdb-x-002",
-                    "collections": [
-                        {
-                            "name": "bike_collection",
-                            "indexes": [
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_id"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "$**"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "bike_id",
-                                            "bike_model"
-                                        ]
-                                    },
-                                    "options": {
-                                        "unique": true
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_ts"
-                                        ]
-                                    },
-                                    "options": {
-                                        "expireAfterSeconds": 2629746
-                                    }
-                                }
-                            ],
-                            "shardKey": {
-                                "bike_id": "Hash"
-                            }
-                        },
-                        {
-                            "name": "bicycle_collection",
-                            "indexes": [
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_id"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "$**"
-                                        ]
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "bicycle_id",
-                                            "bicycle_model"
-                                        ]
-                                    },
-                                    "options": {
-                                        "unique": true
-                                    }
-                                },
-                                {
-                                    "key": {
-                                        "keys": [
-                                            "_ts"
-                                        ]
-                                    },
-                                    "options": {
-                                        "expireAfterSeconds": 2629746
-                                    }
-                                }
-                            ],
-                            "shardKey": {
-                                "bicycle_id": "Hash"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        }
-    }
-}
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
deleted file mode 100644
index 564968cf20..0000000000
--- a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/plain.parameters.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cdb-plain-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "locations": {
-            "value": [
-                {
-                    "locationName": "West Europe",
-                    "failoverPriority": 0,
-                    "isZoneRedundant": false
-                },
-                {
-                    "locationName": "North Europe",
-                    "failoverPriority": 1,
-                    "isZoneRedundant": false
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json b/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
deleted file mode 100644
index 11f83861d1..0000000000
--- a/modules/Microsoft.DocumentDB/databaseAccounts/.parameters/sqldb.parameters.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-cdb-sqldb-001"
-        },
-        "location": {
-            "value": "West Europe"
-        },
-        "locations": {
-            "value": [
-                {
-                    "locationName": "West Europe",
-                    "failoverPriority": 0,
-                    "isZoneRedundant": false
-                },
-                {
-                    "locationName": "North Europe",
-                    "failoverPriority": 1,
-                    "isZoneRedundant": false
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "sqlDatabases": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-sql-x-001",
-                    "containers": [
-                        {
-                            "name": "container-001",
-                            "paths": [
-                                "/myPartitionKey"
-                            ],
-                            "kind": "Hash"
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-sql-x-002",
-                    "containers": []
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
deleted file mode 100644
index 87be2f37f1..0000000000
--- a/modules/Microsoft.EventGrid/systemTopics/.parameters/min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-egstn-x-002"
-        },
-        "source": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "topicType": {
-            "value": "Microsoft.Storage.StorageAccounts"
-        }
-    }
-}
diff --git a/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json b/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
deleted file mode 100644
index 5a415c770e..0000000000
--- a/modules/Microsoft.EventGrid/systemTopics/.parameters/parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-egstn-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "source": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "topicType": {
-            "value": "Microsoft.Storage.StorageAccounts"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.EventGrid/topics/.parameters/parameters.json b/modules/Microsoft.EventGrid/topics/.parameters/parameters.json
deleted file mode 100644
index 5976a4588b..0000000000
--- a/modules/Microsoft.EventGrid/topics/.parameters/parameters.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-egtn-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "topic"
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
deleted file mode 100644
index d90c44f3fb..0000000000
--- a/modules/Microsoft.EventHub/namespaces/.parameters/min.parameters.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {}
-}
diff --git a/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json b/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
deleted file mode 100644
index 38aff7a42e..0000000000
--- a/modules/Microsoft.EventHub/namespaces/.parameters/parameters.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-evnsp-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "authorizationRules": {
-            "value": [
-                {
-                    "name": "RootManageSharedAccessKey",
-                    "rights": [
-                        "Listen",
-                        "Manage",
-                        "Send"
-                    ]
-                },
-                {
-                    "name": "SendListenAccess",
-                    "rights": [
-                        "Listen",
-                        "Send"
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "eventHubs": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-evh-x-001"
-                },
-                {
-                    "name": "<<namePrefix>>-az-evh-x-002",
-                    "authorizationRules": [
-                        {
-                            "name": "RootManageSharedAccessKey",
-                            "rights": [
-                                "Listen",
-                                "Manage",
-                                "Send"
-                            ]
-                        },
-                        {
-                            "name": "SendListenAccess",
-                            "rights": [
-                                "Listen",
-                                "Send"
-                            ]
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ],
-                    "messageRetentionInDays": 1,
-                    "partitionCount": 2,
-                    "status": "Active",
-                    "captureDescriptionEnabled": true,
-                    "captureDescriptionEncoding": "Avro",
-                    "captureDescriptionIntervalInSeconds": 300,
-                    "captureDescriptionSizeLimitInBytes": 314572800,
-                    "captureDescriptionDestinationName": "EventHubArchive.AzureBlockBlob",
-                    "captureDescriptionDestinationStorageAccountResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                    "captureDescriptionDestinationBlobContainer": "eventhub",
-                    "captureDescriptionDestinationArchiveNameFormat": "{Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}",
-                    "captureDescriptionSkipEmptyArchives": true,
-                    "consumerGroups": [
-                        {
-                            "name": "custom",
-                            "userMetadata": "customMetadata"
-                        }
-                    ]
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "namespace"
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "networkRuleSets": {
-            "value": {
-                "defaultAction": "Deny",
-                "ipRules": [
-                    {
-                        "action": "Allow",
-                        "ipMask": "10.10.10.10"
-                    }
-                ],
-                "virtualNetworkRules": [
-                    {
-                        "subnet": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001"
-                        },
-                        "ignoreMissingVnetServiceEndpoint": true
-                    }
-                ],
-                "trustedServiceAccessEnabled": false
-            }
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json b/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
deleted file mode 100644
index fef2b742de..0000000000
--- a/modules/Microsoft.HealthBot/healthBots/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ahb-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json b/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
deleted file mode 100644
index 32c9e76062..0000000000
--- a/modules/Microsoft.Insights/actionGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ag-x-001"
-        },
-        "groupShortName": {
-            "value": "azagweux001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "emailReceivers": {
-            "value": [
-                {
-                    "name": "TestUser_-EmailAction-",
-                    "emailAddress": "test.user@testcompany.com",
-                    "useCommonAlertSchema": true
-                },
-                {
-                    "name": "TestUser2",
-                    "emailAddress": "test.user2@testcompany.com",
-                    "useCommonAlertSchema": true
-                }
-            ]
-        },
-        "smsReceivers": {
-            "value": [
-                {
-                    "name": "TestUser_-SMSAction-",
-                    "countryCode": "1",
-                    "phoneNumber": "2345678901"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
deleted file mode 100644
index 8d7e3e6581..0000000000
--- a/modules/Microsoft.Insights/activityLogAlerts/.parameters/parameters.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ala-x-001"
-        },
-        "scopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>"
-            ]
-        },
-        "conditions": {
-            "value": [
-                {
-                    "field": "category",
-                    "equals": "Administrative"
-                },
-                {
-                    "field": "resourceType",
-                    "equals": "microsoft.compute/virtualmachines"
-                },
-                {
-                    "field": "operationName",
-                    "equals": "Microsoft.Compute/virtualMachines/performMaintenance/action"
-                }
-            ]
-        },
-        "actions": {
-            "value": [
-                {
-                    "actionGroupId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/microsoft.insights/actiongroups/adp-<<namePrefix>>-az-ag-x-001"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/components/.parameters/parameters.json b/modules/Microsoft.Insights/components/.parameters/parameters.json
deleted file mode 100644
index 636d9f6c7d..0000000000
--- a/modules/Microsoft.Insights/components/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appi-x-001"
-        },
-        "workspaceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json b/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
deleted file mode 100644
index 2e1d38512a..0000000000
--- a/modules/Microsoft.Insights/diagnosticSettings/.parameters/parameters.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-diag-x-001"
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json b/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
deleted file mode 100644
index bbe65cdaea..0000000000
--- a/modules/Microsoft.Insights/metricAlerts/.parameters/parameters.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ma-x-001"
-        },
-        "windowSize": {
-            "value": "PT15M"
-        },
-        "actions": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/microsoft.insights/actiongroups/adp-<<namePrefix>>-az-ag-x-001"
-            ]
-        },
-        "targetResourceType": {
-            "value": "microsoft.compute/virtualmachines"
-        },
-        "targetResourceRegion": {
-            "value": "westeurope"
-        },
-        "criterias": {
-            "value": [
-                {
-                    "criterionType": "StaticThresholdCriterion",
-                    "metricName": "Percentage CPU",
-                    "metricNamespace": "microsoft.compute/virtualmachines",
-                    "name": "HighCPU",
-                    "operator": "GreaterThan",
-                    "threshold": "90",
-                    "timeAggregation": "Average"
-                }
-            ]
-        },
-        "alertCriteriaType": {
-            "value": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json b/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
deleted file mode 100644
index 8bfe5c1638..0000000000
--- a/modules/Microsoft.Insights/privateLinkScopes/.parameters/parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-pls-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "scopedResources": {
-            "value": [
-                {
-                    "name": "scoped1",
-                    "linkedResourceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "azuremonitor"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json b/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
deleted file mode 100644
index 85cb87625b..0000000000
--- a/modules/Microsoft.Insights/scheduledQueryRules/.parameters/parameters.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "myAlert01"
-        },
-        "alertDescription": {
-            "value": "My sample Alert"
-        },
-        "scopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-            ]
-        },
-        "evaluationFrequency": {
-            "value": "PT5M"
-        },
-        "windowSize": {
-            "value": "PT5M"
-        },
-        "suppressForMinutes": {
-            "value": "PT5M"
-        },
-        "queryTimeRange": {
-            "value": "PT5M"
-        },
-        "autoMitigate": {
-            "value": false
-        },
-        "criterias": {
-            "value": {
-                "allOf": [
-                    {
-                        "query": "Perf | where ObjectName == \"LogicalDisk\" | where CounterName == \"% Free Space\" | where InstanceName <> \"HarddiskVolume1\" and InstanceName <> \"_Total\" | summarize AggregatedValue = min(CounterValue) by Computer, InstanceName, bin(TimeGenerated,5m)",
-                        "timeAggregation": "Average",
-                        "metricMeasureColumn": "AggregatedValue",
-                        "dimensions": [
-                            {
-                                "name": "Computer",
-                                "operator": "Include",
-                                "values": [
-                                    "*"
-                                ]
-                            },
-                            {
-                                "name": "InstanceName",
-                                "operator": "Include",
-                                "values": [
-                                    "*"
-                                ]
-                            }
-                        ],
-                        "operator": "GreaterThan",
-                        "threshold": 0
-                    }
-                ]
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
deleted file mode 100644
index d90c44f3fb..0000000000
--- a/modules/Microsoft.KeyVault/vaults/.parameters/min.parameters.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {}
-}
diff --git a/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json b/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
deleted file mode 100644
index d015736c8f..0000000000
--- a/modules/Microsoft.KeyVault/vaults/.parameters/parameters.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-kv-x-002"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "softDeleteRetentionInDays": {
-            "value": 7
-        },
-        "enableRbacAuthorization": {
-            "value": false
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "vault"
-                }
-            ]
-        },
-        "networkAcls": {
-            "value": {
-                "bypass": "AzureServices",
-                "defaultAction": "Deny",
-                "virtualNetworkRules": [
-                    {
-                        "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                        "action": "Allow"
-                    }
-                ],
-                "ipRules": []
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "secrets": {
-            "value": {
-                "secureList": [
-                    {
-                        "name": "secretName",
-                        "value": "secretValue",
-                        "contentType": "Something",
-                        "attributesExp": 1702648632,
-                        "attributesNbf": 10000,
-                        "roleAssignments": [
-                            {
-                                "roleDefinitionIdOrName": "Reader",
-                                "principalIds": [
-                                    "<<deploymentSpId>>"
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        },
-        "keys": {
-            "value": [
-                {
-                    "name": "keyName",
-                    "attributesExp": 1702648632,
-                    "attributesNbf": 10000,
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "accessPolicies": {
-            "value": [
-                {
-                    "objectId": "<<deploymentSpId>>",
-                    "permissions": {
-                        "keys": [
-                            "get",
-                            "list",
-                            "update"
-                        ],
-                        "secrets": [
-                            "all"
-                        ]
-                    },
-                    "tenantId": "<<tenantId>>"
-                },
-                {
-                    "objectId": "<<deploymentSpId>>",
-                    "permissions": {
-                        "certificates": [
-                            "backup",
-                            "create",
-                            "delete"
-                        ],
-                        "secrets": [
-                            "all"
-                        ]
-                    }
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
deleted file mode 100644
index 8beee2d23b..0000000000
--- a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/min.parameters.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "flux"
-        },
-        "extensionType": {
-            "value": "microsoft.flux"
-        },
-        "clusterName": {
-            "value": "<<namePrefix>>-az-aks-kubenet-001"
-        },
-        "releaseTrain": {
-            "value": "Stable"
-        },
-        "releaseNamespace": {
-            "value": "flux-system"
-        }
-    }
-}
diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
deleted file mode 100644
index 29ca85067d..0000000000
--- a/modules/Microsoft.KubernetesConfiguration/extensions/.parameters/parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "flux"
-        },
-        "extensionType": {
-            "value": "microsoft.flux"
-        },
-        "clusterName": {
-            "value": "<<namePrefix>>-az-aks-kubenet-001"
-        },
-        "releaseTrain": {
-            "value": "Stable"
-        },
-        "releaseNamespace": {
-            "value": "flux-system"
-        },
-        "version": {
-            "value": "0.5.2"
-        },
-        "configurationSettings": {
-            "value": {
-                // "helm-controller.enabled": "false",
-                "source-controller.enabled": "true",
-                "kustomize-controller.enabled": "true",
-                "notification-controller.enabled": "false",
-                "image-automation-controller.enabled": "false",
-                "image-reflector-controller.enabled": "false"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
deleted file mode 100644
index 201ac22b6b..0000000000
--- a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/min.parameters.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "flux2"
-        },
-        "scope": {
-            "value": "cluster"
-        },
-        "clusterName": {
-            "value": "<<namePrefix>>-az-aks-kubenet-001"
-        },
-        "namespace": {
-            "value": "flux-system"
-        },
-        "sourceKind": {
-            "value": "GitRepository"
-        },
-        "gitRepository": {
-            "value": {
-                "url": "https://github.com/mspnp/aks-baseline",
-                "timeoutInSeconds": 180,
-                "syncIntervalInSeconds": 300,
-                "repositoryRef": {
-                    "branch": "main"
-                },
-                "sshKnownHosts": ""
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json b/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
deleted file mode 100644
index e6f563f7f8..0000000000
--- a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "flux2"
-        },
-        "scope": {
-            "value": "cluster"
-        },
-        "clusterName": {
-            "value": "<<namePrefix>>-az-aks-kubenet-001"
-        },
-        "namespace": {
-            "value": "flux-system"
-        },
-        "sourceKind": {
-            "value": "GitRepository"
-        },
-        "gitRepository": {
-            "value": {
-                "url": "https://github.com/mspnp/aks-baseline",
-                "timeoutInSeconds": 180,
-                "syncIntervalInSeconds": 300,
-                "repositoryRef": {
-                    "branch": "main"
-                },
-                "sshKnownHosts": ""
-            }
-        },
-        "kustomizations": {
-            "value": {
-                "unified": {
-                    "path": "./cluster-manifests",
-                    "dependsOn": [],
-                    "timeoutInSeconds": 300,
-                    "syncIntervalInSeconds": 300,
-                    "prune": true,
-                    "force": false
-                }
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Logic/workflows/.parameters/parameters.json b/modules/Microsoft.Logic/workflows/.parameters/parameters.json
deleted file mode 100644
index 6436e5c1b7..0000000000
--- a/modules/Microsoft.Logic/workflows/.parameters/parameters.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lga-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "tags": {
-            "value": {}
-        },
-        "workflowActions": {
-            "value": {
-                "HTTP": {
-                    "type": "Http",
-                    "inputs": {
-                        "method": "POST",
-                        "uri": "https://testStringForValidation.com",
-                        "body": {
-                            "HostPoolName": "[HostPoolName]",
-                            "LAWorkspaceName": "[LAWorkspaceName]",
-                            "LimitSecondsToForceLogOffUser": "[LimitSecondsToForceLogOffUser]",
-                            "EndPeakTime": "[EndPeakTime]",
-                            "BeginPeakTime": "[BeginPeakTime]",
-                            "UtcOffset": "[UtcOffset]",
-                            "LogOffMessageBody": "[LogOffMessageBody]",
-                            "LogOffMessageTitle": "[LogOffMessageTitle]",
-                            "MinimumNumberOfRDSH": 1,
-                            "SessionThresholdPerCPU": 1,
-                            "ResourceGroupName": "[ResourceGroupName]"
-                        }
-                    }
-                }
-            }
-        },
-        "workflowTriggers": {
-            "value": {
-                "Recurrence": {
-                    "recurrence": {
-                        "frequency": "Minute",
-                        "interval": 15
-                    },
-                    "type": "Recurrence"
-                }
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        }
-    }
-}
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
deleted file mode 100644
index 012526cf1f..0000000000
--- a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/min.parameters.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-mls-min-001"
-        },
-        "sku": {
-            "value": "Basic"
-        },
-        "associatedStorageAccountResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "associatedKeyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-        },
-        "associatedApplicationInsightsResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Insights/components/adp-<<namePrefix>>-az-appi-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        }
-    }
-}
diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json b/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
deleted file mode 100644
index d8058a2616..0000000000
--- a/modules/Microsoft.MachineLearningServices/workspaces/.parameters/parameters.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-mls-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "sku": {
-            "value": "Basic"
-        },
-        "associatedStorageAccountResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "associatedKeyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-        },
-        "associatedApplicationInsightsResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Insights/components/adp-<<namePrefix>>-az-appi-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": false // Must be false if `primaryUserAssignedIdentity` is provided
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "description": {
-            "value": "The cake is a lie."
-        },
-        "discoveryUrl": {
-            "value": "http://example.com"
-        },
-        "encryptionIdentity": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "encryptionKeyIdentifier": {
-            "value": "https://adp-carml-az-kv-nopr-002.vault.azure.net/keys/keyEncryptionKey/5263fcde203347baa7cda35d074073b2" // ID must be updated for new keys
-        },
-        "encryptionKeyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-carml-az-kv-nopr-002"
-        },
-        "imageBuildCompute": {
-            "value": "testcompute"
-        },
-        "publicNetworkAccess": {
-            "value": "Enabled"
-        },
-        "primaryUserAssignedIdentity": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "computes": {
-            "value": [
-                {
-                    "name": "DefaultCPU",
-                    "location": "westeurope",
-                    "computeLocation": "westeurope",
-                    "sku": "Basic",
-                    "systemAssignedIdentity": false,
-                    "userAssignedIdentities": {
-                        "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-                    },
-                    "description": "Default CPU Cluster",
-                    "disableLocalAuth": false,
-                    "computeType": "AmlCompute",
-                    "properties": {
-                        "enableNodePublicIp": true,
-                        "isolatedNetwork": false,
-                        "osType": "Linux",
-                        "remoteLoginPortPublicAccess": "Disabled",
-                        "scaleSettings": {
-                            "maxNodeCount": 3,
-                            "minNodeCount": 0,
-                            "nodeIdleTimeBeforeScaleDown": "PT5M"
-                        },
-                        "vmPriority": "Dedicated",
-                        "vmSize": "STANDARD_DS11_V2"
-                    }
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "amlworkspace"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json b/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
deleted file mode 100644
index d76c001bb1..0000000000
--- a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-msi-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
deleted file mode 100644
index 8fc6fc1cc9..0000000000
--- a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "Component Validation - Subscription assignment"
-        },
-        "registrationDescription": {
-            "value": "Managed by Lighthouse"
-        },
-        "managedByTenantId": {
-            "value": "195ee85d-2f10-4764-8352-a3c99aa772fb"
-        },
-        "authorizations": {
-            "value": [
-                {
-                    "principalId": "e87a249c-b53b-4685-94fe-863af522e4ee",
-                    "principalIdDisplayName": "ResourceModules-Reader",
-                    "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
-                },
-                {
-                    "principalId": "e2f126a7-136e-443f-b39f-f73ddfd146b1",
-                    "principalIdDisplayName": "ResourceModules-Contributor",
-                    "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c"
-                },
-                {
-                    "principalId": "87813317-fb25-4c76-91fe-783af429d109",
-                    "principalIdDisplayName": "ResourceModules-LHManagement",
-                    "roleDefinitionId": "91c1777a-f3dc-4fae-b103-61d183457e46"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json b/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
deleted file mode 100644
index 5e21414369..0000000000
--- a/modules/Microsoft.ManagedServices/registrationDefinitions/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "Component Validation - Resource group assignment"
-        },
-        "registrationDescription": {
-            "value": "Managed by Lighthouse"
-        },
-        "managedByTenantId": {
-            "value": "195ee85d-2f10-4764-8352-a3c99aa772fb"
-        },
-        "resourceGroupName": {
-            "value": "validation-rg"
-        },
-        "authorizations": {
-            "value": [
-                {
-                    "principalId": "e87a249c-b53b-4685-94fe-863af522e4ee",
-                    "principalIdDisplayName": "ResourceModules-Reader",
-                    "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
-                },
-                {
-                    "principalId": "e2f126a7-136e-443f-b39f-f73ddfd146b1",
-                    "principalIdDisplayName": "ResourceModules-Contributor",
-                    "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c"
-                },
-                {
-                    "principalId": "87813317-fb25-4c76-91fe-783af429d109",
-                    "principalIdDisplayName": "ResourceModules-LHManagement",
-                    "roleDefinitionId": "91c1777a-f3dc-4fae-b103-61d183457e46"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Management/managementGroups/.parameters/parameters.json b/modules/Microsoft.Management/managementGroups/.parameters/parameters.json
deleted file mode 100644
index 21e2524a5f..0000000000
--- a/modules/Microsoft.Management/managementGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "testMG"
-        },
-        "displayName": {
-            "value": "Test MG"
-        },
-        "parentId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
deleted file mode 100644
index 029d5ebc09..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-anf-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
deleted file mode 100644
index 8718b5fdab..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs3.parameters.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-anf-nfs3-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "capacityPools": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-anfcp-x-001",
-                    "serviceLevel": "Premium",
-                    "size": 4398046511104,
-                    "volumes": [
-                        {
-                            "name": "anf3-vol01-nfsv3",
-                            "usageThreshold": 107374182400,
-                            "protocolTypes": [
-                                "NFSv3"
-                            ],
-                            "exportPolicyRules": [
-                                {
-                                    "ruleIndex": 1,
-                                    "unixReadOnly": false,
-                                    "unixReadWrite": true,
-                                    "nfsv3": true,
-                                    "nfsv41": false,
-                                    "allowedClients": "0.0.0.0/0"
-                                }
-                            ],
-                            "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-004",
-                            "roleAssignments": [
-                                {
-                                    "roleDefinitionIdOrName": "Reader",
-                                    "principalIds": [
-                                        "<<deploymentSpId>>"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "name": "anf3-vol02-nfsv3",
-                            "usageThreshold": 107374182400,
-                            "protocolTypes": [
-                                "NFSv3"
-                            ],
-                            "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-004"
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-anfcp-x-002",
-                    "serviceLevel": "Premium",
-                    "size": 4398046511104,
-                    "volumes": [],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "tags": {
-            "value": {
-                "Environment": "Non-Prod",
-                "Contact": "test.user@testcompany.com",
-                "PurchaseOrder": "1234",
-                "CostCenter": "7890",
-                "ServiceName": "DeploymentValidation",
-                "Role": "DeploymentValidation"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
deleted file mode 100644
index 2f961c1442..0000000000
--- a/modules/Microsoft.NetApp/netAppAccounts/.parameters/nfs41.parameters.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-anf-nfs41-001"
-        },
-        "capacityPools": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-anfcp-x-001",
-                    "serviceLevel": "Premium",
-                    "size": 4398046511104,
-                    "volumes": [
-                        {
-                            "name": "anf4-vol01-nfsv41",
-                            "usageThreshold": 107374182400,
-                            "protocolTypes": [
-                                "NFSv4.1"
-                            ],
-                            "exportPolicyRules": [
-                                {
-                                    "ruleIndex": 1,
-                                    "unixReadOnly": false,
-                                    "unixReadWrite": true,
-                                    "nfsv3": false,
-                                    "nfsv41": true,
-                                    "allowedClients": "0.0.0.0/0"
-                                }
-                            ],
-                            "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-004",
-                            "roleAssignments": [
-                                {
-                                    "roleDefinitionIdOrName": "Reader",
-                                    "principalIds": [
-                                        "<<deploymentSpId>>"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "name": "anf4-vol02-nfsv41",
-                            "usageThreshold": 107374182400,
-                            "protocolTypes": [
-                                "NFSv4.1"
-                            ],
-                            "exportPolicyRules": [
-                                {
-                                    "ruleIndex": 1,
-                                    "unixReadOnly": false,
-                                    "unixReadWrite": true,
-                                    "nfsv3": false,
-                                    "nfsv41": true,
-                                    "allowedClients": "0.0.0.0/0"
-                                }
-                            ],
-                            "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-004"
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-anfcp-x-002",
-                    "serviceLevel": "Premium",
-                    "size": 4398046511104,
-                    "volumes": [],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "tags": {
-            "value": {
-                "Environment": "Non-Prod",
-                "Contact": "test.user@testcompany.com",
-                "PurchaseOrder": "1234",
-                "CostCenter": "7890",
-                "ServiceName": "DeploymentValidation",
-                "Role": "DeploymentValidation"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json b/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
deleted file mode 100644
index f0a3b3a148..0000000000
--- a/modules/Microsoft.Network/applicationGateways/.parameters/parameters.json
+++ /dev/null
@@ -1,367 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-apgw-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "webApplicationFirewallConfiguration": {
-            "value": {
-                "enabled": true,
-                "firewallMode": "Detection",
-                "ruleSetType": "OWASP",
-                "ruleSetVersion": "3.0",
-                "disabledRuleGroups": [],
-                "requestBodyCheck": true,
-                "maxRequestBodySizeInKb": 128,
-                "fileUploadLimitInMb": 100
-            }
-        },
-        "enableHttp2": {
-            "value": true
-        },
-        "backendAddressPools": {
-            "value": [
-                {
-                    "name": "appServiceBackendPool",
-                    "properties": {
-                        "backendAddresses": [
-                            {
-                                "fqdn": "aghapp.azurewebsites.net"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "privateVmBackendPool",
-                    "properties": {
-                        "backendAddresses": [
-                            {
-                                "ipAddress": "10.0.0.4"
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
-        "backendHttpSettingsCollection": {
-            "value": [
-                {
-                    "name": "appServiceBackendHttpsSetting",
-                    "properties": {
-                        "port": 443,
-                        "protocol": "Https",
-                        "cookieBasedAffinity": "Disabled",
-                        "pickHostNameFromBackendAddress": true,
-                        "requestTimeout": 30
-                    }
-                },
-                {
-                    "name": "privateVmHttpSetting",
-                    "properties": {
-                        "port": 80,
-                        "protocol": "Http",
-                        "cookieBasedAffinity": "Disabled",
-                        "pickHostNameFromBackendAddress": false,
-                        "requestTimeout": 30,
-                        "probe": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/probes/privateVmHttpSettingProbe"
-                        }
-                    }
-                }
-            ]
-        },
-        "frontendIPConfigurations": {
-            "value": [
-                {
-                    "name": "private",
-                    "properties": {
-                        "privateIPAddress": "10.0.8.6",
-                        "privateIPAllocationMethod": "Static",
-                        "subnet": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-007"
-                        }
-                    }
-                },
-                {
-                    "name": "public",
-                    "properties": {
-                        "privateIPAllocationMethod": "Dynamic",
-                        "publicIPAddress": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-x-apgw"
-                        }
-                    }
-                }
-            ]
-        },
-        "frontendPorts": {
-            "value": [
-                {
-                    "name": "port443",
-                    "properties": {
-                        "port": 443
-                    }
-                },
-                {
-                    "name": "port4433",
-                    "properties": {
-                        "port": 4433
-                    }
-                },
-                {
-                    "name": "port80",
-                    "properties": {
-                        "port": 80
-                    }
-                },
-                {
-                    "name": "port8080",
-                    "properties": {
-                        "port": 8080
-                    }
-                }
-            ]
-        },
-        "httpListeners": {
-            "value": [
-                {
-                    "name": "public443",
-                    "properties": {
-                        "frontendIPConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendIPConfigurations/public"
-                        },
-                        "frontendPort": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendPorts/port443"
-                        },
-                        "sslCertificate": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/sslCertificates/<<namePrefix>>-az-apgw-x-001-ssl-certificate"
-                        },
-                        "protocol": "https",
-                        "hostNames": [],
-                        "requireServerNameIndication": false
-                    }
-                },
-                {
-                    "name": "private4433",
-                    "properties": {
-                        "frontendIPConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendIPConfigurations/private"
-                        },
-                        "frontendPort": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendPorts/port4433"
-                        },
-                        "sslCertificate": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/sslCertificates/<<namePrefix>>-az-apgw-x-001-ssl-certificate"
-                        },
-                        "protocol": "https",
-                        "hostNames": [],
-                        "requireServerNameIndication": false
-                    }
-                },
-                {
-                    "name": "httpRedirect80",
-                    "properties": {
-                        "frontendIPConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendIPConfigurations/public"
-                        },
-                        "frontendPort": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendPorts/port80"
-                        },
-                        "protocol": "Http",
-                        "hostNames": [],
-                        "requireServerNameIndication": false
-                    }
-                },
-                {
-                    "name": "httpRedirect8080",
-                    "properties": {
-                        "frontendIPConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendIPConfigurations/private"
-                        },
-                        "frontendPort": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/frontendPorts/port8080"
-                        },
-                        "protocol": "Http",
-                        "hostNames": [],
-                        "requireServerNameIndication": false
-                    }
-                }
-            ]
-        },
-        "gatewayIPConfigurations": {
-            "value": [
-                {
-                    "name": "apw-ip-configuration",
-                    "properties": {
-                        "subnet": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-007"
-                        }
-                    }
-                }
-            ]
-        },
-        "probes": {
-            "value": [
-                {
-                    "name": "privateVmHttpSettingProbe",
-                    "properties": {
-                        "protocol": "Http",
-                        "host": "10.0.0.4",
-                        "path": "/",
-                        "interval": 60,
-                        "timeout": 15,
-                        "unhealthyThreshold": 5,
-                        "pickHostNameFromBackendHttpSettings": false,
-                        "minServers": 3,
-                        "match": {
-                            "statusCodes": [
-                                "200",
-                                "401"
-                            ]
-                        }
-                    }
-                }
-            ]
-        },
-        "redirectConfigurations": {
-            "value": [
-                {
-                    "name": "httpRedirect80",
-                    "properties": {
-                        "redirectType": "Permanent",
-                        "targetListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/public443"
-                        },
-                        "includePath": true,
-                        "includeQueryString": true,
-                        "requestRoutingRules": [
-                            {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/requestRoutingRules/httpRedirect80-public443"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "httpRedirect8080",
-                    "properties": {
-                        "redirectType": "Permanent",
-                        "targetListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/private4433"
-                        },
-                        "includePath": true,
-                        "includeQueryString": true,
-                        "requestRoutingRules": [
-                            {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/requestRoutingRules/httpRedirect8080-private4433"
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
-        "requestRoutingRules": {
-            "value": [
-                {
-                    "name": "public443-appServiceBackendHttpsSetting-appServiceBackendHttpsSetting",
-                    "properties": {
-                        "ruleType": "Basic",
-                        "httpListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/public443"
-                        },
-                        "backendAddressPool": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/backendAddressPools/appServiceBackendPool"
-                        },
-                        "backendHttpSettings": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/backendHttpSettingsCollection/appServiceBackendHttpsSetting"
-                        }
-                    }
-                },
-                {
-                    "name": "private4433-privateVmHttpSetting-privateVmHttpSetting",
-                    "properties": {
-                        "ruleType": "Basic",
-                        "httpListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/private4433"
-                        },
-                        "backendAddressPool": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/backendAddressPools/privateVmBackendPool"
-                        },
-                        "backendHttpSettings": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/backendHttpSettingsCollection/privateVmHttpSetting"
-                        }
-                    }
-                },
-                {
-                    "name": "httpRedirect80-public443",
-                    "properties": {
-                        "ruleType": "Basic",
-                        "httpListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/httpRedirect80"
-                        },
-                        "redirectConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/redirectConfigurations/httpRedirect80"
-                        }
-                    }
-                },
-                {
-                    "name": "httpRedirect8080-private4433",
-                    "properties": {
-                        "ruleType": "Basic",
-                        "httpListener": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/httpListeners/httpRedirect8080"
-                        },
-                        "redirectConfiguration": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationGateways/<<namePrefix>>-az-apgw-x-001/redirectConfigurations/httpRedirect8080"
-                        }
-                    }
-                }
-            ]
-        },
-        "sku": {
-            "value": "WAF_v2"
-        },
-        "sslCertificates": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-apgw-x-001-ssl-certificate",
-                    "properties": {
-                        "keyVaultSecretId": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/secrets/applicationGatewaySslCertificate"
-                    }
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
deleted file mode 100644
index 8bfef178fc..0000000000
--- a/modules/Microsoft.Network/applicationSecurityGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-asg-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
deleted file mode 100644
index bd881f7897..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.parameters/addpip.parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fw-add-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-add-azfw"
-        },
-        "additionalPublicIpConfigurations": {
-            "value": [
-                {
-                    "name": "ipConfig01",
-                    "publicIPAddressResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-additional-fw"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
deleted file mode 100644
index 68a1ce42cd..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.parameters/custompip.parameters.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fw-custompip-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-custompip-azfw"
-        },
-        "publicIPAddressObject": {
-            "value": {
-                "name": "adp-<<namePrefix>>-az-pip-custom-x-fw",
-                "publicIPPrefixResourceId": "",
-                "publicIPAllocationMethod": "Static",
-                "skuName": "Standard",
-                "skuTier": "Regional",
-                "roleAssignments": [
-                    {
-                        "roleDefinitionIdOrName": "Reader",
-                        "principalIds": [
-                            "<<deploymentSpId>>"
-                        ]
-                    }
-                ],
-                "diagnosticMetricsToEnable": [
-                    "AllMetrics"
-                ],
-                "diagnosticLogCategoriesToEnable": [
-                    "DDoSProtectionNotifications",
-                    "DDoSMitigationFlowLogs",
-                    "DDoSMitigationReports"
-                ]
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
deleted file mode 100644
index 56f60cdaca..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fw-min-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-min-azfw"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json b/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
deleted file mode 100644
index 6f0a85edea..0000000000
--- a/modules/Microsoft.Network/azureFirewalls/.parameters/parameters.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fw-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "zones": {
-            "value": [
-                "1",
-                "2",
-                "3"
-            ]
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-azfw"
-        },
-        "azureFirewallSubnetPublicIpId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-x-fw"
-        },
-        "applicationRuleCollections": {
-            "value": [
-                {
-                    "name": "allow-app-rules",
-                    "properties": {
-                        "priority": 100,
-                        "action": {
-                            "type": "allow"
-                        },
-                        "rules": [
-                            {
-                                "name": "allow-ase-tags",
-                                "sourceAddresses": [
-                                    "*"
-                                ],
-                                "protocols": [
-                                    {
-                                        "protocolType": "HTTP",
-                                        "port": "80"
-                                    },
-                                    {
-                                        "protocolType": "HTTPS",
-                                        "port": "443"
-                                    }
-                                ],
-                                "fqdnTags": [
-                                    "AppServiceEnvironment",
-                                    "WindowsUpdate"
-                                ]
-                            },
-                            {
-                                "name": "allow-ase-management",
-                                "sourceAddresses": [
-                                    "*"
-                                ],
-                                "protocols": [
-                                    {
-                                        "protocolType": "HTTP",
-                                        "port": "80"
-                                    },
-                                    {
-                                        "protocolType": "HTTPS",
-                                        "port": "443"
-                                    }
-                                ],
-                                "targetFqdns": [
-                                    "management.azure.com"
-                                ]
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
-        "networkRuleCollections": {
-            "value": [
-                {
-                    "name": "allow-network-rules",
-                    "properties": {
-                        "priority": 100,
-                        "action": {
-                            "type": "allow"
-                        },
-                        "rules": [
-                            {
-                                "name": "allow-ntp",
-                                "sourceAddresses": [
-                                    "*"
-                                ],
-                                "destinationAddresses": [
-                                    "*"
-                                ],
-                                "destinationPorts": [
-                                    "123",
-                                    "12000"
-                                ],
-                                "protocols": [
-                                    "Any"
-                                ]
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
deleted file mode 100644
index 7c82650737..0000000000
--- a/modules/Microsoft.Network/bastionHosts/.parameters/addpip.parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bas-add-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-add-bas"
-        },
-        "additionalPublicIpConfigurations": {
-            "value": [
-                {
-                    "name": "ipConfig01",
-                    "publicIPAddressResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-additional-bas"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
deleted file mode 100644
index dbb195e70f..0000000000
--- a/modules/Microsoft.Network/bastionHosts/.parameters/custompip.parameters.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bas-custompip-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-custompip-bas"
-        },
-        "publicIPAddressObject": {
-            "value": {
-                "name": "adp-<<namePrefix>>-az-pip-custom-x-bas",
-                "publicIPPrefixResourceId": "",
-                "publicIPAllocationMethod": "Static",
-                "skuName": "Standard",
-                "skuTier": "Regional",
-                "roleAssignments": [
-                    {
-                        "roleDefinitionIdOrName": "Reader",
-                        "principalIds": [
-                            "<<deploymentSpId>>"
-                        ]
-                    }
-                ],
-                "diagnosticMetricsToEnable": [
-                    "AllMetrics"
-                ],
-                "diagnosticLogCategoriesToEnable": [
-                    "DDoSProtectionNotifications",
-                    "DDoSMitigationFlowLogs",
-                    "DDoSMitigationReports"
-                ]
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
deleted file mode 100644
index 6ef38853fb..0000000000
--- a/modules/Microsoft.Network/bastionHosts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bas-min-001"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-002"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json b/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
deleted file mode 100644
index 0f0cf18c07..0000000000
--- a/modules/Microsoft.Network/bastionHosts/.parameters/parameters.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-bas-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "vNetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001"
-        },
-        "azureBastionSubnetPublicIpId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-x-bas"
-        },
-        "skuType": {
-            "value": "Standard"
-        },
-        "scaleUnits": {
-            "value": 4
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
deleted file mode 100644
index c58d1a4593..0000000000
--- a/modules/Microsoft.Network/connections/.parameters/vnet2vnet.parameters.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vnetgwc-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "virtualNetworkGateway1": {
-            "value": {
-                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<<namePrefix>>-az-vnet-vpn-gw-p-001"
-            }
-        },
-        "virtualNetworkGateway2": {
-            "value": {
-                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<<namePrefix>>-az-vnet-vpn-gw-p-002"
-            }
-        },
-        "vpnSharedKey": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "vpnSharedKey"
-            }
-        },
-        "virtualNetworkGatewayConnectionType": {
-            "value": "Vnet2Vnet"
-        },
-        "enableBgp": {
-            "value": false
-        },
-        "location": {
-            "value": "eastus"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json b/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
deleted file mode 100644
index fe639affc6..0000000000
--- a/modules/Microsoft.Network/ddosProtectionPlans/.parameters/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ddos-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json b/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
deleted file mode 100644
index fa4209859e..0000000000
--- a/modules/Microsoft.Network/expressRouteCircuits/.parameters/parameters.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-erc-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "serviceProviderName": {
-            "value": "Equinix"
-        },
-        "peeringLocation": {
-            "value": "Amsterdam"
-        },
-        "bandwidthInMbps": {
-            "value": 50
-        },
-        "skuTier": {
-            "value": "Standard"
-        },
-        "skuFamily": {
-            "value": "MeteredData"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
deleted file mode 100644
index bb555089ed..0000000000
--- a/modules/Microsoft.Network/firewallPolicies/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fwpol-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json b/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
deleted file mode 100644
index 67e03ad34e..0000000000
--- a/modules/Microsoft.Network/firewallPolicies/.parameters/parameters.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fwpol-x-002"
-        },
-        "ruleCollectionGroups": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-rule-001",
-                    "priority": 5000,
-                    "ruleCollections": [
-                        {
-                            "name": "collection002",
-                            "priority": 5555,
-                            "action": {
-                                "type": "Allow"
-                            },
-                            "rules": [
-                                {
-                                    "name": "rule002",
-                                    "ipProtocols": [
-                                        "TCP",
-                                        "UDP"
-                                    ],
-                                    "destinationPorts": [
-                                        "80"
-                                    ],
-                                    "sourceAddresses": [
-                                        "*"
-                                    ],
-                                    "sourceIpGroups": [],
-                                    "ruleType": "NetworkRule",
-                                    "destinationIpGroups": [],
-                                    "destinationAddresses": [
-                                        "*"
-                                    ],
-                                    "destinationFqdns": []
-                                }
-                            ],
-                            "ruleCollectionType": "FirewallPolicyFilterRuleCollection"
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/frontDoors/.parameters/parameters.json b/modules/Microsoft.Network/frontDoors/.parameters/parameters.json
deleted file mode 100644
index e52cca17f9..0000000000
--- a/modules/Microsoft.Network/frontDoors/.parameters/parameters.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fd-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "backendPools": {
-            "value": [
-                {
-                    "name": "backendPool",
-                    "properties": {
-                        "backends": [
-                            {
-                                "address": "biceptest.local",
-                                "backendHostHeader": "backendAddress",
-                                "httpPort": 80,
-                                "httpsPort": 443,
-                                "weight": 50,
-                                "priority": 1,
-                                "enabledState": "Enabled",
-                                "privateLinkAlias": "",
-                                "privateLinkApprovalMessage": "",
-                                "privateLinkLocation": "",
-                                "privateLinkResourceId": ""
-                            }
-                        ],
-                        "LoadBalancingSettings": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/frontDoors/<<namePrefix>>-az-fd-x-001/LoadBalancingSettings/loadBalancer"
-                        },
-                        "HealthProbeSettings": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/frontDoors/<<namePrefix>>-az-fd-x-001/HealthProbeSettings/heathProbe"
-                        }
-                    }
-                }
-            ]
-        },
-        "enforceCertificateNameCheck": {
-            "value": "Disabled"
-        },
-        "sendRecvTimeoutSeconds": {
-            "value": 10
-        },
-        "frontendEndpoints": {
-            "value": [
-                {
-                    "name": "frontEnd",
-                    "properties": {
-                        "hostName": "<<namePrefix>>-az-fd-x-001.azurefd.net",
-                        "sessionAffinityEnabledState": "Disabled",
-                        "sessionAffinityTtlSeconds": 60
-                    }
-                }
-            ]
-        },
-        "healthProbeSettings": {
-            "value": [
-                {
-                    "name": "heathProbe",
-                    "properties": {
-                        "enabledState": "",
-                        "healthProbeMethod": "",
-                        "intervalInSeconds": 60,
-                        "path": "/",
-                        "protocol": "Https"
-                    }
-                }
-            ]
-        },
-        "loadBalancingSettings": {
-            "value": [
-                {
-                    "name": "loadBalancer",
-                    "properties": {
-                        "additionalLatencyMilliseconds": 0,
-                        "sampleSize": 50,
-                        "successfulSamplesRequired": 1
-                    }
-                }
-            ]
-        },
-        "routingRules": {
-            "value": [
-                {
-                    "name": "routingRule",
-                    "properties": {
-                        "acceptedProtocols": [
-                            "Http",
-                            "Https"
-                        ],
-                        "enabledState": "Enabled",
-                        "frontendEndpoints": [
-                            {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/frontDoors/<<namePrefix>>-az-fd-x-001/FrontendEndpoints/frontEnd"
-                            }
-                        ],
-                        "patternsToMatch": [
-                            "/*"
-                        ],
-                        "routeConfiguration": {
-                            "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration",
-                            "forwardingProtocol": "MatchRequest",
-                            "backendPool": {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/frontDoors/<<namePrefix>>-az-fd-x-001/BackendPools/backendPool"
-                            }
-                        }
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/ipGroups/.parameters/parameters.json b/modules/Microsoft.Network/ipGroups/.parameters/parameters.json
deleted file mode 100644
index b30fd0db80..0000000000
--- a/modules/Microsoft.Network/ipGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "iacsGroup-servers"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "ipAddresses": {
-            "value": [
-                "10.0.0.1",
-                "10.0.0.2"
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
deleted file mode 100644
index 4c3ffb022f..0000000000
--- a/modules/Microsoft.Network/loadBalancers/.parameters/internal.parameters.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lb-internal-001"
-        },
-        "loadBalancerSku": {
-            "value": "Standard"
-        },
-        "frontendIPConfigurations": {
-            "value": [
-                {
-                    "name": "privateIPConfig1",
-                    "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001"
-                }
-            ]
-        },
-        "backendAddressPools": {
-            "value": [
-                {
-                    "name": "servers"
-                }
-            ]
-        },
-        "probes": {
-            "value": [
-                {
-                    "name": "probe1",
-                    "protocol": "Tcp",
-                    "port": "62000",
-                    "intervalInSeconds": 5,
-                    "numberOfProbes": 2
-                }
-            ]
-        },
-        "loadBalancingRules": {
-            "value": [
-                {
-                    "name": "privateIPLBRule1",
-                    "frontendIPConfigurationName": "privateIPConfig1",
-                    "frontendPort": 0,
-                    "backendPort": 0,
-                    "enableFloatingIP": true,
-                    "idleTimeoutInMinutes": 4,
-                    "protocol": "All",
-                    "loadDistribution": "Default",
-                    "probeName": "probe1",
-                    "disableOutboundSnat": true,
-                    "enableTcpReset": false,
-                    "backendAddressPoolName": "servers"
-                }
-            ]
-        },
-        "inboundNatRules": {
-            "value": [
-                {
-                    "name": "inboundNatRule1",
-                    "frontendIPConfigurationName": "privateIPConfig1",
-                    "frontendPort": 443,
-                    "backendPort": 443,
-                    "enableFloatingIP": false,
-                    "idleTimeoutInMinutes": 4,
-                    "protocol": "Tcp",
-                    "enableTcpReset": false
-                },
-                {
-                    "name": "inboundNatRule2",
-                    "frontendIPConfigurationName": "privateIPConfig1",
-                    "frontendPort": 3389,
-                    "backendPort": 3389
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
deleted file mode 100644
index 695027dc9f..0000000000
--- a/modules/Microsoft.Network/loadBalancers/.parameters/min.parameters.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lb-min-001"
-        },
-        "frontendIPConfigurations": {
-            "value": [
-                {
-                    "name": "publicIPConfig1",
-                    "publicIPAddressId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-min-lb"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json b/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
deleted file mode 100644
index df44d93edf..0000000000
--- a/modules/Microsoft.Network/loadBalancers/.parameters/parameters.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lb-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "frontendIPConfigurations": {
-            "value": [
-                {
-                    "name": "publicIPConfig1",
-                    "publicIPAddressId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-x-lb"
-                }
-            ]
-        },
-        "backendAddressPools": {
-            "value": [
-                {
-                    "name": "backendAddressPool1"
-                },
-                {
-                    "name": "backendAddressPool2"
-                }
-            ]
-        },
-        "loadBalancingRules": {
-            "value": [
-                {
-                    "name": "publicIPLBRule1",
-                    "frontendIPConfigurationName": "publicIPConfig1",
-                    "frontendPort": 80,
-                    "backendPort": 80,
-                    "enableFloatingIP": false,
-                    "idleTimeoutInMinutes": 5,
-                    "protocol": "Tcp",
-                    "enableTcpReset": false,
-                    "loadDistribution": "Default",
-                    "disableOutboundSnat": true,
-                    "probeName": "probe1",
-                    "backendAddressPoolName": "backendAddressPool1"
-                },
-                {
-                    "name": "publicIPLBRule2",
-                    "frontendIPConfigurationName": "publicIPConfig1",
-                    "frontendPort": 8080,
-                    "backendPort": 8080,
-                    "loadDistribution": "Default",
-                    "probeName": "probe2",
-                    "backendAddressPoolName": "backendAddressPool2"
-                }
-            ]
-        },
-        "inboundNatRules": {
-            "value": [
-                {
-                    "name": "inboundNatRule1",
-                    "frontendIPConfigurationName": "publicIPConfig1",
-                    "frontendPort": 443,
-                    "backendPort": 443,
-                    "enableFloatingIP": false,
-                    "idleTimeoutInMinutes": 4,
-                    "protocol": "Tcp",
-                    "enableTcpReset": false
-                },
-                {
-                    "name": "inboundNatRule2",
-                    "frontendIPConfigurationName": "publicIPConfig1",
-                    "frontendPort": 3389,
-                    "backendPort": 3389
-                }
-            ]
-        },
-        "outboundRules": {
-            "value": [
-                {
-                    "name": "outboundRule1",
-                    "frontendIPConfigurationName": "publicIPConfig1",
-                    "backendAddressPoolName": "backendAddressPool1",
-                    "allocatedOutboundPorts": 63984
-                }
-            ]
-        },
-        "probes": {
-            "value": [
-                {
-                    "name": "probe1",
-                    "protocol": "Tcp",
-                    "port": 80,
-                    "intervalInSeconds": 10,
-                    "numberOfProbes": 5
-                },
-                {
-                    "name": "probe2",
-                    "protocol": "Https",
-                    "port": 443,
-                    "requestPath": "/"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json b/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
deleted file mode 100644
index f2d289d373..0000000000
--- a/modules/Microsoft.Network/localNetworkGateways/.parameters/parameters.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lng-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "localAddressPrefixes": {
-            "value": [
-                "192.168.1.0/24"
-            ]
-        },
-        "localGatewayPublicIpAddress": {
-            "value": "8.8.8.8"
-        },
-        "localAsn": {
-            "value": "65123"
-        },
-        "localBgpPeeringAddress": {
-            "value": "192.168.1.5"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/natGateways/.parameters/parameters.json b/modules/Microsoft.Network/natGateways/.parameters/parameters.json
deleted file mode 100644
index ec9c2014d9..0000000000
--- a/modules/Microsoft.Network/natGateways/.parameters/parameters.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ngw-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "natGatewayPublicIpAddress": {
-            "value": true
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
deleted file mode 100644
index 9fe27817ce..0000000000
--- a/modules/Microsoft.Network/networkInterfaces/.parameters/min.parameters.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-nic-min-001"
-        },
-        "ipConfigurations": {
-            "value": [
-                {
-                    "name": "ipconfig01",
-                    "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json b/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
deleted file mode 100644
index b0cc8d9757..0000000000
--- a/modules/Microsoft.Network/networkInterfaces/.parameters/parameters.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-nic-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "ipConfigurations": {
-            "value": [
-                {
-                    "name": "ipconfig01",
-                    "subnetId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                    "loadBalancerBackendAddressPools": [
-                        {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/loadBalancers/adp-<<namePrefix>>-az-lb-internal-001/backendAddressPools/servers"
-                        }
-                    ],
-                    "applicationSecurityGroups": [
-                        {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
-                        }
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
deleted file mode 100644
index b07946467a..0000000000
--- a/modules/Microsoft.Network/networkSecurityGroups/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-nsg-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json b/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
deleted file mode 100644
index 26cbb1eb56..0000000000
--- a/modules/Microsoft.Network/networkSecurityGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-nsg-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "securityRules": {
-            "value": [
-                {
-                    "name": "Specific",
-                    "properties": {
-                        "description": "Tests specific IPs and ports",
-                        "protocol": "*",
-                        "sourcePortRange": "*",
-                        "destinationPortRange": "8080",
-                        "sourceAddressPrefix": "*",
-                        "destinationAddressPrefix": "*",
-                        "access": "Allow",
-                        "priority": 100,
-                        "direction": "Inbound"
-                    }
-                },
-                {
-                    "name": "Ranges",
-                    "properties": {
-                        "description": "Tests Ranges",
-                        "protocol": "*",
-                        "access": "Allow",
-                        "priority": 101,
-                        "direction": "Inbound",
-                        "sourcePortRanges": [
-                            "80",
-                            "81"
-                        ],
-                        "destinationPortRanges": [
-                            "90",
-                            "91"
-                        ],
-                        "sourceAddressPrefixes": [
-                            "10.0.0.0/16",
-                            "10.1.0.0/16"
-                        ],
-                        "destinationAddressPrefixes": [
-                            "10.2.0.0/16",
-                            "10.3.0.0/16"
-                        ]
-                    }
-                },
-                {
-                    "name": "Port_8082",
-                    "properties": {
-                        "description": "Allow inbound access on TCP 8082",
-                        "protocol": "*",
-                        "sourcePortRange": "*",
-                        "destinationPortRange": "8082",
-                        "access": "Allow",
-                        "priority": 102,
-                        "direction": "Inbound",
-                        "sourceApplicationSecurityGroups": [
-                            {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
-                            }
-                        ],
-                        "destinationApplicationSecurityGroups": [
-                            {
-                                "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
-                            }
-                        ]
-                    }
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
deleted file mode 100644
index 78acbb0c7e..0000000000
--- a/modules/Microsoft.Network/networkWatchers/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "location": {
-            "value": "northeurope"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json b/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
deleted file mode 100644
index 78a7e1f272..0000000000
--- a/modules/Microsoft.Network/networkWatchers/.parameters/parameters.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "adp-<<namePrefix>>-az-nw-x-001"
-        },
-        "flowLogs": {
-            "value": [
-                {
-                    "targetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/networkSecurityGroups/adp-<<namePrefix>>-az-nsg-x-001",
-                    "storageId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                    "enabled": false
-                },
-                {
-                    "name": "adp-<<namePrefix>>-az-nsg-x-apgw-flowlog",
-                    "targetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/networkSecurityGroups/adp-<<namePrefix>>-az-nsg-x-apgw",
-                    "storageId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                    "workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                    "formatVersion": 1,
-                    "trafficAnalyticsInterval": 10,
-                    "retentionInDays": 8
-                }
-            ]
-        },
-        "connectionMonitors": {
-            "value": [
-                {
-                    "name": "adp-<<namePrefix>>-az-conn-mon-x-001",
-                    "endpoints": [
-                        {
-                            "name": "<<namePrefix>>-az-subnet-x-001(validation-rg)",
-                            "type": "AzureVM",
-                            "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/virtualMachines/adp-<<namePrefix>>-vm-01"
-                        },
-                        {
-                            "name": "Office Portal",
-                            "type": "ExternalAddress",
-                            "address": "www.office.com"
-                        }
-                    ],
-                    "testConfigurations": [
-                        {
-                            "name": "HTTP Test",
-                            "testFrequencySec": 30,
-                            "protocol": "Http",
-                            "httpConfiguration": {
-                                "port": 80,
-                                "method": "Get",
-                                "requestHeaders": [],
-                                "validStatusCodeRanges": [
-                                    "200"
-                                ],
-                                "preferHTTPS": false
-                            },
-                            "successThreshold": {
-                                "checksFailedPercent": 5,
-                                "roundTripTimeMs": 100
-                            }
-                        }
-                    ],
-                    "testGroups": [
-                        {
-                            "name": "TestHTTPBing",
-                            "disable": false,
-                            "testConfigurations": [
-                                "HTTP Test"
-                            ],
-                            "sources": [
-                                "<<namePrefix>>-az-subnet-x-001(validation-rg)"
-                            ],
-                            "destinations": [
-                                "Office Portal"
-                            ]
-                        }
-                    ],
-                    "workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
deleted file mode 100644
index d33fbd032b..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-privdns-x-001.com"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json b/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
deleted file mode 100644
index 8b3662c1ee..0000000000
--- a/modules/Microsoft.Network/privateDnsZones/.parameters/parameters.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-privdns-x-002.com"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "AAAA": {
-            "value": [
-                {
-                    "name": "AAAA_2001_0db8_85a3_0000_0000_8a2e_0370_7334",
-                    "ttl": 3600,
-                    "aaaaRecords": [
-                        {
-                            "ipv6Address": "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
-                        }
-                    ]
-                }
-            ]
-        },
-        "A": {
-            "value": [
-                {
-                    "name": "A_10.240.4.4",
-                    "ttl": 3600,
-                    "aRecords": [
-                        {
-                            "ipv4Address": "10.240.4.4"
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "CNAME": {
-            "value": [
-                {
-                    "name": "CNAME_test",
-                    "ttl": 3600,
-                    "cnameRecord": {
-                        "cname": "test"
-                    },
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "MX": {
-            "value": [
-                {
-                    "name": "MX_contoso",
-                    "ttl": 3600,
-                    "mxRecords": [
-                        {
-                            "exchange": "contoso.com",
-                            "preference": 100
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "PTR": {
-            "value": [
-                {
-                    "name": "PTR_contoso",
-                    "ttl": 3600,
-                    "ptrRecords": [
-                        {
-                            "ptrdname": "contoso.com"
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "SOA": {
-            "value": [
-                {
-                    "name": "@",
-                    "ttl": 3600,
-                    "soaRecord": {
-                        "email": "azureprivatedns-host.microsoft.com",
-                        "expireTime": 2419200,
-                        "host": "azureprivatedns.net",
-                        "minimumTtl": 10,
-                        "refreshTime": 3600,
-                        "retryTime": 300,
-                        "serialNumber": "1"
-                    },
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "SRV": {
-            "value": [
-                {
-                    "name": "SRV_contoso",
-                    "ttl": 3600,
-                    "srvRecords": [
-                        {
-                            "port": 9332,
-                            "priority": 0,
-                            "target": "test.contoso.com",
-                            "weight": 0
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "TXT": {
-            "value": [
-                {
-                    "name": "TXT_test",
-                    "ttl": 3600,
-                    "txtRecords": [
-                        {
-                            "value": [
-                                "test"
-                            ]
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "virtualNetworkLinks": {
-            "value": [
-                {
-                    "virtualNetworkResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001",
-                    "registrationEnabled": true
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
deleted file mode 100644
index aa3ea8eba2..0000000000
--- a/modules/Microsoft.Network/privateEndpoints/.parameters/min.parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-pe-kvlt-min-001"
-        },
-        "subnetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints"
-        },
-        "serviceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-pe"
-        },
-        "groupIds": {
-            "value": [
-                "vault"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json b/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
deleted file mode 100644
index eff507a0b2..0000000000
--- a/modules/Microsoft.Network/privateEndpoints/.parameters/parameters.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-pe-kvlt-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "subnetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints"
-        },
-        "serviceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-pe"
-        },
-        "groupIds": {
-            "value": [
-                "vault"
-            ]
-        },
-        "privateDnsZoneGroups": {
-            "value": [
-                {
-                    "privateDNSResourceIds": [
-                        "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
deleted file mode 100644
index 9a95bc279f..0000000000
--- a/modules/Microsoft.Network/publicIPAddresses/.parameters/parameters.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-pip-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "skuName": {
-            "value": "Standard"
-        },
-        "publicIPAllocationMethod": {
-            "value": "Static"
-        },
-        "zones": {
-            "value": [
-                "1",
-                "2",
-                "3"
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json b/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
deleted file mode 100644
index 4367694850..0000000000
--- a/modules/Microsoft.Network/publicIPPrefixes/.parameters/parameters.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-pippfx-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "prefixLength": {
-            "value": 28
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/routeTables/.parameters/parameters.json b/modules/Microsoft.Network/routeTables/.parameters/parameters.json
deleted file mode 100644
index 65fa5d2d91..0000000000
--- a/modules/Microsoft.Network/routeTables/.parameters/parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-udr-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "routes": {
-            "value": [
-                {
-                    "name": "default",
-                    "properties": {
-                        "addressPrefix": "0.0.0.0/0",
-                        "nextHopType": "VirtualAppliance",
-                        "nextHopIpAddress": "172.16.0.20"
-                    }
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json b/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
deleted file mode 100644
index 220f646c39..0000000000
--- a/modules/Microsoft.Network/trafficmanagerprofiles/.parameters/parameters.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "tm-000001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "relativeName": {
-            "value": "tm-000001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
deleted file mode 100644
index dbe2fa650a..0000000000
--- a/modules/Microsoft.Network/virtualHubs/.parameters/min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vhub-min-001"
-        },
-        "addressPrefix": {
-            "value": "10.0.0.0/16"
-        },
-        "virtualWanId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<<namePrefix>>-az-vw-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json b/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
deleted file mode 100644
index 2660f1be93..0000000000
--- a/modules/Microsoft.Network/virtualHubs/.parameters/parameters.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vhub-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "addressPrefix": {
-            "value": "10.1.0.0/16"
-        },
-        "virtualWanId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<<namePrefix>>-az-vw-x-001"
-        },
-        "hubRouteTables": {
-            "value": [
-                {
-                    "name": "routeTable1"
-                }
-            ]
-        },
-        "hubVirtualNetworkConnections": {
-            "value": [
-                {
-                    "name": "connection1",
-                    "remoteVirtualNetworkId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-vhub",
-                    "routingConfiguration": {
-                        "associatedRouteTable": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vHub-x-001/hubRouteTables/routeTable1"
-                        },
-                        "propagatedRouteTables": {
-                            "ids": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vHub-x-001/hubRouteTables/routeTable1"
-                                }
-                            ],
-                            "labels": [
-                                "none"
-                            ]
-                        }
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
deleted file mode 100644
index 3de5a1f41f..0000000000
--- a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/expressRoute.parameters.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-gw-er-001"
-        },
-        "gatewayPipName": {
-            "value": "<<namePrefix>>-az-gw-er-001-pip"
-        },
-        "domainNameLabel": {
-            "value": [
-                "<<namePrefix>>-az-gw-er-dm-001"
-            ]
-        },
-        "virtualNetworkGatewayType": {
-            "value": "ExpressRoute"
-        },
-        "virtualNetworkGatewaySku": {
-            "value": "ErGw1AZ"
-        },
-        "vNetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001"
-        },
-        "tags": {
-            "value": {
-                "Environment": "Validation",
-                "Contact": "test.user@testcompany.com",
-                "PurchaseOrder": "",
-                "CostCenter": "",
-                "ServiceName": "DeploymentValidation",
-                "Role": "DeploymentValidation"
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json b/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
deleted file mode 100644
index cf037dc7e9..0000000000
--- a/modules/Microsoft.Network/virtualNetworkGateways/.parameters/vpn.parameters.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-gw-vpn-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "domainNameLabel": {
-            "value": [
-                "<<namePrefix>>-az-gw-vpn-dm-001"
-            ]
-        },
-        "virtualNetworkGatewayType": {
-            "value": "Vpn"
-        },
-        "virtualNetworkGatewaySku": {
-            "value": "VpnGw1AZ"
-        },
-        "publicIpZones": {
-            "value": [
-                "1"
-            ]
-        },
-        "vpnType": {
-            "value": "RouteBased"
-        },
-        "activeActive": {
-            "value": true
-        },
-        "vNetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
deleted file mode 100644
index 2d50642770..0000000000
--- a/modules/Microsoft.Network/virtualNetworks/.parameters/min.parameters.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vnet-min-001"
-        },
-        "addressPrefixes": {
-            "value": [
-                "10.0.0.0/16"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
deleted file mode 100644
index 6cb5292ceb..0000000000
--- a/modules/Microsoft.Network/virtualNetworks/.parameters/parameters.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vnet-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "addressPrefixes": {
-            "value": [
-                "10.0.0.0/16"
-            ]
-        },
-        "subnets": {
-            "value": [
-                {
-                    "name": "GatewaySubnet",
-                    "addressPrefix": "10.0.255.0/24"
-                },
-                {
-                    "name": "<<namePrefix>>-az-subnet-x-001",
-                    "addressPrefix": "10.0.0.0/24",
-                    "networkSecurityGroupId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/networkSecurityGroups/adp-<<namePrefix>>-az-nsg-x-001",
-                    "serviceEndpoints": [
-                        {
-                            "service": "Microsoft.Storage"
-                        },
-                        {
-                            "service": "Microsoft.Sql"
-                        }
-                    ],
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ],
-                    "routeTableId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/routeTables/adp-<<namePrefix>>-az-udr-x-001"
-                },
-                {
-                    "name": "<<namePrefix>>-az-subnet-x-002",
-                    "addressPrefix": "10.0.3.0/24",
-                    "delegations": [
-                        {
-                            "name": "netappDel",
-                            "properties": {
-                                "serviceName": "Microsoft.Netapp/volumes"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "name": "<<namePrefix>>-az-subnet-x-003",
-                    "addressPrefix": "10.0.6.0/24",
-                    "privateEndpointNetworkPolicies": "Disabled",
-                    "privateLinkServiceNetworkPolicies": "Enabled"
-                }
-            ]
-        },
-        "dnsServers": {
-            "value": [
-                "10.0.1.4",
-                "10.0.1.5"
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json b/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
deleted file mode 100644
index f8faae3175..0000000000
--- a/modules/Microsoft.Network/virtualNetworks/.parameters/vnetPeering.parameters.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vnet-peer-001"
-        },
-        "addressPrefixes": {
-            "value": [
-                "10.0.0.0/24"
-            ]
-        },
-        "subnets": {
-            "value": [
-                {
-                    "name": "GatewaySubnet",
-                    "addressPrefix": "10.0.0.0/26"
-                }
-            ]
-        },
-        "virtualNetworkPeerings": {
-            "value": [
-                {
-                    "remoteVirtualNetworkId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-peer01",
-                    "allowForwardedTraffic": true,
-                    "allowGatewayTransit": false,
-                    "allowVirtualNetworkAccess": true,
-                    "useRemoteGateways": false,
-                    "remotePeeringEnabled": true,
-                    "remotePeeringName": "customName",
-                    "remotePeeringAllowVirtualNetworkAccess": true,
-                    "remotePeeringAllowForwardedTraffic": true
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
deleted file mode 100644
index badddffd7e..0000000000
--- a/modules/Microsoft.Network/virtualWans/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vw-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/virtualWans/.parameters/parameters.json b/modules/Microsoft.Network/virtualWans/.parameters/parameters.json
deleted file mode 100644
index 15f8aa96f5..0000000000
--- a/modules/Microsoft.Network/virtualWans/.parameters/parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vw-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "type": {
-            "value": "Basic"
-        },
-        "allowBranchToBranchTraffic": {
-            "value": true
-        },
-        "allowVnetToVnetTraffic": {
-            "value": true
-        },
-        "disableVpnEncryption": {
-            "value": true
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
deleted file mode 100644
index 4ed3a736e6..0000000000
--- a/modules/Microsoft.Network/vpnGateways/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vpngw-min-001"
-        },
-        "virtualHubResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vhub-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json b/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
deleted file mode 100644
index 620e1c6ff7..0000000000
--- a/modules/Microsoft.Network/vpnGateways/.parameters/parameters.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vpngw-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "virtualHubResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vhub-x-001"
-        },
-        "bgpSettings": {
-            "value": {
-                "asn": 65515,
-                "peerWeight": 0
-            }
-        },
-        "connections": {
-            "value": [
-                {
-                    "name": "Connection-<<namePrefix>>-az-vsite-x-001",
-                    "connectionBandwidth": 10,
-                    "enableBgp": true,
-                    "routingConfiguration": {
-                        "associatedRouteTable": {
-                            "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vhub-x-001/hubRouteTables/defaultRouteTable"
-                        },
-                        "propagatedRouteTables": {
-                            "labels": [
-                                "default"
-                            ],
-                            "ids": [
-                                {
-                                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<<namePrefix>>-az-vhub-x-001/hubRouteTables/defaultRouteTable"
-                                }
-                            ]
-                        },
-                        "vnetRoutes": {
-                            "staticRoutes": []
-                        }
-                    },
-                    "remoteVpnSiteResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/vpnSites/<<namePrefix>>-az-vsite-x-001"
-                }
-            ]
-        },
-        "natRules": {
-            "value": [
-                {
-                    "name": "natRule1",
-                    "internalMappings": [
-                        {
-                            "addressSpace": "10.4.0.0/24"
-                        }
-                    ],
-                    "externalMappings": [
-                        {
-                            "addressSpace": "192.168.21.0/24"
-                        }
-                    ],
-                    "type": "Static",
-                    "mode": "EgressSnat"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
deleted file mode 100644
index 24791e0339..0000000000
--- a/modules/Microsoft.Network/vpnSites/.parameters/min.parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vSite-min-001"
-        },
-        "addressPrefixes": {
-            "value": [
-                "10.0.0.0/16"
-            ]
-        },
-        "ipAddress": {
-            "value": "1.2.3.4"
-        },
-        "virtualWanId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/apd-<<namePrefix>>-az-vw-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Network/vpnSites/.parameters/parameters.json b/modules/Microsoft.Network/vpnSites/.parameters/parameters.json
deleted file mode 100644
index 94c534c5e4..0000000000
--- a/modules/Microsoft.Network/vpnSites/.parameters/parameters.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-vSite-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "tags": {
-            "value": {
-                "tagA": "valueA",
-                "tagB": "valueB"
-            }
-        },
-        "deviceProperties": {
-            "value": {
-                "linkSpeedInMbps": 0
-            }
-        },
-        "virtualWanId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/apd-<<namePrefix>>-az-vw-x-001"
-        },
-        "vpnSiteLinks": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-vSite-x-001",
-                    "properties": {
-                        "bgpProperties": {
-                            "asn": 65010,
-                            "bgpPeeringAddress": "1.1.1.1"
-                        },
-                        "ipAddress": "1.2.3.4",
-                        "linkProperties": {
-                            "linkProviderName": "contoso",
-                            "linkSpeedInMbps": 5
-                        }
-                    }
-                },
-                {
-                    "name": "Link1",
-                    "properties": {
-                        "bgpProperties": {
-                            "asn": 65020,
-                            "bgpPeeringAddress": "192.168.1.0"
-                        },
-                        "ipAddress": "2.2.2.2",
-                        "linkProperties": {
-                            "linkProviderName": "contoso",
-                            "linkSpeedInMbps": 5
-                        }
-                    }
-                }
-            ]
-        },
-        "o365Policy": {
-            "value": {
-                "breakOutCategories": {
-                    "optimize": true,
-                    "allow": true,
-                    "default": true
-                }
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
deleted file mode 100644
index 97fc2fafe4..0000000000
--- a/modules/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-law-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
deleted file mode 100644
index e69b24d3ff..0000000000
--- a/modules/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-law-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "publicNetworkAccessForIngestion": {
-            "value": "Disabled"
-        },
-        "publicNetworkAccessForQuery": {
-            "value": "Disabled"
-        },
-        "dailyQuotaGb": {
-            "value": 10
-        },
-        "storageInsightsConfigs": {
-            "value": [
-                {
-                    "storageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsalaw001",
-                    "tables": [
-                        "WADWindowsEventLogsTable",
-                        "WADETWEventTable",
-                        "WADServiceFabric*EventTable",
-                        "LinuxsyslogVer2v0"
-                    ]
-                }
-            ]
-        },
-        "linkedServices": {
-            "value": [
-                {
-                    "name": "Automation",
-                    "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001"
-                }
-            ]
-        },
-        "savedSearches": {
-            "value": [
-                {
-                    "name": "VMSSQueries",
-                    "displayName": "VMSS Instance Count2",
-                    "category": "VDC Saved Searches",
-                    "query": "Event | where Source == 'ServiceFabricNodeBootstrapAgent' | summarize AggregatedValue = count() by Computer"
-                }
-            ]
-        },
-        "dataSources": {
-            "value": [
-                {
-                    "name": "applicationEvent",
-                    "kind": "WindowsEvent",
-                    "eventLogName": "Application",
-                    "eventTypes": [
-                        {
-                            "eventType": "Error"
-                        },
-                        {
-                            "eventType": "Warning"
-                        },
-                        {
-                            "eventType": "Information"
-                        }
-                    ]
-                },
-                {
-                    "name": "windowsPerfCounter1",
-                    "kind": "WindowsPerformanceCounter",
-                    "objectName": "Processor",
-                    "instanceName": "*",
-                    "intervalSeconds": 60,
-                    "counterName": "% Processor Time"
-                },
-                {
-                    "name": "sampleIISLog1",
-                    "kind": "IISLogs",
-                    "state": "OnPremiseEnabled"
-                },
-                {
-                    "name": "sampleSyslog1",
-                    "kind": "LinuxSyslog",
-                    "syslogName": "kern",
-                    "syslogSeverities": [
-                        {
-                            "severity": "emerg"
-                        },
-                        {
-                            "severity": "alert"
-                        },
-                        {
-                            "severity": "crit"
-                        },
-                        {
-                            "severity": "err"
-                        },
-                        {
-                            "severity": "warning"
-                        }
-                    ]
-                },
-                {
-                    "name": "sampleSyslogCollection1",
-                    "kind": "LinuxSyslogCollection",
-                    "state": "Enabled"
-                },
-                {
-                    "name": "sampleLinuxPerf1",
-                    "kind": "LinuxPerformanceObject",
-                    "syslogSeverities": [
-                        {
-                            "counterName": "% Used Inodes"
-                        },
-                        {
-                            "counterName": "Free Megabytes"
-                        },
-                        {
-                            "counterName": "% Used Space"
-                        },
-                        {
-                            "counterName": "Disk Transfers/sec"
-                        },
-                        {
-                            "counterName": "Disk Reads/sec"
-                        },
-                        {
-                            "counterName": "Disk Writes/sec"
-                        }
-                    ],
-                    "objectName": "Logical Disk",
-                    "instanceName": "*",
-                    "intervalSeconds": 10
-                },
-                {
-                    "name": "sampleLinuxPerfCollection1",
-                    "kind": "LinuxPerformanceCollection",
-                    "state": "Enabled"
-                }
-            ]
-        },
-        "gallerySolutions": {
-            "value": [
-                {
-                    "name": "AzureAutomation",
-                    "product": "OMSGallery",
-                    "publisher": "Microsoft"
-                }
-            ]
-        },
-        "useResourcePermissions": {
-            "value": true
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
deleted file mode 100644
index 6844bb4688..0000000000
--- a/modules/Microsoft.OperationsManagement/solutions/.parameters/min.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "Updates"
-        },
-        "logAnalyticsWorkspaceName": {
-            "value": "adp-<<namePrefix>>-az-law-sol-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
deleted file mode 100644
index c7dcb66400..0000000000
--- a/modules/Microsoft.OperationsManagement/solutions/.parameters/ms.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "AzureAutomation"
-        },
-        "logAnalyticsWorkspaceName": {
-            "value": "adp-<<namePrefix>>-az-law-sol-001"
-        },
-        "product": {
-            "value": "OMSGallery"
-        },
-        "publisher": {
-            "value": "Microsoft"
-        }
-    }
-}
diff --git a/modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json b/modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
deleted file mode 100644
index a040bf8d2f..0000000000
--- a/modules/Microsoft.OperationsManagement/solutions/.parameters/nonms.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "nonmsTestSolution"
-        },
-        "logAnalyticsWorkspaceName": {
-            "value": "adp-<<namePrefix>>-az-law-sol-001"
-        },
-        "product": {
-            "value": "nonmsTestSolutionProduct"
-        },
-        "publisher": {
-            "value": "nonmsTestSolutionPublisher"
-        }
-    }
-}
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
deleted file mode 100644
index 53bc617617..0000000000
--- a/modules/Microsoft.RecoveryServices/vaults/.parameters/dr.parameters.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-rsv-dr-001"
-        },
-        "replicationFabrics": {
-            "value": [
-                {
-                    "location": "NorthEurope",
-                    "replicationContainers": [
-                        {
-                            "name": "ne-container1",
-                            "replicationContainerMappings": [
-                                {
-                                    "targetProtectionContainerId": "/Subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.RecoveryServices/vaults/<<namePrefix>>-az-rsv-min-001/replicationFabrics/NorthEurope/replicationProtectionContainers/ne-container2",
-                                    "policyName": "Default_values",
-                                    "targetContainerName": "pluto"
-                                }
-                            ]
-                        },
-                        {
-                            "name": "ne-container2",
-                            "replicationContainerMappings": [
-                                {
-                                    "policyName": "Default_values",
-                                    "targetContainerFabricName": "WE-2",
-                                    "targetContainerName": "we-container1"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "name": "WE-2",
-                    "location": "WestEurope",
-                    "replicationContainers": [
-                        {
-                            "name": "we-container1",
-                            "replicationContainerMappings": [
-                                {
-                                    "policyName": "Default_values",
-                                    "targetContainerFabricName": "NorthEurope",
-                                    "targetContainerName": "ne-container2"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "replicationPolicies": {
-            "value": [
-                {
-                    "name": "Default_values"
-                },
-                {
-                    "name": "Custom_values",
-                    "appConsistentFrequencyInMinutes": 240,
-                    "crashConsistentFrequencyInMinutes": 7,
-                    "multiVmSyncStatus": "Disable",
-                    "recoveryPointHistory": 2880
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
deleted file mode 100644
index 81ba350a36..0000000000
--- a/modules/Microsoft.RecoveryServices/vaults/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-rsv-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json b/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
deleted file mode 100644
index 67f01a8bb6..0000000000
--- a/modules/Microsoft.RecoveryServices/vaults/.parameters/parameters.json
+++ /dev/null
@@ -1,289 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-rsv-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "backupConfig": {
-            "value": {
-                "enhancedSecurityState": "Disabled",
-                "softDeleteFeatureState": "Disabled"
-            }
-        },
-        "backupPolicies": {
-            "value": [
-                {
-                    "name": "VMpolicy",
-                    "properties": {
-                        "backupManagementType": "AzureIaasVM",
-                        "instantRPDetails": {},
-                        "schedulePolicy": {
-                            "schedulePolicyType": "SimpleSchedulePolicy",
-                            "scheduleRunFrequency": "Daily",
-                            "scheduleRunTimes": [
-                                "2019-11-07T07:00:00Z"
-                            ],
-                            "scheduleWeeklyFrequency": 0
-                        },
-                        "retentionPolicy": {
-                            "retentionPolicyType": "LongTermRetentionPolicy",
-                            "dailySchedule": {
-                                "retentionTimes": [
-                                    "2019-11-07T07:00:00Z"
-                                ],
-                                "retentionDuration": {
-                                    "count": 180,
-                                    "durationType": "Days"
-                                }
-                            },
-                            "weeklySchedule": {
-                                "daysOfTheWeek": [
-                                    "Sunday"
-                                ],
-                                "retentionTimes": [
-                                    "2019-11-07T07:00:00Z"
-                                ],
-                                "retentionDuration": {
-                                    "count": 12,
-                                    "durationType": "Weeks"
-                                }
-                            },
-                            "monthlySchedule": {
-                                "retentionScheduleFormatType": "Weekly",
-                                "retentionScheduleWeekly": {
-                                    "daysOfTheWeek": [
-                                        "Sunday"
-                                    ],
-                                    "weeksOfTheMonth": [
-                                        "First"
-                                    ]
-                                },
-                                "retentionTimes": [
-                                    "2019-11-07T07:00:00Z"
-                                ],
-                                "retentionDuration": {
-                                    "count": 60,
-                                    "durationType": "Months"
-                                }
-                            },
-                            "yearlySchedule": {
-                                "retentionScheduleFormatType": "Weekly",
-                                "monthsOfYear": [
-                                    "January"
-                                ],
-                                "retentionScheduleWeekly": {
-                                    "daysOfTheWeek": [
-                                        "Sunday"
-                                    ],
-                                    "weeksOfTheMonth": [
-                                        "First"
-                                    ]
-                                },
-                                "retentionTimes": [
-                                    "2019-11-07T07:00:00Z"
-                                ],
-                                "retentionDuration": {
-                                    "count": 10,
-                                    "durationType": "Years"
-                                }
-                            }
-                        },
-                        "instantRpRetentionRangeInDays": 2,
-                        "timeZone": "UTC",
-                        "protectedItemsCount": 0
-                    }
-                },
-                {
-                    "name": "sqlpolicy",
-                    "properties": {
-                        "backupManagementType": "AzureWorkload",
-                        "workLoadType": "SQLDataBase",
-                        "settings": {
-                            "timeZone": "UTC",
-                            "issqlcompression": true,
-                            "isCompression": true
-                        },
-                        "subProtectionPolicy": [
-                            {
-                                "policyType": "Full",
-                                "schedulePolicy": {
-                                    "schedulePolicyType": "SimpleSchedulePolicy",
-                                    "scheduleRunFrequency": "Weekly",
-                                    "scheduleRunDays": [
-                                        "Sunday"
-                                    ],
-                                    "scheduleRunTimes": [
-                                        "2019-11-07T22:00:00Z"
-                                    ],
-                                    "scheduleWeeklyFrequency": 0
-                                },
-                                "retentionPolicy": {
-                                    "retentionPolicyType": "LongTermRetentionPolicy",
-                                    "weeklySchedule": {
-                                        "daysOfTheWeek": [
-                                            "Sunday"
-                                        ],
-                                        "retentionTimes": [
-                                            "2019-11-07T22:00:00Z"
-                                        ],
-                                        "retentionDuration": {
-                                            "count": 104,
-                                            "durationType": "Weeks"
-                                        }
-                                    },
-                                    "monthlySchedule": {
-                                        "retentionScheduleFormatType": "Weekly",
-                                        "retentionScheduleWeekly": {
-                                            "daysOfTheWeek": [
-                                                "Sunday"
-                                            ],
-                                            "weeksOfTheMonth": [
-                                                "First"
-                                            ]
-                                        },
-                                        "retentionTimes": [
-                                            "2019-11-07T22:00:00Z"
-                                        ],
-                                        "retentionDuration": {
-                                            "count": 60,
-                                            "durationType": "Months"
-                                        }
-                                    },
-                                    "yearlySchedule": {
-                                        "retentionScheduleFormatType": "Weekly",
-                                        "monthsOfYear": [
-                                            "January"
-                                        ],
-                                        "retentionScheduleWeekly": {
-                                            "daysOfTheWeek": [
-                                                "Sunday"
-                                            ],
-                                            "weeksOfTheMonth": [
-                                                "First"
-                                            ]
-                                        },
-                                        "retentionTimes": [
-                                            "2019-11-07T22:00:00Z"
-                                        ],
-                                        "retentionDuration": {
-                                            "count": 10,
-                                            "durationType": "Years"
-                                        }
-                                    }
-                                }
-                            },
-                            {
-                                "policyType": "Differential",
-                                "schedulePolicy": {
-                                    "schedulePolicyType": "SimpleSchedulePolicy",
-                                    "scheduleRunFrequency": "Weekly",
-                                    "scheduleRunDays": [
-                                        "Monday"
-                                    ],
-                                    "scheduleRunTimes": [
-                                        "2017-03-07T02:00:00Z"
-                                    ],
-                                    "scheduleWeeklyFrequency": 0
-                                },
-                                "retentionPolicy": {
-                                    "retentionPolicyType": "SimpleRetentionPolicy",
-                                    "retentionDuration": {
-                                        "count": 30,
-                                        "durationType": "Days"
-                                    }
-                                }
-                            },
-                            {
-                                "policyType": "Log",
-                                "schedulePolicy": {
-                                    "schedulePolicyType": "LogSchedulePolicy",
-                                    "scheduleFrequencyInMins": 120
-                                },
-                                "retentionPolicy": {
-                                    "retentionPolicyType": "SimpleRetentionPolicy",
-                                    "retentionDuration": {
-                                        "count": 15,
-                                        "durationType": "Days"
-                                    }
-                                }
-                            }
-                        ],
-                        "protectedItemsCount": 0
-                    }
-                },
-                {
-                    "name": "filesharepolicy",
-                    "properties": {
-                        "backupManagementType": "AzureStorage",
-                        "workloadType": "AzureFileShare",
-                        "schedulePolicy": {
-                            "schedulePolicyType": "SimpleSchedulePolicy",
-                            "scheduleRunFrequency": "Daily",
-                            "scheduleRunTimes": [
-                                "2019-11-07T04:30:00Z"
-                            ],
-                            "scheduleWeeklyFrequency": 0
-                        },
-                        "retentionPolicy": {
-                            "retentionPolicyType": "LongTermRetentionPolicy",
-                            "dailySchedule": {
-                                "retentionTimes": [
-                                    "2019-11-07T04:30:00Z"
-                                ],
-                                "retentionDuration": {
-                                    "count": 30,
-                                    "durationType": "Days"
-                                }
-                            }
-                        },
-                        "timeZone": "UTC",
-                        "protectedItemsCount": 0
-                    }
-                }
-            ]
-        },
-        "backupStorageConfig": {
-            "value": {
-                "storageModelType": "GeoRedundant",
-                "crossRegionRestoreFlag": true
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
deleted file mode 100644
index e3e775a93d..0000000000
--- a/modules/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ds-cli-001"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "kind": {
-            "value": "AzureCLI"
-        },
-        "azCliVersion": {
-            "value": "2.15.0"
-        },
-        "scriptContent": {
-            "value": "echo \"Hello from inside the script\""
-        },
-        "retentionInterval": {
-            "value": "P1D"
-        },
-        "runOnce": {
-            "value": false
-        },
-        "cleanupPreference": {
-            "value": "Always"
-        },
-        "timeout": {
-            "value": "PT30M"
-        }
-    }
-}
diff --git a/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json b/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
deleted file mode 100644
index accc14b0b0..0000000000
--- a/modules/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-ds-ps-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "kind": {
-            "value": "AzurePowerShell"
-        },
-        "azPowerShellVersion": {
-            "value": "3.0"
-        },
-        "scriptContent": {
-            "value": "Write-Host 'Running PowerShell from template'"
-        },
-        "retentionInterval": {
-            "value": "P1D"
-        },
-        "runOnce": {
-            "value": false
-        },
-        "cleanupPreference": {
-            "value": "Always"
-        },
-        "timeout": {
-            "value": "PT30M"
-        }
-    }
-}
diff --git a/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json b/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
deleted file mode 100644
index a132c26376..0000000000
--- a/modules/Microsoft.Resources/resourceGroups/.parameters/parameters.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-rg-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "tags": {
-            "value": {
-                "Test": "Yes"
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Resources/tags/.parameters/min.parameters.json b/modules/Microsoft.Resources/tags/.parameters/min.parameters.json
deleted file mode 100644
index d90c44f3fb..0000000000
--- a/modules/Microsoft.Resources/tags/.parameters/min.parameters.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {}
-}
diff --git a/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json b/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
deleted file mode 100644
index a90e2e5b2c..0000000000
--- a/modules/Microsoft.Resources/tags/.parameters/rg.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "onlyUpdate": {
-            "value": false
-        },
-        "tags": {
-            "value": {
-                "Test": "Yes",
-                "TestToo": "No"
-            }
-        },
-        "resourceGroupName": {
-            "value": "validation-rg"
-        }
-    }
-}
diff --git a/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json b/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
deleted file mode 100644
index 840b23ba68..0000000000
--- a/modules/Microsoft.Resources/tags/.parameters/sub.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "onlyUpdate": {
-            "value": true
-        },
-        "tags": {
-            "value": {
-                "Test": "Yes",
-                "TestToo": "No"
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json b/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
deleted file mode 100644
index cfa02a1ddc..0000000000
--- a/modules/Microsoft.Security/azureSecurityCenter/.parameters/parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "scope": {
-            "value": "/subscriptions/<<subscriptionId>>"
-        },
-        "securityContactProperties": {
-            "value": {
-                "email": "foo@contoso.com",
-                "phone": "+12345678",
-                "alertNotifications": "Off",
-                "alertsToAdmins": "Off"
-            }
-        },
-        "workspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
deleted file mode 100644
index d90c44f3fb..0000000000
--- a/modules/Microsoft.ServiceBus/namespaces/.parameters/min.parameters.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {}
-}
diff --git a/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json b/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
deleted file mode 100644
index 33c0288e8c..0000000000
--- a/modules/Microsoft.ServiceBus/namespaces/.parameters/parameters.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sbn-x-002"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "skuName": {
-            "value": "Premium"
-        },
-        "tags": {
-            "value": {}
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "disasterRecoveryConfigs": {
-            "value": {}
-        },
-        "migrationConfigurations": {
-            "value": {}
-        },
-        "virtualNetworkRules": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-003"
-            ]
-        },
-        "ipFilterRules": {
-            "value": [
-                {
-                    "filterName": "ipFilter1",
-                    "ipMask": "10.0.1.0/32",
-                    "action": "Accept"
-                },
-                {
-                    "filterName": "ipFilter2",
-                    "ipMask": "10.0.2.0/32",
-                    "action": "Accept"
-                }
-            ]
-        },
-        "authorizationRules": {
-            "value": [
-                {
-                    "name": "RootManageSharedAccessKey",
-                    "rights": [
-                        "Listen",
-                        "Manage",
-                        "Send"
-                    ]
-                },
-                {
-                    "name": "AnotherKey",
-                    "rights": [
-                        "Listen",
-                        "Send"
-                    ]
-                }
-            ]
-        },
-        "queues": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-sbq-x-002",
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ],
-                    "authorizationRules": [
-                        {
-                            "name": "RootManageSharedAccessKey",
-                            "rights": [
-                                "Listen",
-                                "Manage",
-                                "Send"
-                            ]
-                        },
-                        {
-                            "name": "AnotherKey",
-                            "rights": [
-                                "Listen",
-                                "Send"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "topics": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-sbt-x-001",
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ],
-                    "authorizationRules": [
-                        {
-                            "name": "RootManageSharedAccessKey",
-                            "rights": [
-                                "Listen",
-                                "Manage",
-                                "Send"
-                            ]
-                        },
-                        {
-                            "name": "AnotherKey",
-                            "rights": [
-                                "Listen",
-                                "Send"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "namespace"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
deleted file mode 100644
index 668b6d8d12..0000000000
--- a/modules/Microsoft.ServiceFabric/clusters/.parameters/cert.parameters.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sfc-cert-001"
-        },
-        "managementEndpoint": {
-            "value": "https://<<namePrefix>>-az-sfc-cert-001.westeurope.cloudapp.azure.com:19080"
-        },
-        "reliabilityLevel": {
-            "value": "None"
-        },
-        "certificate": {
-            "value": {
-                "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", // Mutual exclusive with the other cert specs
-                "x509StoreName": "My"
-            }
-        },
-        "nodeTypes": {
-            "value": [
-                {
-                    "applicationPorts": {
-                        "endPort": 30000,
-                        "startPort": 20000
-                    },
-                    "clientConnectionEndpointPort": 19000,
-                    "durabilityLevel": "Bronze",
-                    "ephemeralPorts": {
-                        "endPort": 65534,
-                        "startPort": 49152
-                    },
-                    "httpGatewayEndpointPort": 19080,
-                    "isPrimary": true,
-                    "name": "Node01"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
deleted file mode 100644
index 46c19ee885..0000000000
--- a/modules/Microsoft.ServiceFabric/clusters/.parameters/full.parameters.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sfc-full-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "tags": {
-            "value": {
-                "resourceType": "Service Fabric",
-                "clusterName": "<<namePrefix>>-az-sfc-full-001"
-            }
-        },
-        "addOnFeatures": {
-            "value": [
-                "RepairManager",
-                "DnsService",
-                "BackupRestoreService",
-                "ResourceMonitorService"
-            ]
-        },
-        "maxUnusedVersionsToKeep": {
-            "value": 2
-        },
-        "azureActiveDirectory": {
-            "value": {
-                "clientApplication": "<<deploymentSpId>>",
-                "clusterApplication": "cf33fea8-b30f-424f-ab73-c48d99e0b222",
-                "tenantId": "<<tenantId>>"
-            }
-        },
-        "certificateCommonNames": {
-            "value": {
-                "commonNames": [
-                    {
-                        "certificateCommonName": "certcommon",
-                        "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130"
-                    }
-                ],
-                "x509StoreName": ""
-            }
-        },
-        "clientCertificateCommonNames": {
-            "value": [
-                {
-                    "certificateCommonName": "clientcommoncert1",
-                    "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130",
-                    "isAdmin": false
-                },
-                {
-                    "certificateCommonName": "clientcommoncert2",
-                    "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC131",
-                    "isAdmin": false
-                }
-            ]
-        },
-        "clientCertificateThumbprints": {
-            "value": [
-                {
-                    "certificateThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130",
-                    "isAdmin": false
-                },
-                {
-                    "certificateThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC131",
-                    "isAdmin": false
-                }
-            ]
-        },
-        "diagnosticsStorageAccountConfig": {
-            "value": {
-                "blobEndpoint": "https://adp<<namePrefix>>azsaweux001.blob.core.windows.net/",
-                "protectedAccountKeyName": "StorageAccountKey1",
-                "queueEndpoint": "https://adp<<namePrefix>>azsaweux001.queue.core.windows.net/",
-                "storageAccountName": "adp<<namePrefix>>azsaweux001",
-                "tableEndpoint": "https://adp<<namePrefix>>azsaweux001.table.core.windows.net/"
-            }
-        },
-        "fabricSettings": {
-            "value": [
-                {
-                    "name": "Security",
-                    "parameters": [
-                        {
-                            "name": "ClusterProtectionLevel",
-                            "value": "EncryptAndSign"
-                        }
-                    ]
-                },
-                {
-                    "name": "UpgradeService",
-                    "parameters": [
-                        {
-                            "name": "AppPollIntervalInSeconds",
-                            "value": "60"
-                        }
-                    ]
-                }
-            ]
-        },
-        "managementEndpoint": {
-            "value": "https://<<namePrefix>>-az-sfc-full-001.westeurope.cloudapp.azure.com:19080"
-        },
-        "nodeTypes": {
-            "value": [
-                {
-                    "applicationPorts": {
-                        "endPort": 30000,
-                        "startPort": 20000
-                    },
-                    "capacities": {},
-                    "clientConnectionEndpointPort": 19000,
-                    "durabilityLevel": "Silver",
-                    "ephemeralPorts": {
-                        "endPort": 65534,
-                        "startPort": 49152
-                    },
-                    "httpGatewayEndpointPort": 19080,
-                    "isPrimary": true,
-                    "isStateless": false,
-                    "multipleAvailabilityZones": false,
-                    "name": "Node01",
-                    "placementProperties": {},
-                    "reverseProxyEndpointPort": "",
-                    "vmInstanceCount": 5
-                },
-                {
-                    "applicationPorts": {
-                        "endPort": 30000,
-                        "startPort": 20000
-                    },
-                    "clientConnectionEndpointPort": 19000,
-                    "durabilityLevel": "Bronze",
-                    "ephemeralPorts": {
-                        "endPort": 64000,
-                        "startPort": 49000
-                    },
-                    "httpGatewayEndpointPort": 19007,
-                    "isPrimary": true,
-                    "name": "Node02",
-                    "vmInstanceCount": 5
-                }
-            ]
-        },
-        "notifications": {
-            "value": [
-                {
-                    "isEnabled": true,
-                    "notificationCategory": "WaveProgress",
-                    "notificationLevel": "Critical",
-                    "notificationTargets": [
-                        {
-                            "notificationChannel": "EmailUser",
-                            "receivers": [
-                                "SomeReceiver"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "upgradeDescription": {
-            "value": {
-                "forceRestart": false,
-                "upgradeReplicaSetCheckTimeout": "1.00:00:00",
-                "healthCheckWaitDuration": "00:00:30",
-                "healthCheckStableDuration": "00:01:00",
-                "healthCheckRetryTimeout": "00:45:00",
-                "upgradeTimeout": "02:00:00",
-                "upgradeDomainTimeout": "02:00:00",
-                "healthPolicy": {
-                    "maxPercentUnhealthyNodes": 0,
-                    "maxPercentUnhealthyApplications": 0
-                },
-                "deltaHealthPolicy": {
-                    "maxPercentDeltaUnhealthyNodes": 0,
-                    "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
-                    "maxPercentDeltaUnhealthyApplications": 0
-                }
-            }
-        },
-        "reliabilityLevel": {
-            "value": "Silver"
-        },
-        "vmImage": {
-            "value": "Linux"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "applicationTypes": {
-            "value": [
-                {
-                    "name": "WordCount" // not idempotent
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
deleted file mode 100644
index b7673a725b..0000000000
--- a/modules/Microsoft.ServiceFabric/clusters/.parameters/min.parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sfc-min-001"
-        },
-        "managementEndpoint": {
-            "value": "https://<<namePrefix>>-az-sfc-min-001.westeurope.cloudapp.azure.com:19080"
-        },
-        "reliabilityLevel": {
-            "value": "None"
-        },
-        "nodeTypes": {
-            "value": [
-                {
-                    "applicationPorts": {
-                        "endPort": 30000,
-                        "startPort": 20000
-                    },
-                    "clientConnectionEndpointPort": 19000,
-                    "durabilityLevel": "Bronze",
-                    "ephemeralPorts": {
-                        "endPort": 65534,
-                        "startPort": 49152
-                    },
-                    "httpGatewayEndpointPort": 19080,
-                    "isPrimary": true,
-                    "name": "Node01"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json b/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
deleted file mode 100644
index 7435419747..0000000000
--- a/modules/Microsoft.Sql/managedInstances/.parameters/parameters.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-sqlmi-x-002"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "administratorLogin": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "administratorLogin"
-            }
-        },
-        "administratorLoginPassword": {
-            "reference": {
-                "keyVault": {
-                    "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
-                },
-                "secretName": "administratorLoginPassword"
-            }
-        },
-        "subnetId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-sqlmi/subnets/<<namePrefix>>-az-subnet-x-sqlmi"
-        },
-        "skuName": {
-            "value": "GP_Gen5"
-        },
-        "skuTier": {
-            "value": "GeneralPurpose"
-        },
-        "storageSizeInGB": {
-            "value": 32
-        },
-        "vCores": {
-            "value": 4
-        },
-        "licenseType": {
-            "value": "LicenseIncluded"
-        },
-        "hardwareFamily": {
-            "value": "Gen5"
-        },
-        "servicePrincipal": {
-            "value": "SystemAssigned"
-        },
-        "dnsZonePartner": {
-            "value": ""
-        },
-        "timezoneId": {
-            "value": "UTC"
-        },
-        "collation": {
-            "value": "SQL_Latin1_General_CP1_CI_AS"
-        },
-        "proxyOverride": {
-            "value": "Proxy"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "primaryUserAssignedIdentityId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "publicDataEndpointEnabled": {
-            "value": false
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "keys": {
-            "value": [
-                {
-                    "name": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
-                    "uri": "https://adp-<<namePrefix>>-az-kv-x-sqlmi.vault.azure.net/keys/keyEncryptionKeySqlMi/4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
-                    "serverKeyType": "AzureKeyVault"
-                }
-            ]
-        },
-        "encryptionProtectorObj": {
-            "value": {
-                "serverKeyName": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
-                "serverKeyType": "AzureKeyVault"
-            }
-        },
-        "securityAlertPoliciesObj": {
-            "value": {
-                "name": "default",
-                "state": "Enabled",
-                "emailAccountAdmins": true
-            }
-        },
-        "vulnerabilityAssessmentsObj": {
-            "value": {
-                "name": "default",
-                "emailSubscriptionAdmins": true,
-                "recurringScansIsEnabled": true,
-                "recurringScansEmails": [
-                    "test1@contoso.com",
-                    "test2@contoso.com"
-                ],
-                "vulnerabilityAssessmentsStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-            }
-        },
-        "databases": {
-            "value": [
-                {
-                    "name": "<<namePrefix>>-az-sqlmidb-x-001",
-                    "backupShortTermRetentionPolicies": {
-                        "name": "default"
-                    },
-                    "backupLongTermRetentionPolicies": {
-                        "name": "default"
-                    }
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
deleted file mode 100644
index cdc4f530c1..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.parameters/encr.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azsaencr001"
-        },
-        "storageAccountSku": {
-            "value": "Standard_LRS"
-        },
-        "allowBlobPublicAccess": {
-            "value": false
-        },
-        "publicNetworkAccess": {
-            "value": "Disabled"
-        },
-        "requireInfrastructureEncryption": {
-            "value": true
-        },
-        "systemAssignedIdentity": {
-            "value": false
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "cMKKeyVaultResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-nopr-002"
-        },
-        "cMKKeyName": {
-            "value": "keyEncryptionKey"
-        },
-        "cMKUserAssignedIdentityResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
deleted file mode 100644
index 30ac50db6d..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "allowBlobPublicAccess": {
-            "value": false
-        }
-    }
-}
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
deleted file mode 100644
index 7ae90dbdad..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.parameters/nfs.parameters.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azsax002"
-        },
-        "storageAccountSku": {
-            "value": "Premium_LRS"
-        },
-        "storageAccountKind": {
-            "value": "FileStorage"
-        },
-        "allowBlobPublicAccess": {
-            "value": false
-        },
-        "supportsHttpsTrafficOnly": {
-            "value": false
-        },
-        "fileServices": {
-            "value": {
-                "shares": [
-                    {
-                        "name": "nfsfileshare",
-                        "enabledProtocols": "NFS"
-                    }
-                ]
-            }
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
deleted file mode 100644
index 6783c5818a..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.parameters/parameters.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>azsax001"
-        },
-        "storageAccountSku": {
-            "value": "Standard_LRS"
-        },
-        "allowBlobPublicAccess": {
-            "value": false
-        },
-        "publicNetworkAccess": {
-            "value": "Disabled"
-        },
-        "requireInfrastructureEncryption": {
-            "value": true
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "blob"
-                },
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "table"
-                },
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "queue"
-                },
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "file"
-                }
-            ]
-        },
-        "networkAcls": {
-            "value": {
-                "bypass": "AzureServices",
-                "defaultAction": "Deny",
-                "virtualNetworkRules": [
-                    {
-                        "id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-001",
-                        "action": "Allow"
-                    }
-                ],
-                "ipRules": [
-                    {
-                        "action": "Allow",
-                        "value": "1.1.1.1"
-                    }
-                ]
-            }
-        },
-        "blobServices": {
-            "value": {
-                "diagnosticLogsRetentionInDays": 7,
-                "diagnosticStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                "diagnosticWorkspaceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                "diagnosticEventHubAuthorizationRuleId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey",
-                "diagnosticEventHubName": "adp-<<namePrefix>>-az-evh-x-001",
-                "containers": [
-                    {
-                        "name": "avdscripts",
-                        "publicAccess": "None",
-                        "roleAssignments": [
-                            {
-                                "roleDefinitionIdOrName": "Reader",
-                                "principalIds": [
-                                    "<<deploymentSpId>>"
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "name": "archivecontainer",
-                        "publicAccess": "None",
-                        "enableWORM": true,
-                        "WORMRetention": 666,
-                        "allowProtectedAppendWrites": false
-                    }
-                ]
-            }
-        },
-        "fileServices": {
-            "value": {
-                "diagnosticLogsRetentionInDays": 7,
-                "diagnosticStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                "diagnosticWorkspaceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                "diagnosticEventHubAuthorizationRuleId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey",
-                "diagnosticEventHubName": "adp-<<namePrefix>>-az-evh-x-001",
-                "shares": [
-                    {
-                        "name": "avdprofiles",
-                        "shareQuota": "5120",
-                        "roleAssignments": [
-                            {
-                                "roleDefinitionIdOrName": "Reader",
-                                "principalIds": [
-                                    "<<deploymentSpId>>"
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "name": "avdprofiles2",
-                        "shareQuota": "5120"
-                    }
-                ]
-            }
-        },
-        "tableServices": {
-            "value": {
-                "diagnosticLogsRetentionInDays": 7,
-                "diagnosticStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                "diagnosticWorkspaceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                "diagnosticEventHubAuthorizationRuleId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey",
-                "diagnosticEventHubName": "adp-<<namePrefix>>-az-evh-x-001",
-                "tables": [
-                    "table1",
-                    "table2"
-                ]
-            }
-        },
-        "queueServices": {
-            "value": {
-                "diagnosticLogsRetentionInDays": 7,
-                "diagnosticStorageAccountId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001",
-                "diagnosticWorkspaceId": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001",
-                "diagnosticEventHubAuthorizationRuleId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey",
-                "diagnosticEventHubName": "adp-<<namePrefix>>-az-evh-x-001",
-                "queues": [
-                    {
-                        "name": "queue1",
-                        "metadata": {},
-                        "roleAssignments": [
-                            {
-                                "roleDefinitionIdOrName": "Reader",
-                                "principalIds": [
-                                    "<<deploymentSpId>>"
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "name": "queue2",
-                        "metadata": {}
-                    }
-                ]
-            }
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json b/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
deleted file mode 100644
index c411287f9c..0000000000
--- a/modules/Microsoft.Storage/storageAccounts/.parameters/v1.parameters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "storageAccountKind": {
-            "value": "Storage"
-        },
-        "allowBlobPublicAccess": {
-            "value": false
-        }
-    }
-}
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
deleted file mode 100644
index 4bd5cc5f65..0000000000
--- a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "synplhmin001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json b/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
deleted file mode 100644
index 36fe03f6ad..0000000000
--- a/modules/Microsoft.Synapse/privateLinkHubs/.parameters/parameters.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "synplhstandard001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                },
-                {
-                    "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "Web"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json b/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
deleted file mode 100644
index df382ff2e0..0000000000
--- a/modules/Microsoft.VirtualMachineImages/imageTemplates/.parameters/parameters.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-imgt-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "userMsiName": {
-            "value": "adp-<<namePrefix>>-az-msi-x-001"
-        },
-        "userMsiResourceGroup": {
-            "value": "validation-rg"
-        },
-        "buildTimeoutInMinutes": {
-            "value": 0
-        },
-        "vmSize": {
-            "value": "Standard_D2s_v3"
-        },
-        "osDiskSizeGB": {
-            "value": 127
-        },
-        "subnetId": {
-            "value": ""
-        },
-        "imageSource": {
-            "value": {
-                "type": "PlatformImage",
-                "publisher": "MicrosoftWindowsDesktop",
-                "offer": "Windows-10",
-                "sku": "19h2-evd",
-                "version": "latest"
-            }
-        },
-        "customizationSteps": {
-            "value": [
-                {
-                    "type": "WindowsRestart",
-                    "restartTimeout": "30m"
-                }
-            ]
-        },
-        "managedImageName": {
-            "value": "<<namePrefix>>-az-mi-x-001"
-        },
-        "unManagedImageName": {
-            "value": "<<namePrefix>>-az-umi-x-001"
-        },
-        "sigImageDefinitionId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/galleries/adp<<namePrefix>>azsigweux001/images/adp-<<namePrefix>>-az-imgd-x-001"
-        },
-        "imageReplicationRegions": {
-            "value": []
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/connections/.parameters/parameters.json b/modules/Microsoft.Web/connections/.parameters/parameters.json
deleted file mode 100644
index c2862592b5..0000000000
--- a/modules/Microsoft.Web/connections/.parameters/parameters.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "azuremonitor"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "displayName": {
-            "value": "azuremonitorlogs"
-        },
-        "connectionApi": {
-            "value": {
-                "id": "/subscriptions/<<subscriptionId>>/providers/Microsoft.Web/locations/westeurope/managedApis/azuremonitorlogs"
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
deleted file mode 100644
index c556495066..0000000000
--- a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev2.parameters.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appse-asev2-001"
-        },
-        "kind": {
-            "value": "ASEv2"
-        },
-        "multiSize": {
-            "value": "Standard_D1_V2"
-        },
-        "ipsslAddressCount": {
-            "value": 2
-        },
-        "clusterSettings": {
-            "value": [
-                {
-                    "name": "DisableTls1.0",
-                    "value": "1"
-                }
-            ]
-        },
-        "subnetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-008"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json b/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
deleted file mode 100644
index a304822546..0000000000
--- a/modules/Microsoft.Web/hostingEnvironments/.parameters/asev3.parameters.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appse-asev3-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "subnetResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-006"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "clusterSettings": {
-            "value": [
-                {
-                    "name": "DisableTls1.0",
-                    "value": "1"
-                }
-            ]
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/serverfarms/.parameters/parameters.json b/modules/Microsoft.Web/serverfarms/.parameters/parameters.json
deleted file mode 100644
index 63e6aa9044..0000000000
--- a/modules/Microsoft.Web/serverfarms/.parameters/parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-asp-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "sku": {
-            "value": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": "1"
-            }
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
deleted file mode 100644
index 0d4b5e85fb..0000000000
--- a/modules/Microsoft.Web/sites/.parameters/fa.min.parameters.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fa-min-001"
-        },
-        "kind": {
-            "value": "functionapp"
-        },
-        "serverFarmResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Web/serverFarms/adp-<<namePrefix>>-az-asp-x-001"
-        },
-        "siteConfig": {
-            "value": {
-                "alwaysOn": true
-            }
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/sites/.parameters/fa.parameters.json b/modules/Microsoft.Web/sites/.parameters/fa.parameters.json
deleted file mode 100644
index e67fc9f53e..0000000000
--- a/modules/Microsoft.Web/sites/.parameters/fa.parameters.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-fa-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "kind": {
-            "value": "functionapp"
-        },
-        "serverFarmResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Web/serverFarms/adp-<<namePrefix>>-az-asp-x-001"
-        },
-        "siteConfig": {
-            "value": {
-                "alwaysOn": true,
-                "use32BitWorkerProcess": false
-            }
-        },
-        "appInsightId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Insights/components/adp-<<namePrefix>>-az-appi-x-001"
-        },
-        "storageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "setAzureWebJobsDashboard": {
-            "value": true
-        },
-        "appSettingsKeyValuePairs": {
-            "value": {
-                "FUNCTIONS_EXTENSION_VERSION": "~4",
-                "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-                "AzureFunctionsJobHost__logging__logLevel__default": "Trace",
-                "EASYAUTH_SECRET": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/secrets/Modules-Test-SP-Password"
-            }
-        },
-        "authSettingV2Configuration": {
-            "value": {
-                "globalValidation": {
-                    "requireAuthentication": true,
-                    "unauthenticatedClientAction": "Return401"
-                },
-                "httpSettings": {
-                    "forwardProxy": {
-                        "convention": "NoProxy"
-                    },
-                    "requireHttps": true,
-                    "routes": {
-                        "apiPrefix": "/.auth"
-                    }
-                },
-                "identityProviders": {
-                    "azureActiveDirectory": {
-                        "enabled": true,
-                        "login": {
-                            "disableWWWAuthenticate": false
-                        },
-                        "registration": {
-                            "openIdIssuer": "https://sts.windows.net/<<tenantId>>/v2.0/",
-                            "clientId": "d874dd2f-2032-4db1-a053-f0ec243685aa",
-                            "clientSecretSettingName": "EASYAUTH_SECRET"
-                        },
-                        "validation": {
-                            "allowedAudiences": [
-                                "api://d874dd2f-2032-4db1-a053-f0ec243685aa"
-                            ],
-                            "defaultAuthorizationPolicy": {
-                                "allowedPrincipals": {}
-                            },
-                            "jwtClaimChecks": {}
-                        }
-                    }
-                },
-                "login": {
-                    "allowedExternalRedirectUrls": [
-                        "string"
-                    ],
-                    "cookieExpiration": {
-                        "convention": "FixedTime",
-                        "timeToExpiration": "08:00:00"
-                    },
-                    "nonce": {
-                        "nonceExpirationInterval": "00:05:00",
-                        "validateNonce": true
-                    },
-                    "preserveUrlFragmentsForLogins": false,
-                    "routes": {},
-                    "tokenStore": {
-                        "azureBlobStorage": {},
-                        "enabled": true,
-                        "fileSystem": {},
-                        "tokenRefreshExtensionHours": 72
-                    }
-                },
-                "platform": {
-                    "enabled": true,
-                    "runtimeVersion": "~1"
-                }
-            }
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "sites"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
deleted file mode 100644
index 588beef102..0000000000
--- a/modules/Microsoft.Web/sites/.parameters/wa.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-wa-min-001"
-        },
-        "kind": {
-            "value": "app"
-        },
-        "serverFarmResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Web/serverFarms/adp-<<namePrefix>>-az-asp-x-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/sites/.parameters/wa.parameters.json b/modules/Microsoft.Web/sites/.parameters/wa.parameters.json
deleted file mode 100644
index 75ea5f8f00..0000000000
--- a/modules/Microsoft.Web/sites/.parameters/wa.parameters.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-wa-x-001"
-        },
-        "kind": {
-            "value": "app"
-        },
-        "serverFarmResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Web/serverFarms/adp-<<namePrefix>>-az-asp-x-001"
-        },
-        "siteConfig": {
-            "value": {
-                "metadata": [
-                    {
-                        "name": "CURRENT_STACK",
-                        "value": "dotnetcore"
-                    }
-                ],
-                "alwaysOn": true
-            }
-        },
-        "httpsOnly": {
-            "value": true
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "sites"
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json b/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
deleted file mode 100644
index b5781f46f0..0000000000
--- a/modules/Microsoft.Web/staticSites/.parameters/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-wss-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.Web/staticSites/.parameters/parameters.json b/modules/Microsoft.Web/staticSites/.parameters/parameters.json
deleted file mode 100644
index 68d8697715..0000000000
--- a/modules/Microsoft.Web/staticSites/.parameters/parameters.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-wss-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "sku": {
-            "value": "Standard"
-        },
-        "stagingEnvironmentPolicy": {
-            "value": "Enabled"
-        },
-        "allowConfigFileUpdates": {
-            "value": true
-        },
-        "enterpriseGradeCdnStatus": {
-            "value": "Disabled"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "userAssignedIdentities": {
-            "value": {
-                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "staticSites"
-                }
-            ]
-        }
-    }
-}

From 9a9f9354505b648735054ada8de0d30a653c2260 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 08:41:14 +0200
Subject: [PATCH 30/36] Update to latest

---
 .../{parameters => .test}/parameters.json                         | 0
 .../{.deploymentTests => .test}/linux.prefix.parameter.json       | 0
 .../{.deploymentTests => .test}/linux.vmnames.parameter.json      | 0
 .../{parameters => .test}/parameters.json                         | 0
 .../{parameters => .test}/parameters.json                         | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/{parameters => .test}/parameters.json (100%)
 rename constructs/Microsoft.Compute/virtualMachinesMultiple/{.deploymentTests => .test}/linux.prefix.parameter.json (100%)
 rename constructs/Microsoft.Compute/virtualMachinesMultiple/{.deploymentTests => .test}/linux.vmnames.parameter.json (100%)
 rename constructs/Microsoft.Management/managementGroup-structure/{parameters => .test}/parameters.json (100%)
 rename constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/{parameters => .test}/parameters.json (100%)

diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/parameters/parameters.json b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.test/parameters.json
similarity index 100%
rename from constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/parameters/parameters.json
rename to constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.test/parameters.json
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.prefix.parameter.json b/constructs/Microsoft.Compute/virtualMachinesMultiple/.test/linux.prefix.parameter.json
similarity index 100%
rename from constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.prefix.parameter.json
rename to constructs/Microsoft.Compute/virtualMachinesMultiple/.test/linux.prefix.parameter.json
diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.vmnames.parameter.json b/constructs/Microsoft.Compute/virtualMachinesMultiple/.test/linux.vmnames.parameter.json
similarity index 100%
rename from constructs/Microsoft.Compute/virtualMachinesMultiple/.deploymentTests/linux.vmnames.parameter.json
rename to constructs/Microsoft.Compute/virtualMachinesMultiple/.test/linux.vmnames.parameter.json
diff --git a/constructs/Microsoft.Management/managementGroup-structure/parameters/parameters.json b/constructs/Microsoft.Management/managementGroup-structure/.test/parameters.json
similarity index 100%
rename from constructs/Microsoft.Management/managementGroup-structure/parameters/parameters.json
rename to constructs/Microsoft.Management/managementGroup-structure/.test/parameters.json
diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/parameters/parameters.json b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/.test/parameters.json
similarity index 100%
rename from constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/parameters/parameters.json
rename to constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/.test/parameters.json

From ca33962c771c2386768e560fdd2a5e881961a9f3 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 08:46:23 +0200
Subject: [PATCH 31/36] Renamed script

---
 .../templates/getParameterFiles/action.yml    |  4 +-
 .../Get-ModuleParameterFiles.ps1              | 42 -------------------
 ...ileList.ps1 => Get-ModuleTestFileList.ps1} |  4 +-
 3 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
 rename utilities/pipelines/sharedScripts/{Get-DeploymentTestFileList.ps1 => Get-ModuleTestFileList.ps1} (89%)

diff --git a/.github/actions/templates/getParameterFiles/action.yml b/.github/actions/templates/getParameterFiles/action.yml
index 1bcb50e607..4bece51252 100644
--- a/.github/actions/templates/getParameterFiles/action.yml
+++ b/.github/actions/templates/getParameterFiles/action.yml
@@ -21,14 +21,14 @@ runs:
         # Grouping task logs
         Write-Output "::group::Get parameter files"
         # Load used functions
-        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'sharedScripts' 'Get-DeploymentTestFileList.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'sharedScripts' 'Get-ModuleTestFileList.ps1')
         $functionInput = @{
           ModulePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.modulePath }}'
         }
         Write-Verbose "Invoke task with" -Verbose
         Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
         # Get the list of parameter file paths
-        $parameterFilePaths = Get-DeploymentTestFileList @functionInput -Verbose
+        $parameterFilePaths = Get-ModuleTestFileList @functionInput -Verbose
         # Output values to be accessed by next jobs
         $compressedOutput = $parameterFilePaths | ConvertTo-Json -Compress
         if($compressedOutput -notmatch "\[.*\]") {
diff --git a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
deleted file mode 100644
index b13d619e7b..0000000000
--- a/utilities/pipelines/sharedScripts/Get-ModuleParameterFiles.ps1
+++ /dev/null
@@ -1,42 +0,0 @@
-<#
-.SYNOPSIS
-Get the relative file paths of all parameter files in the given module.
-
-.DESCRIPTION
-Get the relative file paths of all parameter files in the given module.
-The relative path is returned instead of the full one to make paths easier to read in the pipeline.
-
-.PARAMETER ModulePath
-Mandatory. The module path to search in.
-
-.EXAMPLE
-Get-ModuleParameterFiles -ModulePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines'
-
-Returns the relative file paths of all parameter files of the virtual machines module.
-#>
-function Get-ModuleParameterFiles {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $ModulePath
-    )
-
-    # Note: Should be 'recurse', but is not working with powershell 7.2.1 on GitHub hosted agents but needs 7.2.2
-    # $parameterFilePaths = (Get-ChildItem -Recurse -Path $ModulePath -Filter '*parameters.json' -File).FullName
-
-    $parameterFilePaths = (Get-ChildItem -Path "$ModulePath/.parameters" -Filter '*parameters.json' -File).FullName
-
-    if (-not $parameterFilePaths) {
-        throw "No parameter files found for module [$ModulePath]"
-    }
-
-    $parameterFilePaths = $parameterFilePaths | ForEach-Object {
-        $_.Replace($ModulePath, '').Trim('\').Trim('/')
-    }
-
-    Write-Verbose 'Found parameter files'
-    $parameterFilePaths | ForEach-Object { Write-Verbose "- $_" }
-
-    return $parameterFilePaths
-}
diff --git a/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1
similarity index 89%
rename from utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
rename to utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1
index e9a68bd65d..c219156f83 100644
--- a/utilities/pipelines/sharedScripts/Get-DeploymentTestFileList.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1
@@ -10,11 +10,11 @@ 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-DeploymentTestFileList -ModulePath 'C:\ResourceModules\arm\Microsoft.Compute\virtualMachines'
+Get-ModuleTestFileList -ModulePath 'C:\ResourceModules\arm\Microsoft.Compute\virtualMachines'
 
 Returns the relative file paths of all parameter files of the virtual machines module.
 #>
-function Get-DeploymentTestFileList {
+function Get-ModuleTestFileList {
 
     [CmdletBinding()]
     param (

From ee95d1c2a83584173629522e4e603be39a406254 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 23:32:39 +0200
Subject: [PATCH 32/36] Renamed var

---
 modules/.global/global.module.tests.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index b44e87e8e7..293c9b26b4 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -120,15 +120,15 @@ Describe 'File/folder tests' -Tag Modules {
                 [string] $moduleFolderName,
                 $moduleFolderPath
             )
-            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
-            (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force).Count | Should -BeGreaterThan 0
+            $testFolderPath = Join-Path $moduleFolderPath '.test'
+            (Get-ChildItem $testFolderPath -Filter '*parameters.json' -Force).Count | Should -BeGreaterThan 0
         }
 
         $parameterFolderFilesTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
-            if (Test-Path $parameterFolderPath) {
-                foreach ($parameterFile in (Get-ChildItem $parameterFolderPath -Filter '*parameters.json' -Force)) {
+            $testFolderPath = Join-Path $moduleFolderPath '.test'
+            if (Test-Path $testFolderPath) {
+                foreach ($parameterFile in (Get-ChildItem $testFolderPath -Filter '*parameters.json' -Force)) {
                     $parameterFolderFilesTestCases += @{
                         moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
                         parameterFilePath = $parameterFile.FullName

From 6f8504dcc725ac36a77c3d5010772f49c6d7822f Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Wed, 29 Jun 2022 23:33:51 +0200
Subject: [PATCH 33/36] Update modules/.global/global.module.tests.ps1

Co-authored-by: Marius Storhaug <Marius.Storhaug@microsoft.com>
---
 modules/.global/global.module.tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 293c9b26b4..77ba21996d 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -948,7 +948,7 @@ Describe 'Deployment template tests' -Tag Template {
 
             $incorrectReferencesFound = $ParameterFileContent | Select-String -Pattern $tokenValue -AllMatches
             if ($incorrectReferencesFound.Matches) {
-                $incorrectReferencesFound.Matches.Count | Should -Be 0 -Because ('Parameter file should not contain the [ { 0 }] value, instead should reference the token value [ { 1 }]. Please check the { 2 } lines: [ { 3 }]' -f $tokenName, $ParameterFileTokenName, $incorrectReferencesFound.Matches.Count, ($incorrectReferencesFound.Line.Trim() -join ",`n"))
+                $incorrectReferencesFound.Matches.Count | Should -Be 0 -Because ('Parameter file should not contain the [{0}] value, instead should reference the token value [{1}]. Please check the {2} lines: [{3}]' -f $tokenName, $ParameterFileTokenName, $incorrectReferencesFound.Matches.Count, ($incorrectReferencesFound.Line.Trim() -join ",`n"))
             }
         }
     }

From ba05015c0ca9f6a2ebe0cd126d8fdd0d36a64217 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 23:37:07 +0200
Subject: [PATCH 34/36] Update to latest

---
 .../templates/getParameterFiles/action.yml    |  4 +-
 modules/.global/global.module.tests.ps1       | 47 ++++++++++++-------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.github/actions/templates/getParameterFiles/action.yml b/.github/actions/templates/getParameterFiles/action.yml
index 4bece51252..fac1cbb3cd 100644
--- a/.github/actions/templates/getParameterFiles/action.yml
+++ b/.github/actions/templates/getParameterFiles/action.yml
@@ -28,9 +28,9 @@ runs:
         Write-Verbose "Invoke task with" -Verbose
         Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
         # Get the list of parameter file paths
-        $parameterFilePaths = Get-ModuleTestFileList @functionInput -Verbose
+        $testFilePaths = Get-ModuleTestFileList @functionInput -Verbose
         # Output values to be accessed by next jobs
-        $compressedOutput = $parameterFilePaths | ConvertTo-Json -Compress
+        $compressedOutput = $testFilePaths | ConvertTo-Json -Compress
         if($compressedOutput -notmatch "\[.*\]") {
           $compressedOutput = "[$compressedOutput]"
         }
diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 293c9b26b4..ee5abd52ba 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -29,7 +29,7 @@ $script:jsonTemplateLoadFailedException = "Unable to load the deploy.json templa
 $script:templateNotFoundException = 'No template file found in folder [{0}]' # -f $moduleFolderPath
 
 # Import any helper function used in this test script
-Import-Module (Join-Path $PSScriptRoot 'shared\helper.psm1') -Force
+Import-Module (Join-Path $PSScriptRoot 'helper\helper.psm1') -Force
 
 Describe 'File/folder tests' -Tag Modules {
 
@@ -118,32 +118,37 @@ Describe 'File/folder tests' -Tag Modules {
 
             param(
                 [string] $moduleFolderName,
-                $moduleFolderPath
+                [string] $moduleFolderPath
             )
-            $testFolderPath = Join-Path $moduleFolderPath '.test'
-            (Get-ChildItem $testFolderPath -Filter '*parameters.json' -Force).Count | Should -BeGreaterThan 0
+
+            $moduleTestFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' }
+            $moduleTestFilePaths.Count | Should -BeGreaterThan 0
         }
 
         $parameterFolderFilesTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            $testFolderPath = Join-Path $moduleFolderPath '.test'
-            if (Test-Path $testFolderPath) {
-                foreach ($parameterFile in (Get-ChildItem $testFolderPath -Filter '*parameters.json' -Force)) {
+            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
+            if (Test-Path $parameterFolderPath) {
+                foreach ($parameterFilePath in ((Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' })) {
                     $parameterFolderFilesTestCases += @{
                         moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
-                        parameterFilePath = $parameterFile.FullName
+                        parameterFilePath = $parameterFilePath
                     }
                 }
             }
         }
 
-        It '[<moduleFolderName>] *parameters.json files in the .parameters folder should be valid json' -TestCases $parameterFolderFilesTestCases {
+        It '[<moduleFolderName>] *parameters.json files in the .test folder should be valid json' -TestCases $parameterFolderFilesTestCases {
 
             param(
                 [string] $moduleFolderName,
-                $parameterFilePath
+                [string] $parameterFilePath
             )
-            (Get-Content $parameterFilePath) | ConvertFrom-Json
+            if ((Split-Path $parameterFilePath -Extension) -eq '.json') {
+                { (Get-Content $parameterFilePath) | ConvertFrom-Json } | Should -Not -Throw
+            } else {
+                Set-ItResult -Skipped -Because 'the module has no JSON parameter file.'
+            }
         }
     }
 }
@@ -506,13 +511,21 @@ Describe 'Deployment template tests' -Tag Template {
             $TemplateFile_RequiredParametersNames = ($templateFile_Parameters.Keys | Where-Object { -not $templateFile_Parameters[$_].ContainsKey('defaultValue') }) | Sort-Object
 
             if (Test-Path (Join-Path $moduleFolderPath '.test')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test' -AdditionalChildPath '*parameters.json') -Recurse -Force).FullName
-                foreach ($ParameterFilePath in $ParameterFilePaths) {
-                    $parameterFile_AllParameterNames = ((Get-Content $ParameterFilePath) | ConvertFrom-Json -AsHashtable).parameters.Keys | Sort-Object
+
+                # Can be removed after full migration to bicep test files
+                $moduleTestFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' }
+
+                foreach ($moduleTestFilePath in $moduleTestFilePaths) {
+                    if ((Split-Path $moduleTestFilePath -Extension) -eq '.json') {
+                        $deploymentTestFile_AllParameterNames = ((Get-Content $moduleTestFilePath) | ConvertFrom-Json -AsHashtable).parameters.Keys | Sort-Object
+                    } else {
+                        $deploymentFileContent = az bicep build --file $moduleTestFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
+                        $deploymentTestFile_AllParameterNames = $deploymentFileContent.resources[-1].properties.parameters.keys | Sort-Object # The last resource should be the test
+                    }
                     $parameterFileTestCases += @{
-                        parameterFile_Path                   = $ParameterFilePath
-                        parameterFile_Name                   = Split-Path $ParameterFilePath -Leaf
-                        parameterFile_AllParameterNames      = $parameterFile_AllParameterNames
+                        parameterFile_Path                   = $moduleTestFilePath
+                        parameterFile_Name                   = Split-Path $moduleTestFilePath -Leaf
+                        parameterFile_AllParameterNames      = $deploymentTestFile_AllParameterNames
                         templateFile_AllParameterNames       = $TemplateFile_AllParameterNames
                         templateFile_RequiredParametersNames = $TemplateFile_RequiredParametersNames
                         tokenSettings                        = $Settings.parameterFileTokens

From 1ad3623a166290de2e753b17447ffd7fc4487010 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 23:40:00 +0200
Subject: [PATCH 35/36] Renamed variable

---
 modules/.global/global.module.tests.ps1 | 22 +++++++++++-----------
 utilities/tools/Set-ModuleReadMe.ps1    |  4 ++--
 utilities/tools/Test-ModuleLocally.ps1  |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index df31a78270..0636d8bb24 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -129,10 +129,10 @@ Describe 'File/folder tests' -Tag Modules {
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             $parameterFolderPath = Join-Path $moduleFolderPath '.test'
             if (Test-Path $parameterFolderPath) {
-                foreach ($parameterFilePath in ((Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' })) {
+                foreach ($testFilePath in ((Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' })) {
                     $parameterFolderFilesTestCases += @{
                         moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
-                        parameterFilePath = $parameterFilePath
+                        parameterFilePath = $testFilePath
                     }
                 }
             }
@@ -142,10 +142,10 @@ Describe 'File/folder tests' -Tag Modules {
 
             param(
                 [string] $moduleFolderName,
-                [string] $parameterFilePath
+                [string] $testFilePath
             )
-            if ((Split-Path $parameterFilePath -Extension) -eq '.json') {
-                { (Get-Content $parameterFilePath) | ConvertFrom-Json } | Should -Not -Throw
+            if ((Split-Path $testFilePath -Extension) -eq '.json') {
+                { (Get-Content $testFilePath) | ConvertFrom-Json } | Should -Not -Throw
             } else {
                 Set-ItResult -Skipped -Because 'the module has no JSON parameter file.'
             }
@@ -931,12 +931,12 @@ Describe 'Deployment template tests' -Tag Template {
 
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             if (Test-Path (Join-Path $moduleFolderPath '.test')) {
-                $ParameterFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.testeters.json') -Recurse -Force).FullName
-                foreach ($ParameterFilePath in $ParameterFilePaths) {
+                $testFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.testeters.json') -Recurse -Force).FullName
+                foreach ($testFilePath in $testFilePaths) {
                     foreach ($token in $enforcedTokenList.Keys) {
                         $parameterFileTokenTestCases += @{
-                            parameterFilePath = $ParameterFilePath
-                            parameterFileName = Split-Path $ParameterFilePath -Leaf
+                            parameterFilePath = $testFilePath
+                            parameterFileName = Split-Path $testFilePath -Leaf
                             tokenSettings     = $Settings.parameterFileTokens
                             tokenName         = $token
                             tokenValue        = $enforcedTokenList[$token]
@@ -949,7 +949,7 @@ Describe 'Deployment template tests' -Tag Template {
 
         It '[<moduleFolderName>] [Tokens] Parameter file [<parameterFileName>] should not contain the plain value for token [<tokenName>] guid' -TestCases $parameterFileTokenTestCases {
             param (
-                [string] $parameterFilePath,
+                [string] $testFilePath,
                 [string] $parameterFileName,
                 [hashtable] $tokenSettings,
                 [string] $tokenName,
@@ -957,7 +957,7 @@ Describe 'Deployment template tests' -Tag Template {
                 [string] $moduleFolderName
             )
             $ParameterFileTokenName = -join ($tokenSettings.tokenPrefix, $tokenName, $tokenSettings.tokenSuffix)
-            $ParameterFileContent = Get-Content -Path $parameterFilePath
+            $ParameterFileContent = Get-Content -Path $testFilePath
 
             $incorrectReferencesFound = $ParameterFileContent | Select-String -Pattern $tokenValue -AllMatches
             if ($incorrectReferencesFound.Matches) {
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index 390ec2413c..8daf716a73 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -354,8 +354,8 @@ function Set-DeploymentExamplesSection {
     $parameterFiles = Get-ChildItem (Join-Path $moduleRoot '.test') -Filter '*parameters.json' -Recurse
 
     $index = 1
-    foreach ($parameterFilePath in $parameterFiles.FullName) {
-        $contentInJSONFormat = Get-Content -Path $parameterFilePath -Encoding 'utf8' | Out-String
+    foreach ($testFilePath in $parameterFiles.FullName) {
+        $contentInJSONFormat = Get-Content -Path $testFilePath -Encoding 'utf8' | Out-String
 
         $SectionContent += @(
             "<h3>Example $index</h3>"
diff --git a/utilities/tools/Test-ModuleLocally.ps1 b/utilities/tools/Test-ModuleLocally.ps1
index 34c40d59cd..70bec18ef0 100644
--- a/utilities/tools/Test-ModuleLocally.ps1
+++ b/utilities/tools/Test-ModuleLocally.ps1
@@ -115,7 +115,7 @@ function Test-ModuleLocally {
         [string] $TemplateFilePath,
 
         [Parameter(Mandatory = $false)]
-        [string] $parameterFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.test'),
+        [string] $testFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) '.test'),
 
         [Parameter(Mandatory = $false)]
         [Psobject] $ValidateOrDeployParameters = @{},
@@ -187,10 +187,10 @@ function Test-ModuleLocally {
 
             # Find Test Parameter Files
             # -------------------------
-            if ((Get-Item -Path $parameterFilePath) -is [System.IO.DirectoryInfo]) {
-                $ModuleParameterFiles = (Get-ChildItem -Path $parameterFilePath).FullName
+            if ((Get-Item -Path $testFilePath) -is [System.IO.DirectoryInfo]) {
+                $ModuleParameterFiles = (Get-ChildItem -Path $testFilePath).FullName
             } else {
-                $ModuleParameterFiles = @($parameterFilePath)
+                $ModuleParameterFiles = @($testFilePath)
             }
 
             # Replace parameter file tokens

From c13158479841626dcce7b4e0b6b97650c0e2aeba Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 29 Jun 2022 23:49:00 +0200
Subject: [PATCH 36/36] Further updates

---
 modules/.global/global.module.tests.ps1       | 48 +++++++++----------
 .../.global/{shared => helper}/helper.psm1    |  0
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename modules/.global/{shared => helper}/helper.psm1 (100%)

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
index 0636d8bb24..e8b08a8ea0 100644
--- a/modules/.global/global.module.tests.ps1
+++ b/modules/.global/global.module.tests.ps1
@@ -125,20 +125,20 @@ Describe 'File/folder tests' -Tag Modules {
             $moduleTestFilePaths.Count | Should -BeGreaterThan 0
         }
 
-        $parameterFolderFilesTestCases = [System.Collections.ArrayList] @()
+        $testFolderFilesTestCases = [System.Collections.ArrayList] @()
         foreach ($moduleFolderPath in $moduleFolderPaths) {
-            $parameterFolderPath = Join-Path $moduleFolderPath '.test'
-            if (Test-Path $parameterFolderPath) {
+            $testFolderPath = Join-Path $moduleFolderPath '.test'
+            if (Test-Path $testFolderPath) {
                 foreach ($testFilePath in ((Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.test') -File).FullName | Where-Object { $_ -match '.+\.[bicep|json]' })) {
-                    $parameterFolderFilesTestCases += @{
-                        moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
-                        parameterFilePath = $testFilePath
+                    $testFolderFilesTestCases += @{
+                        moduleFolderName = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
+                        testFilePath     = $testFilePath
                     }
                 }
             }
         }
 
-        It '[<moduleFolderName>] *parameters.json files in the .test folder should be valid json' -TestCases $parameterFolderFilesTestCases {
+        It '[<moduleFolderName>] *parameters.json files in the .test folder should be valid json' -TestCases $testFolderFilesTestCases {
 
             param(
                 [string] $moduleFolderName,
@@ -505,7 +505,7 @@ Describe 'Deployment template tests' -Tag Template {
             }
 
             # Parameter file test cases
-            $parameterFileTestCases = @()
+            $testFileTestCases = @()
             $templateFile_Parameters = $templateContent.parameters
             $TemplateFile_AllParameterNames = $templateFile_Parameters.Keys | Sort-Object
             $TemplateFile_RequiredParametersNames = ($templateFile_Parameters.Keys | Where-Object { -not $templateFile_Parameters[$_].ContainsKey('defaultValue') }) | Sort-Object
@@ -522,10 +522,10 @@ Describe 'Deployment template tests' -Tag Template {
                         $deploymentFileContent = az bicep build --file $moduleTestFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
                         $deploymentTestFile_AllParameterNames = $deploymentFileContent.resources[-1].properties.parameters.keys | Sort-Object # The last resource should be the test
                     }
-                    $parameterFileTestCases += @{
-                        parameterFile_Path                   = $moduleTestFilePath
-                        parameterFile_Name                   = Split-Path $moduleTestFilePath -Leaf
-                        parameterFile_AllParameterNames      = $deploymentTestFile_AllParameterNames
+                    $testFileTestCases += @{
+                        testFile_Path                        = $moduleTestFilePath
+                        testFile_Name                        = Split-Path $moduleTestFilePath -Leaf
+                        testFile_AllParameterNames           = $deploymentTestFile_AllParameterNames
                         templateFile_AllParameterNames       = $TemplateFile_AllParameterNames
                         templateFile_RequiredParametersNames = $TemplateFile_RequiredParametersNames
                         tokenSettings                        = $Settings.parameterFileTokens
@@ -535,10 +535,10 @@ Describe 'Deployment template tests' -Tag Template {
 
             # Test file setup
             $deploymentFolderTestCases += @{
-                moduleFolderName       = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
-                templateContent        = $templateContent
-                templateFilePath       = $templateFilePath
-                parameterFileTestCases = $parameterFileTestCases
+                moduleFolderName  = $moduleFolderPath.Replace('\', '/').Split('/modules/')[1]
+                templateContent   = $templateContent
+                templateFilePath  = $templateFilePath
+                testFileTestCases = $testFileTestCases
             }
         }
 
@@ -897,28 +897,28 @@ Describe 'Deployment template tests' -Tag Template {
         # PARAMETER Tests
         It '[<moduleFolderName>] All parameters in parameters files exist in template file (deploy.json)' -TestCases $deploymentFolderTestCases {
             param (
-                [hashtable[]] $parameterFileTestCases
+                [hashtable[]] $testFileTestCases
             )
 
-            foreach ($parameterFileTestCase in $parameterFileTestCases) {
-                $parameterFile_AllParameterNames = $parameterFileTestCase.parameterFile_AllParameterNames
+            foreach ($parameterFileTestCase in $testFileTestCases) {
+                $testFile_AllParameterNames = $parameterFileTestCase.testFile_AllParameterNames
                 $templateFile_AllParameterNames = $parameterFileTestCase.templateFile_AllParameterNames
 
-                $nonExistentParameters = $parameterFile_AllParameterNames | Where-Object { $templateFile_AllParameterNames -notcontains $_ }
+                $nonExistentParameters = $testFile_AllParameterNames | Where-Object { $templateFile_AllParameterNames -notcontains $_ }
                 $nonExistentParameters.Count | Should -Be 0 -Because ('no parameter in the parameter file should not exist in the template file. Found excess items: [{0}]' -f ($nonExistentParameters -join ', '))
             }
         }
 
         It '[<moduleFolderName>] All required parameters in template file (deploy.json) should exist in parameters files' -TestCases $deploymentFolderTestCases {
             param (
-                [hashtable[]] $parameterFileTestCases
+                [hashtable[]] $testFileTestCases
             )
 
-            foreach ($parameterFileTestCase in $parameterFileTestCases) {
+            foreach ($parameterFileTestCase in $testFileTestCases) {
                 $TemplateFile_RequiredParametersNames = $parameterFileTestCase.TemplateFile_RequiredParametersNames
-                $parameterFile_AllParameterNames = $parameterFileTestCase.parameterFile_AllParameterNames
+                $testFile_AllParameterNames = $parameterFileTestCase.testFile_AllParameterNames
 
-                $missingParameters = $templateFile_RequiredParametersNames | Where-Object { $parameterFile_AllParameterNames -notcontains $_ }
+                $missingParameters = $templateFile_RequiredParametersNames | Where-Object { $testFile_AllParameterNames -notcontains $_ }
                 $missingParameters.Count | Should -Be 0 -Because ('no required parameters in the template file should be missing in the parameter file. Found missing items: [{0}]' -f ($missingParameters -join ', '))
             }
         }
diff --git a/modules/.global/shared/helper.psm1 b/modules/.global/helper/helper.psm1
similarity index 100%
rename from modules/.global/shared/helper.psm1
rename to modules/.global/helper/helper.psm1