diff --git a/src/components/ListTable/formatters/ShowKeyFormatter.vue b/src/components/ListTable/formatters/ShowKeyFormatter.vue
index ffd30c3c6..db3d34ad1 100644
--- a/src/components/ListTable/formatters/ShowKeyFormatter.vue
+++ b/src/components/ListTable/formatters/ShowKeyFormatter.vue
@@ -1,6 +1,6 @@
 <template>
   <span v-if="systemuser.length===0"><a style="color: #1c84c6;" @click="showSystemUser">{{ this.$t('common.Show') }}</a></span>
-  <span v-else>{{ this.systemuser.toString() }}</span>
+  <span v-else>{{ systemuser.toString() }}</span>
 </template>
 
 <script>
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index 7e7754e88..87c887a62 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -24,7 +24,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import ApiKey from '@/views/dashboard/ApiKey'
+import ApiKey from './ApiKey'
 import { getPermission, setPermission } from '@/utils/auth'
 
 export default {
diff --git a/src/layout/components/NavHeader/ApiKey.vue b/src/layout/components/NavHeader/ApiKey.vue
index d5b86990d..65f550673 100644
--- a/src/layout/components/NavHeader/ApiKey.vue
+++ b/src/layout/components/NavHeader/ApiKey.vue
@@ -1,12 +1,10 @@
 <template>
-  <div>
-    <Dialog width="70%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
-      <div>
-        <el-alert type="success"> {{ helpMessage }} </el-alert>
-        <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-      </div>
-    </Dialog>
-  </div>
+  <Dialog width="70%" class="api-key-dialog" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
+    <div>
+      <el-alert type="success"> {{ helpMessage }} </el-alert>
+      <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
+    </div>
+  </Dialog>
 </template>
 
 <script>
@@ -103,6 +101,8 @@ export default {
 }
 </script>
 
-<style lang='less' scoped>
-
+<style lang='scss' scoped>
+.api-key-dialog >>> .el-dialog__body {
+  padding-top: 0;
+}
 </style>
diff --git a/src/router/assets.js b/src/router/assets.js
index 75a19380d..9f84d622c 100644
--- a/src/router/assets.js
+++ b/src/router/assets.js
@@ -3,27 +3,27 @@ export default [
   {
     path: 'assets',
     name: 'AssetList',
-    component: () => import('@/views/assets/AssetList/AssetList.vue'),
+    component: () => import('@/views/assets/Asset/AssetList.vue'),
     meta: { title: i18n.t('route.AssetList') }
   },
   {
     path: 'assets/create',
     name: 'AssetCreate',
-    component: () => import('@/views/assets/AssetList/AssetCreateUpdate.vue'),
+    component: () => import('@/views/assets/Asset/AssetCreateUpdate.vue'),
     meta: { title: i18n.t('route.AssetCreate'), activeMenu: '/assets/assets' },
     hidden: true
   },
   {
     path: 'assets/:id',
     name: 'AssetDetail',
-    component: () => import('@/views/assets/AssetList/AssetListDetail/index.vue'),
+    component: () => import('@/views/assets/Asset/AssetDetail/index.vue'),
     meta: { title: i18n.t('route.AssetDetail'), activeMenu: '/assets/assets' },
     hidden: true
   },
   {
     path: 'assets/:id/update',
     name: 'AssetUpdate',
-    component: () => import('@/views/assets/AssetList/AssetCreateUpdate.vue'),
+    component: () => import('@/views/assets/Asset/AssetCreateUpdate.vue'),
     meta: { title: i18n.t('route.AssetUpdate'), activeMenu: '/assets/assets' },
     hidden: true
   },
diff --git a/src/router/users.js b/src/router/users.js
index e4224ed0b..6ea0aa177 100644
--- a/src/router/users.js
+++ b/src/router/users.js
@@ -2,54 +2,54 @@ import i18n from '@/i18n/i18n'
 export default [
   {
     path: 'users',
-    component: () => import('@/views/users/users/UserList.vue'), // Parent router-view
+    component: () => import('@/views/users/User/UserList.vue'), // Parent router-view
     name: 'UserList',
     meta: { title: i18n.t('route.UserList') }
   },
   {
     path: 'users/create',
-    component: () => import('@/views/users/users/UserCreateUpdate.vue'), // Parent router-view
+    component: () => import('@/views/users/User/UserCreateUpdate.vue'), // Parent router-view
     name: 'UserCreate',
     hidden: true,
     meta: { title: i18n.t('route.UserCreate'), activeMenu: '/users/users', action: 'create' }
   },
   {
     path: 'users/:id/update',
-    component: () => import('@/views/users/users/UserCreateUpdate.vue'), // Parent router-view
+    component: () => import('@/views/users/User/UserCreateUpdate.vue'), // Parent router-view
     name: 'UserUpdate',
     hidden: true,
     meta: { title: i18n.t('route.UserUpdate'), activeMenu: '/users/users', action: 'update' }
   },
   {
     path: 'users/:id',
-    component: () => import('@/views/users/users/UserDetail/index.vue'), // Parent router-view
+    component: () => import('@/views/users/User/UserDetail/index.vue'), // Parent router-view
     name: 'UserDetail',
     hidden: true,
     meta: { title: i18n.t('route.UserDetail'), activeMenu: '/users/users' }
   },
   {
     path: 'groups',
-    component: () => import('@/views/users/groups/UserGroupList.vue'), // Parent router-view
+    component: () => import('@/views/users/Group/UserGroupList.vue'), // Parent router-view
     name: 'UserGroupList',
     meta: { title: i18n.t('route.UserGroupList') }
   },
   {
     path: 'groups/:id/update',
-    component: () => import('@/views/users/groups/UserGroupCreateUpdate.vue'), // Parent router-view
+    component: () => import('@/views/users/Group/UserGroupCreateUpdate.vue'), // Parent router-view
     name: 'UserGroupUpdate',
     hidden: true,
     meta: { title: i18n.t('route.UserGroupUpdate'), activeMenu: '/users/groups' }
   },
   {
     path: 'groups/create',
-    component: () => import('@/views/users/groups/UserGroupCreateUpdate.vue'), // Parent router-view
+    component: () => import('@/views/users/Group/UserGroupCreateUpdate.vue'), // Parent router-view
     name: 'UserGroupCreate',
     hidden: true,
     meta: { title: i18n.t('route.UserGroupCreate'), activeMenu: '/users/groups' }
   },
   {
     path: 'groups/:id',
-    component: () => import('@/views/users/groups/UserGroupDetail/index.vue'), // Parent router-view
+    component: () => import('@/views/users/Group/UserGroupDetail/index.vue'), // Parent router-view
     name: 'UserGroupDetail',
     hidden: true,
     meta: { title: i18n.t('route.UserGroupDetail'), activeMenu: '/users/groups' }
diff --git a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue b/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
index fef6feb32..0bbbaab77 100644
--- a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
+++ b/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
@@ -13,7 +13,7 @@
 <script>
 import DetailCard from '@/components/DetailCard/index'
 import { toSafeLocalDateStr } from '@/utils/common'
-import RunInfoCard from '../../runinfocard/RunInfoCard'
+import RunInfoCard from '../../RunInfoCard/index'
 
 export default {
   name: 'AdhocDetail',
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index 90f97ec00..7a55c36f9 100644
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -15,7 +15,7 @@
 import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import { toSafeLocalDateStr } from '@/utils/common'
-import RunInfoCard from '../../runinfocard/RunInfoCard'
+import RunInfoCard from '../../RunInfoCard/index'
 
 export default {
   name: 'HistoryExecutionDetail',
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index 161314bf6..97e88e7b4 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -15,7 +15,7 @@
 import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import { toSafeLocalDateStr } from '@/utils/common'
-import RunInfoCard from '../runinfocard/RunInfoCard'
+import RunInfoCard from '../RunInfoCard/index'
 
 export default {
   name: 'TaskDetail',
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 52be52f08..aa4f18ae1 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -50,27 +50,27 @@ export default {
     },
     {
       path: 'orgs',
-      component: () => import('@/views/xpack/org/OrganizationList'),
+      component: () => import('@/views/xpack/Org/OrganizationList'),
       name: 'OrganizationList',
       meta: { title: i18n.t('xpack.OrganizationList') }
     },
     {
       path: 'orgs/create',
-      component: () => import('@/views/xpack/org/OrganizationCreateUpdate'),
+      component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
       name: 'OrganizationCreate',
       hidden: true,
       meta: { title: i18n.t('xpack.OrganizationCreate'), activeMenu: '/xpack/orgs', action: 'create' }
     },
     {
       path: 'orgs/:id/update',
-      component: () => import('@/views/xpack/org/OrganizationCreateUpdate'),
+      component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
       name: 'OrganizationUpdate',
       hidden: true,
       meta: { title: i18n.t('xpack.OrganizationUpdate'), activeMenu: '/xpack/orgs', action: 'update' }
     },
     {
       path: 'orgs/:id',
-      component: () => import('@/views/xpack/org/OrganizationDetail/index'),
+      component: () => import('@/views/xpack/Org/OrganizationDetail/index'),
       name: 'OrganizationDetail',
       hidden: true,
       meta: { title: i18n.t('xpack.OrganizationDetail'), activeMenu: '/xpack/orgs' }