diff --git a/src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx b/src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx
index 2b5e763d9f..4abac407f3 100644
--- a/src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx
@@ -28,7 +28,7 @@ import {
     PermissionConfigurationForm,
     PermissionConfigurationFormProvider,
     usePermissionConfiguration,
-} from '../shared-amrit/components/PermissionConfigurationForm'
+} from '../Shared/components/PermissionConfigurationForm'
 import { createUserPermissionPayload, isDirectPermissionFormComplete } from '../utils'
 import { getDefaultUserStatusAndTimeout } from '../libUtils'
 import { importComponentFromFELibrary } from '../../../../components/common'
diff --git a/src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx b/src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx
index af288d6866..fb8d4277bc 100644
--- a/src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx
@@ -34,7 +34,7 @@ import {
     PermissionConfigurationForm,
     PermissionConfigurationFormProvider,
     usePermissionConfiguration,
-} from '../shared-amrit/components/PermissionConfigurationForm'
+} from '../Shared/components/PermissionConfigurationForm'
 import { createUserPermissionPayload, isDirectPermissionFormComplete } from '../utils'
 import { getDefaultUserStatusAndTimeout } from '../libUtils'
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupAddEdit.component.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupAddEdit.component.tsx
index 020c70c469..98d2629e14 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupAddEdit.component.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupAddEdit.component.tsx
@@ -11,7 +11,7 @@ import React from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { API_STATUS_CODES, URLS } from '../../../../../config'
 import { getPermissionGroupById } from '../../authorization.service'
-import { PermissionConfigurationFormProvider } from '../../shared-amrit/components/PermissionConfigurationForm'
+import { PermissionConfigurationFormProvider } from '../../Shared/components/PermissionConfigurationForm'
 import PermissionGroupForm from './PermissionGroupForm'
 
 const PermissionGroupAddEdit = () => {
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupForm.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupForm.tsx
index 955a6cd01e..f574141d78 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupForm.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupForm.tsx
@@ -19,9 +19,9 @@ import { createOrUpdatePermissionGroup, deletePermissionGroup } from '../../auth
 import {
     PermissionConfigurationForm,
     usePermissionConfiguration,
-} from '../../shared-amrit/components/PermissionConfigurationForm'
+} from '../../Shared/components/PermissionConfigurationForm'
 import { getIsSuperAdminPermission, getRoleFilters, isDirectPermissionFormComplete } from '../../utils'
