diff --git a/src/router/pam/automations.js b/src/router/pam/automations.js
index 1238e8329..5490d9962 100644
--- a/src/router/pam/automations.js
+++ b/src/router/pam/automations.js
@@ -139,7 +139,7 @@ export default [
       },
       {
         path: ':id',
-        component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountChangeSecret/Detail/index.vue'),
         name: 'AccountChangeSecretDetail',
         hidden: true,
         meta: {
@@ -149,7 +149,7 @@ export default [
       },
       {
         path: 'executions',
-        component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue'),
+        component: () => import('@/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue'),
         name: 'AccountChangeSecretExecutionList',
         hidden: true,
         meta: {
@@ -159,7 +159,7 @@ export default [
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountChangeSecret/ExecutionDetail/index.vue'),
         name: 'AccountChangeSecretExecutionDetail',
         hidden: true,
         meta: {
@@ -215,7 +215,7 @@ export default [
       },
       {
         path: ':id',
-        component: () => import('@/views/accounts/AccountPush/AccountPushDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountPush/Detail/index.vue'),
         name: 'AccountPushDetail',
         hidden: true,
         meta: {
@@ -235,7 +235,7 @@ export default [
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountPush/ExecutionDetail/index.vue'),
         name: 'AccountPushExecutionDetail',
         hidden: true,
         meta: {
@@ -293,7 +293,7 @@ export default [
       },
       {
         path: ':id',
-        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/Detail/index.vue'),
         name: 'AccountBackupDetail',
         meta: {
           title: i18n.t('AccountBackupDetail')
@@ -302,14 +302,14 @@ export default [
       },
       {
         path: 'executions',
-        component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue'),
+        component: () => import('@/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue'),
         name: 'AccountBackupExecutionList',
         meta: { title: i18n.t('ExecutionDetail') },
         hidden: true
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/Executions/ExecutionDetail/index.vue'),
         name: 'AccountBackupExecutionDetail',
         meta: { title: i18n.t('ExecutionDetail') },
         hidden: true
diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue
index e96c808e8..d8cb53bf3 100644
--- a/src/views/accounts/AccountBackup/AccountBackupList.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupList.vue
@@ -21,7 +21,7 @@ export default {
     const vm = this
     return {
       createDrawer: () => import('@/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue'),
-      detailDrawer: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/index.vue'),
+      detailDrawer: () => import('@/views/accounts/AccountBackup/Detail/index.vue'),
       tableConfig: {
         url: '/api/v1/accounts/account-backup-plans/',
         permissions: {
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue b/src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue
rename to src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue b/src/views/accounts/AccountBackup/Detail/index.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
rename to src/views/accounts/AccountBackup/Detail/index.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
rename to src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue b/src/views/accounts/AccountBackup/Executions/ExecutionDetail/AccountBackupExecutionInfo.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
rename to src/views/accounts/AccountBackup/Executions/ExecutionDetail/AccountBackupExecutionInfo.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue b/src/views/accounts/AccountBackup/Executions/ExecutionDetail/index.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
rename to src/views/accounts/AccountBackup/Executions/ExecutionDetail/index.vue
diff --git a/src/views/accounts/AccountBackup/index.vue b/src/views/accounts/AccountBackup/index.vue
index d579bf58e..6a26545b0 100644
--- a/src/views/accounts/AccountBackup/index.vue
+++ b/src/views/accounts/AccountBackup/index.vue
@@ -29,7 +29,7 @@ export default {
             title: this.$t('ExecutionList'),
             name: 'AccountBackupExecutionList',
             hidden: !this.$hasPerm('accounts.view_accountbackupexecution'),
-            component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue')
+            component: () => import('@/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue')
           }
         ]
       }
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
index 30bfbfc0c..d15d8a852 100644
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
@@ -21,7 +21,7 @@ export default {
     const vm = this
     return {
       createDrawer: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue'),
-      detailDrawer: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue'),
+      detailDrawer: () => import('@/views/accounts/AccountChangeSecret/Detail/index.vue'),
       tableConfig: {
         url: '/api/v1/accounts/change-secret-automations/',
         columnsExclude: ['password_rules'],
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue b/src/views/accounts/AccountChangeSecret/Detail/AccountChangeSecretAsset/index.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue
rename to src/views/accounts/AccountChangeSecret/Detail/AccountChangeSecretAsset/index.vue
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue b/src/views/accounts/AccountChangeSecret/Detail/AccountChangeSecretInfo.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue
rename to src/views/accounts/AccountChangeSecret/Detail/AccountChangeSecretInfo.vue
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue b/src/views/accounts/AccountChangeSecret/Detail/index.vue
similarity index 93%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue
rename to src/views/accounts/AccountChangeSecret/Detail/index.vue
index ed9a7b4f2..ca65a0ac6 100644
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue
+++ b/src/views/accounts/AccountChangeSecret/Detail/index.vue
@@ -11,7 +11,7 @@ import { GenericDetailPage } from '@/layout/components'
 import AccountChangeSecretInfo from './AccountChangeSecretInfo.vue'
 import AccountChangeSecretAsset from './AccountChangeSecretAsset/index.vue'
 import AccountChangeSecretExecutionList
-from '@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue'
+from '@/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue'
 
 export default {
   components: {
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue b/src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretExecutionInfo.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue
rename to src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretExecutionInfo.vue
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue b/src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretRecord.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue
rename to src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretRecord.vue
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue b/src/views/accounts/AccountChangeSecret/ExecutionDetail/index.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue
rename to src/views/accounts/AccountChangeSecret/ExecutionDetail/index.vue
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue
similarity index 100%
rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
rename to src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue
diff --git a/src/views/accounts/AccountChangeSecret/index.vue b/src/views/accounts/AccountChangeSecret/index.vue
index 87dd6893d..5278582fc 100644
--- a/src/views/accounts/AccountChangeSecret/index.vue
+++ b/src/views/accounts/AccountChangeSecret/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu" :disabled="!hasValidLicense" />
+  <TabPage :active-menu.sync="config.activeMenu" :disabled="!hasValidLicense" :submenu="config.submenu" />
 </template>
 
 <script>
@@ -19,29 +19,25 @@ export default {
           {
             title: this.$t('Overview'),
             name: 'AccountChangeDashboard',
-            component: () => import('@/views/accounts/AccountChangeSecret/Overview/index.vue')
+            component: () => import('./Overview/index.vue')
           },
           {
             title: this.$t('ChangeSecret'),
             name: 'AccountChangeSecretList',
             hidden: () => !this.$hasPerm('accounts.view_changesecretautomation'),
-            component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue')
+            component: () => import('./AccountChangeSecretList.vue')
           },
           {
             title: this.$t('ExecutionList'),
             name: 'AccountChangeSecretExecutionList',
             hidden: () => !this.$hasPerm('accounts.view_changesecretexecution'),
-            component: () => import(
-              '@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue'
-              )
+            component: () => import('@/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue')
           },
           {
             title: this.$t('ExecutionRecord'),
             name: 'ChangeSecretRecord',
             hidden: () => !this.$hasPerm('accounts.view_changesecretrecord'),
-            component: () => import(
-              '@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue'
-              )
+            component: () => import('@/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretRecord.vue')
           }
         ]
       }
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionList.vue b/src/views/accounts/AccountPush/AccountPushExecutionList.vue
index 698b58da8..c10ffcdec 100644
--- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue
+++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue
@@ -6,7 +6,7 @@
       :header-actions="headerActions"
       :table-config="tableConfig"
     />
-    <ReportDialog :visible.sync="visible" :url="reportUrl" />
+    <ReportDialog :url="reportUrl" :visible.sync="visible" />
   </div>
 </template>
 
@@ -27,7 +27,7 @@ export default {
     return {
       visible: false,
       reportUrl: '',
-      detailDrawer: () => import('@/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue'),
+      detailDrawer: () => import('@/views/accounts/AccountPush/ExecutionDetail/index.vue'),
       tableConfig: {
         url: '/api/v1/accounts/push-account-executions',
         columns: [
diff --git a/src/views/accounts/AccountPush/AccountPushList.vue b/src/views/accounts/AccountPush/AccountPushList.vue
index 2686c8fca..20a29a263 100644
--- a/src/views/accounts/AccountPush/AccountPushList.vue
+++ b/src/views/accounts/AccountPush/AccountPushList.vue
@@ -22,7 +22,7 @@ export default {
     const vm = this
     return {
       createDrawer: () => import('@/views/accounts/AccountPush/AccountPushCreateUpdate.vue'),
-      detailDrawer: () => import('@/views/accounts/AccountPush/AccountPushDetail/index.vue'),
+      detailDrawer: () => import('@/views/accounts/AccountPush/Detail/index.vue'),
       tableConfig: {
         url: '/api/v1/accounts/push-account-automations/',
         columns: [
diff --git a/src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue b/src/views/accounts/AccountPush/Detail/AccountPushInfo.vue
similarity index 100%
rename from src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue
rename to src/views/accounts/AccountPush/Detail/AccountPushInfo.vue
diff --git a/src/views/accounts/AccountPush/AccountPushDetail/index.vue b/src/views/accounts/AccountPush/Detail/index.vue
similarity index 100%
rename from src/views/accounts/AccountPush/AccountPushDetail/index.vue
rename to src/views/accounts/AccountPush/Detail/index.vue
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue b/src/views/accounts/AccountPush/ExecutionDetail/AccountPushExecutionInfo.vue
similarity index 100%
rename from src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue
rename to src/views/accounts/AccountPush/ExecutionDetail/AccountPushExecutionInfo.vue
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushRecord.vue b/src/views/accounts/AccountPush/ExecutionDetail/AccountPushRecord.vue
similarity index 100%
rename from src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushRecord.vue
rename to src/views/accounts/AccountPush/ExecutionDetail/AccountPushRecord.vue
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue b/src/views/accounts/AccountPush/ExecutionDetail/index.vue
similarity index 100%
rename from src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue
rename to src/views/accounts/AccountPush/ExecutionDetail/index.vue
diff --git a/src/views/accounts/AccountPush/index.vue b/src/views/accounts/AccountPush/index.vue
index 07ae86c41..bb4e6f1c1 100644
--- a/src/views/accounts/AccountPush/index.vue
+++ b/src/views/accounts/AccountPush/index.vue
@@ -32,7 +32,7 @@ export default {
             name: 'AccountPushRecord',
             hidden: () => !this.$hasPerm('accounts.view_pushsecretrecord'),
             component: () => import(
-              '@/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushRecord.vue'
+              '@/views/accounts/AccountPush/ExecutionDetail/AccountPushRecord.vue'
               )
           }
         ]
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateTable.vue b/src/views/accounts/AccountTemplate/AccountTemplateTable.vue
index 7ca8af2d9..db17c2968 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateTable.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateTable.vue
@@ -35,7 +35,7 @@ export default {
     return {
       showViewSecretDialog: false,
       createDrawer: () => import('@/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue'),
-      detailDrawer: () => import('@/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue'),
+      detailDrawer: () => import('@/views/accounts/AccountTemplate/Detail/index.vue'),
       account: {},
       secretUrl: '',
       tableConfig: {
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue b/src/views/accounts/AccountTemplate/Detail/Account.vue
similarity index 100%
rename from src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue
rename to src/views/accounts/AccountTemplate/Detail/Account.vue
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue b/src/views/accounts/AccountTemplate/Detail/Detail.vue
similarity index 100%
rename from src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
rename to src/views/accounts/AccountTemplate/Detail/Detail.vue
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue b/src/views/accounts/AccountTemplate/Detail/index.vue
similarity index 100%
rename from src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue
rename to src/views/accounts/AccountTemplate/Detail/index.vue