diff --git a/packages/plugins/users-permissions/admin/src/index.js b/packages/plugins/users-permissions/admin/src/index.js
index a086a9e2f2..83135e4173 100644
--- a/packages/plugins/users-permissions/admin/src/index.js
+++ b/packages/plugins/users-permissions/admin/src/index.js
@@ -11,10 +11,10 @@ import pluginLogo from './assets/images/logo.svg';
 import pluginPermissions from './permissions';
 import pluginId from './pluginId';
 import trads from './translations';
-import RolesPage from './containers/Roles';
-import ProvidersPage from './containers/Providers';
-import EmailTemplatesPage from './containers/EmailTemplates';
-import AdvancedSettingsPage from './containers/AdvancedSettings';
+import RolesPage from './pages/Roles';
+import ProvidersPage from './pages/Providers';
+import EmailTemplatesPage from './pages/EmailTemplates';
+import AdvancedSettingsPage from './pages/AdvancedSettings';
 import getTrad from './utils/getTrad';
 
 const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
diff --git a/packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/index.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/index.js
rename to packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/reducer.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/reducer.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/reducer.js
rename to packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/reducer.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/tests/reducer.test.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/reducer.test.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/tests/reducer.test.js
rename to packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/reducer.test.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/utils/form.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/form.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/AdvancedSettings/utils/form.js
rename to packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/form.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/CustomTextInput.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/CustomTextInput.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/CustomTextInput.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/CustomTextInput.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/Wrapper.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/Wrapper.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/Wrapper.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/Wrapper.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/index.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/index.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/reducer.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/reducer.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/reducer.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/reducer.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/utils/forms.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/forms.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/utils/forms.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/forms.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/EmailTemplates/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/EmailTemplates/utils/schema.js
rename to packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Providers/index.js b/packages/plugins/users-permissions/admin/src/pages/Providers/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Providers/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Providers/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Providers/reducer.js b/packages/plugins/users-permissions/admin/src/pages/Providers/reducer.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Providers/reducer.js
rename to packages/plugins/users-permissions/admin/src/pages/Providers/reducer.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Providers/utils/createProvidersArray.js b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/createProvidersArray.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Providers/utils/createProvidersArray.js
rename to packages/plugins/users-permissions/admin/src/pages/Providers/utils/createProvidersArray.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Providers/utils/forms.js b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Providers/utils/forms.js
rename to packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Providers/utils/tests/createProvidersArray.test.js b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/tests/createProvidersArray.test.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Providers/utils/tests/createProvidersArray.test.js
rename to packages/plugins/users-permissions/admin/src/pages/Providers/utils/tests/createProvidersArray.test.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/CreatePage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/CreatePage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/CreatePage/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/CreatePage/utils/schema.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/EditPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/EditPage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/EditPage/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/EditPage/utils/schema.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/ListPage/BaselineAlignment.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/BaselineAlignment.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/ListPage/BaselineAlignment.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/BaselineAlignment.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/ListPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/ListPage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedListPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/ProtectedListPage/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js
diff --git a/packages/plugins/users-permissions/admin/src/containers/Roles/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/index.js
similarity index 100%
rename from packages/plugins/users-permissions/admin/src/containers/Roles/index.js
rename to packages/plugins/users-permissions/admin/src/pages/Roles/index.js