-import { excludeKeyAndClusterValue } from '../../shared-amrit/components/K8sObjectPermissions/utils'
+import { excludeKeyAndClusterValue } from '../../Shared/components/K8sObjectPermissions/utils'
 
 const PermissionGroupForm = ({ isAddMode }: { isAddMode: boolean }) => {
     const { serverMode } = useMainContext()
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupContainer.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupContainer.tsx
index 36cb0c01ca..061c529135 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupContainer.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupContainer.tsx
@@ -10,15 +10,15 @@ import React, { useRef } from 'react'
 import { importComponentFromFELibrary } from '../../../../../components/common'
 import { API_STATUS_CODES } from '../../../../../config'
 import { useAuthorizationContext } from '../../AuthorizationProvider'
-import FiltersEmptyState from '../../shared-amrit/components/FilterEmptyState/FilterEmptyState.component'
-import BulkSelectionActionWidget from '../../shared-amrit/components/BulkSelection/BulkSelectionActionWidget'
-import BulkSelectionModal from '../../shared-amrit/components/BulkSelection/BulkSelectionModal'
+import FiltersEmptyState from '../../Shared/components/FilterEmptyState/FilterEmptyState.component'
+import BulkSelectionActionWidget from '../../Shared/components/BulkSelection/BulkSelectionActionWidget'
+import BulkSelectionModal from '../../Shared/components/BulkSelection/BulkSelectionModal'
 import NoPermissionGroups from './NoPermissionGroups'
 import PermissionGroupListHeader from './PermissionGroupListHeader'
 import PermissionGroupTable from './PermissionGroupTable'
 import { PermissionGroupContainerProps } from './types'
-import { BulkSelectionModalTypes, useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
-import { BulkSelectionEntityTypes } from '../../shared-amrit/components/BulkSelection/constants'
+import { BulkSelectionModalTypes, useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
+import { BulkSelectionEntityTypes } from '../../Shared/components/BulkSelection/constants'
 
 const PermissionGroupInfoBar = importComponentFromFELibrary('PermissionGroupInfoBar', noop, 'function')
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx
index cc80583879..e46b82b525 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx
@@ -14,7 +14,7 @@ import { getPermissionGroupList } from '../../authorization.service'
 import { SortableKeys } from './constants'
 import { PermissionGroup } from '../../types'
 import PermissionGroupContainer from './PermissionGroupContainer'
-import { BulkSelectionModalConfig, BulkSelectionModalTypes } from '../../shared-amrit/components/BulkSelection'
+import { BulkSelectionModalConfig, BulkSelectionModalTypes } from '../../Shared/components/BulkSelection'
 
 const PermissionGroupList = () => {
     const [bulkSelectionModalConfig, setBulkSelectionModalConfig] = useState<BulkSelectionModalConfig>({
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupRow.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupRow.tsx
index f8a70a9658..37dda42f3f 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupRow.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupRow.tsx
@@ -14,7 +14,7 @@ import { ReactComponent as Trash } from '../../../../../assets/icons/ic-delete-i
 
 import { PermissionGroupRowProps } from './types'
 import { deletePermissionGroup } from '../../authorization.service'
-import { useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
+import { useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
 
 const PermissionGroupRow = ({
     id,
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupTable.tsx b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupTable.tsx
index 07e22fa702..f966996bbe 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupTable.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupTable.tsx
@@ -1,6 +1,6 @@
 import { BulkSelection, Pagination, SortableTableHeaderCell } from '@devtron-labs/devtron-fe-common-lib'
 import React from 'react'
-import { useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
+import { useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
 import { handleToggleCheckForBulkSelection } from '../../utils'
 import { permissionGroupLoading, SortableKeys } from './constants'
 import PermissionGroupRow from './PermissionGroupRow'
diff --git a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/types.ts b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/types.ts
index df41bd7e6f..bfd1c96c4f 100644
--- a/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/types.ts
+++ b/src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/types.ts
@@ -1,6 +1,6 @@
 import { SearchBarProps, ServerError, UseUrlFiltersReturnType } from '@devtron-labs/devtron-fe-common-lib'
 import { getPermissionGroupList } from '../../authorization.service'
-import { BulkSelectionModalConfig } from '../../shared-amrit/components/BulkSelection'
+import { BulkSelectionModalConfig } from '../../Shared/components/BulkSelection'
 import { PermissionGroup } from '../../types'
 import { SortableKeys } from './constants'
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/AppPermissionDetail.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissionDetail.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/AppPermissionDetail.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissionDetail.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/AppPermissions.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/AppPermissions.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/DirectPermission.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/DirectPermission.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/common.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/common.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/common.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/common.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/constants.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/utils.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/utils.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/AppPermissions/utils.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/utils.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkDeleteModal.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkDeleteModal.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkDeleteModal.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkDeleteModal.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionActionWidget.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionActionWidget.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionActionWidget.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionActionWidget.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionClearConfirmationModal.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionClearConfirmationModal.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionClearConfirmationModal.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionClearConfirmationModal.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionModal.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionModal.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/BulkSelectionModal.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/BulkSelectionModal.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/constants.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/constants.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/constants.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/useAuthorizationBulkSelection.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/useAuthorizationBulkSelection.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/BulkSelection/useAuthorizationBulkSelection.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/BulkSelection/useAuthorizationBulkSelection.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/ChartPermission.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/ChartPermission.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/ChartPermission.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/ChartPermission.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/constants.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/constants.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/constants.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/ChartPermission/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/ChartPermission/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/FilterEmptyState.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/FilterEmptyState.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/FilterEmptyState.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/FilterEmptyState.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/FilterEmptyState/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/FilterEmptyState/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sListItemCard.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sListItemCard.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissionModal.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissionModal.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissionRow.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissionRow.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissionRow.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissionRow.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissions.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissions.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/K8sPermissions.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sPermissions.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/constants.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/constants.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/constants.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/utils.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/utils.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/K8sObjectPermissions/utils.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/utils.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/PermissionConfigurationForm.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationForm.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/PermissionConfigurationForm.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationForm.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/types.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/PermissionConfigurationForm/types.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/types.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/SuperAdminInfoBar/SuperAdminInfoBar.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/SuperAdminInfoBar/SuperAdminInfoBar.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/SuperAdminInfoBar/SuperAdminInfoBar.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/SuperAdminInfoBar/SuperAdminInfoBar.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/SuperAdminInfoBar/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/SuperAdminInfoBar/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/SuperAdminInfoBar/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/SuperAdminInfoBar/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/UserPermissionGroupsSelector/UserPermissionGroupsSelector.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/UserPermissionGroupsSelector/UserPermissionGroupsSelector.component.tsx
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/UserPermissionGroupsSelector/UserPermissionGroupsSelector.component.tsx
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/UserPermissionGroupsSelector/UserPermissionGroupsSelector.component.tsx
diff --git a/src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/UserPermissionGroupsSelector/index.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/UserPermissionGroupsSelector/index.ts
similarity index 100%
rename from src/Pages/GlobalConfigurations/Authorization/shared-amrit/components/UserPermissionGroupsSelector/index.ts
rename to src/Pages/GlobalConfigurations/Authorization/Shared/components/UserPermissionGroupsSelector/index.ts
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx
index eda055e3d2..3e37fc7857 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx
@@ -24,9 +24,9 @@ import { User } from '../../types'
 import {
     PermissionConfigurationForm,
     usePermissionConfiguration,
-} from '../../shared-amrit/components/PermissionConfigurationForm'
+} from '../../Shared/components/PermissionConfigurationForm'
 import { createUserPermissionPayload, isDirectPermissionFormComplete } from '../../utils'
-import { excludeKeyAndClusterValue } from '../../shared-amrit/components/K8sObjectPermissions/utils'
+import { excludeKeyAndClusterValue } from '../../Shared/components/K8sObjectPermissions/utils'
 import { getCreatableChipStyle } from '../utils'
 import { getDefaultUserStatusAndTimeout } from '../../libUtils'
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserPermissionAddEdit.component.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserPermissionAddEdit.component.tsx
index e0014b94b3..7d6bc4cd16 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserPermissionAddEdit.component.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserPermissionAddEdit.component.tsx
@@ -13,7 +13,7 @@ import { API_STATUS_CODES, URLS } from '../../../../../config'
 import { getUserById } from '../../authorization.service'
 import UserForm from './UserForm'
 import { getIsAdminOrSystemUser } from '../utils'
-import { PermissionConfigurationFormProvider } from '../../shared-amrit/components/PermissionConfigurationForm'
+import { PermissionConfigurationFormProvider } from '../../Shared/components/PermissionConfigurationForm'
 import { importComponentFromFELibrary } from '../../../../../components/common'
 
 const showStatus = !!importComponentFromFELibrary('StatusHeaderCell', null, 'function')
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionContainer.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionContainer.tsx
index b645f7c660..b9984ef3d1 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionContainer.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionContainer.tsx
@@ -8,15 +8,15 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 import React, { useRef } from 'react'
 import { API_STATUS_CODES } from '../../../../../config'
-import FiltersEmptyState from '../../shared-amrit/components/FilterEmptyState/FilterEmptyState.component'
+import FiltersEmptyState from '../../Shared/components/FilterEmptyState/FilterEmptyState.component'
 import NoUsers from './NoUsers'
 import { UserPermissionContainerProps } from './types'
 import UserPermissionListHeader from './UserPermissionListHeader'
-import BulkSelectionActionWidget from '../../shared-amrit/components/BulkSelection/BulkSelectionActionWidget'
-import BulkSelectionModal from '../../shared-amrit/components/BulkSelection/BulkSelectionModal'
+import BulkSelectionActionWidget from '../../Shared/components/BulkSelection/BulkSelectionActionWidget'
+import BulkSelectionModal from '../../Shared/components/BulkSelection/BulkSelectionModal'
 import UserPermissionTable from './UserPermissionTable'
-import { BulkSelectionModalTypes, useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
-import { BulkSelectionEntityTypes } from '../../shared-amrit/components/BulkSelection/constants'
+import { BulkSelectionModalTypes, useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
+import { BulkSelectionEntityTypes } from '../../Shared/components/BulkSelection/constants'
 import { importComponentFromFELibrary } from '../../../../../components/common'
 
 const UserListFilterToolbar = importComponentFromFELibrary('UserListFilterToolbar', null, 'function')
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx
index 38c8a6963b..1718a88910 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx
@@ -17,7 +17,7 @@ import { importComponentFromFELibrary } from '../../../../../components/common'
 import { User } from '../../types'
 import { getIsAdminOrSystemUser, parseSearchParams } from '../utils'
 import UserPermissionContainer from './UserPermissionContainer'
-import { BulkSelectionModalConfig, BulkSelectionModalTypes } from '../../shared-amrit/components/BulkSelection'
+import { BulkSelectionModalConfig, BulkSelectionModalTypes } from '../../Shared/components/BulkSelection'
 import { UserListFilter } from './types'
 
 const StatusHeaderCell = importComponentFromFELibrary('StatusHeaderCell', null, 'function')
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx
index da51a969f8..cc6492f9e5 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx
@@ -24,7 +24,7 @@ import { deleteUser } from '../../authorization.service'
 import { importComponentFromFELibrary } from '../../../../../components/common'
 import { Moment12HourFormat } from '../../../../../config'
 import { LAST_LOGIN_TIME_NULL_STATE } from '../constants'
-import { useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
+import { useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
 
 const StatusCell = importComponentFromFELibrary('StatusCell', null, 'function')
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionTable.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionTable.tsx
index f1246e2502..432fa3c849 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionTable.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionTable.tsx
@@ -6,7 +6,7 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 import React from 'react'
 import { importComponentFromFELibrary } from '../../../../../components/common'
-import { useAuthorizationBulkSelection } from '../../shared-amrit/components/BulkSelection'
+import { useAuthorizationBulkSelection } from '../../Shared/components/BulkSelection'
 import { handleToggleCheckForBulkSelection } from '../../utils'
 import { userListLoading } from './constants'
 import { UserPermissionTableProps } from './types'
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/types.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/types.tsx
index 4643dc2a4c..a17c2af4b0 100644
--- a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/types.tsx
+++ b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/types.tsx
@@ -7,7 +7,7 @@ import {
     UseUrlFiltersReturnType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { getUserList } from '../../authorization.service'
-import { BulkSelectionActionWidgetProps, BulkSelectionModalConfig } from '../../shared-amrit/components/BulkSelection'
+import { BulkSelectionActionWidgetProps, BulkSelectionModalConfig } from '../../Shared/components/BulkSelection'
 import { User } from '../../types'
 
 export type UserListFilter = Pick<UserListFilterParams, 'status'>
diff --git a/src/Pages/GlobalConfigurations/Authorization/utils.ts b/src/Pages/GlobalConfigurations/Authorization/utils.ts
index ded5da1051..7c8842643a 100644
--- a/src/Pages/GlobalConfigurations/Authorization/utils.ts
+++ b/src/Pages/GlobalConfigurations/Authorization/utils.ts
@@ -30,7 +30,7 @@ import {
     UserDto,
 } from './types'
 import { LAST_LOGIN_TIME_NULL_STATE } from './UserPermissions/constants'
-import { useAuthorizationBulkSelection } from './shared-amrit/components/BulkSelection'
+import { useAuthorizationBulkSelection } from './Shared/components/BulkSelection'
 import {
     CONFIG_APPROVER_ACTION,
     ARTIFACT_PROMOTER_ACTION,
@@ -40,7 +40,7 @@ import {
     ViewChartGroupPermission,
 } from './constants'
 import { AppIdWorkflowNamesMapping } from '../../../services/service.types'
-import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE } from './shared-amrit/components/AppPermissions/constants'
+import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE } from './Shared/components/AppPermissions/constants'
 import { importComponentFromFELibrary } from '../../../components/common'
 import { getFormattedTimeToLive } from './libUtils'