diff --git a/packages/core/admin/admin/src/components/Roles/CollapseLabel/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/CollapseLabel/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/CollapseLabel/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/CollapseLabel/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsButton/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsButton/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/ClearIndicator.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/ClearIndicator.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/ClearIndicator.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/ClearIndicator.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/CustomDropdownIndicator.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/CustomDropdownIndicator.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/CustomDropdownIndicator.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/CustomDropdownIndicator.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/IndicatorSeparator.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/IndicatorSeparator.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/SubUl.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/SubUl.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/Ul.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/Ul.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/index.js
similarity index 97%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/index.js
index 62965bdb87..baf06cb867 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/index.js
@@ -6,7 +6,7 @@ import { get } from 'lodash';
 import { Checkbox, Flex } from '@buffetjs/core';
 import { Label } from '@buffetjs/styles';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import IS_DISABLED from 'ee_else_ce/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/constants';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/constants';
 import { getCheckboxState } from '../../../utils';
 import createCollapsesObject from './utils/createCollapsesObject';
 import SubUl from './SubUl';
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/createCollapsesObject.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/createCollapsesObject.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/createCollapsesObject.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/createCollapsesObject.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/tests/createCollapsesObject.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/tests/createCollapsesObject.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/tests/createCollapsesObject.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/tests/createCollapsesObject.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/SingleValue.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/SingleValue.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/SingleValue.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/SingleValue.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/index.js
similarity index 98%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/index.js
index 1331292a7a..4db0babf05 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/index.js
@@ -16,7 +16,7 @@ import { get, groupBy, upperFirst } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { usePermissionsDataManager } from '../../../hooks';
+import { usePermissionsDataManager } from '../../../../../hooks';
 import ActionRow from './ActionRow';
 import createDefaultConditionsForm from './utils/createDefaultConditionsForm';
 
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/createDefaultConditionsForm.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/createDefaultConditionsForm.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/selectStyle.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/selectStyle.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/selectStyle.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/selectStyle.js
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js
similarity index 96%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js
index 786ae936ad..f8db41b3d9 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js
@@ -1,12 +1,12 @@
 import { Down, Up } from '@strapi/icons';
 import { Box, Checkbox, Row, Text } from '@strapi/parts';
-import IS_DISABLED from 'ee_else_ce/components/Roles/ContentTypeCollapse/Collapse/utils/constants';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/constants';
 import { get, omit } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
-import { usePermissionsDataManager } from '../../../../hooks';
+import { usePermissionsDataManager } from '../../../../../../hooks';
 import ConditionsButton from '../../ConditionsButton';
 import ConditionsModal from '../../ConditionsModal';
 import HiddenAction from '../../HiddenAction';
@@ -191,13 +191,14 @@ const Collapse = ({
                         { label: `${permissionLabel} ${label}` }
                       )}
                       // Keep same signature as packages/core/admin/admin/src/components/Roles/Permissions/index.js l.91
-                      onValueChange={value =>
+                      onValueChange={value => {
                         onChangeParentCheckbox({
                           target: {
                             name: checkboxName,
                             value,
                           },
-                        })}
+                        });
+                      }}
                       indeterminate={hasSomeActionsSelected}
                       value={hasAllActionsSelected}
                     />
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/tests/generateCheckboxesActions.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/tests/generateCheckboxesActions.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/tests/generateCheckboxesActions.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/tests/generateCheckboxesActions.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
similarity index 94%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
index 5fad0f0a06..bfa14f9f91 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
@@ -1,11 +1,11 @@
 import { Checkbox, Row } from '@strapi/parts';
