diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/__cmd_group.py b/src/acat/azext_acat/aaz/latest/acat/__cmd_group.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/__cmd_group.py
rename to src/acat/azext_acat/aaz/latest/acat/__cmd_group.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/__init__.py b/src/acat/azext_acat/aaz/latest/acat/__init__.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/__init__.py
rename to src/acat/azext_acat/aaz/latest/acat/__init__.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/_onboard.py b/src/acat/azext_acat/aaz/latest/acat/_onboard.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/_onboard.py
rename to src/acat/azext_acat/aaz/latest/acat/_onboard.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/_trigger_evaluation.py b/src/acat/azext_acat/aaz/latest/acat/_trigger_evaluation.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/_trigger_evaluation.py
rename to src/acat/azext_acat/aaz/latest/acat/_trigger_evaluation.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/__cmd_group.py b/src/acat/azext_acat/aaz/latest/acat/report/__cmd_group.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/__cmd_group.py
rename to src/acat/azext_acat/aaz/latest/acat/report/__cmd_group.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/__init__.py b/src/acat/azext_acat/aaz/latest/acat/report/__init__.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/__init__.py
rename to src/acat/azext_acat/aaz/latest/acat/report/__init__.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_create.py b/src/acat/azext_acat/aaz/latest/acat/report/_create.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_create.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_create.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_delete.py b/src/acat/azext_acat/aaz/latest/acat/report/_delete.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_delete.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_delete.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_list.py b/src/acat/azext_acat/aaz/latest/acat/report/_list.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_list.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_list.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_show.py b/src/acat/azext_acat/aaz/latest/acat/report/_show.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_show.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_show.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_update.py b/src/acat/azext_acat/aaz/latest/acat/report/_update.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_update.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_update.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_wait.py b/src/acat/azext_acat/aaz/latest/acat/report/_wait.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/_wait.py
rename to src/acat/azext_acat/aaz/latest/acat/report/_wait.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/__cmd_group.py b/src/acat/azext_acat/aaz/latest/acat/report/snapshot/__cmd_group.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/__cmd_group.py
rename to src/acat/azext_acat/aaz/latest/acat/report/snapshot/__cmd_group.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/__init__.py b/src/acat/azext_acat/aaz/latest/acat/report/snapshot/__init__.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/__init__.py
rename to src/acat/azext_acat/aaz/latest/acat/report/snapshot/__init__.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_download.py b/src/acat/azext_acat/aaz/latest/acat/report/snapshot/_download.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_download.py
rename to src/acat/azext_acat/aaz/latest/acat/report/snapshot/_download.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_list.py b/src/acat/azext_acat/aaz/latest/acat/report/snapshot/_list.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_list.py
rename to src/acat/azext_acat/aaz/latest/acat/report/snapshot/_list.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_show.py b/src/acat/azext_acat/aaz/latest/acat/report/snapshot/_show.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/snapshot/_show.py
rename to src/acat/azext_acat/aaz/latest/acat/report/snapshot/_show.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/__cmd_group.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/__cmd_group.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/__cmd_group.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/__cmd_group.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/__init__.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/__init__.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/__init__.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/__init__.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_create.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/_create.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_create.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/_create.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_delete.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/_delete.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_delete.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/_delete.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_list.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/_list.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_list.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/_list.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_show.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/_show.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_show.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/_show.py
diff --git a/src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_update.py b/src/acat/azext_acat/aaz/latest/acat/report/webhook/_update.py
similarity index 100%
rename from src/acat/azext_acat/aaz/latest/app_compliance_automation/report/webhook/_update.py
rename to src/acat/azext_acat/aaz/latest/acat/report/webhook/_update.py
diff --git a/src/acat/azext_acat/custom.py b/src/acat/azext_acat/custom.py
index 62483fe41d6..736aff5d50e 100644
--- a/src/acat/azext_acat/custom.py
+++ b/src/acat/azext_acat/custom.py
@@ -9,19 +9,19 @@
 # pylint: disable=too-many-statements
 
 from knack.log import get_logger
-from .aaz.latest.app_compliance_automation import Onboard as _AcatOnboard
-from .aaz.latest.app_compliance_automation.report import List as _AcatListReport
-from .aaz.latest.app_compliance_automation.report import Show as _AcatShowReport
-from .aaz.latest.app_compliance_automation.report import Create as _AcatCreateReport
-from .aaz.latest.app_compliance_automation.report import Update as _AcatUpdateReport
-from .aaz.latest.app_compliance_automation.report import Delete as _AcatDeleteReport
-from .aaz.latest.app_compliance_automation.report.snapshot import List as _AcatListSnapshot
-from .aaz.latest.app_compliance_automation.report.snapshot import Download as _AcatDownloadSnapshot
-from .aaz.latest.app_compliance_automation.report.webhook import List as _AcatListReportWebhook
-from .aaz.latest.app_compliance_automation.report.webhook import Show as _AcatShowReportWebhook
-from .aaz.latest.app_compliance_automation.report.webhook import Create as _AcatCreateReportWebhook
-from .aaz.latest.app_compliance_automation.report.webhook import Update as _AcatUpdateReportWebhook
-from .aaz.latest.app_compliance_automation.report.webhook import Delete as _AcatDeleteReportWebhook
+from .aaz.latest.acat import Onboard as _AcatOnboard
+from .aaz.latest.acat.report import List as _AcatListReport
+from .aaz.latest.acat.report import Show as _AcatShowReport
+from .aaz.latest.acat.report import Create as _AcatCreateReport
+from .aaz.latest.acat.report import Update as _AcatUpdateReport
+from .aaz.latest.acat.report import Delete as _AcatDeleteReport
+from .aaz.latest.acat.report.snapshot import List as _AcatListSnapshot
+from .aaz.latest.acat.report.snapshot import Download as _AcatDownloadSnapshot
+from .aaz.latest.acat.report.webhook import List as _AcatListReportWebhook
+from .aaz.latest.acat.report.webhook import Show as _AcatShowReportWebhook
+from .aaz.latest.acat.report.webhook import Create as _AcatCreateReportWebhook
+from .aaz.latest.acat.report.webhook import Update as _AcatUpdateReportWebhook
+from .aaz.latest.acat.report.webhook import Delete as _AcatDeleteReportWebhook
 from azure.cli.core.commands import LongRunningOperation
 from .utils import *
 import os