diff --git a/diagrams/azure/__init__.py b/diagrams/azure/__init__.py
deleted file mode 100644
index 0b80ace0..00000000
--- a/diagrams/azure/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-Azure provides a set of services for Microsoft Azure provider.
-"""
-
-from diagrams import Node
-
-
-class _Azure(Node):
-    _provider = "azure"
-    _icon_dir = "resources/azure"
-
-    fontcolor = "#ffffff"
diff --git a/diagrams/azure/ai_ml.py b/diagrams/azure/ai_ml.py
new file mode 100644
index 00000000..764dd66e
--- /dev/null
+++ b/diagrams/azure/ai_ml.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Ai_Ml(_Azure):
+    _type = "ai_ml"
+    _icon_dir = "resources/azure/ai_ml"
+
+
+class BotServices(_Ai_Ml):
+    _icon = "bot-services.png"
+
+
+class CognitiveServices(_Ai_Ml):
+    _icon = "cognitive-services.png"
+
+
+class MachineLearningStudioClassicWebServices(_Ai_Ml):
+    _icon = "machine-learning-studio-classic-web-services.png"
+
+
+class MachineLearningStudioWebServicePlans(_Ai_Ml):
+    _icon = "machine-learning-studio-web-service-plans.png"
+
+
+class MachineLearningStudioWorkspaces(_Ai_Ml):
+    _icon = "machine-learning-studio-workspaces.png"
+
+
+class TranslatorText(_Ai_Ml):
+    _icon = "translator-text.png"
+
+
+# Aliases
diff --git a/diagrams/azure/analytics.py b/diagrams/azure/analytics.py
index 216b3582..a3e28454 100644
--- a/diagrams/azure/analytics.py
+++ b/diagrams/azure/analytics.py
@@ -12,18 +12,6 @@ class AnalysisServices(_Analytics):
     _icon = "analysis-services.png"
 
 
-class DataExplorerClusters(_Analytics):
-    _icon = "data-explorer-clusters.png"
-
-
-class DataFactories(_Analytics):
-    _icon = "data-factories.png"
-
-
-class DataLakeAnalytics(_Analytics):
-    _icon = "data-lake-analytics.png"
-
-
 class DataLakeStoreGen1(_Analytics):
     _icon = "data-lake-store-gen1.png"
 
@@ -40,8 +28,8 @@ class EventHubs(_Analytics):
     _icon = "event-hubs.png"
 
 
-class Hdinsightclusters(_Analytics):
-    _icon = "hdinsightclusters.png"
+class HDInsightClusters(_Analytics):
+    _icon = "hd-insight-clusters.png"
 
 
 class LogAnalyticsWorkspaces(_Analytics):
diff --git a/diagrams/azure/app_services.py b/diagrams/azure/app_services.py
new file mode 100644
index 00000000..1fcc1474
--- /dev/null
+++ b/diagrams/azure/app_services.py
@@ -0,0 +1,47 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _App_Services(_Azure):
+    _type = "app_services"
+    _icon_dir = "resources/azure/app_services"
+
+
+class APIManagementServices(_App_Services):
+    _icon = "api-management-services.png"
+
+
+class AppServiceCertificates(_App_Services):
+    _icon = "app-service-certificates.png"
+
+
+class AppServiceDomains(_App_Services):
+    _icon = "app-service-domains.png"
+
+
+class AppServiceEnvironments(_App_Services):
+    _icon = "app-service-environments.png"
+
+
+class AppServicePlans(_App_Services):
+    _icon = "app-service-plans.png"
+
+
+class AppServices(_App_Services):
+    _icon = "app-services.png"
+
+
+class CDNProfiles(_App_Services):
+    _icon = "cdn-profiles.png"
+
+
+class NotificationHubs(_App_Services):
+    _icon = "notification-hubs.png"
+
+
+class SearchServices(_App_Services):
+    _icon = "search-services.png"
+
+
+# Aliases
diff --git a/diagrams/azure/azure_stack.py b/diagrams/azure/azure_stack.py
new file mode 100644
index 00000000..8479c2c9
--- /dev/null
+++ b/diagrams/azure/azure_stack.py
@@ -0,0 +1,43 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Azure_Stack(_Azure):
+    _type = "azure_stack"
+    _icon_dir = "resources/azure/azure_stack"
+
+
+class Capacity(_Azure_Stack):
+    _icon = "capacity.png"
+
+
+class InfrastructureBackup(_Azure_Stack):
+    _icon = "infrastructure-backup.png"
+
+
+class MultiTenancy(_Azure_Stack):
+    _icon = "multi-tenancy.png"
+
+
+class Offers(_Azure_Stack):
+    _icon = "offers.png"
+
+
+class Plans(_Azure_Stack):
+    _icon = "plans.png"
+
+
+class Stack(_Azure_Stack):
+    _icon = "stack.png"
+
+
+class Updates(_Azure_Stack):
+    _icon = "updates.png"
+
+
+class UserSubscriptions(_Azure_Stack):
+    _icon = "user-subscriptions.png"
+
+
+# Aliases
diff --git a/diagrams/azure/azure_vmware.py b/diagrams/azure/azure_vmware.py
new file mode 100644
index 00000000..8c15c6bf
--- /dev/null
+++ b/diagrams/azure/azure_vmware.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Azure_Vmware(_Azure):
+    _type = "azure_vmware"
+    _icon_dir = "resources/azure/azure_vmware"
+
+
+class Avs(_Azure_Vmware):
+    _icon = "avs.png"
+
+
+# Aliases
diff --git a/diagrams/azure/blockchain.py b/diagrams/azure/blockchain.py
new file mode 100644
index 00000000..4ffe512c
--- /dev/null
+++ b/diagrams/azure/blockchain.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Blockchain(_Azure):
+    _type = "blockchain"
+    _icon_dir = "resources/azure/blockchain"
+
+
+class AbsMember(_Blockchain):
+    _icon = "abs-member.png"
+
+
+class BlockchainService(_Blockchain):
+    _icon = "blockchain-service.png"
+
+
+class Consortium(_Blockchain):
+    _icon = "consortium.png"
+
+
+class OutboundConnection(_Blockchain):
+    _icon = "outbound-connection.png"
+
+
+class TokenService(_Blockchain):
+    _icon = "token-service.png"
+
+
+# Aliases
diff --git a/diagrams/azure/compute.py b/diagrams/azure/compute.py
index e2e23ba6..c1cf0876 100644
--- a/diagrams/azure/compute.py
+++ b/diagrams/azure/compute.py
@@ -24,36 +24,28 @@ class BatchAccounts(_Compute):
     _icon = "batch-accounts.png"
 
 
-class CitrixVirtualDesktopsEssentials(_Compute):
-    _icon = "citrix-virtual-desktops-essentials.png"
-
-
 class CloudServicesClassic(_Compute):
     _icon = "cloud-services-classic.png"
 
 
-class CloudServices(_Compute):
-    _icon = "cloud-services.png"
-
-
-class CloudsimpleVirtualMachines(_Compute):
-    _icon = "cloudsimple-virtual-machines.png"
-
-
 class ContainerInstances(_Compute):
     _icon = "container-instances.png"
 
 
-class ContainerRegistries(_Compute):
-    _icon = "container-registries.png"
+class ContainerServicesDeprecated(_Compute):
+    _icon = "container-services-deprecated.png"
 
 
 class DiskEncryptionSets(_Compute):
     _icon = "disk-encryption-sets.png"
 
 
-class DiskSnapshots(_Compute):
-    _icon = "disk-snapshots.png"
+class DisksClassic(_Compute):
+    _icon = "disks-classic.png"
+
+
+class DisksSnapshots(_Compute):
+    _icon = "disks-snapshots.png"
 
 
 class Disks(_Compute):
@@ -72,6 +64,10 @@ class ImageVersions(_Compute):
     _icon = "image-versions.png"
 
 
+class Images(_Compute):
+    _icon = "images.png"
+
+
 class KubernetesServices(_Compute):
     _icon = "kubernetes-services.png"
 
@@ -80,12 +76,8 @@ class MeshApplications(_Compute):
     _icon = "mesh-applications.png"
 
 
-class OsImages(_Compute):
-    _icon = "os-images.png"
-
-
-class SAPHANAOnAzure(_Compute):
-    _icon = "sap-hana-on-azure.png"
+class OsImagesClassic(_Compute):
+    _icon = "os-images-classic.png"
 
 
 class ServiceFabricClusters(_Compute):
@@ -100,28 +92,20 @@ class SpringCloud(_Compute):
     _icon = "spring-cloud.png"
 
 
-class VMClassic(_Compute):
-    _icon = "vm-classic.png"
-
-
-class VMImages(_Compute):
-    _icon = "vm-images.png"
-
-
-class VMLinux(_Compute):
-    _icon = "vm-linux.png"
+class VirtualMachine(_Compute):
+    _icon = "virtual-machine.png"
 
 
-class VMScaleSet(_Compute):
-    _icon = "vm-scale-set.png"
+class VirtualMachinesClassic(_Compute):
+    _icon = "virtual-machines-classic.png"
 
 
-class VMWindows(_Compute):
-    _icon = "vm-windows.png"
+class VMImagesClassic(_Compute):
+    _icon = "vm-images-classic.png"
 
 
-class VM(_Compute):
-    _icon = "vm.png"
+class VMScaleSets(_Compute):
+    _icon = "vm-scale-sets.png"
 
 
 class Workspaces(_Compute):
diff --git a/diagrams/azure/containers.py b/diagrams/azure/containers.py
new file mode 100644
index 00000000..f57c6723
--- /dev/null
+++ b/diagrams/azure/containers.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Containers(_Azure):
+    _type = "containers"
+    _icon_dir = "resources/azure/containers"
+
+
+class AppServices(_Containers):
+    _icon = "app-services.png"
+
+
+class BatchAccounts(_Containers):
+    _icon = "batch-accounts.png"
+
+
+class ContainerInstances(_Containers):
+    _icon = "container-instances.png"
+
+
+class ContainerRegistries(_Containers):
+    _icon = "container-registries.png"
+
+
+class KubernetesServices(_Containers):
+    _icon = "kubernetes-services.png"
+
+
+class ServiceFabricClusters(_Containers):
+    _icon = "service-fabric-clusters.png"
+
+
+# Aliases
diff --git a/diagrams/azure/database.py b/diagrams/azure/database.py
deleted file mode 100644
index a9127a85..00000000
--- a/diagrams/azure/database.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Azure
-
-
-class _Database(_Azure):
-    _type = "database"
-    _icon_dir = "resources/azure/database"
-
-
-class BlobStorage(_Database):
-    _icon = "blob-storage.png"
-
-
-class CacheForRedis(_Database):
-    _icon = "cache-for-redis.png"
-
-
-class CosmosDb(_Database):
-    _icon = "cosmos-db.png"
-
-
-class DataExplorerClusters(_Database):
-    _icon = "data-explorer-clusters.png"
-
-
-class DataFactory(_Database):
-    _icon = "data-factory.png"
-
-
-class DataLake(_Database):
-    _icon = "data-lake.png"
-
-
-class DatabaseForMariadbServers(_Database):
-    _icon = "database-for-mariadb-servers.png"
-
-
-class DatabaseForMysqlServers(_Database):
-    _icon = "database-for-mysql-servers.png"
-
-
-class DatabaseForPostgresqlServers(_Database):
-    _icon = "database-for-postgresql-servers.png"
-
-
-class ElasticDatabasePools(_Database):
-    _icon = "elastic-database-pools.png"
-
-
-class ElasticJobAgents(_Database):
-    _icon = "elastic-job-agents.png"
-
-
-class InstancePools(_Database):
-    _icon = "instance-pools.png"
-
-
-class ManagedDatabases(_Database):
-    _icon = "managed-databases.png"
-
-
-class SQLDatabases(_Database):
-    _icon = "sql-databases.png"
-
-
-class SQLDatawarehouse(_Database):
-    _icon = "sql-datawarehouse.png"
-
-
-class SQLManagedInstances(_Database):
-    _icon = "sql-managed-instances.png"
-
-
-class SQLServerStretchDatabases(_Database):
-    _icon = "sql-server-stretch-databases.png"
-
-
-class SQLServers(_Database):
-    _icon = "sql-servers.png"
-
-
-class SQLVM(_Database):
-    _icon = "sql-vm.png"
-
-
-class SQL(_Database):
-    _icon = "sql.png"
-
-
-class SsisLiftAndShiftIr(_Database):
-    _icon = "ssis-lift-and-shift-ir.png"
-
-
-class SynapseAnalytics(_Database):
-    _icon = "synapse-analytics.png"
-
-
-class VirtualClusters(_Database):
-    _icon = "virtual-clusters.png"
-
-
-class VirtualDatacenter(_Database):
-    _icon = "virtual-datacenter.png"
-
-
-# Aliases
diff --git a/diagrams/azure/databases.py b/diagrams/azure/databases.py
new file mode 100644
index 00000000..73eb6872
--- /dev/null
+++ b/diagrams/azure/databases.py
@@ -0,0 +1,99 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Databases(_Azure):
+    _type = "databases"
+    _icon_dir = "resources/azure/databases"
+
+
+class CacheRedis(_Databases):
+    _icon = "cache-redis.png"
+
+
+class CosmosDb(_Databases):
+    _icon = "cosmos-db.png"
+
+
+class DataExplorerClusters(_Databases):
+    _icon = "data-explorer-clusters.png"
+
+
+class DataFactory(_Databases):
+    _icon = "data-factory.png"
+
+
+class DatabaseMariadbServer(_Databases):
+    _icon = "database-mariadb-server.png"
+
+
+class DatabaseMigrationServices(_Databases):
+    _icon = "database-migration-services.png"
+
+
+class DatabaseMysqlServer(_Databases):
+    _icon = "database-mysql-server.png"
+
+
+class DatabasePostgresqlServer(_Databases):
+    _icon = "database-postgresql-server.png"
+
+
+class ElasticJobAgents(_Databases):
+    _icon = "elastic-job-agents.png"
+
+
+class InstancePools(_Databases):
+    _icon = "instance-pools.png"
+
+
+class ManagedDatabase(_Databases):
+    _icon = "managed-database.png"
+
+
+class SQLDataWarehouses(_Databases):
+    _icon = "sql-data-warehouses.png"
+
+
+class SQLDatabase(_Databases):
+    _icon = "sql-database.png"
+
+
+class SQLElasticPools(_Databases):
+    _icon = "sql-elastic-pools.png"
+
+
+class SQLManagedInstance(_Databases):
+    _icon = "sql-managed-instance.png"
+
+
+class SQLServerStretchDatabases(_Databases):
+    _icon = "sql-server-stretch-databases.png"
+
+
+class SQLServer(_Databases):
+    _icon = "sql-server.png"
+
+
+class SQLVM(_Databases):
+    _icon = "sql-vm.png"
+
+
+class SQL(_Databases):
+    _icon = "sql.png"
+
+
+class SsisLiftAndShiftIr(_Databases):
+    _icon = "ssis-lift-and-shift-ir.png"
+
+
+class SynapseAnalytics(_Databases):
+    _icon = "synapse-analytics.png"
+
+
+class VirtualClusters(_Databases):
+    _icon = "virtual-clusters.png"
+
+
+# Aliases
diff --git a/diagrams/azure/devops.py b/diagrams/azure/devops.py
index eee9f253..a7c90cdc 100644
--- a/diagrams/azure/devops.py
+++ b/diagrams/azure/devops.py
@@ -12,14 +12,6 @@ class ApplicationInsights(_Devops):
     _icon = "application-insights.png"
 
 
-class Artifacts(_Devops):
-    _icon = "artifacts.png"
-
-
-class Boards(_Devops):
-    _icon = "boards.png"
-
-
 class Devops(_Devops):
     _icon = "devops.png"
 
@@ -32,16 +24,4 @@ class LabServices(_Devops):
     _icon = "lab-services.png"
 
 
-class Pipelines(_Devops):
-    _icon = "pipelines.png"
-
-
-class Repos(_Devops):
-    _icon = "repos.png"
-
-
-class TestPlans(_Devops):
-    _icon = "test-plans.png"
-
-
 # Aliases
diff --git a/diagrams/azure/general.py b/diagrams/azure/general.py
index 8958e975..02618ae1 100644
--- a/diagrams/azure/general.py
+++ b/diagrams/azure/general.py
@@ -8,36 +8,260 @@ class _General(_Azure):
     _icon_dir = "resources/azure/general"
 
 
-class Allresources(_General):
-    _icon = "allresources.png"
+class AllResources(_General):
+    _icon = "all-resources.png"
 
 
-class Azurehome(_General):
-    _icon = "azurehome.png"
+class Backlog(_General):
+    _icon = "backlog.png"
 
 
-class Developertools(_General):
-    _icon = "developertools.png"
+class BizTalk(_General):
+    _icon = "biz-talk.png"
 
 
-class Helpsupport(_General):
-    _icon = "helpsupport.png"
+class BlobBlock(_General):
+    _icon = "blob-block.png"
+
+
+class BlobPage(_General):
+    _icon = "blob-page.png"
+
+
+class Branch(_General):
+    _icon = "branch.png"
+
+
+class Browser(_General):
+    _icon = "browser.png"
+
+
+class Bug(_General):
+    _icon = "bug.png"
+
+
+class Builds(_General):
+    _icon = "builds.png"
+
+
+class Cache(_General):
+    _icon = "cache.png"
+
+
+class Code(_General):
+    _icon = "code.png"
+
+
+class Commit(_General):
+    _icon = "commit.png"
+
+
+class ControlsHorizontal(_General):
+    _icon = "controls-horizontal.png"
+
+
+class Controls(_General):
+    _icon = "controls.png"
+
+
+class CostAlerts(_General):
+    _icon = "cost-alerts.png"
+
+
+class CostAnalysis(_General):
+    _icon = "cost-analysis.png"
+
+
+class CostBudgets(_General):
+    _icon = "cost-budgets.png"
+
+
+class CostManagementAndBilling(_General):
+    _icon = "cost-management-and-billing.png"
+
+
+class CostManagement(_General):
+    _icon = "cost-management.png"
+
+
+class Counter(_General):
+    _icon = "counter.png"
+
+
+class Cubes(_General):
+    _icon = "cubes.png"
+
+
+class Dashboard(_General):
+    _icon = "dashboard.png"
+
+
+class DevConsole(_General):
+    _icon = "dev-console.png"
+
+
+class Download(_General):
+    _icon = "download.png"
+
+
+class Error(_General):
+    _icon = "error.png"
+
+
+class Extensions(_General):
+    _icon = "extensions.png"
+
+
+class File(_General):
+    _icon = "file.png"
+
+
+class Files(_General):
+    _icon = "files.png"
+
+
+class FolderBlank(_General):
+    _icon = "folder-blank.png"
+
+
+class FolderWebsite(_General):
+    _icon = "folder-website.png"
+
+
+class FreeServices(_General):
+    _icon = "free-services.png"
+
+
+class Ftp(_General):
+    _icon = "ftp.png"
+
+
+class Gear(_General):
+    _icon = "gear.png"
+
+
+class GlobeError(_General):
+    _icon = "globe-error.png"
+
+
+class GlobeSuccess(_General):
+    _icon = "globe-success.png"
+
+
+class GlobeWarning(_General):
+    _icon = "globe-warning.png"
+
+
+class Globe(_General):
+    _icon = "globe.png"
+
+
+class Guide(_General):
+    _icon = "guide.png"
+
+
+class Heart(_General):
+    _icon = "heart.png"
+
+
+class HelpAndSupport(_General):
+    _icon = "help-and-support.png"
+
+
+class Image(_General):
+    _icon = "image.png"
 
 
 class Information(_General):
     _icon = "information.png"
 
 
-class Managementgroups(_General):
-    _icon = "managementgroups.png"
+class InputOutput(_General):
+    _icon = "input-output.png"
+
+
+class JourneyHub(_General):
+    _icon = "journey-hub.png"
+
+
+class LaunchPortal(_General):
+    _icon = "launch-portal.png"
+
+
+class Learn(_General):
+    _icon = "learn.png"
+
+
+class LoadTest(_General):
+    _icon = "load-test.png"
+
+
+class Location(_General):
+    _icon = "location.png"
+
+
+class LogStreaming(_General):
+    _icon = "log-streaming.png"
+
+
+class ManagementGroups(_General):
+    _icon = "management-groups.png"
+
+
+class ManagementPortal(_General):
+    _icon = "management-portal.png"
 
 
 class Marketplace(_General):
     _icon = "marketplace.png"
 
 
-class Quickstartcenter(_General):
-    _icon = "quickstartcenter.png"
+class MediaFile(_General):
+    _icon = "media-file.png"
+
+
+class Media(_General):
+    _icon = "media.png"
+
+
+class MobileEngagement(_General):
+    _icon = "mobile-engagement.png"
+
+
+class Mobile(_General):
+    _icon = "mobile.png"
+
+
+class Module(_General):
+    _icon = "module.png"
+
+
+class PowerUp(_General):
+    _icon = "power-up.png"
+
+
+class Power(_General):
+    _icon = "power.png"
+
+
+class Powershell(_General):
+    _icon = "powershell.png"
+
+
+class Preview(_General):
+    _icon = "preview.png"
+
+
+class ProcessExplorer(_General):
+    _icon = "process-explorer.png"
+
+
+class ProductionReadyDatabase(_General):
+    _icon = "production-ready-database.png"
+
+
+class QuickstartCenter(_General):
+    _icon = "quickstart-center.png"
 
 
 class Recent(_General):
@@ -48,32 +272,72 @@ class Reservations(_General):
     _icon = "reservations.png"
 
 
-class Resource(_General):
-    _icon = "resource.png"
+class ResourceExplorer(_General):
+    _icon = "resource-explorer.png"
 
 
-class Resourcegroups(_General):
-    _icon = "resourcegroups.png"
+class ResourceGroupList(_General):
+    _icon = "resource-group-list.png"
 
 
-class Servicehealth(_General):
-    _icon = "servicehealth.png"
+class ResourceGroups(_General):
+    _icon = "resource-groups.png"
 
 
-class Shareddashboard(_General):
-    _icon = "shareddashboard.png"
+class ResourceLinked(_General):
+    _icon = "resource-linked.png"
 
 
-class Subscriptions(_General):
-    _icon = "subscriptions.png"
+class Scale(_General):
+    _icon = "scale.png"
+
+
+class Scheduler(_General):
+    _icon = "scheduler.png"
+
+
+class SearchGrid(_General):
+    _icon = "search-grid.png"
+
+
+class Search(_General):
+    _icon = "search.png"
+
+
+class ServerFarm(_General):
+    _icon = "server-farm.png"
+
 
+class ServiceBus(_General):
+    _icon = "service-bus.png"
 
-class Support(_General):
-    _icon = "support.png"
 
+class ServiceHealth(_General):
+    _icon = "service-health.png"
 
-class Supportrequests(_General):
-    _icon = "supportrequests.png"
+
+class Ssd(_General):
+    _icon = "ssd.png"
+
+
+class StorageAzureFiles(_General):
+    _icon = "storage-azure-files.png"
+
+
+class StorageContainer(_General):
+    _icon = "storage-container.png"
+
+
+class StorageQueue(_General):
+    _icon = "storage-queue.png"
+
+
+class Subscriptions(_General):
+    _icon = "subscriptions.png"
+
+
+class Table(_General):
+    _icon = "table.png"
 
 
 class Tag(_General):
@@ -84,32 +348,40 @@ class Tags(_General):
     _icon = "tags.png"
 
 
-class Templates(_General):
-    _icon = "templates.png"
+class TfsVcRepository(_General):
+    _icon = "tfs-vc-repository.png"
+
+
+class Toolbox(_General):
+    _icon = "toolbox.png"
+
+
+class Versions(_General):
+    _icon = "versions.png"
 
 
-class Twousericon(_General):
-    _icon = "twousericon.png"
+class WebSlots(_General):
+    _icon = "web-slots.png"
 
 
-class Userhealthicon(_General):
-    _icon = "userhealthicon.png"
+class WebTest(_General):
+    _icon = "web-test.png"
 
 
-class Usericon(_General):
-    _icon = "usericon.png"
+class WebsitePower(_General):
+    _icon = "website-power.png"
 
 
-class Userprivacy(_General):
-    _icon = "userprivacy.png"
+class WebsiteStaging(_General):
+    _icon = "website-staging.png"
 
 
-class Userresource(_General):
-    _icon = "userresource.png"
+class Workbooks(_General):
+    _icon = "workbooks.png"
 
 
-class Whatsnew(_General):
-    _icon = "whatsnew.png"
+class Workflow(_General):
+    _icon = "workflow.png"
 
 
 # Aliases
diff --git a/diagrams/azure/identity.py b/diagrams/azure/identity.py
index a7913728..669d7c53 100644
--- a/diagrams/azure/identity.py
+++ b/diagrams/azure/identity.py
@@ -8,10 +8,6 @@ class _Identity(_Azure):
     _icon_dir = "resources/azure/identity"
 
 
-class AccessReview(_Identity):
-    _icon = "access-review.png"
-
-
 class ActiveDirectoryConnectHealth(_Identity):
     _icon = "active-directory-connect-health.png"
 
@@ -32,18 +28,10 @@ class ADIdentityProtection(_Identity):
     _icon = "ad-identity-protection.png"
 
 
-class ADPrivilegedIdentityManagement(_Identity):
-    _icon = "ad-privileged-identity-management.png"
-
-
 class AppRegistrations(_Identity):
     _icon = "app-registrations.png"
 
 
-class ConditionalAccess(_Identity):
-    _icon = "conditional-access.png"
-
-
 class EnterpriseApplications(_Identity):
     _icon = "enterprise-applications.png"
 
@@ -56,10 +44,6 @@ class IdentityGovernance(_Identity):
     _icon = "identity-governance.png"
 
 
-class InformationProtection(_Identity):
-    _icon = "information-protection.png"
-
-
 class ManagedIdentities(_Identity):
     _icon = "managed-identities.png"
 
diff --git a/diagrams/azure/integration.py b/diagrams/azure/integration.py
index 369cd97b..64c147bd 100644
--- a/diagrams/azure/integration.py
+++ b/diagrams/azure/integration.py
@@ -12,12 +12,8 @@ class APIForFhir(_Integration):
     _icon = "api-for-fhir.png"
 
 
-class APIManagement(_Integration):
-    _icon = "api-management.png"
-
-
-class AppConfiguration(_Integration):
-    _icon = "app-configuration.png"
+class APIManagementServices(_Integration):
+    _icon = "api-management-services.png"
 
 
 class DataCatalog(_Integration):
@@ -40,14 +36,6 @@ class IntegrationAccounts(_Integration):
     _icon = "integration-accounts.png"
 
 
-class IntegrationServiceEnvironments(_Integration):
-    _icon = "integration-service-environments.png"
-
-
-class LogicAppsCustomConnector(_Integration):
-    _icon = "logic-apps-custom-connector.png"
-
-
 class LogicApps(_Integration):
     _icon = "logic-apps.png"
 
@@ -56,28 +44,16 @@ class PartnerTopic(_Integration):
     _icon = "partner-topic.png"
 
 
-class SendgridAccounts(_Integration):
-    _icon = "sendgrid-accounts.png"
-
-
-class ServiceBusRelays(_Integration):
-    _icon = "service-bus-relays.png"
-
-
-class ServiceBus(_Integration):
-    _icon = "service-bus.png"
-
-
-class ServiceCatalogManagedApplicationDefinitions(_Integration):
-    _icon = "service-catalog-managed-application-definitions.png"
+class Relays(_Integration):
+    _icon = "relays.png"
 
 
 class SoftwareAsAService(_Integration):
     _icon = "software-as-a-service.png"
 
 
-class StorsimpleDeviceManagers(_Integration):
-    _icon = "storsimple-device-managers.png"
+class SQLDataWarehouses(_Integration):
+    _icon = "sql-data-warehouses.png"
 
 
 class SystemTopic(_Integration):
diff --git a/diagrams/azure/internet_of_things.py b/diagrams/azure/internet_of_things.py
new file mode 100644
index 00000000..a0f88731
--- /dev/null
+++ b/diagrams/azure/internet_of_things.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Internet_Of_Things(_Azure):
+    _type = "internet_of_things"
+    _icon_dir = "resources/azure/internet_of_things"
+
+
+class DigitalTwins(_Internet_Of_Things):
+    _icon = "digital-twins.png"
+
+
+class TimeSeriesInsightsAccessPolicies(_Internet_Of_Things):
+    _icon = "time-series-insights-access-policies.png"
+
+
+# Aliases
diff --git a/diagrams/azure/intune.py b/diagrams/azure/intune.py
new file mode 100644
index 00000000..214c8e21
--- /dev/null
+++ b/diagrams/azure/intune.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Intune(_Azure):
+    _type = "intune"
+    _icon_dir = "resources/azure/intune"
+
+
+class ADRolesAndAdministrators(_Intune):
+    _icon = "ad-roles-and-administrators.png"
+
+
+class DeviceSecurityApple(_Intune):
+    _icon = "device-security-apple.png"
+
+
+class DeviceSecurityGoogle(_Intune):
+    _icon = "device-security-google.png"
+
+
+class DeviceSecurityWindows(_Intune):
+    _icon = "device-security-windows.png"
+
+
+class IntuneForEducation(_Intune):
+    _icon = "intune-for-education.png"
+
+
+class Intune(_Intune):
+    _icon = "intune.png"
+
+
+# Aliases
diff --git a/diagrams/azure/iot.py b/diagrams/azure/iot.py
index 5d6dce8e..ce570b7a 100644
--- a/diagrams/azure/iot.py
+++ b/diagrams/azure/iot.py
@@ -12,40 +12,44 @@ class DeviceProvisioningServices(_Iot):
     _icon = "device-provisioning-services.png"
 
 
-class DigitalTwins(_Iot):
-    _icon = "digital-twins.png"
+class EventHubs(_Iot):
+    _icon = "event-hubs.png"
 
 
-class IotCentralApplications(_Iot):
-    _icon = "iot-central-applications.png"
+class FunctionApps(_Iot):
+    _icon = "function-apps.png"
 
 
-class IotHubSecurity(_Iot):
-    _icon = "iot-hub-security.png"
+class IotCentralApplications(_Iot):
+    _icon = "iot-central-applications.png"
 
 
 class IotHub(_Iot):
     _icon = "iot-hub.png"
 
 
-class Maps(_Iot):
-    _icon = "maps.png"
+class LogicApps(_Iot):
+    _icon = "logic-apps.png"
 
 
-class Sphere(_Iot):
-    _icon = "sphere.png"
+class MapsAccounts(_Iot):
+    _icon = "maps-accounts.png"
 
 
-class TimeSeriesInsightsEnvironments(_Iot):
-    _icon = "time-series-insights-environments.png"
+class NotificationHubs(_Iot):
+    _icon = "notification-hubs.png"
+
+
+class StreamAnalyticsJobs(_Iot):
+    _icon = "stream-analytics-jobs.png"
 
 
-class TimeSeriesInsightsEventsSources(_Iot):
-    _icon = "time-series-insights-events-sources.png"
+class TimeSeriesInsightsEnvironments(_Iot):
+    _icon = "time-series-insights-environments.png"
 
 
-class Windows10IotCoreServices(_Iot):
-    _icon = "windows-10-iot-core-services.png"
+class TimeSeriesInsightsEventSources(_Iot):
+    _icon = "time-series-insights-event-sources.png"
 
 
 # Aliases
diff --git a/diagrams/azure/management_governance.py b/diagrams/azure/management_governance.py
new file mode 100644
index 00000000..f94ccf91
--- /dev/null
+++ b/diagrams/azure/management_governance.py
@@ -0,0 +1,111 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Management_Governance(_Azure):
+    _type = "management_governance"
+    _icon_dir = "resources/azure/management_governance"
+
+
+class ActivityLog(_Management_Governance):
+    _icon = "activity-log.png"
+
+
+class Advisor(_Management_Governance):
+    _icon = "advisor.png"
+
+
+class Alerts(_Management_Governance):
+    _icon = "alerts.png"
+
+
+class ApplicationInsights(_Management_Governance):
+    _icon = "application-insights.png"
+
+
+class Arc(_Management_Governance):
+    _icon = "arc.png"
+
+
+class AutomationAccounts(_Management_Governance):
+    _icon = "automation-accounts.png"
+
+
+class Blueprints(_Management_Governance):
+    _icon = "blueprints.png"
+
+
+class Compliance(_Management_Governance):
+    _icon = "compliance.png"
+
+
+class CostManagementAndBilling(_Management_Governance):
+    _icon = "cost-management-and-billing.png"
+
+
+class DiagnosticsSettings(_Management_Governance):
+    _icon = "diagnostics-settings.png"
+
+
+class Education(_Management_Governance):
+    _icon = "education.png"
+
+
+class Lighthouse(_Management_Governance):
+    _icon = "lighthouse.png"
+
+
+class LogAnalyticsWorkspaces(_Management_Governance):
+    _icon = "log-analytics-workspaces.png"
+
+
+class Machinesazurearc(_Management_Governance):
+    _icon = "machinesazurearc.png"
+
+
+class ManagedApplicationsCenter(_Management_Governance):
+    _icon = "managed-applications-center.png"
+
+
+class Metrics(_Management_Governance):
+    _icon = "metrics.png"
+
+
+class Monitor(_Management_Governance):
+    _icon = "monitor.png"
+
+
+class MyCustomers(_Management_Governance):
+    _icon = "my-customers.png"
+
+
+class OperationLogClassic(_Management_Governance):
+    _icon = "operation-log-classic.png"
+
+
+class Policy(_Management_Governance):
+    _icon = "policy.png"
+
+
+class RecoveryServicesVaults(_Management_Governance):
+    _icon = "recovery-services-vaults.png"
+
+
+class ResourceGraphExplorer(_Management_Governance):
+    _icon = "resource-graph-explorer.png"
+
+
+class ServiceProviders(_Management_Governance):
+    _icon = "service-providers.png"
+
+
+class Solutions(_Management_Governance):
+    _icon = "solutions.png"
+
+
+class UserPrivacy(_Management_Governance):
+    _icon = "user-privacy.png"
+
+
+# Aliases
diff --git a/diagrams/azure/migrate.py b/diagrams/azure/migrate.py
new file mode 100644
index 00000000..4f7028a4
--- /dev/null
+++ b/diagrams/azure/migrate.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Migrate(_Azure):
+    _type = "migrate"
+    _icon_dir = "resources/azure/migrate"
+
+
+class CostManagementAndBilling(_Migrate):
+    _icon = "cost-management-and-billing.png"
+
+
+class DataBoxEdge(_Migrate):
+    _icon = "data-box-edge.png"
+
+
+class DataBox(_Migrate):
+    _icon = "data-box.png"
+
+
+class Migrate(_Migrate):
+    _icon = "migrate.png"
+
+
+class RecoveryServicesVaults(_Migrate):
+    _icon = "recovery-services-vaults.png"
+
+
+# Aliases
diff --git a/diagrams/azure/migration.py b/diagrams/azure/migration.py
deleted file mode 100644
index 74f573f7..00000000
--- a/diagrams/azure/migration.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Azure
-
-
-class _Migration(_Azure):
-    _type = "migration"
-    _icon_dir = "resources/azure/migration"
-
-
-class DataBoxEdge(_Migration):
-    _icon = "data-box-edge.png"
-
-
-class DataBox(_Migration):
-    _icon = "data-box.png"
-
-
-class DatabaseMigrationServices(_Migration):
-    _icon = "database-migration-services.png"
-
-
-class MigrationProjects(_Migration):
-    _icon = "migration-projects.png"
-
-
-class RecoveryServicesVaults(_Migration):
-    _icon = "recovery-services-vaults.png"
-
-
-# Aliases
diff --git a/diagrams/azure/mixed_reality.py b/diagrams/azure/mixed_reality.py
new file mode 100644
index 00000000..2d5210ed
--- /dev/null
+++ b/diagrams/azure/mixed_reality.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Mixed_Reality(_Azure):
+    _type = "mixed_reality"
+    _icon_dir = "resources/azure/mixed_reality"
+
+
+class RemoteRendering(_Mixed_Reality):
+    _icon = "remote-rendering.png"
+
+
+# Aliases
diff --git a/diagrams/azure/ml.py b/diagrams/azure/ml.py
deleted file mode 100644
index 295a261e..00000000
--- a/diagrams/azure/ml.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Azure
-
-
-class _Ml(_Azure):
-    _type = "ml"
-    _icon_dir = "resources/azure/ml"
-
-
-class BatchAI(_Ml):
-    _icon = "batch-ai.png"
-
-
-class BotServices(_Ml):
-    _icon = "bot-services.png"
-
-
-class CognitiveServices(_Ml):
-    _icon = "cognitive-services.png"
-
-
-class GenomicsAccounts(_Ml):
-    _icon = "genomics-accounts.png"
-
-
-class MachineLearningServiceWorkspaces(_Ml):
-    _icon = "machine-learning-service-workspaces.png"
-
-
-class MachineLearningStudioWebServicePlans(_Ml):
-    _icon = "machine-learning-studio-web-service-plans.png"
-
-
-class MachineLearningStudioWebServices(_Ml):
-    _icon = "machine-learning-studio-web-services.png"
-
-
-class MachineLearningStudioWorkspaces(_Ml):
-    _icon = "machine-learning-studio-workspaces.png"
-
-
-# Aliases
diff --git a/diagrams/azure/mobile.py b/diagrams/azure/mobile.py
deleted file mode 100644
index e2eb20a5..00000000
--- a/diagrams/azure/mobile.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Azure
-
-
-class _Mobile(_Azure):
-    _type = "mobile"
-    _icon_dir = "resources/azure/mobile"
-
-
-class AppServiceMobile(_Mobile):
-    _icon = "app-service-mobile.png"
-
-
-class MobileEngagement(_Mobile):
-    _icon = "mobile-engagement.png"
-
-
-class NotificationHubs(_Mobile):
-    _icon = "notification-hubs.png"
-
-
-# Aliases
diff --git a/diagrams/azure/monitor.py b/diagrams/azure/monitor.py
new file mode 100644
index 00000000..4a958a35
--- /dev/null
+++ b/diagrams/azure/monitor.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Monitor(_Azure):
+    _type = "monitor"
+    _icon_dir = "resources/azure/monitor"
+
+
+class SAPAzureMonitor(_Monitor):
+    _icon = "sap-azure-monitor.png"
+
+
+# Aliases
diff --git a/diagrams/azure/network.py b/diagrams/azure/network.py
deleted file mode 100644
index 23dd69c0..00000000
--- a/diagrams/azure/network.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Azure
-
-
-class _Network(_Azure):
-    _type = "network"
-    _icon_dir = "resources/azure/network"
-
-
-class ApplicationGateway(_Network):
-    _icon = "application-gateway.png"
-
-
-class ApplicationSecurityGroups(_Network):
-    _icon = "application-security-groups.png"
-
-
-class CDNProfiles(_Network):
-    _icon = "cdn-profiles.png"
-
-
-class Connections(_Network):
-    _icon = "connections.png"
-
-
-class DDOSProtectionPlans(_Network):
-    _icon = "ddos-protection-plans.png"
-
-
-class DNSPrivateZones(_Network):
-    _icon = "dns-private-zones.png"
-
-
-class DNSZones(_Network):
-    _icon = "dns-zones.png"
-
-
-class ExpressrouteCircuits(_Network):
-    _icon = "expressroute-circuits.png"
-
-
-class Firewall(_Network):
-    _icon = "firewall.png"
-
-
-class FrontDoors(_Network):
-    _icon = "front-doors.png"
-
-
-class LoadBalancers(_Network):
-    _icon = "load-balancers.png"
-
-
-class LocalNetworkGateways(_Network):
-    _icon = "local-network-gateways.png"
-
-
-class NetworkInterfaces(_Network):
-    _icon = "network-interfaces.png"
-
-
-class NetworkSecurityGroupsClassic(_Network):
-    _icon = "network-security-groups-classic.png"
-
-
-class NetworkWatcher(_Network):
-    _icon = "network-watcher.png"
-
-
-class OnPremisesDataGateways(_Network):
-    _icon = "on-premises-data-gateways.png"
-
-
-class PublicIpAddresses(_Network):
-    _icon = "public-ip-addresses.png"
-
-
-class ReservedIpAddressesClassic(_Network):
-    _icon = "reserved-ip-addresses-classic.png"
-
-
-class RouteFilters(_Network):
-    _icon = "route-filters.png"
-
-
-class RouteTables(_Network):
-    _icon = "route-tables.png"
-
-
-class ServiceEndpointPolicies(_Network):
-    _icon = "service-endpoint-policies.png"
-
-
-class Subnets(_Network):
-    _icon = "subnets.png"
-
-
-class TrafficManagerProfiles(_Network):
-    _icon = "traffic-manager-profiles.png"
-
-
-class VirtualNetworkClassic(_Network):
-    _icon = "virtual-network-classic.png"
-
-
-class VirtualNetworkGateways(_Network):
-    _icon = "virtual-network-gateways.png"
-
-
-class VirtualNetworks(_Network):
-    _icon = "virtual-networks.png"
-
-
-class VirtualWans(_Network):
-    _icon = "virtual-wans.png"
-
-
-# Aliases
diff --git a/diagrams/azure/networking.py b/diagrams/azure/networking.py
new file mode 100644
index 00000000..6b627c4d
--- /dev/null
+++ b/diagrams/azure/networking.py
@@ -0,0 +1,139 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Networking(_Azure):
+    _type = "networking"
+    _icon_dir = "resources/azure/networking"
+
+
+class ApplicationGateways(_Networking):
+    _icon = "application-gateways.png"
+
+
+class CDNProfiles(_Networking):
+    _icon = "cdn-profiles.png"
+
+
+class Connections(_Networking):
+    _icon = "connections.png"
+
+
+class DDOSProtectionPlans(_Networking):
+    _icon = "ddos-protection-plans.png"
+
+
+class DNSZones(_Networking):
+    _icon = "dns-zones.png"
+
+
+class ExpressrouteCircuits(_Networking):
+    _icon = "expressroute-circuits.png"
+
+
+class FirewallManager(_Networking):
+    _icon = "firewall-manager.png"
+
+
+class Firewalls(_Networking):
+    _icon = "firewalls.png"
+
+
+class FrontDoors(_Networking):
+    _icon = "front-doors.png"
+
+
+class IpGroups(_Networking):
+    _icon = "ip-groups.png"
+
+
+class LoadBalancers(_Networking):
+    _icon = "load-balancers.png"
+
+
+class LocalNetworkGateways(_Networking):
+    _icon = "local-network-gateways.png"
+
+
+class Nat(_Networking):
+    _icon = "nat.png"
+
+
+class NetworkInterfaces(_Networking):
+    _icon = "network-interfaces.png"
+
+
+class NetworkSecurityGroups(_Networking):
+    _icon = "network-security-groups.png"
+
+
+class NetworkWatcher(_Networking):
+    _icon = "network-watcher.png"
+
+
+class PrivateLinkService(_Networking):
+    _icon = "private-link-service.png"
+
+
+class PrivateLink(_Networking):
+    _icon = "private-link.png"
+
+
+class ProximityPlacementGroups(_Networking):
+    _icon = "proximity-placement-groups.png"
+
+
+class PublicIpAddressesClassic(_Networking):
+    _icon = "public-ip-addresses-classic.png"
+
+
+class PublicIpAddresses(_Networking):
+    _icon = "public-ip-addresses.png"
+
+
+class PublicIpPrefixes(_Networking):
+    _icon = "public-ip-prefixes.png"
+
+
+class ReservedIpAddressesClassic(_Networking):
+    _icon = "reserved-ip-addresses-classic.png"
+
+
+class RouteFilters(_Networking):
+    _icon = "route-filters.png"
+
+
+class RouteTables(_Networking):
+    _icon = "route-tables.png"
+
+
+class ServiceEndpointPolicies(_Networking):
+    _icon = "service-endpoint-policies.png"
+
+
+class TrafficManagerProfiles(_Networking):
+    _icon = "traffic-manager-profiles.png"
+
+
+class VirtualNetworkGateways(_Networking):
+    _icon = "virtual-network-gateways.png"
+
+
+class VirtualNetworksClassic(_Networking):
+    _icon = "virtual-networks-classic.png"
+
+
+class VirtualNetworks(_Networking):
+    _icon = "virtual-networks.png"
+
+
+class VirtualWans(_Networking):
+    _icon = "virtual-wans.png"
+
+
+class WebApplicationFirewallPolicieswaf(_Networking):
+    _icon = "web-application-firewall-policieswaf.png"
+
+
+# Aliases
diff --git a/diagrams/azure/other.py b/diagrams/azure/other.py
new file mode 100644
index 00000000..937b096c
--- /dev/null
+++ b/diagrams/azure/other.py
@@ -0,0 +1,59 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Other(_Azure):
+    _type = "other"
+    _icon_dir = "resources/azure/other"
+
+
+class BackupCenter(_Other):
+    _icon = "backup-center.png"
+
+
+class Detonation(_Other):
+    _icon = "detonation.png"
+
+
+class ExpressrouteDirect(_Other):
+    _icon = "expressroute-direct.png"
+
+
+class InstancePools(_Other):
+    _icon = "instance-pools.png"
+
+
+class InternetAnalyzerProfiles(_Other):
+    _icon = "internet-analyzer-profiles.png"
+
+
+class LocalNetworkGateways(_Other):
+    _icon = "local-network-gateways.png"
+
+
+class PeeringService(_Other):
+    _icon = "peering-service.png"
+
+
+class ResourceMover(_Other):
+    _icon = "resource-mover.png"
+
+
+class SshKeys(_Other):
+    _icon = "ssh-keys.png"
+
+
+class TemplateSpecs(_Other):
+    _icon = "template-specs.png"
+
+
+class UniversalPrint(_Other):
+    _icon = "universal-print.png"
+
+
+class WindowsVirtualDesktop(_Other):
+    _icon = "windows-virtual-desktop.png"
+
+
+# Aliases
diff --git a/diagrams/azure/preview.py b/diagrams/azure/preview.py
new file mode 100644
index 00000000..6df05745
--- /dev/null
+++ b/diagrams/azure/preview.py
@@ -0,0 +1,47 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Preview(_Azure):
+    _type = "preview"
+    _icon_dir = "resources/azure/preview"
+
+
+class CloudShell(_Preview):
+    _icon = "cloud-shell.png"
+
+
+class IotEdge(_Preview):
+    _icon = "iot-edge.png"
+
+
+class PrivateLinkHub(_Preview):
+    _icon = "private-link-hub.png"
+
+
+class Rtos(_Preview):
+    _icon = "rtos.png"
+
+
+class Sphere(_Preview):
+    _icon = "sphere.png"
+
+
+class StaticApps(_Preview):
+    _icon = "static-apps.png"
+
+
+class TimeSeriesDataSets(_Preview):
+    _icon = "time-series-data-sets.png"
+
+
+class WebEnvironment(_Preview):
+    _icon = "web-environment.png"
+
+
+class Workbooks(_Preview):
+    _icon = "workbooks.png"
+
+
+# Aliases
diff --git a/diagrams/azure/security.py b/diagrams/azure/security.py
index f78fb51d..e579d6df 100644
--- a/diagrams/azure/security.py
+++ b/diagrams/azure/security.py
@@ -20,8 +20,8 @@ class Defender(_Security):
     _icon = "defender.png"
 
 
-class ExtendedSecurityUpdates(_Security):
-    _icon = "extended-security-updates.png"
+class Extendedsecurityupdates(_Security):
+    _icon = "extendedsecurityupdates.png"
 
 
 class KeyVaults(_Security):
diff --git a/diagrams/azure/storage.py b/diagrams/azure/storage.py
index 5dcf1f2c..1a703132 100644
--- a/diagrams/azure/storage.py
+++ b/diagrams/azure/storage.py
@@ -8,40 +8,44 @@ class _Storage(_Azure):
     _icon_dir = "resources/azure/storage"
 
 
-class ArchiveStorage(_Storage):
-    _icon = "archive-storage.png"
+class DataBoxEdge(_Storage):
+    _icon = "data-box-edge.png"
 
 
-class Azurefxtedgefiler(_Storage):
-    _icon = "azurefxtedgefiler.png"
+class DataBox(_Storage):
+    _icon = "data-box.png"
 
 
-class BlobStorage(_Storage):
-    _icon = "blob-storage.png"
+class DataLakeStorageGen1(_Storage):
+    _icon = "data-lake-storage-gen1.png"
 
 
-class DataBoxEdgeDataBoxGateway(_Storage):
-    _icon = "data-box-edge-data-box-gateway.png"
+class DataShareInvitations(_Storage):
+    _icon = "data-share-invitations.png"
 
 
-class DataBox(_Storage):
-    _icon = "data-box.png"
+class DataShares(_Storage):
+    _icon = "data-shares.png"
 
 
-class DataLakeStorage(_Storage):
-    _icon = "data-lake-storage.png"
+class HcpCache(_Storage):
+    _icon = "hcp-cache.png"
 
 
-class GeneralStorage(_Storage):
-    _icon = "general-storage.png"
+class ImportExportJobs(_Storage):
+    _icon = "import-export-jobs.png"
 
 
 class NetappFiles(_Storage):
     _icon = "netapp-files.png"
 
 
-class QueuesStorage(_Storage):
-    _icon = "queues-storage.png"
+class RecoveryServicesVaults(_Storage):
+    _icon = "recovery-services-vaults.png"
+
+
+class StackEdge(_Storage):
+    _icon = "stack-edge.png"
 
 
 class StorageAccountsClassic(_Storage):
@@ -52,10 +56,6 @@ class StorageAccounts(_Storage):
     _icon = "storage-accounts.png"
 
 
-class StorageExplorer(_Storage):
-    _icon = "storage-explorer.png"
-
-
 class StorageSyncServices(_Storage):
     _icon = "storage-sync-services.png"
 
@@ -68,8 +68,4 @@ class StorsimpleDeviceManagers(_Storage):
     _icon = "storsimple-device-managers.png"
 
 
-class TableStorage(_Storage):
-    _icon = "table-storage.png"
-
-
 # Aliases
diff --git a/diagrams/azure/web.py b/diagrams/azure/web.py
index b99a61cc..4f689be0 100644
--- a/diagrams/azure/web.py
+++ b/diagrams/azure/web.py
@@ -8,44 +8,12 @@ class _Web(_Azure):
     _icon_dir = "resources/azure/web"
 
 
-class APIConnections(_Web):
-    _icon = "api-connections.png"
-
-
-class AppServiceCertificates(_Web):
-    _icon = "app-service-certificates.png"
-
-
-class AppServiceDomains(_Web):
-    _icon = "app-service-domains.png"
-
-
-class AppServiceEnvironments(_Web):
-    _icon = "app-service-environments.png"
-
-
-class AppServicePlans(_Web):
-    _icon = "app-service-plans.png"
-
-
-class AppServices(_Web):
-    _icon = "app-services.png"
-
-
-class MediaServices(_Web):
-    _icon = "media-services.png"
+class MediaService(_Web):
+    _icon = "media-service.png"
 
 
 class NotificationHubNamespaces(_Web):
     _icon = "notification-hub-namespaces.png"
 
 
-class Search(_Web):
-    _icon = "search.png"
-
-
-class Signalr(_Web):
-    _icon = "signalr.png"
-
-
 # Aliases
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index c6fe5852..c5d3a3e6 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,268 +5,422 @@ title: Azure
 
 Node classes list of azure provider.
 
+## azure.ai_ml
+
+- **diagrams.azure.ai_ml.BotServices**
+- **diagrams.azure.ai_ml.CognitiveServices**
+- **diagrams.azure.ai_ml.MachineLearningStudioClassicWebServices**
+- **diagrams.azure.ai_ml.MachineLearningStudioWebServicePlans**
+- **diagrams.azure.ai_ml.MachineLearningStudioWorkspaces**
+- **diagrams.azure.ai_ml.TranslatorText**
+
 ## azure.analytics
 
 - **diagrams.azure.analytics.AnalysisServices**
-- **diagrams.azure.analytics.DataExplorerClusters**
-- **diagrams.azure.analytics.DataFactories**
-- **diagrams.azure.analytics.DataLakeAnalytics**
 - **diagrams.azure.analytics.DataLakeStoreGen1**
 - **diagrams.azure.analytics.Databricks**
 - **diagrams.azure.analytics.EventHubClusters**
 - **diagrams.azure.analytics.EventHubs**
-- **diagrams.azure.analytics.Hdinsightclusters**
+- **diagrams.azure.analytics.HDInsightClusters**
 - **diagrams.azure.analytics.LogAnalyticsWorkspaces**
 - **diagrams.azure.analytics.StreamAnalyticsJobs**
 - **diagrams.azure.analytics.SynapseAnalytics**
 
+## azure.app_services
+
+- **diagrams.azure.app_services.APIManagementServices**
+- **diagrams.azure.app_services.AppServiceCertificates**
+- **diagrams.azure.app_services.AppServiceDomains**
+- **diagrams.azure.app_services.AppServiceEnvironments**
+- **diagrams.azure.app_services.AppServicePlans**
+- **diagrams.azure.app_services.AppServices**
+- **diagrams.azure.app_services.CDNProfiles**
+- **diagrams.azure.app_services.NotificationHubs**
+- **diagrams.azure.app_services.SearchServices**
+
+## azure.azure_stack
+
+- **diagrams.azure.azure_stack.Capacity**
+- **diagrams.azure.azure_stack.InfrastructureBackup**
+- **diagrams.azure.azure_stack.MultiTenancy**
+- **diagrams.azure.azure_stack.Offers**
+- **diagrams.azure.azure_stack.Plans**
+- **diagrams.azure.azure_stack.Stack**
+- **diagrams.azure.azure_stack.Updates**
+- **diagrams.azure.azure_stack.UserSubscriptions**
+
+## azure.azure_vmware
+
+- **diagrams.azure.azure_vmware.Avs**
+
+## azure.blockchain
+
+- **diagrams.azure.blockchain.AbsMember**
+- **diagrams.azure.blockchain.BlockchainService**
+- **diagrams.azure.blockchain.Consortium**
+- **diagrams.azure.blockchain.OutboundConnection**
+- **diagrams.azure.blockchain.TokenService**
+
 ## azure.compute
 
 - **diagrams.azure.compute.AppServices**
 - **diagrams.azure.compute.AutomanagedVM**
 - **diagrams.azure.compute.AvailabilitySets**
 - **diagrams.azure.compute.BatchAccounts**
-- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
 - **diagrams.azure.compute.CloudServicesClassic**
-- **diagrams.azure.compute.CloudServices**
-- **diagrams.azure.compute.CloudsimpleVirtualMachines**
 - **diagrams.azure.compute.ContainerInstances**
-- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
+- **diagrams.azure.compute.ContainerServicesDeprecated**
 - **diagrams.azure.compute.DiskEncryptionSets**
-- **diagrams.azure.compute.DiskSnapshots**
+- **diagrams.azure.compute.DisksClassic**
+- **diagrams.azure.compute.DisksSnapshots**
 - **diagrams.azure.compute.Disks**
 - **diagrams.azure.compute.FunctionApps**
 - **diagrams.azure.compute.ImageDefinitions**
 - **diagrams.azure.compute.ImageVersions**
+- **diagrams.azure.compute.Images**
 - **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
 - **diagrams.azure.compute.MeshApplications**
-- **diagrams.azure.compute.OsImages**
-- **diagrams.azure.compute.SAPHANAOnAzure**
+- **diagrams.azure.compute.OsImagesClassic**
 - **diagrams.azure.compute.ServiceFabricClusters**
 - **diagrams.azure.compute.SharedImageGalleries**
 - **diagrams.azure.compute.SpringCloud**
-- **diagrams.azure.compute.VMClassic**
-- **diagrams.azure.compute.VMImages**
-- **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMScaleSet**, **VMSS** (alias)
-- **diagrams.azure.compute.VMWindows**
-- **diagrams.azure.compute.VM**
+- **diagrams.azure.compute.VirtualMachine**
+- **diagrams.azure.compute.VirtualMachinesClassic**
+- **diagrams.azure.compute.VMImagesClassic**
+- **diagrams.azure.compute.VMScaleSets**
 - **diagrams.azure.compute.Workspaces**
 
-## azure.database
-
-- **diagrams.azure.database.BlobStorage**
-- **diagrams.azure.database.CacheForRedis**
-- **diagrams.azure.database.CosmosDb**
-- **diagrams.azure.database.DataExplorerClusters**
-- **diagrams.azure.database.DataFactory**
-- **diagrams.azure.database.DataLake**
-- **diagrams.azure.database.DatabaseForMariadbServers**
-- **diagrams.azure.database.DatabaseForMysqlServers**
-- **diagrams.azure.database.DatabaseForPostgresqlServers**
-- **diagrams.azure.database.ElasticDatabasePools**
-- **diagrams.azure.database.ElasticJobAgents**
-- **diagrams.azure.database.InstancePools**
-- **diagrams.azure.database.ManagedDatabases**
-- **diagrams.azure.database.SQLDatabases**
-- **diagrams.azure.database.SQLDatawarehouse**
-- **diagrams.azure.database.SQLManagedInstances**
-- **diagrams.azure.database.SQLServerStretchDatabases**
-- **diagrams.azure.database.SQLServers**
-- **diagrams.azure.database.SQLVM**
-- **diagrams.azure.database.SQL**
-- **diagrams.azure.database.SsisLiftAndShiftIr**
-- **diagrams.azure.database.SynapseAnalytics**
-- **diagrams.azure.database.VirtualClusters**
-- **diagrams.azure.database.VirtualDatacenter**
+## azure.containers
+
+- **diagrams.azure.containers.AppServices**
+- **diagrams.azure.containers.BatchAccounts**
+- **diagrams.azure.containers.ContainerInstances**
+- **diagrams.azure.containers.ContainerRegistries**
+- **diagrams.azure.containers.KubernetesServices**
+- **diagrams.azure.containers.ServiceFabricClusters**
+
+## azure.databases
+
+- **diagrams.azure.databases.CacheRedis**
+- **diagrams.azure.databases.CosmosDb**
+- **diagrams.azure.databases.DataExplorerClusters**
+- **diagrams.azure.databases.DataFactory**
+- **diagrams.azure.databases.DatabaseMariadbServer**
+- **diagrams.azure.databases.DatabaseMigrationServices**
+- **diagrams.azure.databases.DatabaseMysqlServer**
+- **diagrams.azure.databases.DatabasePostgresqlServer**
+- **diagrams.azure.databases.ElasticJobAgents**
+- **diagrams.azure.databases.InstancePools**
+- **diagrams.azure.databases.ManagedDatabase**
+- **diagrams.azure.databases.SQLDataWarehouses**
+- **diagrams.azure.databases.SQLDatabase**
+- **diagrams.azure.databases.SQLElasticPools**
+- **diagrams.azure.databases.SQLManagedInstance**
+- **diagrams.azure.databases.SQLServerStretchDatabases**
+- **diagrams.azure.databases.SQLServer**
+- **diagrams.azure.databases.SQLVM**
+- **diagrams.azure.databases.SQL**
+- **diagrams.azure.databases.SsisLiftAndShiftIr**
+- **diagrams.azure.databases.SynapseAnalytics**
+- **diagrams.azure.databases.VirtualClusters**
 
 ## azure.devops
 
 - **diagrams.azure.devops.ApplicationInsights**
-- **diagrams.azure.devops.Artifacts**
-- **diagrams.azure.devops.Boards**
 - **diagrams.azure.devops.Devops**
 - **diagrams.azure.devops.DevtestLabs**
 - **diagrams.azure.devops.LabServices**
-- **diagrams.azure.devops.Pipelines**
-- **diagrams.azure.devops.Repos**
-- **diagrams.azure.devops.TestPlans**
 
 ## azure.general
 
-- **diagrams.azure.general.Allresources**
-- **diagrams.azure.general.Azurehome**
-- **diagrams.azure.general.Developertools**
-- **diagrams.azure.general.Helpsupport**
+- **diagrams.azure.general.AllResources**
+- **diagrams.azure.general.Backlog**
+- **diagrams.azure.general.BizTalk**
+- **diagrams.azure.general.BlobBlock**
+- **diagrams.azure.general.BlobPage**
+- **diagrams.azure.general.Branch**
+- **diagrams.azure.general.Browser**
+- **diagrams.azure.general.Bug**
+- **diagrams.azure.general.Builds**
+- **diagrams.azure.general.Cache**
+- **diagrams.azure.general.Code**
+- **diagrams.azure.general.Commit**
+- **diagrams.azure.general.ControlsHorizontal**
+- **diagrams.azure.general.Controls**
+- **diagrams.azure.general.CostAlerts**
+- **diagrams.azure.general.CostAnalysis**
+- **diagrams.azure.general.CostBudgets**
+- **diagrams.azure.general.CostManagementAndBilling**
+- **diagrams.azure.general.CostManagement**
+- **diagrams.azure.general.Counter**
+- **diagrams.azure.general.Cubes**
+- **diagrams.azure.general.Dashboard**
+- **diagrams.azure.general.DevConsole**
+- **diagrams.azure.general.Download**
+- **diagrams.azure.general.Error**
+- **diagrams.azure.general.Extensions**
+- **diagrams.azure.general.File**
+- **diagrams.azure.general.Files**
+- **diagrams.azure.general.FolderBlank**
+- **diagrams.azure.general.FolderWebsite**
+- **diagrams.azure.general.FreeServices**
+- **diagrams.azure.general.Ftp**
+- **diagrams.azure.general.Gear**
+- **diagrams.azure.general.GlobeError**
+- **diagrams.azure.general.GlobeSuccess**
+- **diagrams.azure.general.GlobeWarning**
+- **diagrams.azure.general.Globe**
+- **diagrams.azure.general.Guide**
+- **diagrams.azure.general.Heart**
+- **diagrams.azure.general.HelpAndSupport**
+- **diagrams.azure.general.Image**
 - **diagrams.azure.general.Information**
-- **diagrams.azure.general.Managementgroups**
+- **diagrams.azure.general.InputOutput**
+- **diagrams.azure.general.JourneyHub**
+- **diagrams.azure.general.LaunchPortal**
+- **diagrams.azure.general.Learn**
+- **diagrams.azure.general.LoadTest**
+- **diagrams.azure.general.Location**
+- **diagrams.azure.general.LogStreaming**
+- **diagrams.azure.general.ManagementGroups**
+- **diagrams.azure.general.ManagementPortal**
 - **diagrams.azure.general.Marketplace**
-- **diagrams.azure.general.Quickstartcenter**
+- **diagrams.azure.general.MediaFile**
+- **diagrams.azure.general.Media**
+- **diagrams.azure.general.MobileEngagement**
+- **diagrams.azure.general.Mobile**
+- **diagrams.azure.general.Module**
+- **diagrams.azure.general.PowerUp**
+- **diagrams.azure.general.Power**
+- **diagrams.azure.general.Powershell**
+- **diagrams.azure.general.Preview**
+- **diagrams.azure.general.ProcessExplorer**
+- **diagrams.azure.general.ProductionReadyDatabase**
+- **diagrams.azure.general.QuickstartCenter**
 - **diagrams.azure.general.Recent**
 - **diagrams.azure.general.Reservations**
-- **diagrams.azure.general.Resource**
-- **diagrams.azure.general.Resourcegroups**
-- **diagrams.azure.general.Servicehealth**
-- **diagrams.azure.general.Shareddashboard**
+- **diagrams.azure.general.ResourceExplorer**
+- **diagrams.azure.general.ResourceGroupList**
+- **diagrams.azure.general.ResourceGroups**
+- **diagrams.azure.general.ResourceLinked**
+- **diagrams.azure.general.Scale**
+- **diagrams.azure.general.Scheduler**
+- **diagrams.azure.general.SearchGrid**
+- **diagrams.azure.general.Search**
+- **diagrams.azure.general.ServerFarm**
+- **diagrams.azure.general.ServiceBus**
+- **diagrams.azure.general.ServiceHealth**
+- **diagrams.azure.general.Ssd**
+- **diagrams.azure.general.StorageAzureFiles**
+- **diagrams.azure.general.StorageContainer**
+- **diagrams.azure.general.StorageQueue**
 - **diagrams.azure.general.Subscriptions**
-- **diagrams.azure.general.Support**
-- **diagrams.azure.general.Supportrequests**
+- **diagrams.azure.general.Table**
 - **diagrams.azure.general.Tag**
 - **diagrams.azure.general.Tags**
-- **diagrams.azure.general.Templates**
-- **diagrams.azure.general.Twousericon**
-- **diagrams.azure.general.Userhealthicon**
-- **diagrams.azure.general.Usericon**
-- **diagrams.azure.general.Userprivacy**
-- **diagrams.azure.general.Userresource**
-- **diagrams.azure.general.Whatsnew**
+- **diagrams.azure.general.TfsVcRepository**
+- **diagrams.azure.general.Toolbox**
+- **diagrams.azure.general.Versions**
+- **diagrams.azure.general.WebSlots**
+- **diagrams.azure.general.WebTest**
+- **diagrams.azure.general.WebsitePower**
+- **diagrams.azure.general.WebsiteStaging**
+- **diagrams.azure.general.Workbooks**
+- **diagrams.azure.general.Workflow**
 
 ## azure.identity
 
-- **diagrams.azure.identity.AccessReview**
 - **diagrams.azure.identity.ActiveDirectoryConnectHealth**
 - **diagrams.azure.identity.ActiveDirectory**
 - **diagrams.azure.identity.ADB2C**
 - **diagrams.azure.identity.ADDomainServices**
 - **diagrams.azure.identity.ADIdentityProtection**
-- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
 - **diagrams.azure.identity.AppRegistrations**
-- **diagrams.azure.identity.ConditionalAccess**
 - **diagrams.azure.identity.EnterpriseApplications**
 - **diagrams.azure.identity.Groups**
 - **diagrams.azure.identity.IdentityGovernance**
-- **diagrams.azure.identity.InformationProtection**
 - **diagrams.azure.identity.ManagedIdentities**
 - **diagrams.azure.identity.Users**
 
 ## azure.integration
 
 - **diagrams.azure.integration.APIForFhir**
-- **diagrams.azure.integration.APIManagement**
-- **diagrams.azure.integration.AppConfiguration**
+- **diagrams.azure.integration.APIManagementServices**
 - **diagrams.azure.integration.DataCatalog**
 - **diagrams.azure.integration.EventGridDomains**
 - **diagrams.azure.integration.EventGridSubscriptions**
 - **diagrams.azure.integration.EventGridTopics**
 - **diagrams.azure.integration.IntegrationAccounts**
-- **diagrams.azure.integration.IntegrationServiceEnvironments**
-- **diagrams.azure.integration.LogicAppsCustomConnector**
 - **diagrams.azure.integration.LogicApps**
 - **diagrams.azure.integration.PartnerTopic**
-- **diagrams.azure.integration.SendgridAccounts**
-- **diagrams.azure.integration.ServiceBusRelays**
-- **diagrams.azure.integration.ServiceBus**
-- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
+- **diagrams.azure.integration.Relays**
 - **diagrams.azure.integration.SoftwareAsAService**
-- **diagrams.azure.integration.StorsimpleDeviceManagers**
+- **diagrams.azure.integration.SQLDataWarehouses**
 - **diagrams.azure.integration.SystemTopic**
 
+## azure.internet_of_things
+
+- **diagrams.azure.internet_of_things.DigitalTwins**
+- **diagrams.azure.internet_of_things.TimeSeriesInsightsAccessPolicies**
+
+## azure.intune
+
+- **diagrams.azure.intune.ADRolesAndAdministrators**
+- **diagrams.azure.intune.DeviceSecurityApple**
+- **diagrams.azure.intune.DeviceSecurityGoogle**
+- **diagrams.azure.intune.DeviceSecurityWindows**
+- **diagrams.azure.intune.IntuneForEducation**
+- **diagrams.azure.intune.Intune**
+
 ## azure.iot
 
 - **diagrams.azure.iot.DeviceProvisioningServices**
-- **diagrams.azure.iot.DigitalTwins**
+- **diagrams.azure.iot.EventHubs**
+- **diagrams.azure.iot.FunctionApps**
 - **diagrams.azure.iot.IotCentralApplications**
-- **diagrams.azure.iot.IotHubSecurity**
 - **diagrams.azure.iot.IotHub**
-- **diagrams.azure.iot.Maps**
-- **diagrams.azure.iot.Sphere**
+- **diagrams.azure.iot.LogicApps**
+- **diagrams.azure.iot.MapsAccounts**
+- **diagrams.azure.iot.NotificationHubs**
+- **diagrams.azure.iot.StreamAnalyticsJobs**
 - **diagrams.azure.iot.TimeSeriesInsightsEnvironments**
-- **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
-- **diagrams.azure.iot.Windows10IotCoreServices**
-
-## azure.migration
-
-- **diagrams.azure.migration.DataBoxEdge**
-- **diagrams.azure.migration.DataBox**
-- **diagrams.azure.migration.DatabaseMigrationServices**
-- **diagrams.azure.migration.MigrationProjects**
-- **diagrams.azure.migration.RecoveryServicesVaults**
-
-## azure.ml
-
-- **diagrams.azure.ml.BatchAI**
-- **diagrams.azure.ml.BotServices**
-- **diagrams.azure.ml.CognitiveServices**
-- **diagrams.azure.ml.GenomicsAccounts**
-- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
-- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
-- **diagrams.azure.ml.MachineLearningStudioWebServices**
-- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
-
-## azure.mobile
-
-- **diagrams.azure.mobile.AppServiceMobile**
-- **diagrams.azure.mobile.MobileEngagement**
-- **diagrams.azure.mobile.NotificationHubs**
-
-## azure.network
-
-- **diagrams.azure.network.ApplicationGateway**
-- **diagrams.azure.network.ApplicationSecurityGroups**
-- **diagrams.azure.network.CDNProfiles**
-- **diagrams.azure.network.Connections**
-- **diagrams.azure.network.DDOSProtectionPlans**
-- **diagrams.azure.network.DNSPrivateZones**
-- **diagrams.azure.network.DNSZones**
-- **diagrams.azure.network.ExpressrouteCircuits**
-- **diagrams.azure.network.Firewall**
-- **diagrams.azure.network.FrontDoors**
-- **diagrams.azure.network.LoadBalancers**
-- **diagrams.azure.network.LocalNetworkGateways**
-- **diagrams.azure.network.NetworkInterfaces**
-- **diagrams.azure.network.NetworkSecurityGroupsClassic**
-- **diagrams.azure.network.NetworkWatcher**
-- **diagrams.azure.network.OnPremisesDataGateways**
-- **diagrams.azure.network.PublicIpAddresses**
-- **diagrams.azure.network.ReservedIpAddressesClassic**
-- **diagrams.azure.network.RouteFilters**
-- **diagrams.azure.network.RouteTables**
-- **diagrams.azure.network.ServiceEndpointPolicies**
-- **diagrams.azure.network.Subnets**
-- **diagrams.azure.network.TrafficManagerProfiles**
-- **diagrams.azure.network.VirtualNetworkClassic**
-- **diagrams.azure.network.VirtualNetworkGateways**
-- **diagrams.azure.network.VirtualNetworks**
-- **diagrams.azure.network.VirtualWans**
+- **diagrams.azure.iot.TimeSeriesInsightsEventSources**
+
+## azure.management_governance
+
+- **diagrams.azure.management_governance.ActivityLog**
+- **diagrams.azure.management_governance.Advisor**
+- **diagrams.azure.management_governance.Alerts**
+- **diagrams.azure.management_governance.ApplicationInsights**
+- **diagrams.azure.management_governance.Arc**
+- **diagrams.azure.management_governance.AutomationAccounts**
+- **diagrams.azure.management_governance.Blueprints**
+- **diagrams.azure.management_governance.Compliance**
+- **diagrams.azure.management_governance.CostManagementAndBilling**
+- **diagrams.azure.management_governance.DiagnosticsSettings**
+- **diagrams.azure.management_governance.Education**
+- **diagrams.azure.management_governance.Lighthouse**
+- **diagrams.azure.management_governance.LogAnalyticsWorkspaces**
+- **diagrams.azure.management_governance.Machinesazurearc**
+- **diagrams.azure.management_governance.ManagedApplicationsCenter**
+- **diagrams.azure.management_governance.Metrics**
+- **diagrams.azure.management_governance.Monitor**
+- **diagrams.azure.management_governance.MyCustomers**
+- **diagrams.azure.management_governance.OperationLogClassic**
+- **diagrams.azure.management_governance.Policy**
+- **diagrams.azure.management_governance.RecoveryServicesVaults**
+- **diagrams.azure.management_governance.ResourceGraphExplorer**
+- **diagrams.azure.management_governance.ServiceProviders**
+- **diagrams.azure.management_governance.Solutions**
+- **diagrams.azure.management_governance.UserPrivacy**
+
+## azure.migrate
+
+- **diagrams.azure.migrate.CostManagementAndBilling**
+- **diagrams.azure.migrate.DataBoxEdge**
+- **diagrams.azure.migrate.DataBox**
+- **diagrams.azure.migrate.Migrate**
+- **diagrams.azure.migrate.RecoveryServicesVaults**
+
+## azure.mixed_reality
+
+- **diagrams.azure.mixed_reality.RemoteRendering**
+
+## azure.monitor
+
+- **diagrams.azure.monitor.SAPAzureMonitor**
+
+## azure.networking
+
+- **diagrams.azure.networking.ApplicationGateways**
+- **diagrams.azure.networking.CDNProfiles**
+- **diagrams.azure.networking.Connections**
+- **diagrams.azure.networking.DDOSProtectionPlans**
+- **diagrams.azure.networking.DNSZones**
+- **diagrams.azure.networking.ExpressrouteCircuits**
+- **diagrams.azure.networking.FirewallManager**
+- **diagrams.azure.networking.Firewalls**
+- **diagrams.azure.networking.FrontDoors**
+- **diagrams.azure.networking.IpGroups**
+- **diagrams.azure.networking.LoadBalancers**
+- **diagrams.azure.networking.LocalNetworkGateways**
+- **diagrams.azure.networking.Nat**
+- **diagrams.azure.networking.NetworkInterfaces**
+- **diagrams.azure.networking.NetworkSecurityGroups**
+- **diagrams.azure.networking.NetworkWatcher**
+- **diagrams.azure.networking.PrivateLinkService**
+- **diagrams.azure.networking.PrivateLink**
+- **diagrams.azure.networking.ProximityPlacementGroups**
+- **diagrams.azure.networking.PublicIpAddressesClassic**
+- **diagrams.azure.networking.PublicIpAddresses**
+- **diagrams.azure.networking.PublicIpPrefixes**
+- **diagrams.azure.networking.ReservedIpAddressesClassic**
+- **diagrams.azure.networking.RouteFilters**
+- **diagrams.azure.networking.RouteTables**
+- **diagrams.azure.networking.ServiceEndpointPolicies**
+- **diagrams.azure.networking.TrafficManagerProfiles**
+- **diagrams.azure.networking.VirtualNetworkGateways**
+- **diagrams.azure.networking.VirtualNetworksClassic**
+- **diagrams.azure.networking.VirtualNetworks**
+- **diagrams.azure.networking.VirtualWans**
+- **diagrams.azure.networking.WebApplicationFirewallPolicieswaf**
+
+## azure.other
+
+- **diagrams.azure.other.BackupCenter**
+- **diagrams.azure.other.Detonation**
+- **diagrams.azure.other.ExpressrouteDirect**
+- **diagrams.azure.other.InstancePools**
+- **diagrams.azure.other.InternetAnalyzerProfiles**
+- **diagrams.azure.other.LocalNetworkGateways**
+- **diagrams.azure.other.PeeringService**
+- **diagrams.azure.other.ResourceMover**
+- **diagrams.azure.other.SshKeys**
+- **diagrams.azure.other.TemplateSpecs**
+- **diagrams.azure.other.UniversalPrint**
+- **diagrams.azure.other.WindowsVirtualDesktop**
+
+## azure.preview
+
+- **diagrams.azure.preview.CloudShell**
+- **diagrams.azure.preview.IotEdge**
+- **diagrams.azure.preview.PrivateLinkHub**
+- **diagrams.azure.preview.Rtos**
+- **diagrams.azure.preview.Sphere**
+- **diagrams.azure.preview.StaticApps**
+- **diagrams.azure.preview.TimeSeriesDataSets**
+- **diagrams.azure.preview.WebEnvironment**
+- **diagrams.azure.preview.Workbooks**
 
 ## azure.security
 
 - **diagrams.azure.security.ApplicationSecurityGroups**
 - **diagrams.azure.security.ConditionalAccess**
 - **diagrams.azure.security.Defender**
-- **diagrams.azure.security.ExtendedSecurityUpdates**
+- **diagrams.azure.security.Extendedsecurityupdates**
 - **diagrams.azure.security.KeyVaults**
 - **diagrams.azure.security.SecurityCenter**
 - **diagrams.azure.security.Sentinel**
 
 ## azure.storage
 
-- **diagrams.azure.storage.ArchiveStorage**
-- **diagrams.azure.storage.Azurefxtedgefiler**
-- **diagrams.azure.storage.BlobStorage**
-- **diagrams.azure.storage.DataBoxEdgeDataBoxGateway**
+- **diagrams.azure.storage.DataBoxEdge**
 - **diagrams.azure.storage.DataBox**
-- **diagrams.azure.storage.DataLakeStorage**
-- **diagrams.azure.storage.GeneralStorage**
+- **diagrams.azure.storage.DataLakeStorageGen1**
+- **diagrams.azure.storage.DataShareInvitations**
+- **diagrams.azure.storage.DataShares**
+- **diagrams.azure.storage.HcpCache**
+- **diagrams.azure.storage.ImportExportJobs**
 - **diagrams.azure.storage.NetappFiles**
-- **diagrams.azure.storage.QueuesStorage**
+- **diagrams.azure.storage.RecoveryServicesVaults**
+- **diagrams.azure.storage.StackEdge**
 - **diagrams.azure.storage.StorageAccountsClassic**
 - **diagrams.azure.storage.StorageAccounts**
-- **diagrams.azure.storage.StorageExplorer**
 - **diagrams.azure.storage.StorageSyncServices**
 - **diagrams.azure.storage.StorsimpleDataManagers**
 - **diagrams.azure.storage.StorsimpleDeviceManagers**
-- **diagrams.azure.storage.TableStorage**
 
 ## azure.web
 
-- **diagrams.azure.web.APIConnections**
-- **diagrams.azure.web.AppServiceCertificates**
-- **diagrams.azure.web.AppServiceDomains**
-- **diagrams.azure.web.AppServiceEnvironments**
-- **diagrams.azure.web.AppServicePlans**
-- **diagrams.azure.web.AppServices**
-- **diagrams.azure.web.MediaServices**
+- **diagrams.azure.web.MediaService**
 - **diagrams.azure.web.NotificationHubNamespaces**
-- **diagrams.azure.web.Search**
-- **diagrams.azure.web.Signalr**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 0ec40683..1b6e6900 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -158,8 +158,8 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Dynatrace**
 - **diagrams.onprem.monitoring.Grafana**
 - **diagrams.onprem.monitoring.Humio**
-- **diagrams.onprem.monitoring.Newrelic**
 - **diagrams.onprem.monitoring.Nagios**
+- **diagrams.onprem.monitoring.Newrelic**
 - **diagrams.onprem.monitoring.PrometheusOperator**
 - **diagrams.onprem.monitoring.Prometheus**
 - **diagrams.onprem.monitoring.Sentry**
diff --git a/resources/azure/ml/bot-services.png b/resources/azure/ai_ml/bot-services.png
similarity index 100%
rename from resources/azure/ml/bot-services.png
rename to resources/azure/ai_ml/bot-services.png
diff --git a/resources/azure/ml/cognitive-services.png b/resources/azure/ai_ml/cognitive-services.png
similarity index 100%
rename from resources/azure/ml/cognitive-services.png
rename to resources/azure/ai_ml/cognitive-services.png
diff --git a/resources/azure/ml/machine-learning-studio-web-services.png b/resources/azure/ai_ml/machine-learning-studio-classic-web-services.png
similarity index 100%
rename from resources/azure/ml/machine-learning-studio-web-services.png
rename to resources/azure/ai_ml/machine-learning-studio-classic-web-services.png
diff --git a/resources/azure/ml/machine-learning-studio-web-service-plans.png b/resources/azure/ai_ml/machine-learning-studio-web-service-plans.png
similarity index 100%
rename from resources/azure/ml/machine-learning-studio-web-service-plans.png
rename to resources/azure/ai_ml/machine-learning-studio-web-service-plans.png
diff --git a/resources/azure/ml/machine-learning-studio-workspaces.png b/resources/azure/ai_ml/machine-learning-studio-workspaces.png
similarity index 100%
rename from resources/azure/ml/machine-learning-studio-workspaces.png
rename to resources/azure/ai_ml/machine-learning-studio-workspaces.png
diff --git a/resources/azure/ai_ml/translator-text.png b/resources/azure/ai_ml/translator-text.png
new file mode 100644
index 00000000..42a25a7e
Binary files /dev/null and b/resources/azure/ai_ml/translator-text.png differ
diff --git a/resources/azure/analytics/data-explorer-clusters.png b/resources/azure/analytics/data-explorer-clusters.png
deleted file mode 100644
index 2c4f8021..00000000
Binary files a/resources/azure/analytics/data-explorer-clusters.png and /dev/null differ
diff --git a/resources/azure/analytics/data-factories.png b/resources/azure/analytics/data-factories.png
deleted file mode 100644
index 6016899e..00000000
Binary files a/resources/azure/analytics/data-factories.png and /dev/null differ
diff --git a/resources/azure/analytics/data-lake-analytics.png b/resources/azure/analytics/data-lake-analytics.png
deleted file mode 100644
index e561bfc4..00000000
Binary files a/resources/azure/analytics/data-lake-analytics.png and /dev/null differ
diff --git a/resources/azure/analytics/hdinsightclusters.png b/resources/azure/analytics/hd-insight-clusters.png
similarity index 100%
rename from resources/azure/analytics/hdinsightclusters.png
rename to resources/azure/analytics/hd-insight-clusters.png
diff --git a/resources/azure/integration/api-management.png b/resources/azure/app_services/api-management-services.png
similarity index 100%
rename from resources/azure/integration/api-management.png
rename to resources/azure/app_services/api-management-services.png
diff --git a/resources/azure/web/app-service-certificates.png b/resources/azure/app_services/app-service-certificates.png
similarity index 100%
rename from resources/azure/web/app-service-certificates.png
rename to resources/azure/app_services/app-service-certificates.png
diff --git a/resources/azure/web/app-service-domains.png b/resources/azure/app_services/app-service-domains.png
similarity index 100%
rename from resources/azure/web/app-service-domains.png
rename to resources/azure/app_services/app-service-domains.png
diff --git a/resources/azure/web/app-service-environments.png b/resources/azure/app_services/app-service-environments.png
similarity index 100%
rename from resources/azure/web/app-service-environments.png
rename to resources/azure/app_services/app-service-environments.png
diff --git a/resources/azure/web/app-service-plans.png b/resources/azure/app_services/app-service-plans.png
similarity index 100%
rename from resources/azure/web/app-service-plans.png
rename to resources/azure/app_services/app-service-plans.png
diff --git a/resources/azure/web/app-services.png b/resources/azure/app_services/app-services.png
similarity index 100%
rename from resources/azure/web/app-services.png
rename to resources/azure/app_services/app-services.png
diff --git a/resources/azure/network/cdn-profiles.png b/resources/azure/app_services/cdn-profiles.png
similarity index 100%
rename from resources/azure/network/cdn-profiles.png
rename to resources/azure/app_services/cdn-profiles.png
diff --git a/resources/azure/mobile/notification-hubs.png b/resources/azure/app_services/notification-hubs.png
similarity index 100%
rename from resources/azure/mobile/notification-hubs.png
rename to resources/azure/app_services/notification-hubs.png
diff --git a/resources/azure/web/search.png b/resources/azure/app_services/search-services.png
similarity index 100%
rename from resources/azure/web/search.png
rename to resources/azure/app_services/search-services.png
diff --git a/resources/azure/azure_stack/capacity.png b/resources/azure/azure_stack/capacity.png
new file mode 100644
index 00000000..72309566
Binary files /dev/null and b/resources/azure/azure_stack/capacity.png differ
diff --git a/resources/azure/azure_stack/infrastructure-backup.png b/resources/azure/azure_stack/infrastructure-backup.png
new file mode 100644
index 00000000..8bc05f97
Binary files /dev/null and b/resources/azure/azure_stack/infrastructure-backup.png differ
diff --git a/resources/azure/azure_stack/multi-tenancy.png b/resources/azure/azure_stack/multi-tenancy.png
new file mode 100644
index 00000000..dfc407e8
Binary files /dev/null and b/resources/azure/azure_stack/multi-tenancy.png differ
diff --git a/resources/azure/azure_stack/offers.png b/resources/azure/azure_stack/offers.png
new file mode 100644
index 00000000..7249f3ee
Binary files /dev/null and b/resources/azure/azure_stack/offers.png differ
diff --git a/resources/azure/azure_stack/plans.png b/resources/azure/azure_stack/plans.png
new file mode 100644
index 00000000..fe1b823a
Binary files /dev/null and b/resources/azure/azure_stack/plans.png differ
diff --git a/resources/azure/azure_stack/stack.png b/resources/azure/azure_stack/stack.png
new file mode 100644
index 00000000..01b8bd07
Binary files /dev/null and b/resources/azure/azure_stack/stack.png differ
diff --git a/resources/azure/azure_stack/updates.png b/resources/azure/azure_stack/updates.png
new file mode 100644
index 00000000..fca0c8dc
Binary files /dev/null and b/resources/azure/azure_stack/updates.png differ
diff --git a/resources/azure/azure_stack/user-subscriptions.png b/resources/azure/azure_stack/user-subscriptions.png
new file mode 100644
index 00000000..adcbc578
Binary files /dev/null and b/resources/azure/azure_stack/user-subscriptions.png differ
diff --git a/resources/azure/azure_vmware/avs.png b/resources/azure/azure_vmware/avs.png
new file mode 100644
index 00000000..6e5f11dd
Binary files /dev/null and b/resources/azure/azure_vmware/avs.png differ
diff --git a/resources/azure/blockchain/abs-member.png b/resources/azure/blockchain/abs-member.png
new file mode 100644
index 00000000..cf8f0dd3
Binary files /dev/null and b/resources/azure/blockchain/abs-member.png differ
diff --git a/resources/azure/blockchain/blockchain-service.png b/resources/azure/blockchain/blockchain-service.png
new file mode 100644
index 00000000..150e4d1a
Binary files /dev/null and b/resources/azure/blockchain/blockchain-service.png differ
diff --git a/resources/azure/blockchain/consortium.png b/resources/azure/blockchain/consortium.png
new file mode 100644
index 00000000..d8e248f5
Binary files /dev/null and b/resources/azure/blockchain/consortium.png differ
diff --git a/resources/azure/blockchain/outbound-connection.png b/resources/azure/blockchain/outbound-connection.png
new file mode 100644
index 00000000..b11dd77a
Binary files /dev/null and b/resources/azure/blockchain/outbound-connection.png differ
diff --git a/resources/azure/blockchain/token-service.png b/resources/azure/blockchain/token-service.png
new file mode 100644
index 00000000..f1664972
Binary files /dev/null and b/resources/azure/blockchain/token-service.png differ
diff --git a/resources/azure/compute/citrix-virtual-desktops-essentials.png b/resources/azure/compute/citrix-virtual-desktops-essentials.png
deleted file mode 100644
index fc262400..00000000
Binary files a/resources/azure/compute/citrix-virtual-desktops-essentials.png and /dev/null differ
diff --git a/resources/azure/compute/cloud-services.png b/resources/azure/compute/cloud-services.png
deleted file mode 100644
index 0e403583..00000000
Binary files a/resources/azure/compute/cloud-services.png and /dev/null differ
diff --git a/resources/azure/compute/cloudsimple-virtual-machines.png b/resources/azure/compute/cloudsimple-virtual-machines.png
deleted file mode 100644
index 8c8b1c64..00000000
Binary files a/resources/azure/compute/cloudsimple-virtual-machines.png and /dev/null differ
diff --git a/resources/azure/compute/container-registries.png b/resources/azure/compute/container-registries.png
deleted file mode 100644
index 17bd6678..00000000
Binary files a/resources/azure/compute/container-registries.png and /dev/null differ
diff --git a/resources/azure/compute/container-services-deprecated.png b/resources/azure/compute/container-services-deprecated.png
new file mode 100644
index 00000000..11c37ef8
Binary files /dev/null and b/resources/azure/compute/container-services-deprecated.png differ
diff --git a/resources/azure/compute/disks-classic.png b/resources/azure/compute/disks-classic.png
new file mode 100644
index 00000000..effee0b1
Binary files /dev/null and b/resources/azure/compute/disks-classic.png differ
diff --git a/resources/azure/compute/disk-snapshots.png b/resources/azure/compute/disks-snapshots.png
similarity index 100%
rename from resources/azure/compute/disk-snapshots.png
rename to resources/azure/compute/disks-snapshots.png
diff --git a/resources/azure/compute/images.png b/resources/azure/compute/images.png
new file mode 100644
index 00000000..e941a2d3
Binary files /dev/null and b/resources/azure/compute/images.png differ
diff --git a/resources/azure/compute/mesh-applications.png b/resources/azure/compute/mesh-applications.png
index 468f4e5c..56e268ff 100644
Binary files a/resources/azure/compute/mesh-applications.png and b/resources/azure/compute/mesh-applications.png differ
diff --git a/resources/azure/compute/os-images.png b/resources/azure/compute/os-images-classic.png
similarity index 100%
rename from resources/azure/compute/os-images.png
rename to resources/azure/compute/os-images-classic.png
diff --git a/resources/azure/compute/sap-hana-on-azure.png b/resources/azure/compute/sap-hana-on-azure.png
deleted file mode 100644
index 8641469f..00000000
Binary files a/resources/azure/compute/sap-hana-on-azure.png and /dev/null differ
diff --git a/resources/azure/compute/vm.png b/resources/azure/compute/virtual-machine.png
similarity index 100%
rename from resources/azure/compute/vm.png
rename to resources/azure/compute/virtual-machine.png
diff --git a/resources/azure/compute/vm-classic.png b/resources/azure/compute/virtual-machines-classic.png
similarity index 100%
rename from resources/azure/compute/vm-classic.png
rename to resources/azure/compute/virtual-machines-classic.png
diff --git a/resources/azure/compute/vm-images.png b/resources/azure/compute/vm-images-classic.png
similarity index 100%
rename from resources/azure/compute/vm-images.png
rename to resources/azure/compute/vm-images-classic.png
diff --git a/resources/azure/compute/vm-linux.png b/resources/azure/compute/vm-linux.png
deleted file mode 100644
index d5f0f2bb..00000000
Binary files a/resources/azure/compute/vm-linux.png and /dev/null differ
diff --git a/resources/azure/compute/vm-scale-set.png b/resources/azure/compute/vm-scale-sets.png
similarity index 100%
rename from resources/azure/compute/vm-scale-set.png
rename to resources/azure/compute/vm-scale-sets.png
diff --git a/resources/azure/compute/vm-windows.png b/resources/azure/compute/vm-windows.png
deleted file mode 100644
index 5239bbb6..00000000
Binary files a/resources/azure/compute/vm-windows.png and /dev/null differ
diff --git a/resources/azure/containers/app-services.png b/resources/azure/containers/app-services.png
new file mode 100644
index 00000000..f7ca7fb0
Binary files /dev/null and b/resources/azure/containers/app-services.png differ
diff --git a/resources/azure/containers/batch-accounts.png b/resources/azure/containers/batch-accounts.png
new file mode 100644
index 00000000..8f41434e
Binary files /dev/null and b/resources/azure/containers/batch-accounts.png differ
diff --git a/resources/azure/containers/container-instances.png b/resources/azure/containers/container-instances.png
new file mode 100644
index 00000000..6be6aacc
Binary files /dev/null and b/resources/azure/containers/container-instances.png differ
diff --git a/resources/azure/containers/container-registries.png b/resources/azure/containers/container-registries.png
new file mode 100644
index 00000000..efa50cd8
Binary files /dev/null and b/resources/azure/containers/container-registries.png differ
diff --git a/resources/azure/containers/kubernetes-services.png b/resources/azure/containers/kubernetes-services.png
new file mode 100644
index 00000000..11c37ef8
Binary files /dev/null and b/resources/azure/containers/kubernetes-services.png differ
diff --git a/resources/azure/containers/service-fabric-clusters.png b/resources/azure/containers/service-fabric-clusters.png
new file mode 100644
index 00000000..a03a2194
Binary files /dev/null and b/resources/azure/containers/service-fabric-clusters.png differ
diff --git a/resources/azure/database/blob-storage.png b/resources/azure/database/blob-storage.png
deleted file mode 100644
index 5764c131..00000000
Binary files a/resources/azure/database/blob-storage.png and /dev/null differ
diff --git a/resources/azure/database/data-lake.png b/resources/azure/database/data-lake.png
deleted file mode 100644
index e50ee889..00000000
Binary files a/resources/azure/database/data-lake.png and /dev/null differ
diff --git a/resources/azure/database/virtual-datacenter.png b/resources/azure/database/virtual-datacenter.png
deleted file mode 100644
index 31ebc4c8..00000000
Binary files a/resources/azure/database/virtual-datacenter.png and /dev/null differ
diff --git a/resources/azure/database/cache-for-redis.png b/resources/azure/databases/cache-redis.png
similarity index 100%
rename from resources/azure/database/cache-for-redis.png
rename to resources/azure/databases/cache-redis.png
diff --git a/resources/azure/database/cosmos-db.png b/resources/azure/databases/cosmos-db.png
similarity index 100%
rename from resources/azure/database/cosmos-db.png
rename to resources/azure/databases/cosmos-db.png
diff --git a/resources/azure/database/data-explorer-clusters.png b/resources/azure/databases/data-explorer-clusters.png
similarity index 100%
rename from resources/azure/database/data-explorer-clusters.png
rename to resources/azure/databases/data-explorer-clusters.png
diff --git a/resources/azure/database/data-factory.png b/resources/azure/databases/data-factory.png
similarity index 100%
rename from resources/azure/database/data-factory.png
rename to resources/azure/databases/data-factory.png
diff --git a/resources/azure/database/database-for-mariadb-servers.png b/resources/azure/databases/database-mariadb-server.png
similarity index 100%
rename from resources/azure/database/database-for-mariadb-servers.png
rename to resources/azure/databases/database-mariadb-server.png
diff --git a/resources/azure/migration/database-migration-services.png b/resources/azure/databases/database-migration-services.png
similarity index 100%
rename from resources/azure/migration/database-migration-services.png
rename to resources/azure/databases/database-migration-services.png
diff --git a/resources/azure/database/database-for-mysql-servers.png b/resources/azure/databases/database-mysql-server.png
similarity index 100%
rename from resources/azure/database/database-for-mysql-servers.png
rename to resources/azure/databases/database-mysql-server.png
diff --git a/resources/azure/database/database-for-postgresql-servers.png b/resources/azure/databases/database-postgresql-server.png
similarity index 100%
rename from resources/azure/database/database-for-postgresql-servers.png
rename to resources/azure/databases/database-postgresql-server.png
diff --git a/resources/azure/database/elastic-job-agents.png b/resources/azure/databases/elastic-job-agents.png
similarity index 100%
rename from resources/azure/database/elastic-job-agents.png
rename to resources/azure/databases/elastic-job-agents.png
diff --git a/resources/azure/database/instance-pools.png b/resources/azure/databases/instance-pools.png
similarity index 100%
rename from resources/azure/database/instance-pools.png
rename to resources/azure/databases/instance-pools.png
diff --git a/resources/azure/database/managed-databases.png b/resources/azure/databases/managed-database.png
similarity index 100%
rename from resources/azure/database/managed-databases.png
rename to resources/azure/databases/managed-database.png
diff --git a/resources/azure/database/sql-datawarehouse.png b/resources/azure/databases/sql-data-warehouses.png
similarity index 100%
rename from resources/azure/database/sql-datawarehouse.png
rename to resources/azure/databases/sql-data-warehouses.png
diff --git a/resources/azure/database/sql-databases.png b/resources/azure/databases/sql-database.png
similarity index 100%
rename from resources/azure/database/sql-databases.png
rename to resources/azure/databases/sql-database.png
diff --git a/resources/azure/database/elastic-database-pools.png b/resources/azure/databases/sql-elastic-pools.png
similarity index 100%
rename from resources/azure/database/elastic-database-pools.png
rename to resources/azure/databases/sql-elastic-pools.png
diff --git a/resources/azure/database/sql-managed-instances.png b/resources/azure/databases/sql-managed-instance.png
similarity index 100%
rename from resources/azure/database/sql-managed-instances.png
rename to resources/azure/databases/sql-managed-instance.png
diff --git a/resources/azure/database/sql-server-stretch-databases.png b/resources/azure/databases/sql-server-stretch-databases.png
similarity index 100%
rename from resources/azure/database/sql-server-stretch-databases.png
rename to resources/azure/databases/sql-server-stretch-databases.png
diff --git a/resources/azure/database/sql-servers.png b/resources/azure/databases/sql-server.png
similarity index 100%
rename from resources/azure/database/sql-servers.png
rename to resources/azure/databases/sql-server.png
diff --git a/resources/azure/database/sql-vm.png b/resources/azure/databases/sql-vm.png
similarity index 100%
rename from resources/azure/database/sql-vm.png
rename to resources/azure/databases/sql-vm.png
diff --git a/resources/azure/database/sql.png b/resources/azure/databases/sql.png
similarity index 100%
rename from resources/azure/database/sql.png
rename to resources/azure/databases/sql.png
diff --git a/resources/azure/database/ssis-lift-and-shift-ir.png b/resources/azure/databases/ssis-lift-and-shift-ir.png
similarity index 100%
rename from resources/azure/database/ssis-lift-and-shift-ir.png
rename to resources/azure/databases/ssis-lift-and-shift-ir.png
diff --git a/resources/azure/database/synapse-analytics.png b/resources/azure/databases/synapse-analytics.png
similarity index 100%
rename from resources/azure/database/synapse-analytics.png
rename to resources/azure/databases/synapse-analytics.png
diff --git a/resources/azure/database/virtual-clusters.png b/resources/azure/databases/virtual-clusters.png
similarity index 100%
rename from resources/azure/database/virtual-clusters.png
rename to resources/azure/databases/virtual-clusters.png
diff --git a/resources/azure/devops/artifacts.png b/resources/azure/devops/artifacts.png
deleted file mode 100644
index dc928c1d..00000000
Binary files a/resources/azure/devops/artifacts.png and /dev/null differ
diff --git a/resources/azure/devops/boards.png b/resources/azure/devops/boards.png
deleted file mode 100644
index 1813eba5..00000000
Binary files a/resources/azure/devops/boards.png and /dev/null differ
diff --git a/resources/azure/devops/devtest-labs.png b/resources/azure/devops/devtest-labs.png
index 75b82c12..8083f650 100644
Binary files a/resources/azure/devops/devtest-labs.png and b/resources/azure/devops/devtest-labs.png differ
diff --git a/resources/azure/devops/lab-services.png b/resources/azure/devops/lab-services.png
index abbe48da..f310199b 100644
Binary files a/resources/azure/devops/lab-services.png and b/resources/azure/devops/lab-services.png differ
diff --git a/resources/azure/devops/pipelines.png b/resources/azure/devops/pipelines.png
deleted file mode 100644
index 631e082d..00000000
Binary files a/resources/azure/devops/pipelines.png and /dev/null differ
diff --git a/resources/azure/devops/repos.png b/resources/azure/devops/repos.png
deleted file mode 100644
index 636be5d4..00000000
Binary files a/resources/azure/devops/repos.png and /dev/null differ
diff --git a/resources/azure/devops/test-plans.png b/resources/azure/devops/test-plans.png
deleted file mode 100644
index 3543c991..00000000
Binary files a/resources/azure/devops/test-plans.png and /dev/null differ
diff --git a/resources/azure/general/allresources.png b/resources/azure/general/all-resources.png
similarity index 100%
rename from resources/azure/general/allresources.png
rename to resources/azure/general/all-resources.png
diff --git a/resources/azure/general/azurehome.png b/resources/azure/general/azurehome.png
deleted file mode 100644
index e86046d6..00000000
Binary files a/resources/azure/general/azurehome.png and /dev/null differ
diff --git a/resources/azure/general/backlog.png b/resources/azure/general/backlog.png
new file mode 100644
index 00000000..f43fb2ce
Binary files /dev/null and b/resources/azure/general/backlog.png differ
diff --git a/resources/azure/general/biz-talk.png b/resources/azure/general/biz-talk.png
new file mode 100644
index 00000000..fa5dac78
Binary files /dev/null and b/resources/azure/general/biz-talk.png differ
diff --git a/resources/azure/general/blob-block.png b/resources/azure/general/blob-block.png
new file mode 100644
index 00000000..ab92795d
Binary files /dev/null and b/resources/azure/general/blob-block.png differ
diff --git a/resources/azure/general/blob-page.png b/resources/azure/general/blob-page.png
new file mode 100644
index 00000000..1adfa68a
Binary files /dev/null and b/resources/azure/general/blob-page.png differ
diff --git a/resources/azure/general/branch.png b/resources/azure/general/branch.png
new file mode 100644
index 00000000..aba4f33d
Binary files /dev/null and b/resources/azure/general/branch.png differ
diff --git a/resources/azure/general/browser.png b/resources/azure/general/browser.png
new file mode 100644
index 00000000..620d9f70
Binary files /dev/null and b/resources/azure/general/browser.png differ
diff --git a/resources/azure/general/bug.png b/resources/azure/general/bug.png
new file mode 100644
index 00000000..4fa2d3d5
Binary files /dev/null and b/resources/azure/general/bug.png differ
diff --git a/resources/azure/general/builds.png b/resources/azure/general/builds.png
new file mode 100644
index 00000000..0643bc9a
Binary files /dev/null and b/resources/azure/general/builds.png differ
diff --git a/resources/azure/general/cache.png b/resources/azure/general/cache.png
new file mode 100644
index 00000000..9c06b1fc
Binary files /dev/null and b/resources/azure/general/cache.png differ
diff --git a/resources/azure/general/code.png b/resources/azure/general/code.png
new file mode 100644
index 00000000..f6228574
Binary files /dev/null and b/resources/azure/general/code.png differ
diff --git a/resources/azure/general/commit.png b/resources/azure/general/commit.png
new file mode 100644
index 00000000..0d92fc08
Binary files /dev/null and b/resources/azure/general/commit.png differ
diff --git a/resources/azure/general/controls-horizontal.png b/resources/azure/general/controls-horizontal.png
new file mode 100644
index 00000000..7e0d7965
Binary files /dev/null and b/resources/azure/general/controls-horizontal.png differ
diff --git a/resources/azure/general/controls.png b/resources/azure/general/controls.png
new file mode 100644
index 00000000..bfd58d9a
Binary files /dev/null and b/resources/azure/general/controls.png differ
diff --git a/resources/azure/general/cost-alerts.png b/resources/azure/general/cost-alerts.png
new file mode 100644
index 00000000..2d27b3d8
Binary files /dev/null and b/resources/azure/general/cost-alerts.png differ
diff --git a/resources/azure/general/cost-analysis.png b/resources/azure/general/cost-analysis.png
new file mode 100644
index 00000000..b5240679
Binary files /dev/null and b/resources/azure/general/cost-analysis.png differ
diff --git a/resources/azure/general/cost-budgets.png b/resources/azure/general/cost-budgets.png
new file mode 100644
index 00000000..c8980af4
Binary files /dev/null and b/resources/azure/general/cost-budgets.png differ
diff --git a/resources/azure/general/cost-management-and-billing.png b/resources/azure/general/cost-management-and-billing.png
new file mode 100644
index 00000000..226a1d9d
Binary files /dev/null and b/resources/azure/general/cost-management-and-billing.png differ
diff --git a/resources/azure/general/cost-management.png b/resources/azure/general/cost-management.png
new file mode 100644
index 00000000..d082ebc1
Binary files /dev/null and b/resources/azure/general/cost-management.png differ
diff --git a/resources/azure/general/counter.png b/resources/azure/general/counter.png
new file mode 100644
index 00000000..d1d779ec
Binary files /dev/null and b/resources/azure/general/counter.png differ
diff --git a/resources/azure/general/cubes.png b/resources/azure/general/cubes.png
new file mode 100644
index 00000000..53ea681a
Binary files /dev/null and b/resources/azure/general/cubes.png differ
diff --git a/resources/azure/general/dashboard.png b/resources/azure/general/dashboard.png
new file mode 100644
index 00000000..0783aa33
Binary files /dev/null and b/resources/azure/general/dashboard.png differ
diff --git a/resources/azure/general/dev-console.png b/resources/azure/general/dev-console.png
new file mode 100644
index 00000000..4a807d62
Binary files /dev/null and b/resources/azure/general/dev-console.png differ
diff --git a/resources/azure/general/developertools.png b/resources/azure/general/developertools.png
deleted file mode 100644
index 882de89e..00000000
Binary files a/resources/azure/general/developertools.png and /dev/null differ
diff --git a/resources/azure/general/download.png b/resources/azure/general/download.png
new file mode 100644
index 00000000..438d9f89
Binary files /dev/null and b/resources/azure/general/download.png differ
diff --git a/resources/azure/general/error.png b/resources/azure/general/error.png
new file mode 100644
index 00000000..60ab7d1c
Binary files /dev/null and b/resources/azure/general/error.png differ
diff --git a/resources/azure/general/extensions.png b/resources/azure/general/extensions.png
new file mode 100644
index 00000000..7b26021b
Binary files /dev/null and b/resources/azure/general/extensions.png differ
diff --git a/resources/azure/general/file.png b/resources/azure/general/file.png
new file mode 100644
index 00000000..ac8ded3f
Binary files /dev/null and b/resources/azure/general/file.png differ
diff --git a/resources/azure/general/files.png b/resources/azure/general/files.png
new file mode 100644
index 00000000..09659c67
Binary files /dev/null and b/resources/azure/general/files.png differ
diff --git a/resources/azure/general/folder-blank.png b/resources/azure/general/folder-blank.png
new file mode 100644
index 00000000..3029ee35
Binary files /dev/null and b/resources/azure/general/folder-blank.png differ
diff --git a/resources/azure/general/folder-website.png b/resources/azure/general/folder-website.png
new file mode 100644
index 00000000..b356a959
Binary files /dev/null and b/resources/azure/general/folder-website.png differ
diff --git a/resources/azure/general/free-services.png b/resources/azure/general/free-services.png
new file mode 100644
index 00000000..59b0c748
Binary files /dev/null and b/resources/azure/general/free-services.png differ
diff --git a/resources/azure/general/ftp.png b/resources/azure/general/ftp.png
new file mode 100644
index 00000000..1de41c77
Binary files /dev/null and b/resources/azure/general/ftp.png differ
diff --git a/resources/azure/general/gear.png b/resources/azure/general/gear.png
new file mode 100644
index 00000000..3a35028e
Binary files /dev/null and b/resources/azure/general/gear.png differ
diff --git a/resources/azure/general/globe-error.png b/resources/azure/general/globe-error.png
new file mode 100644
index 00000000..3570c353
Binary files /dev/null and b/resources/azure/general/globe-error.png differ
diff --git a/resources/azure/general/globe-success.png b/resources/azure/general/globe-success.png
new file mode 100644
index 00000000..dff9e1c6
Binary files /dev/null and b/resources/azure/general/globe-success.png differ
diff --git a/resources/azure/general/globe-warning.png b/resources/azure/general/globe-warning.png
new file mode 100644
index 00000000..91e14c10
Binary files /dev/null and b/resources/azure/general/globe-warning.png differ
diff --git a/resources/azure/general/globe.png b/resources/azure/general/globe.png
new file mode 100644
index 00000000..48882b23
Binary files /dev/null and b/resources/azure/general/globe.png differ
diff --git a/resources/azure/general/guide.png b/resources/azure/general/guide.png
new file mode 100644
index 00000000..afb783ab
Binary files /dev/null and b/resources/azure/general/guide.png differ
diff --git a/resources/azure/general/heart.png b/resources/azure/general/heart.png
new file mode 100644
index 00000000..0b85e8af
Binary files /dev/null and b/resources/azure/general/heart.png differ
diff --git a/resources/azure/general/helpsupport.png b/resources/azure/general/help-and-support.png
similarity index 100%
rename from resources/azure/general/helpsupport.png
rename to resources/azure/general/help-and-support.png
diff --git a/resources/azure/general/image.png b/resources/azure/general/image.png
new file mode 100644
index 00000000..b5928fa5
Binary files /dev/null and b/resources/azure/general/image.png differ
diff --git a/resources/azure/general/input-output.png b/resources/azure/general/input-output.png
new file mode 100644
index 00000000..acd9c7ce
Binary files /dev/null and b/resources/azure/general/input-output.png differ
diff --git a/resources/azure/general/journey-hub.png b/resources/azure/general/journey-hub.png
new file mode 100644
index 00000000..57b32533
Binary files /dev/null and b/resources/azure/general/journey-hub.png differ
diff --git a/resources/azure/general/launch-portal.png b/resources/azure/general/launch-portal.png
new file mode 100644
index 00000000..b268b5a8
Binary files /dev/null and b/resources/azure/general/launch-portal.png differ
diff --git a/resources/azure/general/learn.png b/resources/azure/general/learn.png
new file mode 100644
index 00000000..65bac83e
Binary files /dev/null and b/resources/azure/general/learn.png differ
diff --git a/resources/azure/general/load-test.png b/resources/azure/general/load-test.png
new file mode 100644
index 00000000..12fcb8e7
Binary files /dev/null and b/resources/azure/general/load-test.png differ
diff --git a/resources/azure/general/location.png b/resources/azure/general/location.png
new file mode 100644
index 00000000..12dd0a4d
Binary files /dev/null and b/resources/azure/general/location.png differ
diff --git a/resources/azure/general/log-streaming.png b/resources/azure/general/log-streaming.png
new file mode 100644
index 00000000..1d06eae8
Binary files /dev/null and b/resources/azure/general/log-streaming.png differ
diff --git a/resources/azure/general/managementgroups.png b/resources/azure/general/management-groups.png
similarity index 100%
rename from resources/azure/general/managementgroups.png
rename to resources/azure/general/management-groups.png
diff --git a/resources/azure/general/management-portal.png b/resources/azure/general/management-portal.png
new file mode 100644
index 00000000..e16134a9
Binary files /dev/null and b/resources/azure/general/management-portal.png differ
diff --git a/resources/azure/general/media-file.png b/resources/azure/general/media-file.png
new file mode 100644
index 00000000..3b58de0f
Binary files /dev/null and b/resources/azure/general/media-file.png differ
diff --git a/resources/azure/general/media.png b/resources/azure/general/media.png
new file mode 100644
index 00000000..912e36cb
Binary files /dev/null and b/resources/azure/general/media.png differ
diff --git a/resources/azure/mobile/mobile-engagement.png b/resources/azure/general/mobile-engagement.png
similarity index 100%
rename from resources/azure/mobile/mobile-engagement.png
rename to resources/azure/general/mobile-engagement.png
diff --git a/resources/azure/mobile/app-service-mobile.png b/resources/azure/general/mobile.png
similarity index 100%
rename from resources/azure/mobile/app-service-mobile.png
rename to resources/azure/general/mobile.png
diff --git a/resources/azure/general/module.png b/resources/azure/general/module.png
new file mode 100644
index 00000000..6f564b6a
Binary files /dev/null and b/resources/azure/general/module.png differ
diff --git a/resources/azure/general/power-up.png b/resources/azure/general/power-up.png
new file mode 100644
index 00000000..483bee93
Binary files /dev/null and b/resources/azure/general/power-up.png differ
diff --git a/resources/azure/general/power.png b/resources/azure/general/power.png
new file mode 100644
index 00000000..2d8c30a1
Binary files /dev/null and b/resources/azure/general/power.png differ
diff --git a/resources/azure/general/powershell.png b/resources/azure/general/powershell.png
new file mode 100644
index 00000000..fbc128ee
Binary files /dev/null and b/resources/azure/general/powershell.png differ
diff --git a/resources/azure/general/preview.png b/resources/azure/general/preview.png
new file mode 100644
index 00000000..840c4669
Binary files /dev/null and b/resources/azure/general/preview.png differ
diff --git a/resources/azure/general/process-explorer.png b/resources/azure/general/process-explorer.png
new file mode 100644
index 00000000..bae06932
Binary files /dev/null and b/resources/azure/general/process-explorer.png differ
diff --git a/resources/azure/general/production-ready-database.png b/resources/azure/general/production-ready-database.png
new file mode 100644
index 00000000..9ad01178
Binary files /dev/null and b/resources/azure/general/production-ready-database.png differ
diff --git a/resources/azure/general/quickstartcenter.png b/resources/azure/general/quickstart-center.png
similarity index 100%
rename from resources/azure/general/quickstartcenter.png
rename to resources/azure/general/quickstart-center.png
diff --git a/resources/azure/general/resource-explorer.png b/resources/azure/general/resource-explorer.png
new file mode 100644
index 00000000..37ae9303
Binary files /dev/null and b/resources/azure/general/resource-explorer.png differ
diff --git a/resources/azure/general/resource-group-list.png b/resources/azure/general/resource-group-list.png
new file mode 100644
index 00000000..8a5f5fe5
Binary files /dev/null and b/resources/azure/general/resource-group-list.png differ
diff --git a/resources/azure/general/resourcegroups.png b/resources/azure/general/resource-groups.png
similarity index 100%
rename from resources/azure/general/resourcegroups.png
rename to resources/azure/general/resource-groups.png
diff --git a/resources/azure/general/resource-linked.png b/resources/azure/general/resource-linked.png
new file mode 100644
index 00000000..3af52f0a
Binary files /dev/null and b/resources/azure/general/resource-linked.png differ
diff --git a/resources/azure/general/resource.png b/resources/azure/general/resource.png
deleted file mode 100644
index 8dfdc432..00000000
Binary files a/resources/azure/general/resource.png and /dev/null differ
diff --git a/resources/azure/general/scale.png b/resources/azure/general/scale.png
new file mode 100644
index 00000000..47b46c34
Binary files /dev/null and b/resources/azure/general/scale.png differ
diff --git a/resources/azure/general/scheduler.png b/resources/azure/general/scheduler.png
new file mode 100644
index 00000000..771fd6ea
Binary files /dev/null and b/resources/azure/general/scheduler.png differ
diff --git a/resources/azure/general/search-grid.png b/resources/azure/general/search-grid.png
new file mode 100644
index 00000000..8a5f5fe5
Binary files /dev/null and b/resources/azure/general/search-grid.png differ
diff --git a/resources/azure/general/search.png b/resources/azure/general/search.png
new file mode 100644
index 00000000..8873bb10
Binary files /dev/null and b/resources/azure/general/search.png differ
diff --git a/resources/azure/general/server-farm.png b/resources/azure/general/server-farm.png
new file mode 100644
index 00000000..024a0955
Binary files /dev/null and b/resources/azure/general/server-farm.png differ
diff --git a/resources/azure/general/service-bus.png b/resources/azure/general/service-bus.png
new file mode 100644
index 00000000..036f3166
Binary files /dev/null and b/resources/azure/general/service-bus.png differ
diff --git a/resources/azure/general/service-health.png b/resources/azure/general/service-health.png
new file mode 100644
index 00000000..a8f4ee52
Binary files /dev/null and b/resources/azure/general/service-health.png differ
diff --git a/resources/azure/general/servicehealth.png b/resources/azure/general/servicehealth.png
deleted file mode 100644
index 308f7062..00000000
Binary files a/resources/azure/general/servicehealth.png and /dev/null differ
diff --git a/resources/azure/general/shareddashboard.png b/resources/azure/general/shareddashboard.png
deleted file mode 100644
index 97caf721..00000000
Binary files a/resources/azure/general/shareddashboard.png and /dev/null differ
diff --git a/resources/azure/general/ssd.png b/resources/azure/general/ssd.png
new file mode 100644
index 00000000..fa867e4b
Binary files /dev/null and b/resources/azure/general/ssd.png differ
diff --git a/resources/azure/general/storage-azure-files.png b/resources/azure/general/storage-azure-files.png
new file mode 100644
index 00000000..1a05025f
Binary files /dev/null and b/resources/azure/general/storage-azure-files.png differ
diff --git a/resources/azure/general/storage-container.png b/resources/azure/general/storage-container.png
new file mode 100644
index 00000000..de07e838
Binary files /dev/null and b/resources/azure/general/storage-container.png differ
diff --git a/resources/azure/general/storage-queue.png b/resources/azure/general/storage-queue.png
new file mode 100644
index 00000000..ebb0263e
Binary files /dev/null and b/resources/azure/general/storage-queue.png differ
diff --git a/resources/azure/general/support.png b/resources/azure/general/support.png
deleted file mode 100644
index 6590fc9a..00000000
Binary files a/resources/azure/general/support.png and /dev/null differ
diff --git a/resources/azure/general/supportrequests.png b/resources/azure/general/supportrequests.png
deleted file mode 100644
index 582ee94e..00000000
Binary files a/resources/azure/general/supportrequests.png and /dev/null differ
diff --git a/resources/azure/general/table.png b/resources/azure/general/table.png
new file mode 100644
index 00000000..c4812d77
Binary files /dev/null and b/resources/azure/general/table.png differ
diff --git a/resources/azure/general/tags.png b/resources/azure/general/tags.png
index 58f2b4d5..c3001968 100644
Binary files a/resources/azure/general/tags.png and b/resources/azure/general/tags.png differ
diff --git a/resources/azure/general/templates.png b/resources/azure/general/templates.png
deleted file mode 100644
index 263cebb9..00000000
Binary files a/resources/azure/general/templates.png and /dev/null differ
diff --git a/resources/azure/general/tfs-vc-repository.png b/resources/azure/general/tfs-vc-repository.png
new file mode 100644
index 00000000..0e90113c
Binary files /dev/null and b/resources/azure/general/tfs-vc-repository.png differ
diff --git a/resources/azure/general/toolbox.png b/resources/azure/general/toolbox.png
new file mode 100644
index 00000000..3242e3dc
Binary files /dev/null and b/resources/azure/general/toolbox.png differ
diff --git a/resources/azure/general/twousericon.png b/resources/azure/general/twousericon.png
deleted file mode 100644
index 9d6d8c1a..00000000
Binary files a/resources/azure/general/twousericon.png and /dev/null differ
diff --git a/resources/azure/general/userhealthicon.png b/resources/azure/general/userhealthicon.png
deleted file mode 100644
index b2e7e0cd..00000000
Binary files a/resources/azure/general/userhealthicon.png and /dev/null differ
diff --git a/resources/azure/general/usericon.png b/resources/azure/general/usericon.png
deleted file mode 100644
index 773ccd09..00000000
Binary files a/resources/azure/general/usericon.png and /dev/null differ
diff --git a/resources/azure/general/userprivacy.png b/resources/azure/general/userprivacy.png
deleted file mode 100644
index 09d22ce3..00000000
Binary files a/resources/azure/general/userprivacy.png and /dev/null differ
diff --git a/resources/azure/general/userresource.png b/resources/azure/general/userresource.png
deleted file mode 100644
index 1418179a..00000000
Binary files a/resources/azure/general/userresource.png and /dev/null differ
diff --git a/resources/azure/general/versions.png b/resources/azure/general/versions.png
new file mode 100644
index 00000000..d7db1ef8
Binary files /dev/null and b/resources/azure/general/versions.png differ
diff --git a/resources/azure/general/web-slots.png b/resources/azure/general/web-slots.png
new file mode 100644
index 00000000..052e6ecd
Binary files /dev/null and b/resources/azure/general/web-slots.png differ
diff --git a/resources/azure/general/web-test.png b/resources/azure/general/web-test.png
new file mode 100644
index 00000000..4a97e3a8
Binary files /dev/null and b/resources/azure/general/web-test.png differ
diff --git a/resources/azure/general/website-power.png b/resources/azure/general/website-power.png
new file mode 100644
index 00000000..7ab7ef63
Binary files /dev/null and b/resources/azure/general/website-power.png differ
diff --git a/resources/azure/general/website-staging.png b/resources/azure/general/website-staging.png
new file mode 100644
index 00000000..aefebe2c
Binary files /dev/null and b/resources/azure/general/website-staging.png differ
diff --git a/resources/azure/general/whatsnew.png b/resources/azure/general/whatsnew.png
deleted file mode 100644
index 2142d2b3..00000000
Binary files a/resources/azure/general/whatsnew.png and /dev/null differ
diff --git a/resources/azure/general/workbooks.png b/resources/azure/general/workbooks.png
new file mode 100644
index 00000000..0a7861cb
Binary files /dev/null and b/resources/azure/general/workbooks.png differ
diff --git a/resources/azure/general/workflow.png b/resources/azure/general/workflow.png
new file mode 100644
index 00000000..a5d0a4df
Binary files /dev/null and b/resources/azure/general/workflow.png differ
diff --git a/resources/azure/identity/access-review.png b/resources/azure/identity/access-review.png
deleted file mode 100644
index 22064e8b..00000000
Binary files a/resources/azure/identity/access-review.png and /dev/null differ
diff --git a/resources/azure/identity/ad-privileged-identity-management.png b/resources/azure/identity/ad-privileged-identity-management.png
deleted file mode 100644
index aca32aa5..00000000
Binary files a/resources/azure/identity/ad-privileged-identity-management.png and /dev/null differ
diff --git a/resources/azure/identity/conditional-access.png b/resources/azure/identity/conditional-access.png
deleted file mode 100644
index e0fa97e2..00000000
Binary files a/resources/azure/identity/conditional-access.png and /dev/null differ
diff --git a/resources/azure/identity/information-protection.png b/resources/azure/identity/information-protection.png
deleted file mode 100644
index e7f561cf..00000000
Binary files a/resources/azure/identity/information-protection.png and /dev/null differ
diff --git a/resources/azure/identity/managed-identities.png b/resources/azure/identity/managed-identities.png
index d191007d..15178460 100644
Binary files a/resources/azure/identity/managed-identities.png and b/resources/azure/identity/managed-identities.png differ
diff --git a/resources/azure/integration/api-management-services.png b/resources/azure/integration/api-management-services.png
new file mode 100644
index 00000000..1d7db0b9
Binary files /dev/null and b/resources/azure/integration/api-management-services.png differ
diff --git a/resources/azure/integration/app-configuration.png b/resources/azure/integration/app-configuration.png
deleted file mode 100644
index 088ea173..00000000
Binary files a/resources/azure/integration/app-configuration.png and /dev/null differ
diff --git a/resources/azure/integration/data-catalog.png b/resources/azure/integration/data-catalog.png
index 6f571571..7d25f45b 100644
Binary files a/resources/azure/integration/data-catalog.png and b/resources/azure/integration/data-catalog.png differ
diff --git a/resources/azure/integration/integration-service-environments.png b/resources/azure/integration/integration-service-environments.png
deleted file mode 100644
index fefb03b3..00000000
Binary files a/resources/azure/integration/integration-service-environments.png and /dev/null differ
diff --git a/resources/azure/integration/logic-apps-custom-connector.png b/resources/azure/integration/logic-apps-custom-connector.png
deleted file mode 100644
index ace467c7..00000000
Binary files a/resources/azure/integration/logic-apps-custom-connector.png and /dev/null differ
diff --git a/resources/azure/integration/service-bus-relays.png b/resources/azure/integration/relays.png
similarity index 100%
rename from resources/azure/integration/service-bus-relays.png
rename to resources/azure/integration/relays.png
diff --git a/resources/azure/integration/sendgrid-accounts.png b/resources/azure/integration/sendgrid-accounts.png
deleted file mode 100644
index e4cd7afa..00000000
Binary files a/resources/azure/integration/sendgrid-accounts.png and /dev/null differ
diff --git a/resources/azure/integration/service-bus.png b/resources/azure/integration/service-bus.png
deleted file mode 100644
index b64ad18e..00000000
Binary files a/resources/azure/integration/service-bus.png and /dev/null differ
diff --git a/resources/azure/integration/service-catalog-managed-application-definitions.png b/resources/azure/integration/service-catalog-managed-application-definitions.png
deleted file mode 100644
index 411380d8..00000000
Binary files a/resources/azure/integration/service-catalog-managed-application-definitions.png and /dev/null differ
diff --git a/resources/azure/integration/sql-data-warehouses.png b/resources/azure/integration/sql-data-warehouses.png
new file mode 100644
index 00000000..2aeeeeaa
Binary files /dev/null and b/resources/azure/integration/sql-data-warehouses.png differ
diff --git a/resources/azure/integration/storsimple-device-managers.png b/resources/azure/integration/storsimple-device-managers.png
deleted file mode 100644
index b29ce455..00000000
Binary files a/resources/azure/integration/storsimple-device-managers.png and /dev/null differ
diff --git a/resources/azure/internet_of_things/digital-twins.png b/resources/azure/internet_of_things/digital-twins.png
new file mode 100644
index 00000000..ce3e8e29
Binary files /dev/null and b/resources/azure/internet_of_things/digital-twins.png differ
diff --git a/resources/azure/internet_of_things/time-series-insights-access-policies.png b/resources/azure/internet_of_things/time-series-insights-access-policies.png
new file mode 100644
index 00000000..a5ef8a87
Binary files /dev/null and b/resources/azure/internet_of_things/time-series-insights-access-policies.png differ
diff --git a/resources/azure/intune/ad-roles-and-administrators.png b/resources/azure/intune/ad-roles-and-administrators.png
new file mode 100644
index 00000000..196ce97a
Binary files /dev/null and b/resources/azure/intune/ad-roles-and-administrators.png differ
diff --git a/resources/azure/intune/device-security-apple.png b/resources/azure/intune/device-security-apple.png
new file mode 100644
index 00000000..415fafbd
Binary files /dev/null and b/resources/azure/intune/device-security-apple.png differ
diff --git a/resources/azure/intune/device-security-google.png b/resources/azure/intune/device-security-google.png
new file mode 100644
index 00000000..398fb36b
Binary files /dev/null and b/resources/azure/intune/device-security-google.png differ
diff --git a/resources/azure/intune/device-security-windows.png b/resources/azure/intune/device-security-windows.png
new file mode 100644
index 00000000..62ade1c7
Binary files /dev/null and b/resources/azure/intune/device-security-windows.png differ
diff --git a/resources/azure/intune/intune-for-education.png b/resources/azure/intune/intune-for-education.png
new file mode 100644
index 00000000..d6014ce2
Binary files /dev/null and b/resources/azure/intune/intune-for-education.png differ
diff --git a/resources/azure/intune/intune.png b/resources/azure/intune/intune.png
new file mode 100644
index 00000000..d6014ce2
Binary files /dev/null and b/resources/azure/intune/intune.png differ
diff --git a/resources/azure/iot/digital-twins.png b/resources/azure/iot/digital-twins.png
deleted file mode 100644
index ceb39f8a..00000000
Binary files a/resources/azure/iot/digital-twins.png and /dev/null differ
diff --git a/resources/azure/iot/event-hubs.png b/resources/azure/iot/event-hubs.png
new file mode 100644
index 00000000..2677ee0a
Binary files /dev/null and b/resources/azure/iot/event-hubs.png differ
diff --git a/resources/azure/iot/function-apps.png b/resources/azure/iot/function-apps.png
new file mode 100644
index 00000000..b6c7f67d
Binary files /dev/null and b/resources/azure/iot/function-apps.png differ
diff --git a/resources/azure/iot/iot-hub-security.png b/resources/azure/iot/iot-hub-security.png
deleted file mode 100644
index 2b4d980c..00000000
Binary files a/resources/azure/iot/iot-hub-security.png and /dev/null differ
diff --git a/resources/azure/iot/logic-apps.png b/resources/azure/iot/logic-apps.png
new file mode 100644
index 00000000..b07f52c5
Binary files /dev/null and b/resources/azure/iot/logic-apps.png differ
diff --git a/resources/azure/iot/maps.png b/resources/azure/iot/maps-accounts.png
similarity index 100%
rename from resources/azure/iot/maps.png
rename to resources/azure/iot/maps-accounts.png
diff --git a/resources/azure/iot/notification-hubs.png b/resources/azure/iot/notification-hubs.png
new file mode 100644
index 00000000..ad3129f4
Binary files /dev/null and b/resources/azure/iot/notification-hubs.png differ
diff --git a/resources/azure/iot/sphere.png b/resources/azure/iot/sphere.png
deleted file mode 100644
index 5fef9d0c..00000000
Binary files a/resources/azure/iot/sphere.png and /dev/null differ
diff --git a/resources/azure/iot/stream-analytics-jobs.png b/resources/azure/iot/stream-analytics-jobs.png
new file mode 100644
index 00000000..a9fceb32
Binary files /dev/null and b/resources/azure/iot/stream-analytics-jobs.png differ
diff --git a/resources/azure/iot/time-series-insights-events-sources.png b/resources/azure/iot/time-series-insights-event-sources.png
similarity index 100%
rename from resources/azure/iot/time-series-insights-events-sources.png
rename to resources/azure/iot/time-series-insights-event-sources.png
diff --git a/resources/azure/iot/windows-10-iot-core-services.png b/resources/azure/iot/windows-10-iot-core-services.png
deleted file mode 100644
index 54b6f7e8..00000000
Binary files a/resources/azure/iot/windows-10-iot-core-services.png and /dev/null differ
diff --git a/resources/azure/management_governance/activity-log.png b/resources/azure/management_governance/activity-log.png
new file mode 100644
index 00000000..43843466
Binary files /dev/null and b/resources/azure/management_governance/activity-log.png differ
diff --git a/resources/azure/management_governance/advisor.png b/resources/azure/management_governance/advisor.png
new file mode 100644
index 00000000..3d19fded
Binary files /dev/null and b/resources/azure/management_governance/advisor.png differ
diff --git a/resources/azure/management_governance/alerts.png b/resources/azure/management_governance/alerts.png
new file mode 100644
index 00000000..53653c21
Binary files /dev/null and b/resources/azure/management_governance/alerts.png differ
diff --git a/resources/azure/management_governance/application-insights.png b/resources/azure/management_governance/application-insights.png
new file mode 100644
index 00000000..f80e0173
Binary files /dev/null and b/resources/azure/management_governance/application-insights.png differ
diff --git a/resources/azure/management_governance/arc.png b/resources/azure/management_governance/arc.png
new file mode 100644
index 00000000..53343615
Binary files /dev/null and b/resources/azure/management_governance/arc.png differ
diff --git a/resources/azure/management_governance/automation-accounts.png b/resources/azure/management_governance/automation-accounts.png
new file mode 100644
index 00000000..d780e4df
Binary files /dev/null and b/resources/azure/management_governance/automation-accounts.png differ
diff --git a/resources/azure/management_governance/blueprints.png b/resources/azure/management_governance/blueprints.png
new file mode 100644
index 00000000..f6e6e921
Binary files /dev/null and b/resources/azure/management_governance/blueprints.png differ
diff --git a/resources/azure/management_governance/compliance.png b/resources/azure/management_governance/compliance.png
new file mode 100644
index 00000000..91b4e5da
Binary files /dev/null and b/resources/azure/management_governance/compliance.png differ
diff --git a/resources/azure/management_governance/cost-management-and-billing.png b/resources/azure/management_governance/cost-management-and-billing.png
new file mode 100644
index 00000000..226a1d9d
Binary files /dev/null and b/resources/azure/management_governance/cost-management-and-billing.png differ
diff --git a/resources/azure/management_governance/diagnostics-settings.png b/resources/azure/management_governance/diagnostics-settings.png
new file mode 100644
index 00000000..a015178c
Binary files /dev/null and b/resources/azure/management_governance/diagnostics-settings.png differ
diff --git a/resources/azure/management_governance/education.png b/resources/azure/management_governance/education.png
new file mode 100644
index 00000000..3afd40c1
Binary files /dev/null and b/resources/azure/management_governance/education.png differ
diff --git a/resources/azure/management_governance/lighthouse.png b/resources/azure/management_governance/lighthouse.png
new file mode 100644
index 00000000..af4aa115
Binary files /dev/null and b/resources/azure/management_governance/lighthouse.png differ
diff --git a/resources/azure/management_governance/log-analytics-workspaces.png b/resources/azure/management_governance/log-analytics-workspaces.png
new file mode 100644
index 00000000..d3f462ad
Binary files /dev/null and b/resources/azure/management_governance/log-analytics-workspaces.png differ
diff --git a/resources/azure/management_governance/machinesazurearc.png b/resources/azure/management_governance/machinesazurearc.png
new file mode 100644
index 00000000..adeb9c3d
Binary files /dev/null and b/resources/azure/management_governance/machinesazurearc.png differ
diff --git a/resources/azure/management_governance/managed-applications-center.png b/resources/azure/management_governance/managed-applications-center.png
new file mode 100644
index 00000000..97f2b7d0
Binary files /dev/null and b/resources/azure/management_governance/managed-applications-center.png differ
diff --git a/resources/azure/management_governance/metrics.png b/resources/azure/management_governance/metrics.png
new file mode 100644
index 00000000..6bcd84ff
Binary files /dev/null and b/resources/azure/management_governance/metrics.png differ
diff --git a/resources/azure/management_governance/monitor.png b/resources/azure/management_governance/monitor.png
new file mode 100644
index 00000000..7a93a8f7
Binary files /dev/null and b/resources/azure/management_governance/monitor.png differ
diff --git a/resources/azure/management_governance/my-customers.png b/resources/azure/management_governance/my-customers.png
new file mode 100644
index 00000000..b859b014
Binary files /dev/null and b/resources/azure/management_governance/my-customers.png differ
diff --git a/resources/azure/management_governance/operation-log-classic.png b/resources/azure/management_governance/operation-log-classic.png
new file mode 100644
index 00000000..43843466
Binary files /dev/null and b/resources/azure/management_governance/operation-log-classic.png differ
diff --git a/resources/azure/management_governance/policy.png b/resources/azure/management_governance/policy.png
new file mode 100644
index 00000000..d3a02a8c
Binary files /dev/null and b/resources/azure/management_governance/policy.png differ
diff --git a/resources/azure/migration/recovery-services-vaults.png b/resources/azure/management_governance/recovery-services-vaults.png
similarity index 100%
rename from resources/azure/migration/recovery-services-vaults.png
rename to resources/azure/management_governance/recovery-services-vaults.png
diff --git a/resources/azure/management_governance/resource-graph-explorer.png b/resources/azure/management_governance/resource-graph-explorer.png
new file mode 100644
index 00000000..eafc4e12
Binary files /dev/null and b/resources/azure/management_governance/resource-graph-explorer.png differ
diff --git a/resources/azure/management_governance/service-providers.png b/resources/azure/management_governance/service-providers.png
new file mode 100644
index 00000000..48e11419
Binary files /dev/null and b/resources/azure/management_governance/service-providers.png differ
diff --git a/resources/azure/management_governance/solutions.png b/resources/azure/management_governance/solutions.png
new file mode 100644
index 00000000..fb9749c5
Binary files /dev/null and b/resources/azure/management_governance/solutions.png differ
diff --git a/resources/azure/management_governance/user-privacy.png b/resources/azure/management_governance/user-privacy.png
new file mode 100644
index 00000000..dc1d4c19
Binary files /dev/null and b/resources/azure/management_governance/user-privacy.png differ
diff --git a/resources/azure/migrate/cost-management-and-billing.png b/resources/azure/migrate/cost-management-and-billing.png
new file mode 100644
index 00000000..226a1d9d
Binary files /dev/null and b/resources/azure/migrate/cost-management-and-billing.png differ
diff --git a/resources/azure/migration/data-box-edge.png b/resources/azure/migrate/data-box-edge.png
similarity index 100%
rename from resources/azure/migration/data-box-edge.png
rename to resources/azure/migrate/data-box-edge.png
diff --git a/resources/azure/migration/data-box.png b/resources/azure/migrate/data-box.png
similarity index 100%
rename from resources/azure/migration/data-box.png
rename to resources/azure/migrate/data-box.png
diff --git a/resources/azure/migration/migration-projects.png b/resources/azure/migrate/migrate.png
similarity index 100%
rename from resources/azure/migration/migration-projects.png
rename to resources/azure/migrate/migrate.png
diff --git a/resources/azure/migrate/recovery-services-vaults.png b/resources/azure/migrate/recovery-services-vaults.png
new file mode 100644
index 00000000..1275988e
Binary files /dev/null and b/resources/azure/migrate/recovery-services-vaults.png differ
diff --git a/resources/azure/mixed_reality/remote-rendering.png b/resources/azure/mixed_reality/remote-rendering.png
new file mode 100644
index 00000000..22311632
Binary files /dev/null and b/resources/azure/mixed_reality/remote-rendering.png differ
diff --git a/resources/azure/ml/batch-ai.png b/resources/azure/ml/batch-ai.png
deleted file mode 100644
index 935f482e..00000000
Binary files a/resources/azure/ml/batch-ai.png and /dev/null differ
diff --git a/resources/azure/ml/genomics-accounts.png b/resources/azure/ml/genomics-accounts.png
deleted file mode 100644
index 782eba24..00000000
Binary files a/resources/azure/ml/genomics-accounts.png and /dev/null differ
diff --git a/resources/azure/ml/machine-learning-service-workspaces.png b/resources/azure/ml/machine-learning-service-workspaces.png
deleted file mode 100644
index b1e967bb..00000000
Binary files a/resources/azure/ml/machine-learning-service-workspaces.png and /dev/null differ
diff --git a/resources/azure/monitor/sap-azure-monitor.png b/resources/azure/monitor/sap-azure-monitor.png
new file mode 100644
index 00000000..8628b3a3
Binary files /dev/null and b/resources/azure/monitor/sap-azure-monitor.png differ
diff --git a/resources/azure/network/application-security-groups.png b/resources/azure/network/application-security-groups.png
deleted file mode 100644
index 0e0b6be9..00000000
Binary files a/resources/azure/network/application-security-groups.png and /dev/null differ
diff --git a/resources/azure/network/dns-private-zones.png b/resources/azure/network/dns-private-zones.png
deleted file mode 100644
index 60bd589e..00000000
Binary files a/resources/azure/network/dns-private-zones.png and /dev/null differ
diff --git a/resources/azure/network/on-premises-data-gateways.png b/resources/azure/network/on-premises-data-gateways.png
deleted file mode 100644
index fb1b0ecb..00000000
Binary files a/resources/azure/network/on-premises-data-gateways.png and /dev/null differ
diff --git a/resources/azure/network/subnets.png b/resources/azure/network/subnets.png
deleted file mode 100644
index eb4b1f59..00000000
Binary files a/resources/azure/network/subnets.png and /dev/null differ
diff --git a/resources/azure/network/virtual-network-gateways.png b/resources/azure/network/virtual-network-gateways.png
deleted file mode 100644
index 5e66c940..00000000
Binary files a/resources/azure/network/virtual-network-gateways.png and /dev/null differ
diff --git a/resources/azure/network/application-gateway.png b/resources/azure/networking/application-gateways.png
similarity index 100%
rename from resources/azure/network/application-gateway.png
rename to resources/azure/networking/application-gateways.png
diff --git a/resources/azure/networking/cdn-profiles.png b/resources/azure/networking/cdn-profiles.png
new file mode 100644
index 00000000..abf28b27
Binary files /dev/null and b/resources/azure/networking/cdn-profiles.png differ
diff --git a/resources/azure/network/connections.png b/resources/azure/networking/connections.png
similarity index 100%
rename from resources/azure/network/connections.png
rename to resources/azure/networking/connections.png
diff --git a/resources/azure/network/ddos-protection-plans.png b/resources/azure/networking/ddos-protection-plans.png
similarity index 100%
rename from resources/azure/network/ddos-protection-plans.png
rename to resources/azure/networking/ddos-protection-plans.png
diff --git a/resources/azure/network/dns-zones.png b/resources/azure/networking/dns-zones.png
similarity index 100%
rename from resources/azure/network/dns-zones.png
rename to resources/azure/networking/dns-zones.png
diff --git a/resources/azure/network/expressroute-circuits.png b/resources/azure/networking/expressroute-circuits.png
similarity index 100%
rename from resources/azure/network/expressroute-circuits.png
rename to resources/azure/networking/expressroute-circuits.png
diff --git a/resources/azure/networking/firewall-manager.png b/resources/azure/networking/firewall-manager.png
new file mode 100644
index 00000000..18a4f3b6
Binary files /dev/null and b/resources/azure/networking/firewall-manager.png differ
diff --git a/resources/azure/network/firewall.png b/resources/azure/networking/firewalls.png
similarity index 100%
rename from resources/azure/network/firewall.png
rename to resources/azure/networking/firewalls.png
diff --git a/resources/azure/network/front-doors.png b/resources/azure/networking/front-doors.png
similarity index 100%
rename from resources/azure/network/front-doors.png
rename to resources/azure/networking/front-doors.png
diff --git a/resources/azure/networking/ip-groups.png b/resources/azure/networking/ip-groups.png
new file mode 100644
index 00000000..c7ddd799
Binary files /dev/null and b/resources/azure/networking/ip-groups.png differ
diff --git a/resources/azure/network/load-balancers.png b/resources/azure/networking/load-balancers.png
similarity index 100%
rename from resources/azure/network/load-balancers.png
rename to resources/azure/networking/load-balancers.png
diff --git a/resources/azure/network/local-network-gateways.png b/resources/azure/networking/local-network-gateways.png
similarity index 100%
rename from resources/azure/network/local-network-gateways.png
rename to resources/azure/networking/local-network-gateways.png
diff --git a/resources/azure/networking/nat.png b/resources/azure/networking/nat.png
new file mode 100644
index 00000000..c78bbf0f
Binary files /dev/null and b/resources/azure/networking/nat.png differ
diff --git a/resources/azure/network/network-interfaces.png b/resources/azure/networking/network-interfaces.png
similarity index 100%
rename from resources/azure/network/network-interfaces.png
rename to resources/azure/networking/network-interfaces.png
diff --git a/resources/azure/network/network-security-groups-classic.png b/resources/azure/networking/network-security-groups.png
similarity index 100%
rename from resources/azure/network/network-security-groups-classic.png
rename to resources/azure/networking/network-security-groups.png
diff --git a/resources/azure/network/network-watcher.png b/resources/azure/networking/network-watcher.png
similarity index 100%
rename from resources/azure/network/network-watcher.png
rename to resources/azure/networking/network-watcher.png
diff --git a/resources/azure/networking/private-link-service.png b/resources/azure/networking/private-link-service.png
new file mode 100644
index 00000000..6e60e15a
Binary files /dev/null and b/resources/azure/networking/private-link-service.png differ
diff --git a/resources/azure/networking/private-link.png b/resources/azure/networking/private-link.png
new file mode 100644
index 00000000..21956718
Binary files /dev/null and b/resources/azure/networking/private-link.png differ
diff --git a/resources/azure/networking/proximity-placement-groups.png b/resources/azure/networking/proximity-placement-groups.png
new file mode 100644
index 00000000..f16f1e0f
Binary files /dev/null and b/resources/azure/networking/proximity-placement-groups.png differ
diff --git a/resources/azure/networking/public-ip-addresses-classic.png b/resources/azure/networking/public-ip-addresses-classic.png
new file mode 100644
index 00000000..8284a592
Binary files /dev/null and b/resources/azure/networking/public-ip-addresses-classic.png differ
diff --git a/resources/azure/network/public-ip-addresses.png b/resources/azure/networking/public-ip-addresses.png
similarity index 100%
rename from resources/azure/network/public-ip-addresses.png
rename to resources/azure/networking/public-ip-addresses.png
diff --git a/resources/azure/networking/public-ip-prefixes.png b/resources/azure/networking/public-ip-prefixes.png
new file mode 100644
index 00000000..09015f7e
Binary files /dev/null and b/resources/azure/networking/public-ip-prefixes.png differ
diff --git a/resources/azure/network/reserved-ip-addresses-classic.png b/resources/azure/networking/reserved-ip-addresses-classic.png
similarity index 100%
rename from resources/azure/network/reserved-ip-addresses-classic.png
rename to resources/azure/networking/reserved-ip-addresses-classic.png
diff --git a/resources/azure/network/route-filters.png b/resources/azure/networking/route-filters.png
similarity index 100%
rename from resources/azure/network/route-filters.png
rename to resources/azure/networking/route-filters.png
diff --git a/resources/azure/network/route-tables.png b/resources/azure/networking/route-tables.png
similarity index 100%
rename from resources/azure/network/route-tables.png
rename to resources/azure/networking/route-tables.png
diff --git a/resources/azure/network/service-endpoint-policies.png b/resources/azure/networking/service-endpoint-policies.png
similarity index 100%
rename from resources/azure/network/service-endpoint-policies.png
rename to resources/azure/networking/service-endpoint-policies.png
diff --git a/resources/azure/network/traffic-manager-profiles.png b/resources/azure/networking/traffic-manager-profiles.png
similarity index 100%
rename from resources/azure/network/traffic-manager-profiles.png
rename to resources/azure/networking/traffic-manager-profiles.png
diff --git a/resources/azure/networking/virtual-network-gateways.png b/resources/azure/networking/virtual-network-gateways.png
new file mode 100644
index 00000000..879e1cc7
Binary files /dev/null and b/resources/azure/networking/virtual-network-gateways.png differ
diff --git a/resources/azure/network/virtual-network-classic.png b/resources/azure/networking/virtual-networks-classic.png
similarity index 100%
rename from resources/azure/network/virtual-network-classic.png
rename to resources/azure/networking/virtual-networks-classic.png
diff --git a/resources/azure/network/virtual-networks.png b/resources/azure/networking/virtual-networks.png
similarity index 100%
rename from resources/azure/network/virtual-networks.png
rename to resources/azure/networking/virtual-networks.png
diff --git a/resources/azure/network/virtual-wans.png b/resources/azure/networking/virtual-wans.png
similarity index 100%
rename from resources/azure/network/virtual-wans.png
rename to resources/azure/networking/virtual-wans.png
diff --git a/resources/azure/networking/web-application-firewall-policieswaf.png b/resources/azure/networking/web-application-firewall-policieswaf.png
new file mode 100644
index 00000000..c3f564e3
Binary files /dev/null and b/resources/azure/networking/web-application-firewall-policieswaf.png differ
diff --git a/resources/azure/other/backup-center.png b/resources/azure/other/backup-center.png
new file mode 100644
index 00000000..7e71cebf
Binary files /dev/null and b/resources/azure/other/backup-center.png differ
diff --git a/resources/azure/other/detonation.png b/resources/azure/other/detonation.png
new file mode 100644
index 00000000..35d111d8
Binary files /dev/null and b/resources/azure/other/detonation.png differ
diff --git a/resources/azure/other/expressroute-direct.png b/resources/azure/other/expressroute-direct.png
new file mode 100644
index 00000000..373e2c6a
Binary files /dev/null and b/resources/azure/other/expressroute-direct.png differ
diff --git a/resources/azure/other/instance-pools.png b/resources/azure/other/instance-pools.png
new file mode 100644
index 00000000..ccf66287
Binary files /dev/null and b/resources/azure/other/instance-pools.png differ
diff --git a/resources/azure/other/internet-analyzer-profiles.png b/resources/azure/other/internet-analyzer-profiles.png
new file mode 100644
index 00000000..1cdcb64c
Binary files /dev/null and b/resources/azure/other/internet-analyzer-profiles.png differ
diff --git a/resources/azure/other/local-network-gateways.png b/resources/azure/other/local-network-gateways.png
new file mode 100644
index 00000000..11e7bf9c
Binary files /dev/null and b/resources/azure/other/local-network-gateways.png differ
diff --git a/resources/azure/other/peering-service.png b/resources/azure/other/peering-service.png
new file mode 100644
index 00000000..60441e47
Binary files /dev/null and b/resources/azure/other/peering-service.png differ
diff --git a/resources/azure/other/resource-mover.png b/resources/azure/other/resource-mover.png
new file mode 100644
index 00000000..b2d5343b
Binary files /dev/null and b/resources/azure/other/resource-mover.png differ
diff --git a/resources/azure/other/ssh-keys.png b/resources/azure/other/ssh-keys.png
new file mode 100644
index 00000000..9635d26e
Binary files /dev/null and b/resources/azure/other/ssh-keys.png differ
diff --git a/resources/azure/other/template-specs.png b/resources/azure/other/template-specs.png
new file mode 100644
index 00000000..36657fd8
Binary files /dev/null and b/resources/azure/other/template-specs.png differ
diff --git a/resources/azure/other/universal-print.png b/resources/azure/other/universal-print.png
new file mode 100644
index 00000000..7da3c662
Binary files /dev/null and b/resources/azure/other/universal-print.png differ
diff --git a/resources/azure/other/windows-virtual-desktop.png b/resources/azure/other/windows-virtual-desktop.png
new file mode 100644
index 00000000..1103e59f
Binary files /dev/null and b/resources/azure/other/windows-virtual-desktop.png differ
diff --git a/resources/azure/preview/cloud-shell.png b/resources/azure/preview/cloud-shell.png
new file mode 100644
index 00000000..378f7ef3
Binary files /dev/null and b/resources/azure/preview/cloud-shell.png differ
diff --git a/resources/azure/preview/iot-edge.png b/resources/azure/preview/iot-edge.png
new file mode 100644
index 00000000..ee3be9f6
Binary files /dev/null and b/resources/azure/preview/iot-edge.png differ
diff --git a/resources/azure/preview/private-link-hub.png b/resources/azure/preview/private-link-hub.png
new file mode 100644
index 00000000..bc440119
Binary files /dev/null and b/resources/azure/preview/private-link-hub.png differ
diff --git a/resources/azure/preview/rtos.png b/resources/azure/preview/rtos.png
new file mode 100644
index 00000000..01a30eb6
Binary files /dev/null and b/resources/azure/preview/rtos.png differ
diff --git a/resources/azure/preview/sphere.png b/resources/azure/preview/sphere.png
new file mode 100644
index 00000000..44ebda4a
Binary files /dev/null and b/resources/azure/preview/sphere.png differ
diff --git a/resources/azure/preview/static-apps.png b/resources/azure/preview/static-apps.png
new file mode 100644
index 00000000..a7d63903
Binary files /dev/null and b/resources/azure/preview/static-apps.png differ
diff --git a/resources/azure/preview/time-series-data-sets.png b/resources/azure/preview/time-series-data-sets.png
new file mode 100644
index 00000000..242495c1
Binary files /dev/null and b/resources/azure/preview/time-series-data-sets.png differ
diff --git a/resources/azure/preview/web-environment.png b/resources/azure/preview/web-environment.png
new file mode 100644
index 00000000..4ae02f5d
Binary files /dev/null and b/resources/azure/preview/web-environment.png differ
diff --git a/resources/azure/preview/workbooks.png b/resources/azure/preview/workbooks.png
new file mode 100644
index 00000000..0a856860
Binary files /dev/null and b/resources/azure/preview/workbooks.png differ
diff --git a/resources/azure/security/extended-security-updates.png b/resources/azure/security/extendedsecurityupdates.png
similarity index 100%
rename from resources/azure/security/extended-security-updates.png
rename to resources/azure/security/extendedsecurityupdates.png
diff --git a/resources/azure/security/key-vaults.png b/resources/azure/security/key-vaults.png
index bc57429f..60724ea6 100644
Binary files a/resources/azure/security/key-vaults.png and b/resources/azure/security/key-vaults.png differ
diff --git a/resources/azure/storage/archive-storage.png b/resources/azure/storage/archive-storage.png
deleted file mode 100644
index f80a1066..00000000
Binary files a/resources/azure/storage/archive-storage.png and /dev/null differ
diff --git a/resources/azure/storage/azurefxtedgefiler.png b/resources/azure/storage/azurefxtedgefiler.png
deleted file mode 100644
index 052a8b1d..00000000
Binary files a/resources/azure/storage/azurefxtedgefiler.png and /dev/null differ
diff --git a/resources/azure/storage/blob-storage.png b/resources/azure/storage/blob-storage.png
deleted file mode 100644
index e849152a..00000000
Binary files a/resources/azure/storage/blob-storage.png and /dev/null differ
diff --git a/resources/azure/storage/data-box-edge-data-box-gateway.png b/resources/azure/storage/data-box-edge.png
similarity index 100%
rename from resources/azure/storage/data-box-edge-data-box-gateway.png
rename to resources/azure/storage/data-box-edge.png
diff --git a/resources/azure/storage/data-lake-storage-gen1.png b/resources/azure/storage/data-lake-storage-gen1.png
new file mode 100644
index 00000000..6e861246
Binary files /dev/null and b/resources/azure/storage/data-lake-storage-gen1.png differ
diff --git a/resources/azure/storage/data-lake-storage.png b/resources/azure/storage/data-lake-storage.png
deleted file mode 100644
index 8f22588a..00000000
Binary files a/resources/azure/storage/data-lake-storage.png and /dev/null differ
diff --git a/resources/azure/storage/data-share-invitations.png b/resources/azure/storage/data-share-invitations.png
new file mode 100644
index 00000000..6bbb6f30
Binary files /dev/null and b/resources/azure/storage/data-share-invitations.png differ
diff --git a/resources/azure/storage/data-shares.png b/resources/azure/storage/data-shares.png
new file mode 100644
index 00000000..e779bfeb
Binary files /dev/null and b/resources/azure/storage/data-shares.png differ
diff --git a/resources/azure/storage/general-storage.png b/resources/azure/storage/general-storage.png
deleted file mode 100644
index 03955bd2..00000000
Binary files a/resources/azure/storage/general-storage.png and /dev/null differ
diff --git a/resources/azure/storage/hcp-cache.png b/resources/azure/storage/hcp-cache.png
new file mode 100644
index 00000000..98df92f2
Binary files /dev/null and b/resources/azure/storage/hcp-cache.png differ
diff --git a/resources/azure/storage/import-export-jobs.png b/resources/azure/storage/import-export-jobs.png
new file mode 100644
index 00000000..cc2f53ab
Binary files /dev/null and b/resources/azure/storage/import-export-jobs.png differ
diff --git a/resources/azure/storage/queues-storage.png b/resources/azure/storage/queues-storage.png
deleted file mode 100644
index 565aba78..00000000
Binary files a/resources/azure/storage/queues-storage.png and /dev/null differ
diff --git a/resources/azure/storage/recovery-services-vaults.png b/resources/azure/storage/recovery-services-vaults.png
new file mode 100644
index 00000000..1275988e
Binary files /dev/null and b/resources/azure/storage/recovery-services-vaults.png differ
diff --git a/resources/azure/storage/stack-edge.png b/resources/azure/storage/stack-edge.png
new file mode 100644
index 00000000..6f8e44c8
Binary files /dev/null and b/resources/azure/storage/stack-edge.png differ
diff --git a/resources/azure/storage/storage-explorer.png b/resources/azure/storage/storage-explorer.png
deleted file mode 100644
index c623801f..00000000
Binary files a/resources/azure/storage/storage-explorer.png and /dev/null differ
diff --git a/resources/azure/storage/storage-sync-services.png b/resources/azure/storage/storage-sync-services.png
index 6d22924a..2a5b3e38 100644
Binary files a/resources/azure/storage/storage-sync-services.png and b/resources/azure/storage/storage-sync-services.png differ
diff --git a/resources/azure/storage/table-storage.png b/resources/azure/storage/table-storage.png
deleted file mode 100644
index 7dd762fd..00000000
Binary files a/resources/azure/storage/table-storage.png and /dev/null differ
diff --git a/resources/azure/web/api-connections.png b/resources/azure/web/api-connections.png
deleted file mode 100644
index 3c0db2e6..00000000
Binary files a/resources/azure/web/api-connections.png and /dev/null differ
diff --git a/resources/azure/web/media-services.png b/resources/azure/web/media-service.png
similarity index 100%
rename from resources/azure/web/media-services.png
rename to resources/azure/web/media-service.png
diff --git a/resources/azure/web/signalr.png b/resources/azure/web/signalr.png
deleted file mode 100644
index 8596a694..00000000
Binary files a/resources/azure/web/signalr.png and /dev/null differ
diff --git a/scripts/resource.py b/scripts/resource.py
index d2b0f4c8..2130ebff 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -36,6 +36,10 @@ def cleaner_aws(f):
 
 
 def cleaner_azure(f):
+    t = f.split('-')
+    del t[:3]
+    sep = '-'
+    f = sep.join(t)
     f = f.replace("_", "-")
     f = f.replace("(", "").replace(")", "")
     f = "-".join(f.split())