-import IS_DISABLED from 'ee_else_ce/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants';
 import { get } from 'lodash';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import React, { memo, useCallback, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { usePermissionsDataManager } from '../../../../../hooks';
+import { usePermissionsDataManager } from '../../../../../../../hooks';
 import HiddenAction from '../../../HiddenAction';
 import { cellWidth, rowHeight } from '../../../Permissions/utils/constants';
 import RequiredSign from '../../../RequiredSign';
@@ -143,13 +143,14 @@ const ActionRow = ({
                         { label: `${name} ${label}` }
                       )}
                       // Keep same signature as packages/core/admin/admin/src/components/Roles/Permissions/index.js l.91
-                      onValueChange={value =>
+                      onValueChange={value => {
                         onChangeSimpleCheckbox({
                           target: {
                             name: checkboxName.join('..'),
                             value,
                           },
-                        })}
+                        });
+                      }}
                       value={checkboxValue}
                     />
                   </Cell>
@@ -166,13 +167,14 @@ const ActionRow = ({
                     disabled={isFormDisabled || IS_DISABLED}
                     name={checkboxName.join('..')}
                     // Keep same signature as packages/core/admin/admin/src/components/Roles/Permissions/index.js l.91
-                    onValueChange={value =>
+                    onValueChange={value => {
                       onChangeParentCheckbox({
                         target: {
                           name: checkboxName.join('..'),
                           value,
                         },
-                      })}
+                      });
+                    }}
                     aria-label={formatMessage(
                       {
                         id: `Settings.permissions.select-by-permission`,
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/tests/getRowLabelCheckboxeState.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/tests/getRowLabelCheckboxeState.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/tests/getRowLabelCheckboxeState.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/tests/getRowLabelCheckboxeState.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js
similarity index 96%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js
index 0923f9bb36..92f5fa2fdb 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js
@@ -1,11 +1,11 @@
 import { Box, Checkbox, Row, Text } from '@strapi/parts';
-import IS_DISABLED from 'ee_else_ce/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants';
 import { get, upperFirst } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { memo, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
-import { usePermissionsDataManager } from '../../../../../hooks';
+import { usePermissionsDataManager } from '../../../../../../../hooks';
 import CollapseLabel from '../../../CollapseLabel';
 import Curve from '../../../Curve';
 import HiddenAction from '../../../HiddenAction';
@@ -169,13 +169,14 @@ const SubActionRow = ({
                                 { label: `${parentName} ${label} ${propertyLabel}` }
                               )}
                               // Keep same signature as packages/core/admin/admin/src/components/Roles/Permissions/index.js l.91
-                              onValueChange={value =>
+                              onValueChange={value => {
                                 onChangeSimpleCheckbox({
                                   target: {
                                     name: checkboxName.join('..'),
                                     value,
                                   },
-                                })}
+                                });
+                              }}
                               value={checkboxValue}
                             />
                           </Cell>
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/utils/generateHeadersFromActions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/utils/generateHeadersFromActions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/utils/generateHeadersFromActions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/utils/generateHeadersFromActions.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/utils/tests/generateHeadersFromActions.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/utils/tests/generateHeadersFromActions.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/utils/tests/generateHeadersFromActions.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/utils/tests/generateHeadersFromActions.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/activeStyle.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/activeStyle.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/getAvailableActions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/getAvailableActions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/getAvailableActions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/getAvailableActions.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/tests/getAvailableActions.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/tests/getAvailableActions.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/utils/tests/getAvailableActions.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapse/utils/tests/getAvailableActions.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapses/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapses/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypeCollapses/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypeCollapses/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypes/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypes/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/ContentTypes/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/ContentTypes/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/Curve/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Curve/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Curve/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Curve/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/index.js
similarity index 94%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/index.js
index 3de1794163..fe6a08ee5b 100644
--- a/packages/core/admin/admin/src/components/Roles/GlobalActions/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/index.js
@@ -1,11 +1,11 @@
 import { Checkbox, Stack, TableLabel, Box } from '@strapi/parts';
-import IS_DISABLED from 'ee_else_ce/components/Roles/GlobalActions/utils/constants';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/GlobalActions/utils/constants';
 import { get } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { memo, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
-import { usePermissionsDataManager } from '../../../hooks';
+import { usePermissionsDataManager } from '../../../../../hooks';
 import { cellWidth, firstRowWidth } from '../Permissions/utils/constants';
 import { findDisplayedActions, getCheckboxesState } from './utils';
 
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/findDisplayedActions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/findDisplayedActions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/findDisplayedActions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/findDisplayedActions.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/getRowLabelCheckboxesState.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/getRowLabelCheckboxesState.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/tests/findDisplayedActions.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/tests/findDisplayedActions.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/tests/findDisplayedActions.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/tests/findDisplayedActions.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/HiddenAction/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/HiddenAction/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/HiddenAction/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/HiddenAction/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/README.md b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/README.md
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/README.md
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/README.md
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/init.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/init.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/init.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/init.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/reducer.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/reducer.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/reducer.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/reducer.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/tests/reducer.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/tests/reducer.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/tests/reducer.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/tests/reducer.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/createDefaultCTFormFromLayout.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/createDefaultCTFormFromLayout.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/createDefaultPluginsFormFromLayout.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/createDefaultPluginsFormFromLayout.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/findMatchingPermissions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/findMatchingPermissions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/findMatchingPermissions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/findMatchingPermissions.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/formatContentTypesPermissionToAPI.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/formatContentTypesPermissionToAPI.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/formatLayoutForSettingsAndPlugins.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatLayoutForSettingsAndPlugins.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/formatLayoutForSettingsAndPlugins.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatLayoutForSettingsAndPlugins.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/formatPermissionsToAPI.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatPermissionsToAPI.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/formatPermissionsToAPI.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatPermissionsToAPI.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/formatSettingsPermissionsToAPI.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatSettingsPermissionsToAPI.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/formatSettingsPermissionsToAPI.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/formatSettingsPermissionsToAPI.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tabLabels.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tabLabels.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tabLabels.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tabLabels.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/data.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/data.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/data.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/data.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatContentTypesPermissionToAPI.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatContentTypesPermissionToAPI.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatContentTypesPermissionToAPI.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatContentTypesPermissionToAPI.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatSettingsPermissionsToAPI.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatSettingsPermissionsToAPI.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/formatSettingsPermissionsToAPI.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/formatSettingsPermissionsToAPI.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/updateConditionsToFalse.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/updateConditionsToFalse.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/updateConditionsToFalse.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/updateConditionsToFalse.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/updateValues.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/updateValues.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/tests/updateValues.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/tests/updateValues.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/updateConditionsToFalse.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/updateConditionsToFalse.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/utils/updateValues.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/updateValues.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/Permissions/utils/updateValues.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/Permissions/utils/updateValues.js
diff --git a/packages/core/admin/admin/src/components/Roles/PermissionsDataManagerProvider/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js
similarity index 92%
rename from packages/core/admin/admin/src/components/Roles/PermissionsDataManagerProvider/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js
index 57fd13496f..84036c776b 100644
--- a/packages/core/admin/admin/src/components/Roles/PermissionsDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { PermissionsDataManagerContext } from '../../../contexts';
+import { PermissionsDataManagerContext } from '../../../../../contexts';
 
 const PermissionsDataManagerProvider = ({ children, value }) => {
   return (
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/Row/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/Row/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js
similarity index 95%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js
index 539e7c0afd..0a47d69906 100644
--- a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js
@@ -5,8 +5,8 @@ import { Row, Box, TableLabel, Checkbox, Grid, GridItem } from '@strapi/parts';
 
 import { useIntl } from 'react-intl';
 import { get } from 'lodash';
-import IS_DISABLED from 'ee_else_ce/components/Roles/PluginsAndSettings/SubCategory/utils/constants';
-import { usePermissionsDataManager } from '../../../../hooks';
+import IS_DISABLED from 'ee_else_ce/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/constants';
+import { usePermissionsDataManager } from '../../../../../../hooks';
 import { getCheckboxState, removeConditionKeyFromData } from '../../utils';
 import ConditionsButton from '../../ConditionsButton';
 import ConditionsModal from '../../ConditionsModal';
@@ -80,13 +80,14 @@ const SubCategory = ({ categoryName, isFormDisabled, subCategoryName, actions, p
               name={pathToData.join('..')}
               disabled={isFormDisabled || IS_DISABLED}
               // Keep same signature as packages/core/admin/admin/src/components/Roles/Permissions/index.js l.91
-              onValueChange={value =>
+              onValueChange={value => {
                 onChangeParentCheckbox({
                   target: {
                     name: pathToData.join('..'),
                     value,
                   },
-                })}
+                });
+              }}
               indeterminate={hasSomeActionsSelected}
               value={hasAllActionsSelected}
             >
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/constants.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/constants.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/constants.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/constants.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/formatActions.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/formatActions.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/getConditionsButtonState.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/getConditionsButtonState.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/getConditionsButtonState.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/getConditionsButtonState.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/tests/formatActions.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/tests/formatActions.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/tests/formatActions.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/tests/formatActions.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/tests/getConditionsButtonState.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/tests/getConditionsButtonState.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/tests/getConditionsButtonState.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/tests/getConditionsButtonState.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/PluginsAndSettings/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/PluginsAndSettings/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/RequiredSign/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/RequiredSign/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/RequiredSign/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/RequiredSign/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/RoleForm/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/RoleForm/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/RoleForm/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/RoleForm/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/RowLabelWithCheckbox/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/RowLabelWithCheckbox/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/index.js
similarity index 51%
rename from packages/core/admin/admin/src/components/Roles/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/index.js
index ee12204851..ab699643c1 100644
--- a/packages/core/admin/admin/src/components/Roles/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/components/index.js
@@ -1,4 +1,2 @@
-export { default as EmptyRole } from './EmptyRole';
 export { default as Permissions } from './Permissions';
 export { default as RoleForm } from './RoleForm';
-export { default as RoleRow } from './RoleRow';
diff --git a/packages/core/admin/admin/src/components/Roles/utils/createArrayOfValues.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/createArrayOfValues.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/createArrayOfValues.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/createArrayOfValues.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/getCheckboxState.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/getCheckboxState.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/getCheckboxState.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/getCheckboxState.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/index.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/removeConditionKeyFromData.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/removeConditionKeyFromData.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/removeConditionKeyFromData.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/removeConditionKeyFromData.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/tests/createArrayOfValues.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/createArrayOfValues.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/tests/createArrayOfValues.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/createArrayOfValues.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/tests/getCheckboxState.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/getCheckboxState.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/tests/getCheckboxState.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/getCheckboxState.test.js
diff --git a/packages/core/admin/admin/src/components/Roles/utils/tests/removeConditionKeyFromData.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/removeConditionKeyFromData.test.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/utils/tests/removeConditionKeyFromData.test.js
rename to packages/core/admin/admin/src/pages/Roles/EditPage/components/utils/tests/removeConditionKeyFromData.test.js
diff --git a/packages/core/admin/admin/src/pages/Roles/EditPage/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
index 610c4c103a..05644218dd 100644
--- a/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
@@ -12,7 +12,7 @@ import get from 'lodash/get';
 import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
-import { Permissions, RoleForm } from '../../../components/Roles';
+import { Permissions, RoleForm } from './components';
 import { useFetchPermissionsLayout, useFetchRole } from '../../../hooks';
 import schema from './utils/schema';
 
diff --git a/packages/core/admin/admin/src/components/Roles/EmptyRole/index.js b/packages/core/admin/admin/src/pages/Roles/ListPage/components/EmptyRole/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/EmptyRole/index.js
rename to packages/core/admin/admin/src/pages/Roles/ListPage/components/EmptyRole/index.js
diff --git a/packages/core/admin/admin/src/components/Roles/RoleRow/index.js b/packages/core/admin/admin/src/pages/Roles/ListPage/components/RoleRow/index.js
similarity index 100%
rename from packages/core/admin/admin/src/components/Roles/RoleRow/index.js
rename to packages/core/admin/admin/src/pages/Roles/ListPage/components/RoleRow/index.js
diff --git a/packages/core/admin/admin/src/pages/Roles/ListPage/index.js b/packages/core/admin/admin/src/pages/Roles/ListPage/index.js
index 34040d1693..4f8b1620b0 100644
--- a/packages/core/admin/admin/src/pages/Roles/ListPage/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/ListPage/index.js
@@ -18,7 +18,8 @@ import matchSorter from 'match-sorter';
 import React, { useCallback, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router';
-import { EmptyRole, RoleRow } from '../../../components/Roles';
+import RoleRow from './components/RoleRow';
+import EmptyRole from './components/EmptyRole';
 import UpgradePlanModal from '../../../components/UpgradePlanModal';
 import { useRolesList } from '../../../hooks';
 
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js
index cf6fdf0887..73c3dcd4c8 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js
@@ -21,7 +21,7 @@ jest.mock('react-intl', () => ({
   FormattedMessage: ({ id }) => id,
   useIntl: () => ({ formatMessage: jest.fn(({ id }) => id) }),
 }));
-jest.mock('../../ApplicationInfosPage', () => () => <h1>App infos</h1>);
+jest.mock('../pages/ApplicationInfosPage', () => () => <h1>App infos</h1>);
 
 const makeApp = (history, settings) => (
   <Theme>
diff --git a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
index 1f0fb7a9d4..89170a3f01 100644
--- a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
+++ b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
@@ -29,7 +29,7 @@ import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import styled from 'styled-components';
-import Permissions from '../../../../../admin/src/components/Roles/Permissions';
+import Permissions from '../../../../../admin/src/pages/Roles/EditPage/components/Permissions';
 import { useFetchPermissionsLayout, useFetchRole } from '../../../../../admin/src/hooks';
 import adminPermissions from '../../../../../admin/src/permissions';
 import schema from './utils/schema';
diff --git a/packages/core/admin/ee/admin/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/ConditionsModal/ConditionsSelect/MenuList/utils/constants.js
diff --git a/packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/Collapse/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/Collapse/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/constants.js
diff --git a/packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/constants.js
diff --git a/packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/utils/constants.js
diff --git a/packages/core/admin/ee/admin/components/Roles/GlobalActions/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/GlobalActions/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/GlobalActions/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/GlobalActions/utils/constants.js
diff --git a/packages/core/admin/ee/admin/components/Roles/PluginsAndSettings/SubCategory/utils/constants.js b/packages/core/admin/ee/admin/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/constants.js
similarity index 100%
rename from packages/core/admin/ee/admin/components/Roles/PluginsAndSettings/SubCategory/utils/constants.js
rename to packages/core/admin/ee/admin/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/constants.js
diff --git a/packages/core/admin/ee/admin/pages/Roles/ListPage/index.js b/packages/core/admin/ee/admin/pages/Roles/ListPage/index.js
index d2dee79fef..2f380a3afc 100644
--- a/packages/core/admin/ee/admin/pages/Roles/ListPage/index.js
+++ b/packages/core/admin/ee/admin/pages/Roles/ListPage/index.js
@@ -29,9 +29,10 @@ import matchSorter from 'match-sorter';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { axiosInstance } from '../../../../../admin/src/core/utils';
-import { EmptyRole, RoleRow as BaseRoleRow } from '../../../../../admin/src/components/Roles';
 import { useRolesList } from '../../../../../admin/src/hooks';
 import adminPermissions from '../../../../../admin/src/permissions';
+import EmptyRole from '../../../../../admin/src/pages/Roles/ListPage/components/EmptyRole';
+import BaseRoleRow from '../../../../../admin/src/pages/Roles/ListPage/components/RoleRow';
 import reducer, { initialState } from './reducer';
 
 const useSortedRoles = () => {