diff --git a/resources/js/bootstrap/cp.ts b/resources/js/bootstrap/cp.ts
index cd2808a7db9..9c88c783a8e 100644
--- a/resources/js/bootstrap/cp.ts
+++ b/resources/js/bootstrap/cp.ts
@@ -1,19 +1,19 @@
 import {QueueService, ConfigService} from '@craftcms/cp';
 import {createInertiaApp, router} from '@inertiajs/vue3';
-import QueueManager from '@/components/utilities/QueueManager/QueueManager.vue';
-import {Axios, Config, Queue} from '@/types/keys';
+import QueueManager from '@/modules/utilities/components/queue-manager/QueueManager.vue';
+import {Axios, Config, Queue} from '@/common/types/keys';
 import axios from 'axios';
-import QueueManagerToolbar from '@/components/utilities/QueueManager/QueueManagerToolbar.vue';
-import DeprecationErrors from '@/components/utilities/DeprecationErrors/DeprecationErrors.vue';
-import ClearCaches from '@/components/utilities/ClearCaches/ClearCaches.vue';
-import FindReplace from '@/components/utilities/FindReplace/FindReplace.vue';
-import DatabaseBackup from '@/components/utilities/DatabaseBackup.vue';
-import Migrations from '@/components/utilities/Migrations.vue';
-import Updates from '@/components/utilities/Updates/Updates.vue';
-import ProjectConfig from '@/components/utilities/ProjectConfig/ProjectConfig.vue';
-import AssetIndexes from '@/components/utilities/AssetIndexes/AssetIndexes.vue';
-import SystemMessages from '@/components/utilities/SystemMessages/SystemMessages.vue';
-import DeprecationErrorsToolbar from '@/components/utilities/DeprecationErrors/DeprecationErrorsToolbar.vue';
+import QueueManagerToolbar from '@/modules/utilities/components/queue-manager/QueueManagerToolbar.vue';
+import DeprecationErrors from '@/modules/utilities/components/deprecation-errors/DeprecationErrors.vue';
+import ClearCaches from '@/modules/utilities/components/clear-caches/ClearCaches.vue';
+import FindReplace from '@/modules/utilities/components/find-replace/FindReplace.vue';
+import DatabaseBackup from '@/modules/utilities/components/DatabaseBackup.vue';
+import Migrations from '@/modules/utilities/components/Migrations.vue';
+import Updates from '@/modules/updater/components/Updates.vue';
+import ProjectConfig from '@/modules/utilities/components/project-config/ProjectConfig.vue';
+import AssetIndexes from '@/modules/utilities/components/asset-indexes/AssetIndexes.vue';
+import SystemMessages from '@/modules/utilities/components/system-messages/SystemMessages.vue';
+import DeprecationErrorsToolbar from '@/modules/utilities/components/deprecation-errors/DeprecationErrorsToolbar.vue';
 import {setTranslations} from '@craftcms/cp/utilities/translate.ts.mjs';
 
 let bootedCallbacks: Array<(instance: any) => void> = [];
diff --git a/resources/js/components/ActionMenu.vue b/resources/js/common/components/ActionMenu.vue
similarity index 100%
rename from resources/js/components/ActionMenu.vue
rename to resources/js/common/components/ActionMenu.vue
diff --git a/resources/js/components/Badge.vue b/resources/js/common/components/Badge.vue
similarity index 100%
rename from resources/js/components/Badge.vue
rename to resources/js/common/components/Badge.vue
diff --git a/resources/js/components/Breadcrumbs.vue b/resources/js/common/components/Breadcrumbs.vue
similarity index 95%
rename from resources/js/components/Breadcrumbs.vue
rename to resources/js/common/components/Breadcrumbs.vue
index f9ad1fa8e76..e733f6edbeb 100644
--- a/resources/js/components/Breadcrumbs.vue
+++ b/resources/js/common/components/Breadcrumbs.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import CpLink from '@/components/CpLink.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import {t} from '@craftcms/cp';
 
   withDefaults(
diff --git a/resources/js/components/Callout.vue b/resources/js/common/components/Callout.vue
similarity index 100%
rename from resources/js/components/Callout.vue
rename to resources/js/common/components/Callout.vue
diff --git a/resources/js/components/CalloutReadOnly.vue b/resources/js/common/components/CalloutReadOnly.vue
similarity index 100%
rename from resources/js/components/CalloutReadOnly.vue
rename to resources/js/common/components/CalloutReadOnly.vue
diff --git a/resources/js/components/CpLink.vue b/resources/js/common/components/CpLink.vue
similarity index 100%
rename from resources/js/components/CpLink.vue
rename to resources/js/common/components/CpLink.vue
diff --git a/resources/js/components/CpSidebar.vue b/resources/js/common/components/CpSidebar.vue
similarity index 93%
rename from resources/js/components/CpSidebar.vue
rename to resources/js/common/components/CpSidebar.vue
index 9c7d33336fa..81a1d51f6b4 100644
--- a/resources/js/components/CpSidebar.vue
+++ b/resources/js/common/components/CpSidebar.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import SystemInfo from '@/components/SystemInfo.vue';
-  import MainNav from '@/components/MainNav.vue';
-  import EditionInfo from '@/components/EditionInfo.vue';
-  import DevModeIndicator from '@/components/DevModeIndicator.vue';
+  import SystemInfo from '@/common/components/SystemInfo.vue';
+  import MainNav from '@/common/components/MainNav.vue';
+  import EditionInfo from '@/common/components/EditionInfo.vue';
+  import DevModeIndicator from '@/common/components/DevModeIndicator.vue';
   import {computed, nextTick, watch} from 'vue';
 
   const emit = defineEmits<{
diff --git a/resources/js/components/CurrentUser.vue b/resources/js/common/components/CurrentUser.vue
similarity index 87%
rename from resources/js/components/CurrentUser.vue
rename to resources/js/common/components/CurrentUser.vue
index a623b2ce5e1..7fed448a183 100644
--- a/resources/js/components/CurrentUser.vue
+++ b/resources/js/common/components/CurrentUser.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
-  import UserThumbnail from '@/components/UserThumbnail.vue';
+  import useCraftData from '@/common/composables/useCraftData';
+  import UserThumbnail from '@/common/components/UserThumbnail.vue';
   import {computed} from 'vue';
   import UsersController from '@actions/Users/UsersController';
 
diff --git a/resources/js/components/Date.vue b/resources/js/common/components/Date.vue
similarity index 100%
rename from resources/js/components/Date.vue
rename to resources/js/common/components/Date.vue
diff --git a/resources/js/components/DevModeIndicator.vue b/resources/js/common/components/DevModeIndicator.vue
similarity index 100%
rename from resources/js/components/DevModeIndicator.vue
rename to resources/js/common/components/DevModeIndicator.vue
diff --git a/resources/js/components/DragShadow.vue b/resources/js/common/components/DragShadow.vue
similarity index 100%
rename from resources/js/components/DragShadow.vue
rename to resources/js/common/components/DragShadow.vue
diff --git a/resources/js/components/DropIndicator.vue b/resources/js/common/components/DropIndicator.vue
similarity index 96%
rename from resources/js/components/DropIndicator.vue
rename to resources/js/common/components/DropIndicator.vue
index 71d0382a846..a1951e85a47 100644
--- a/resources/js/components/DropIndicator.vue
+++ b/resources/js/common/components/DropIndicator.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import type {Edge} from '@atlaskit/pragmatic-drag-and-drop-hitbox/types';
-  import VarDump from '@/components/VarDump.vue';
+  import VarDump from '@/common/components/VarDump.vue';
 
   const props = defineProps<{
     edge?: Edge | null;
diff --git a/resources/js/components/DynamicHtmlRenderer.vue b/resources/js/common/components/DynamicHtmlRenderer.vue
similarity index 100%
rename from resources/js/components/DynamicHtmlRenderer.vue
rename to resources/js/common/components/DynamicHtmlRenderer.vue
diff --git a/resources/js/components/EditionInfo.vue b/resources/js/common/components/EditionInfo.vue
similarity index 95%
rename from resources/js/components/EditionInfo.vue
rename to resources/js/common/components/EditionInfo.vue
index d2383ef927e..05a98aee6d0 100644
--- a/resources/js/components/EditionInfo.vue
+++ b/resources/js/common/components/EditionInfo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
   import {computed} from 'vue';
 
   const {app, cpUrl} = useCraftData();
diff --git a/resources/js/components/Empty.vue b/resources/js/common/components/Empty.vue
similarity index 100%
rename from resources/js/components/Empty.vue
rename to resources/js/common/components/Empty.vue
diff --git a/resources/js/components/FileUpload.vue b/resources/js/common/components/FileUpload.vue
similarity index 100%
rename from resources/js/components/FileUpload.vue
rename to resources/js/common/components/FileUpload.vue
diff --git a/resources/js/components/FlashMessages.vue b/resources/js/common/components/FlashMessages.vue
similarity index 88%
rename from resources/js/components/FlashMessages.vue
rename to resources/js/common/components/FlashMessages.vue
index 9b8866acbc6..cf736fae04d 100644
--- a/resources/js/components/FlashMessages.vue
+++ b/resources/js/common/components/FlashMessages.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import {computed, watch} from 'vue';
   import {usePage} from '@inertiajs/vue3';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
-  import {useAnnouncer} from '@/composables/useAnnouncer';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import {useAnnouncer} from '@/common/composables/useAnnouncer';
 
   const {messages} = useFlashMessages();
   const {announce} = useAnnouncer();
diff --git a/resources/js/components/InlineFlash.vue b/resources/js/common/components/InlineFlash.vue
similarity index 86%
rename from resources/js/components/InlineFlash.vue
rename to resources/js/common/components/InlineFlash.vue
index 86acc4be651..f87f4ac3355 100644
--- a/resources/js/components/InlineFlash.vue
+++ b/resources/js/common/components/InlineFlash.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-  import TransitionFade from '@/components/TransitionFade.vue';
-  import {useFlash} from '@/composables/useFlash';
+  import TransitionFade from '@/common/components/TransitionFade.vue';
+  import {useFlash} from '@/common/composables/useFlash';
 
   withDefaults(
     defineProps<{
diff --git a/resources/js/components/LiveRegion.vue b/resources/js/common/components/LiveRegion.vue
similarity index 70%
rename from resources/js/components/LiveRegion.vue
rename to resources/js/common/components/LiveRegion.vue
index 87a02c21b3a..efab4e481d4 100644
--- a/resources/js/components/LiveRegion.vue
+++ b/resources/js/common/components/LiveRegion.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-  import {useAnnouncer} from '@/composables/useAnnouncer';
-  import TransitionFade from '@/components/TransitionFade.vue';
+  import {useAnnouncer} from '@/common/composables/useAnnouncer';
+  import TransitionFade from '@/common/components/TransitionFade.vue';
 
   const {announcement} = useAnnouncer();
 </script>
diff --git a/resources/js/components/MainNav.vue b/resources/js/common/components/MainNav.vue
similarity index 96%
rename from resources/js/components/MainNav.vue
rename to resources/js/common/components/MainNav.vue
index 4bc38bdde86..81f14d720b7 100644
--- a/resources/js/components/MainNav.vue
+++ b/resources/js/common/components/MainNav.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
   import {computed} from 'vue';
   import {usePage} from '@inertiajs/vue3';
 
diff --git a/resources/js/components/Modal.vue b/resources/js/common/components/Modal.vue
similarity index 100%
rename from resources/js/components/Modal.vue
rename to resources/js/common/components/Modal.vue
diff --git a/resources/js/components/ModalForm.vue b/resources/js/common/components/ModalForm.vue
similarity index 91%
rename from resources/js/components/ModalForm.vue
rename to resources/js/common/components/ModalForm.vue
index b98d8fc7fc8..1035212b28f 100644
--- a/resources/js/components/ModalForm.vue
+++ b/resources/js/common/components/ModalForm.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import Modal, {type ModalProps} from '@/components/Modal.vue';
-  import Pane from '@/components/Pane.vue';
+  import Modal, {type ModalProps} from '@/common/components/Modal.vue';
+  import Pane from '@/common/components/Pane.vue';
 
   const emit = defineEmits<{
     (e: 'close'): void;
diff --git a/resources/js/components/Pane.vue b/resources/js/common/components/Pane.vue
similarity index 100%
rename from resources/js/components/Pane.vue
rename to resources/js/common/components/Pane.vue
diff --git a/resources/js/components/ReorderButton.vue b/resources/js/common/components/ReorderButton.vue
similarity index 100%
rename from resources/js/components/ReorderButton.vue
rename to resources/js/common/components/ReorderButton.vue
diff --git a/resources/js/components/SystemInfo.vue b/resources/js/common/components/SystemInfo.vue
similarity index 93%
rename from resources/js/components/SystemInfo.vue
rename to resources/js/common/components/SystemInfo.vue
index 20e60afef08..430792d2d43 100644
--- a/resources/js/components/SystemInfo.vue
+++ b/resources/js/common/components/SystemInfo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
   import {computed} from 'vue';
 
   const craftData = useCraftData();
diff --git a/resources/js/components/Text.vue b/resources/js/common/components/Text.vue
similarity index 100%
rename from resources/js/components/Text.vue
rename to resources/js/common/components/Text.vue
diff --git a/resources/js/components/Tooltip/Tooltip.vue b/resources/js/common/components/Tooltip.vue
similarity index 100%
rename from resources/js/components/Tooltip/Tooltip.vue
rename to resources/js/common/components/Tooltip.vue
diff --git a/resources/js/components/TransitionFade.vue b/resources/js/common/components/TransitionFade.vue
similarity index 100%
rename from resources/js/components/TransitionFade.vue
rename to resources/js/common/components/TransitionFade.vue
diff --git a/resources/js/components/TransitionShake.vue b/resources/js/common/components/TransitionShake.vue
similarity index 100%
rename from resources/js/components/TransitionShake.vue
rename to resources/js/common/components/TransitionShake.vue
diff --git a/resources/js/components/UserMenu.vue b/resources/js/common/components/UserMenu.vue
similarity index 86%
rename from resources/js/components/UserMenu.vue
rename to resources/js/common/components/UserMenu.vue
index 1817870c2ac..0bbf0a7e67f 100644
--- a/resources/js/components/UserMenu.vue
+++ b/resources/js/common/components/UserMenu.vue
@@ -4,11 +4,11 @@
   import PermissionsController from '@actions/Users/PermissionsController';
   import PreferencesController from '@actions/Users/PreferencesController';
   import UsersController from '@actions/Users/UsersController';
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
   import {computed} from 'vue';
-  import ActionMenu from '@/components/ActionMenu.vue';
-  import CurrentUser from '@/components/CurrentUser.vue';
-  import UserThumbnail from '@/components/UserThumbnail.vue';
+  import ActionMenu from '@/common/components/ActionMenu.vue';
+  import CurrentUser from '@/common/components/CurrentUser.vue';
+  import UserThumbnail from '@/common/components/UserThumbnail.vue';
   import PasswordController from '@actions/Users/PasswordController';
 
   const {currentUser, general} = useCraftData();
diff --git a/resources/js/components/UserThumbnail.vue b/resources/js/common/components/UserThumbnail.vue
similarity index 92%
rename from resources/js/components/UserThumbnail.vue
rename to resources/js/common/components/UserThumbnail.vue
index eb4b792cf41..6f99463c6d2 100644
--- a/resources/js/components/UserThumbnail.vue
+++ b/resources/js/common/components/UserThumbnail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
   import {computed} from 'vue';
 
   const {currentUser} = useCraftData();
diff --git a/resources/js/components/VarDump.vue b/resources/js/common/components/VarDump.vue
similarity index 100%
rename from resources/js/components/VarDump.vue
rename to resources/js/common/components/VarDump.vue
diff --git a/resources/js/composables/useAnnouncer.ts b/resources/js/common/composables/useAnnouncer.ts
similarity index 100%
rename from resources/js/composables/useAnnouncer.ts
rename to resources/js/common/composables/useAnnouncer.ts
diff --git a/resources/js/composables/useAppendHtml.ts b/resources/js/common/composables/useAppendHtml.ts
similarity index 100%
rename from resources/js/composables/useAppendHtml.ts
rename to resources/js/common/composables/useAppendHtml.ts
diff --git a/resources/js/composables/useCraftData.ts b/resources/js/common/composables/useCraftData.ts
similarity index 100%
rename from resources/js/composables/useCraftData.ts
rename to resources/js/common/composables/useCraftData.ts
diff --git a/resources/js/composables/useDragAndDrop.ts b/resources/js/common/composables/useDragAndDrop.ts
similarity index 100%
rename from resources/js/composables/useDragAndDrop.ts
rename to resources/js/common/composables/useDragAndDrop.ts
diff --git a/resources/js/composables/useFetch.ts b/resources/js/common/composables/useFetch.ts
similarity index 98%
rename from resources/js/composables/useFetch.ts
rename to resources/js/common/composables/useFetch.ts
index 3a895d14571..fd6bf24a623 100644
--- a/resources/js/composables/useFetch.ts
+++ b/resources/js/common/composables/useFetch.ts
@@ -14,7 +14,7 @@ import axios, {
   type AxiosResponse,
   type CancelTokenSource,
 } from 'axios';
-import {useHelpers} from '@/composables/useCraftData';
+import {useHelpers} from '@/common/composables/useCraftData';
 import {apiClient} from '@craftcms/cp/utilities/api/apiClient.ts.mjs';
 
 // Type for URL parameter - can be string, ref, or computed
diff --git a/resources/js/composables/useFlash.ts b/resources/js/common/composables/useFlash.ts
similarity index 100%
rename from resources/js/composables/useFlash.ts
rename to resources/js/common/composables/useFlash.ts
diff --git a/resources/js/composables/useFlashMessages.ts b/resources/js/common/composables/useFlashMessages.ts
similarity index 100%
rename from resources/js/composables/useFlashMessages.ts
rename to resources/js/common/composables/useFlashMessages.ts
diff --git a/resources/js/composables/useFocusField.ts b/resources/js/common/composables/useFocusField.ts
similarity index 100%
rename from resources/js/composables/useFocusField.ts
rename to resources/js/common/composables/useFocusField.ts
diff --git a/resources/js/composables/useInputGenerator.ts b/resources/js/common/composables/useInputGenerator.ts
similarity index 100%
rename from resources/js/composables/useInputGenerator.ts
rename to resources/js/common/composables/useInputGenerator.ts
diff --git a/resources/js/composables/useReorderableItems.ts b/resources/js/common/composables/useReorderableItems.ts
similarity index 100%
rename from resources/js/composables/useReorderableItems.ts
rename to resources/js/common/composables/useReorderableItems.ts
diff --git a/resources/js/components/form/CheckboxGroup.vue b/resources/js/common/form/CheckboxGroup.vue
similarity index 97%
rename from resources/js/components/form/CheckboxGroup.vue
rename to resources/js/common/form/CheckboxGroup.vue
index ec86eb1e086..8c2ae71463c 100644
--- a/resources/js/components/form/CheckboxGroup.vue
+++ b/resources/js/common/form/CheckboxGroup.vue
@@ -2,7 +2,7 @@
   import {t} from '@craftcms/cp/utilities/translate.ts';
   import {computed} from 'vue';
   import type CraftCheckbox from '@craftcms/cp/components/checkbox/checkbox.ts.mjs';
-  import type {CheckboxOption} from '@/types';
+  import type {CheckboxOption} from '@/common/types';
 
   const emit = defineEmits<{
     (e: 'update:modelValue', value: Array<string>): void;
diff --git a/resources/js/components/form/CraftCombobox.vue b/resources/js/common/form/CraftCombobox.vue
similarity index 94%
rename from resources/js/components/form/CraftCombobox.vue
rename to resources/js/common/form/CraftCombobox.vue
index 79bdf0d9947..b704f437876 100644
--- a/resources/js/components/form/CraftCombobox.vue
+++ b/resources/js/common/form/CraftCombobox.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import InputCombobox from '@/components/form/InputCombobox.vue';
-  import type {SelectItem} from '@/types';
+  import InputCombobox from '@/common/form/InputCombobox.vue';
+  import type {SelectItem} from '@/common/types';
   import {computed, useSlots} from 'vue';
 
   const modelValue = defineModel<string | number | boolean>();
diff --git a/resources/js/components/form/ErrorSummary.vue b/resources/js/common/form/ErrorSummary.vue
similarity index 100%
rename from resources/js/components/form/ErrorSummary.vue
rename to resources/js/common/form/ErrorSummary.vue
diff --git a/resources/js/components/form/InputCombobox.vue b/resources/js/common/form/InputCombobox.vue
similarity index 97%
rename from resources/js/components/form/InputCombobox.vue
rename to resources/js/common/form/InputCombobox.vue
index ce60f917b24..dd5b97df34f 100644
--- a/resources/js/components/form/InputCombobox.vue
+++ b/resources/js/common/form/InputCombobox.vue
@@ -14,8 +14,8 @@
     ComboboxOptions,
     TransitionRoot,
   } from '@headlessui/vue';
-  import type {SelectItem, SelectOption} from '@/types';
-  import InputComboboxOption from '@/components/form/InputComboboxOption.vue';
+  import type {SelectItem, SelectOption} from '@/common/types';
+  import InputComboboxOption from '@/common/form/InputComboboxOption.vue';
 
   const emit = defineEmits<{
     (e: 'update:modelValue', value: string | number): void;
diff --git a/resources/js/components/form/InputComboboxOption.vue b/resources/js/common/form/InputComboboxOption.vue
similarity index 95%
rename from resources/js/components/form/InputComboboxOption.vue
rename to resources/js/common/form/InputComboboxOption.vue
index 50965173dd3..eb266cb9e31 100644
--- a/resources/js/components/form/InputComboboxOption.vue
+++ b/resources/js/common/form/InputComboboxOption.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import {ComboboxOption} from '@headlessui/vue';
-  import type {SelectOption} from '@/types';
+  import type {SelectOption} from '@/common/types';
 
   defineProps<{
     option: SelectOption;
diff --git a/resources/js/components/form/Select.vue b/resources/js/common/form/Select.vue
similarity index 96%
rename from resources/js/components/form/Select.vue
rename to resources/js/common/form/Select.vue
index ed4373035fa..ec0bfbcdfc9 100644
--- a/resources/js/components/form/Select.vue
+++ b/resources/js/common/form/Select.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import type {BaseOption} from '@/types';
+  import type {BaseOption} from '@/common/types';
   import CraftSelect from '@craftcms/cp/vue/CraftSelect.vue';
   import {computed} from 'vue';
 
diff --git a/resources/js/layout/AppLayout.vue b/resources/js/common/layouts/AppLayout.vue
similarity index 89%
rename from resources/js/layout/AppLayout.vue
rename to resources/js/common/layouts/AppLayout.vue
index 6e04667ff7b..617ca7cc3f5 100644
--- a/resources/js/layout/AppLayout.vue
+++ b/resources/js/common/layouts/AppLayout.vue
@@ -1,25 +1,25 @@
 <script setup lang="ts">
-  import SystemInfo from '@/components/SystemInfo.vue';
-  import useCraftData from '@/composables/useCraftData';
+  import SystemInfo from '@/common/components/SystemInfo.vue';
+  import useCraftData from '@/common/composables/useCraftData';
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {computed, reactive, ref, useTemplateRef, watch} from 'vue';
-  import CpSidebar from '@/components/CpSidebar.vue';
+  import CpSidebar from '@/common/components/CpSidebar.vue';
   import {useMediaQuery} from '@vueuse/core';
   import {Head, type InertiaForm, usePage} from '@inertiajs/vue3';
-  import VarDump from '@/components/VarDump.vue';
-  import Breadcrumbs from '@/components/Breadcrumbs.vue';
-  import {useAnnouncer} from '@/composables/useAnnouncer';
-  import LiveRegion from '@/components/LiveRegion.vue';
-  import {useAppendHtml} from '@/composables/useAppendHtml';
-  import ActionMenu from '@/components/ActionMenu.vue';
-  import type {ActionItemData} from '@/types';
-  import {useFlash} from '@/composables/useFlash';
-  import InlineFlash from '@/components/InlineFlash.vue';
-  import ErrorSummary from '@/components/form/ErrorSummary.vue';
-  import CalloutReadOnly from '@/components/CalloutReadOnly.vue';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
-  import UserMenu from '@/components/UserMenu.vue';
-  import FlashMessages from '@/components/FlashMessages.vue';
+  import VarDump from '@/common/components/VarDump.vue';
+  import Breadcrumbs from '@/common/components/Breadcrumbs.vue';
+  import {useAnnouncer} from '@/common/composables/useAnnouncer';
+  import LiveRegion from '@/common/components/LiveRegion.vue';
+  import {useAppendHtml} from '@/common/composables/useAppendHtml';
+  import ActionMenu from '@/common/components/ActionMenu.vue';
+  import type {ActionItemData} from '@/common/types';
+  import {useFlash} from '@/common/composables/useFlash';
+  import InlineFlash from '@/common/components/InlineFlash.vue';
+  import ErrorSummary from '@/common/form/ErrorSummary.vue';
+  import CalloutReadOnly from '@/common/components/CalloutReadOnly.vue';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import UserMenu from '@/common/components/UserMenu.vue';
+  import FlashMessages from '@/common/components/FlashMessages.vue';
 
   interface SaveOptions {
     redirect?: boolean;
diff --git a/resources/js/layout/AuthBase.vue b/resources/js/common/layouts/AuthBase.vue
similarity index 92%
rename from resources/js/layout/AuthBase.vue
rename to resources/js/common/layouts/AuthBase.vue
index 249940d8f0e..c5c0b0f1525 100644
--- a/resources/js/layout/AuthBase.vue
+++ b/resources/js/common/layouts/AuthBase.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
 
   const {general, system} = useCraftData();
 </script>
diff --git a/resources/js/layout/IndexLayout.vue b/resources/js/common/layouts/IndexLayout.vue
similarity index 97%
rename from resources/js/layout/IndexLayout.vue
rename to resources/js/common/layouts/IndexLayout.vue
index 5680966a36b..5d2d3d9ed27 100644
--- a/resources/js/layout/IndexLayout.vue
+++ b/resources/js/common/layouts/IndexLayout.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout, {type AppLayoutProps} from '@/layout/AppLayout.vue';
+  import AppLayout, {type AppLayoutProps} from '@/common/layouts/AppLayout.vue';
   import {computed, ref, useSlots, watch} from 'vue';
   import {useMediaQuery} from '@vueuse/core';
 
diff --git a/resources/js/types/globals.d.ts b/resources/js/common/types/globals.d.ts
similarity index 100%
rename from resources/js/types/globals.d.ts
rename to resources/js/common/types/globals.d.ts
diff --git a/resources/js/types/index.ts b/resources/js/common/types/index.ts
similarity index 100%
rename from resources/js/types/index.ts
rename to resources/js/common/types/index.ts
diff --git a/resources/js/types/keys.ts b/resources/js/common/types/keys.ts
similarity index 100%
rename from resources/js/types/keys.ts
rename to resources/js/common/types/keys.ts
diff --git a/resources/js/types/shims-vue.d.ts b/resources/js/common/types/shims-vue.d.ts
similarity index 100%
rename from resources/js/types/shims-vue.d.ts
rename to resources/js/common/types/shims-vue.d.ts
diff --git a/resources/js/utils/transformBooleanOptions.ts b/resources/js/common/utils/transformBooleanOptions.ts
similarity index 94%
rename from resources/js/utils/transformBooleanOptions.ts
rename to resources/js/common/utils/transformBooleanOptions.ts
index e07851db74f..e8604715607 100644
--- a/resources/js/utils/transformBooleanOptions.ts
+++ b/resources/js/common/utils/transformBooleanOptions.ts
@@ -1,5 +1,5 @@
 import {t} from '@craftcms/cp';
-import type {SelectItem, SelectOption} from '@/types';
+import type {SelectItem, SelectOption} from '@/common/types';
 
 function addBooleanData(
   option: SelectOption,
diff --git a/resources/js/components/AdminTable/AdminTable.vue b/resources/js/modules/admin-table/components/AdminTable.vue
similarity index 95%
rename from resources/js/components/AdminTable/AdminTable.vue
rename to resources/js/modules/admin-table/components/AdminTable.vue
index d11ce78f979..223350230f3 100644
--- a/resources/js/components/AdminTable/AdminTable.vue
+++ b/resources/js/modules/admin-table/components/AdminTable.vue
@@ -2,14 +2,14 @@
   import {type Column, FlexRender} from '@tanstack/vue-table';
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {computed, useId} from 'vue';
-  import {useReorderableRows} from '@/composables/useReorderableRows';
-  import {TableSpacing, type TableSpacingValue} from '@/types';
-  import ColumnHeaderTitle from '@/components/AdminTable/ColumnHeaderTitle.vue';
-  import ReorderButton from '@/components/ReorderButton.vue';
-  import DropIndicator from '@/components/DropIndicator.vue';
-  import Select from '@/components/form/Select.vue';
-  import Text from '@/components/Text.vue';
-  import Empty from '@/components/Empty.vue';
+  import {useReorderableRows} from '@/modules/admin-table/composables/useReorderableRows';
+  import {TableSpacing, type TableSpacingValue} from '@/common/types';
+  import ColumnHeaderTitle from '@/modules/admin-table/components/ColumnHeaderTitle.vue';
+  import ReorderButton from '@/common/components/ReorderButton.vue';
+  import DropIndicator from '@/common/components/DropIndicator.vue';
+  import Select from '@/common/form/Select.vue';
+  import Text from '@/common/components/Text.vue';
+  import Empty from '@/common/components/Empty.vue';
 
   const props = withDefaults(
     defineProps<{
diff --git a/resources/js/components/AdminTable/ColumnHeaderTitle.vue b/resources/js/modules/admin-table/components/ColumnHeaderTitle.vue
similarity index 100%
rename from resources/js/components/AdminTable/ColumnHeaderTitle.vue
rename to resources/js/modules/admin-table/components/ColumnHeaderTitle.vue
diff --git a/resources/js/components/AdminTable/DeleteButton.vue b/resources/js/modules/admin-table/components/DeleteButton.vue
similarity index 100%
rename from resources/js/components/AdminTable/DeleteButton.vue
rename to resources/js/modules/admin-table/components/DeleteButton.vue
diff --git a/resources/js/components/AdminTable/SearchForm.vue b/resources/js/modules/admin-table/components/SearchForm.vue
similarity index 100%
rename from resources/js/components/AdminTable/SearchForm.vue
rename to resources/js/modules/admin-table/components/SearchForm.vue
diff --git a/resources/js/composables/useEditableTable.ts b/resources/js/modules/admin-table/composables/useEditableTable.ts
similarity index 98%
rename from resources/js/composables/useEditableTable.ts
rename to resources/js/modules/admin-table/composables/useEditableTable.ts
index 96cbb243e17..cf3fbccfab4 100644
--- a/resources/js/composables/useEditableTable.ts
+++ b/resources/js/modules/admin-table/composables/useEditableTable.ts
@@ -9,9 +9,9 @@ import {
   useVueTable,
 } from '@tanstack/vue-table';
 import CraftSwitch from '@craftcms/cp/vue/CraftSwitch.vue';
-import InputCombobox from '@/components/form/InputCombobox.vue';
-import type {SelectItem, SelectOption} from '@/types';
-import useCraftData from '@/composables/useCraftData';
+import InputCombobox from '@/common/form/InputCombobox.vue';
+import type {SelectItem, SelectOption} from '@/common/types';
+import useCraftData from '@/common/composables/useCraftData';
 
 type MaybeGetter<T> = T | (() => T);
 
diff --git a/resources/js/composables/useReorderableRows.ts b/resources/js/modules/admin-table/composables/useReorderableRows.ts
similarity index 100%
rename from resources/js/composables/useReorderableRows.ts
rename to resources/js/modules/admin-table/composables/useReorderableRows.ts
diff --git a/resources/js/composables/useServerPagination.ts b/resources/js/modules/admin-table/composables/useServerPagination.ts
similarity index 96%
rename from resources/js/composables/useServerPagination.ts
rename to resources/js/modules/admin-table/composables/useServerPagination.ts
index a3ed87ad58f..3698979e3ee 100644
--- a/resources/js/composables/useServerPagination.ts
+++ b/resources/js/modules/admin-table/composables/useServerPagination.ts
@@ -4,7 +4,7 @@ import type {
   TableOptionsWithReactiveData,
   Updater,
 } from '@tanstack/vue-table';
-import type {PaginationData} from '@/types';
+import type {PaginationData} from '@/common/types';
 
 interface OnChangeArgs {
   state: PaginationState;
diff --git a/resources/js/composables/useServerSort.ts b/resources/js/modules/admin-table/composables/useServerSort.ts
similarity index 97%
rename from resources/js/composables/useServerSort.ts
rename to resources/js/modules/admin-table/composables/useServerSort.ts
index 4f7b5e8ed83..d0b6849a74a 100644
--- a/resources/js/composables/useServerSort.ts
+++ b/resources/js/modules/admin-table/composables/useServerSort.ts
@@ -1,6 +1,6 @@
 import {ref} from 'vue';
 import type {SortingState, Updater} from '@tanstack/vue-table';
-import type {SortItem} from '@/types';
+import type {SortItem} from '@/common/types';
 
 interface OnChangeArgs {
   state: SortingState;
diff --git a/resources/js/components/AdminTable/createCraftColumnHelper.ts b/resources/js/modules/admin-table/helpers/createCraftColumnHelper.ts
similarity index 94%
rename from resources/js/components/AdminTable/createCraftColumnHelper.ts
rename to resources/js/modules/admin-table/helpers/createCraftColumnHelper.ts
index 671c44d658b..6886363a087 100644
--- a/resources/js/components/AdminTable/createCraftColumnHelper.ts
+++ b/resources/js/modules/admin-table/helpers/createCraftColumnHelper.ts
@@ -8,9 +8,9 @@ import {
   createColumnHelper,
   type DisplayColumnDef,
 } from '@tanstack/vue-table';
-import type {AccessorParam} from '@/composables/useEditableTable';
-import CpLink from '@/components/CpLink.vue';
-import Date from '@/components/Date.vue';
+import type {AccessorParam} from '@/modules/admin-table/composables/useEditableTable';
+import CpLink from '@/common/components/CpLink.vue';
+import Date from '@/common/components/Date.vue';
 
 type LinkColumnDef<T extends Record<string, any>> = DisplayColumnDef<T> & {
   props: (cellContext: CellContext<T, any>) => Record<string, any>;
diff --git a/resources/js/components/Auth/login/login-challenge.ts b/resources/js/modules/auth/components/login/login-challenge.ts
similarity index 100%
rename from resources/js/components/Auth/login/login-challenge.ts
rename to resources/js/modules/auth/components/login/login-challenge.ts
diff --git a/resources/js/components/Auth/login/login-form.styles.ts b/resources/js/modules/auth/components/login/login-form.styles.ts
similarity index 100%
rename from resources/js/components/Auth/login/login-form.styles.ts
rename to resources/js/modules/auth/components/login/login-form.styles.ts
diff --git a/resources/js/components/Auth/login/login-form.ts b/resources/js/modules/auth/components/login/login-form.ts
similarity index 100%
rename from resources/js/components/Auth/login/login-form.ts
rename to resources/js/modules/auth/components/login/login-form.ts
diff --git a/resources/js/components/Auth/login/login-reset-password.ts b/resources/js/modules/auth/components/login/login-reset-password.ts
similarity index 100%
rename from resources/js/components/Auth/login/login-reset-password.ts
rename to resources/js/modules/auth/components/login/login-reset-password.ts
diff --git a/resources/js/components/Auth/recovery-codes/recovery-code-form.ts b/resources/js/modules/auth/components/recovery-codes/recovery-code-form.ts
similarity index 100%
rename from resources/js/components/Auth/recovery-codes/recovery-code-form.ts
rename to resources/js/modules/auth/components/recovery-codes/recovery-code-form.ts
diff --git a/resources/js/components/Auth/recovery-codes/recovery-codes-setup.ts b/resources/js/modules/auth/components/recovery-codes/recovery-codes-setup.ts
similarity index 100%
rename from resources/js/components/Auth/recovery-codes/recovery-codes-setup.ts
rename to resources/js/modules/auth/components/recovery-codes/recovery-codes-setup.ts
diff --git a/resources/js/components/Auth/totp/totp-form.ts b/resources/js/modules/auth/components/totp/totp-form.ts
similarity index 100%
rename from resources/js/components/Auth/totp/totp-form.ts
rename to resources/js/modules/auth/components/totp/totp-form.ts
diff --git a/resources/js/components/Auth/totp/totp-setup.ts b/resources/js/modules/auth/components/totp/totp-setup.ts
similarity index 100%
rename from resources/js/components/Auth/totp/totp-setup.ts
rename to resources/js/modules/auth/components/totp/totp-setup.ts
diff --git a/resources/js/types/auth.ts b/resources/js/modules/auth/types/auth.ts
similarity index 71%
rename from resources/js/types/auth.ts
rename to resources/js/modules/auth/types/auth.ts
index 0054954ea86..4dbec17926c 100644
--- a/resources/js/types/auth.ts
+++ b/resources/js/modules/auth/types/auth.ts
@@ -1,4 +1,4 @@
-import type {User} from '@/types/user';
+import type {User} from '@/modules/user/types/user';
 
 export interface LoginResponse {
   returnUrl: string;
diff --git a/resources/js/components/EntryType/CreateEntryTypeButton.vue b/resources/js/modules/entry-types/components/CreateEntryTypeButton.vue
similarity index 100%
rename from resources/js/components/EntryType/CreateEntryTypeButton.vue
rename to resources/js/modules/entry-types/components/CreateEntryTypeButton.vue
diff --git a/resources/js/components/EntryType/EntryTypeChip.vue b/resources/js/modules/entry-types/components/EntryTypeChip.vue
similarity index 89%
rename from resources/js/components/EntryType/EntryTypeChip.vue
rename to resources/js/modules/entry-types/components/EntryTypeChip.vue
index 96cfe4ce9c8..b9e84e4536f 100644
--- a/resources/js/components/EntryType/EntryTypeChip.vue
+++ b/resources/js/modules/entry-types/components/EntryTypeChip.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-  import ActionMenu from '@/components/ActionMenu.vue';
-  import ReorderButton from '@/components/ReorderButton.vue';
-  import type {EntryType} from '@/types';
-  import Tooltip from '@/components/Tooltip/Tooltip.vue';
+  import ActionMenu from '@/common/components/ActionMenu.vue';
+  import ReorderButton from '@/common/components/ReorderButton.vue';
+  import type {EntryType} from '@/common/types';
+  import Tooltip from '@/common/components/Tooltip.vue';
   import {ref, watch} from 'vue';
 
   const emit = defineEmits<{
diff --git a/resources/js/components/form/EntryTypeSelect.vue b/resources/js/modules/entry-types/components/EntryTypeSelect.vue
similarity index 94%
rename from resources/js/components/form/EntryTypeSelect.vue
rename to resources/js/modules/entry-types/components/EntryTypeSelect.vue
index 93e51bc478b..3acbe53010f 100644
--- a/resources/js/components/form/EntryTypeSelect.vue
+++ b/resources/js/modules/entry-types/components/EntryTypeSelect.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
-  import type {EntryType} from '@/types';
+  import type {EntryType} from '@/common/types';
   import {computed, ref} from 'vue';
   import {appendBodyHtml, appendHeadHtml, t} from '@craftcms/cp';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
-  import Text from '@/components/Text.vue';
+  import Text from '@/common/components/Text.vue';
   import {
     applyOverrideSettings,
     renderOverrideSettings,
   } from '@actions/Settings/EntryTypesController';
-  import type {SlideoutInstance} from '@/types/globals';
-  import EntryTypeChip from '@/components/EntryType/EntryTypeChip.vue';
-  import CreateEntryTypeButton from '@/components/EntryType/CreateEntryTypeButton.vue';
+  import type {SlideoutInstance} from '@/common/types/globals';
+  import EntryTypeChip from '@/modules/entry-types/components/EntryTypeChip.vue';
+  import CreateEntryTypeButton from '@/modules/entry-types/components/CreateEntryTypeButton.vue';
   import {router} from '@inertiajs/vue3';
-  import DragShadow from '@/components/DragShadow.vue';
-  import {useReorderableItems} from '@/composables/useReorderableItems';
-  import ReorderButton from '@/components/ReorderButton.vue';
-  import useCraftData from '@/composables/useCraftData';
+  import DragShadow from '@/common/components/DragShadow.vue';
+  import {useReorderableItems} from '@/common/composables/useReorderableItems';
+  import ReorderButton from '@/common/components/ReorderButton.vue';
+  import useCraftData from '@/common/composables/useCraftData';
 
   const emit = defineEmits<{
     (e: 'update:modelValue', value: Array<EntryType>): void;
diff --git a/resources/js/components/install/AccountFields.vue b/resources/js/modules/install/components/AccountFields.vue
similarity index 96%
rename from resources/js/components/install/AccountFields.vue
rename to resources/js/modules/install/components/AccountFields.vue
index 40d3fd6f302..271591b39b5 100644
--- a/resources/js/components/install/AccountFields.vue
+++ b/resources/js/modules/install/components/AccountFields.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {computed} from 'vue';
-  import {useFocusField} from '@/composables/useFocusField';
+  import {useFocusField} from '@/common/composables/useFocusField';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
   import CraftInputPassword from '@craftcms/cp/vue/CraftInputPassword.vue';
   import {usePage} from '@inertiajs/vue3';
diff --git a/resources/js/components/install/DbFields.vue b/resources/js/modules/install/components/DbFields.vue
similarity index 94%
rename from resources/js/components/install/DbFields.vue
rename to resources/js/modules/install/components/DbFields.vue
index 63093ced102..69569cd8f41 100644
--- a/resources/js/components/install/DbFields.vue
+++ b/resources/js/modules/install/components/DbFields.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {computed, defineEmits, defineProps} from 'vue';
-  import Callout from '@/components/Callout.vue';
-  import {useFocusField} from '@/composables/useFocusField';
+  import Callout from '@/common/components/Callout.vue';
+  import {useFocusField} from '@/common/composables/useFocusField';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
   import CraftInputPassword from '@craftcms/cp/vue/CraftInputPassword.vue';
-  import Select from '@/components/form/Select.vue';
+  import Select from '@/common/form/Select.vue';
 
   const emit = defineEmits<{
     (e: 'update:modelValue', value: any): void;
diff --git a/resources/js/components/install/InstallingScreen.vue b/resources/js/modules/install/components/InstallingScreen.vue
similarity index 94%
rename from resources/js/components/install/InstallingScreen.vue
rename to resources/js/modules/install/components/InstallingScreen.vue
index 93af4ad87a4..b0b0fc94f1e 100644
--- a/resources/js/components/install/InstallingScreen.vue
+++ b/resources/js/modules/install/components/InstallingScreen.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {defineProps, onMounted} from 'vue';
-  import {usePost} from '@/composables/useFetch';
+  import {usePost} from '@/common/composables/useFetch';
   import {usePage} from '@inertiajs/vue3';
-  import Pane from '@/components/Pane.vue';
+  import Pane from '@/common/components/Pane.vue';
 
   const {props: pageProps} = usePage();
 
diff --git a/resources/js/components/install/SiteFields.vue b/resources/js/modules/install/components/SiteFields.vue
similarity index 89%
rename from resources/js/components/install/SiteFields.vue
rename to resources/js/modules/install/components/SiteFields.vue
index 08a47d6572b..223ffdd9824 100644
--- a/resources/js/components/install/SiteFields.vue
+++ b/resources/js/modules/install/components/SiteFields.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {computed} from 'vue';
-  import {useFocusField} from '@/composables/useFocusField';
+  import {useFocusField} from '@/common/composables/useFocusField';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
-  import CraftCombobox from '@/components/form/CraftCombobox.vue';
-  import Select from '@/components/form/Select.vue';
+  import CraftCombobox from '@/common/form/CraftCombobox.vue';
+  import Select from '@/common/form/Select.vue';
   import {usePage} from '@inertiajs/vue3';
-  import type {BaseOption, SelectItem} from '@/types';
+  import type {BaseOption, SelectItem} from '@/common/types';
 
   const emit = defineEmits<{
     (e: 'update:modelValue', data: any): void;
diff --git a/resources/js/components/install/StepScreen.vue b/resources/js/modules/install/components/StepScreen.vue
similarity index 100%
rename from resources/js/components/install/StepScreen.vue
rename to resources/js/modules/install/components/StepScreen.vue
diff --git a/resources/js/composables/useInstall.ts b/resources/js/modules/install/composables/useInstall.ts
similarity index 100%
rename from resources/js/composables/useInstall.ts
rename to resources/js/modules/install/composables/useInstall.ts
diff --git a/resources/js/components/CpGlobalSidebar.ts b/resources/js/modules/navigation/components/CpGlobalSidebar.ts
similarity index 100%
rename from resources/js/components/CpGlobalSidebar.ts
rename to resources/js/modules/navigation/components/CpGlobalSidebar.ts
diff --git a/resources/js/components/CpQueueIndicator.ts b/resources/js/modules/navigation/components/CpQueueIndicator.ts
similarity index 100%
rename from resources/js/components/CpQueueIndicator.ts
rename to resources/js/modules/navigation/components/CpQueueIndicator.ts
diff --git a/resources/js/components/PermissionList.vue b/resources/js/modules/permissions/components/PermissionList.vue
similarity index 98%
rename from resources/js/components/PermissionList.vue
rename to resources/js/modules/permissions/components/PermissionList.vue
index cf5d9bff549..a479b165ef0 100644
--- a/resources/js/components/PermissionList.vue
+++ b/resources/js/modules/permissions/components/PermissionList.vue
@@ -3,7 +3,7 @@
     getNestedKeys,
     hasNested,
     type PermissionItem,
-  } from '@/utils/permissions';
+  } from '@/modules/permissions/helpers/permissions';
   import CraftCheckbox from '@craftcms/cp/vue/CraftCheckbox.vue';
 
   const emit = defineEmits<{
diff --git a/resources/js/utils/permissions.ts b/resources/js/modules/permissions/helpers/permissions.ts
similarity index 100%
rename from resources/js/utils/permissions.ts
rename to resources/js/modules/permissions/helpers/permissions.ts
diff --git a/resources/js/components/Plugins/PluginActionMenu.vue b/resources/js/modules/plugin-manager/components/PluginActionMenu.vue
similarity index 96%
rename from resources/js/components/Plugins/PluginActionMenu.vue
rename to resources/js/modules/plugin-manager/components/PluginActionMenu.vue
index 39ca7852a48..63c2745fda7 100644
--- a/resources/js/components/Plugins/PluginActionMenu.vue
+++ b/resources/js/modules/plugin-manager/components/PluginActionMenu.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import type {PluginInfo} from '@/types/plugins';
-  import ActionMenu from '@/components/ActionMenu.vue';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
+  import ActionMenu from '@/common/components/ActionMenu.vue';
   import {computed, onMounted} from 'vue';
   import type {ActionItem} from '@craftcms/cp/actions.mjs';
   import {
diff --git a/resources/js/components/Plugins/PluginDetails.stories.ts b/resources/js/modules/plugin-manager/components/PluginDetails.stories.ts
similarity index 100%
rename from resources/js/components/Plugins/PluginDetails.stories.ts
rename to resources/js/modules/plugin-manager/components/PluginDetails.stories.ts
diff --git a/resources/js/components/Plugins/PluginDetails.vue b/resources/js/modules/plugin-manager/components/PluginDetails.vue
similarity index 84%
rename from resources/js/components/Plugins/PluginDetails.vue
rename to resources/js/modules/plugin-manager/components/PluginDetails.vue
index 96697928f32..83e085b3c89 100644
--- a/resources/js/components/Plugins/PluginDetails.vue
+++ b/resources/js/modules/plugin-manager/components/PluginDetails.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import type {PluginInfo} from '@/types/plugins';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
   import {computed} from 'vue';
-  import PluginEdition from '@/components/Plugins/PluginEdition.vue';
-  import PluginLicenseStatusIcon from '@/components/Plugins/PluginLicenseStatusIcon.vue';
-  import PluginLinks from '@/components/Plugins/PluginLinks.vue';
-  import PluginLicenseIssues from '@/components/Plugins/PluginLicenseIssues.vue';
-  import PluginLicenseInput from '@/components/Plugins/PluginLicenseInput.vue';
+  import PluginEdition from '@/modules/plugin-manager/components/PluginEdition.vue';
+  import PluginLicenseStatusIcon from '@/modules/plugin-manager/components/PluginLicenseStatusIcon.vue';
+  import PluginLinks from '@/modules/plugin-manager/components/PluginLinks.vue';
+  import PluginLicenseIssues from '@/modules/plugin-manager/components/PluginLicenseIssues.vue';
+  import PluginLicenseInput from '@/modules/plugin-manager/components/PluginLicenseInput.vue';
 
   const props = defineProps<{
     plugin: PluginInfo;
diff --git a/resources/js/components/Plugins/PluginEdition.vue b/resources/js/modules/plugin-manager/components/PluginEdition.vue
similarity index 97%
rename from resources/js/components/Plugins/PluginEdition.vue
rename to resources/js/modules/plugin-manager/components/PluginEdition.vue
index ec10eedb55d..d29d4e4cbff 100644
--- a/resources/js/components/Plugins/PluginEdition.vue
+++ b/resources/js/modules/plugin-manager/components/PluginEdition.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import {t, capitalize} from '@craftcms/cp';
-  import Badge from '@/components/Badge.vue';
+  import Badge from '@/common/components/Badge.vue';
   import {computed} from 'vue';
 
   const props = withDefaults(
diff --git a/resources/js/components/Plugins/PluginLicenseInput.vue b/resources/js/modules/plugin-manager/components/PluginLicenseInput.vue
similarity index 95%
rename from resources/js/components/Plugins/PluginLicenseInput.vue
rename to resources/js/modules/plugin-manager/components/PluginLicenseInput.vue
index 1e88a9f4e54..7fae0d3b697 100644
--- a/resources/js/components/Plugins/PluginLicenseInput.vue
+++ b/resources/js/modules/plugin-manager/components/PluginLicenseInput.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import CpLink from '@/components/CpLink.vue';
-  import type {PluginInfo} from '@/types/plugins';
+  import CpLink from '@/common/components/CpLink.vue';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
   import {useForm, usePage} from '@inertiajs/vue3';
   import {computed} from 'vue';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
diff --git a/resources/js/components/Plugins/PluginLicenseIssues.vue b/resources/js/modules/plugin-manager/components/PluginLicenseIssues.vue
similarity index 94%
rename from resources/js/components/Plugins/PluginLicenseIssues.vue
rename to resources/js/modules/plugin-manager/components/PluginLicenseIssues.vue
index b4796823122..57a75a51682 100644
--- a/resources/js/components/Plugins/PluginLicenseIssues.vue
+++ b/resources/js/modules/plugin-manager/components/PluginLicenseIssues.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import {capitalize} from '@craftcms/cp';
-  import type {PluginInfo} from '@/types/plugins';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
   import {computed} from 'vue';
-  import Text from '@/components/Text.vue';
+  import Text from '@/common/components/Text.vue';
   import {switchEdition} from '@actions/PluginsController';
   import {Form} from '@inertiajs/vue3';
 
diff --git a/resources/js/components/Plugins/PluginLicenseStatusIcon.vue b/resources/js/modules/plugin-manager/components/PluginLicenseStatusIcon.vue
similarity index 100%
rename from resources/js/components/Plugins/PluginLicenseStatusIcon.vue
rename to resources/js/modules/plugin-manager/components/PluginLicenseStatusIcon.vue
diff --git a/resources/js/components/Plugins/PluginLinks.vue b/resources/js/modules/plugin-manager/components/PluginLinks.vue
similarity index 95%
rename from resources/js/components/Plugins/PluginLinks.vue
rename to resources/js/modules/plugin-manager/components/PluginLinks.vue
index a97c5593fd9..e0602d17133 100644
--- a/resources/js/components/Plugins/PluginLinks.vue
+++ b/resources/js/modules/plugin-manager/components/PluginLinks.vue
@@ -2,7 +2,7 @@
   import {computed} from 'vue';
   import {usePage} from '@inertiajs/vue3';
   import {editSettings} from '@actions/PluginsController';
-  import type {PluginInfo} from '@/types/plugins';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
 
   const props = defineProps<{
     plugin: PluginInfo;
diff --git a/resources/js/components/Plugins/PluginStatus.vue b/resources/js/modules/plugin-manager/components/PluginStatus.vue
similarity index 91%
rename from resources/js/components/Plugins/PluginStatus.vue
rename to resources/js/modules/plugin-manager/components/PluginStatus.vue
index b3112e4cdc6..8e0c669244e 100644
--- a/resources/js/components/Plugins/PluginStatus.vue
+++ b/resources/js/modules/plugin-manager/components/PluginStatus.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import type {PluginInfo} from '@/types/plugins';
-  import Badge from '@/components/Badge.vue';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
+  import Badge from '@/common/components/Badge.vue';
 
   defineProps<{
     plugin: PluginInfo & {isComposerInstalled?: boolean};
diff --git a/resources/js/components/Plugins/PluginsList.stories.ts b/resources/js/modules/plugin-manager/components/PluginsList.stories.ts
similarity index 100%
rename from resources/js/components/Plugins/PluginsList.stories.ts
rename to resources/js/modules/plugin-manager/components/PluginsList.stories.ts
diff --git a/resources/js/components/Plugins/PluginsList.vue b/resources/js/modules/plugin-manager/components/PluginsList.vue
similarity index 79%
rename from resources/js/components/Plugins/PluginsList.vue
rename to resources/js/modules/plugin-manager/components/PluginsList.vue
index e085887ed6e..5a3a3fe6ead 100644
--- a/resources/js/components/Plugins/PluginsList.vue
+++ b/resources/js/modules/plugin-manager/components/PluginsList.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {computed, h, onMounted} from 'vue';
-  import Pane from '@/components/Pane.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import Empty from '@/components/Empty.vue';
-  import type {PluginInfo} from '@/types/plugins';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
+  import Pane from '@/common/components/Pane.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import Empty from '@/common/components/Empty.vue';
+  import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import PluginDetails from '@/components/Plugins/PluginDetails.vue';
-  import PluginStatus from '@/components/Plugins/PluginStatus.vue';
-  import PluginActionMenu from '@/components/Plugins/PluginActionMenu.vue';
+  import PluginDetails from '@/modules/plugin-manager/components/PluginDetails.vue';
+  import PluginStatus from '@/modules/plugin-manager/components/PluginStatus.vue';
+  import PluginActionMenu from '@/modules/plugin-manager/components/PluginActionMenu.vue';
   import {router} from '@inertiajs/vue3';
   import {index} from '@actions/PluginsController';
 
diff --git a/resources/js/fixtures/plugins.ts b/resources/js/modules/plugin-manager/fixtures/plugins.ts
similarity index 99%
rename from resources/js/fixtures/plugins.ts
rename to resources/js/modules/plugin-manager/fixtures/plugins.ts
index 7046660282a..44e28a3426f 100644
--- a/resources/js/fixtures/plugins.ts
+++ b/resources/js/modules/plugin-manager/fixtures/plugins.ts
@@ -1,4 +1,4 @@
-import type {PluginInfo} from '@/types/plugins';
+import type {PluginInfo} from '@/modules/plugin-manager/types/plugins';
 
 const legacyPluginInfo = {
   'aws-s3': {
diff --git a/resources/js/types/element.ts b/resources/js/modules/plugin-manager/types/element.ts
similarity index 100%
rename from resources/js/types/element.ts
rename to resources/js/modules/plugin-manager/types/element.ts
diff --git a/resources/js/types/plugins.ts b/resources/js/modules/plugin-manager/types/plugins.ts
similarity index 97%
rename from resources/js/types/plugins.ts
rename to resources/js/modules/plugin-manager/types/plugins.ts
index 93469a7f3f2..6a40c2bd8dc 100644
--- a/resources/js/types/plugins.ts
+++ b/resources/js/modules/plugin-manager/types/plugins.ts
@@ -1,4 +1,4 @@
-import type {AssetElement, CraftElementInterface} from '@/types/element';
+import type {AssetElement, CraftElementInterface} from '@/modules/plugin-manager/types/element';
 
 export type LicenseIssueKey =
   | 'wrong_edition'
diff --git a/resources/js/components/sections/DeleteSectionButton.vue b/resources/js/modules/sections/components/DeleteSectionButton.vue
similarity index 100%
rename from resources/js/components/sections/DeleteSectionButton.vue
rename to resources/js/modules/sections/components/DeleteSectionButton.vue
diff --git a/resources/js/components/sections/PreviewTargetsTable.vue b/resources/js/modules/sections/components/PreviewTargetsTable.vue
similarity index 88%
rename from resources/js/components/sections/PreviewTargetsTable.vue
rename to resources/js/modules/sections/components/PreviewTargetsTable.vue
index ed282aeabeb..e74ffc20dc6 100644
--- a/resources/js/components/sections/PreviewTargetsTable.vue
+++ b/resources/js/modules/sections/components/PreviewTargetsTable.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {h} from 'vue';
-  import Pane from '@/components/Pane.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import {TableSpacing} from '@/types';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
-  import {useEditableTable} from '@/composables/useEditableTable';
+  import Pane from '@/common/components/Pane.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import {TableSpacing} from '@/common/types';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import {useEditableTable} from '@/modules/admin-table/composables/useEditableTable';
 
   type PreviewTarget = {label: string; urlFormat: string; refresh: boolean};
 
diff --git a/resources/js/components/sections/SiteSettingsTable.vue b/resources/js/modules/sections/components/SiteSettingsTable.vue
similarity index 93%
rename from resources/js/components/sections/SiteSettingsTable.vue
rename to resources/js/modules/sections/components/SiteSettingsTable.vue
index 206be6a399c..fb1cc63ddbc 100644
--- a/resources/js/components/sections/SiteSettingsTable.vue
+++ b/resources/js/modules/sections/components/SiteSettingsTable.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {computed, h} from 'vue';
-  import {type SectionSiteSettingsData, TableSpacing} from '@/types';
-  import Pane from '@/components/Pane.vue';
-  import {useEditableTable} from '@/composables/useEditableTable';
+  import {type SectionSiteSettingsData, TableSpacing} from '@/common/types';
+  import Pane from '@/common/components/Pane.vue';
+  import {useEditableTable} from '@/modules/admin-table/composables/useEditableTable';
   import {usePage} from '@inertiajs/vue3';
 
   type SitesData = Record<
diff --git a/resources/js/components/Settings/Email/SiteOverridesTable.vue b/resources/js/modules/settings/components/email/SiteOverridesTable.vue
similarity index 90%
rename from resources/js/components/Settings/Email/SiteOverridesTable.vue
rename to resources/js/modules/settings/components/email/SiteOverridesTable.vue
index 67129f39342..df869f8c0f2 100644
--- a/resources/js/components/Settings/Email/SiteOverridesTable.vue
+++ b/resources/js/modules/settings/components/email/SiteOverridesTable.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import Pane from '@/components/Pane.vue';
-  import {useEditableTable} from '@/composables/useEditableTable';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import {useEditableTable} from '@/modules/admin-table/composables/useEditableTable';
   import {usePage} from '@inertiajs/vue3';
-  import type {SelectItem} from '@/types';
+  import type {SelectItem} from '@/common/types';
   import {computed} from 'vue';
 
   type SiteOverridesData = {
diff --git a/resources/js/composables/useSettingsSave.ts b/resources/js/modules/settings/composables/useSettingsSave.ts
similarity index 100%
rename from resources/js/composables/useSettingsSave.ts
rename to resources/js/modules/settings/composables/useSettingsSave.ts
diff --git a/resources/js/components/sites/DeleteSiteButton.vue b/resources/js/modules/sites/components/DeleteSiteButton.vue
similarity index 83%
rename from resources/js/components/sites/DeleteSiteButton.vue
rename to resources/js/modules/sites/components/DeleteSiteButton.vue
index c8e4c1ccd86..88c00a72c0d 100644
--- a/resources/js/components/sites/DeleteSiteButton.vue
+++ b/resources/js/modules/sites/components/DeleteSiteButton.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-  import type {Site} from '@/types';
+  import type {Site} from '@/common/types';
   import {ref} from 'vue';
-  import DeleteSiteModal from '@/components/sites/DeleteSiteModal.vue';
+  import DeleteSiteModal from '@/modules/sites/components/DeleteSiteModal.vue';
 
   withDefaults(
     defineProps<{
diff --git a/resources/js/components/sites/DeleteSiteModal.vue b/resources/js/modules/sites/components/DeleteSiteModal.vue
similarity index 97%
rename from resources/js/components/sites/DeleteSiteModal.vue
rename to resources/js/modules/sites/components/DeleteSiteModal.vue
index 33134ef7e94..42dc62c1dc8 100644
--- a/resources/js/components/sites/DeleteSiteModal.vue
+++ b/resources/js/modules/sites/components/DeleteSiteModal.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {Deferred, useForm, usePage} from '@inertiajs/vue3';
-  import ModalForm from '@/components/ModalForm.vue';
+  import ModalForm from '@/common/components/ModalForm.vue';
   import {computed} from 'vue';
   import {destroy} from '@actions/Settings/SitesController';
-  import type {Site} from '@/types';
+  import type {Site} from '@/common/types';
   import {t} from '@craftcms/cp';
 
   const emit = defineEmits<{
diff --git a/resources/js/components/sites/SiteFields.vue b/resources/js/modules/sites/components/SiteFields.vue
similarity index 95%
rename from resources/js/components/sites/SiteFields.vue
rename to resources/js/modules/sites/components/SiteFields.vue
index fc9830e7a0b..f61d728c23c 100644
--- a/resources/js/components/sites/SiteFields.vue
+++ b/resources/js/modules/sites/components/SiteFields.vue
@@ -3,12 +3,12 @@
   import {t, toEnvVar} from '@craftcms/cp';
   import {type InertiaForm, usePage} from '@inertiajs/vue3';
   import {computed, useTemplateRef} from 'vue';
-  import type {SelectItem, SelectOption, Site} from '@/types';
-  import {useInputGenerator} from '@/composables/useInputGenerator';
+  import type {SelectItem, SelectOption, Site} from '@/common/types';
+  import {useInputGenerator} from '@/common/composables/useInputGenerator';
   import {toHandle} from '@craftcms/cp/utilities/string.ts.mjs';
-  import useCraftData from '@/composables/useCraftData';
-  import CraftCombobox from '@/components/form/CraftCombobox.vue';
-  import {transformBooleanOptions} from '@/utils/transformBooleanOptions';
+  import useCraftData from '@/common/composables/useCraftData';
+  import CraftCombobox from '@/common/form/CraftCombobox.vue';
+  import {transformBooleanOptions} from '@/common/utils/transformBooleanOptions';
 
   const props = defineProps<{
     inertiaForm: InertiaForm<any>;
diff --git a/resources/js/components/utilities/Updates/Release.vue b/resources/js/modules/updater/components/Release.vue
similarity index 100%
rename from resources/js/components/utilities/Updates/Release.vue
rename to resources/js/modules/updater/components/Release.vue
diff --git a/resources/js/components/utilities/Updates/Update.vue b/resources/js/modules/updater/components/Update.vue
similarity index 98%
rename from resources/js/components/utilities/Updates/Update.vue
rename to resources/js/modules/updater/components/Update.vue
index 3cf9be9c382..3f802873b60 100644
--- a/resources/js/components/utilities/Updates/Update.vue
+++ b/resources/js/modules/updater/components/Update.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import Release from '@/components/utilities/Updates/Release.vue';
+  import Release from '@/modules/updater/components/Release.vue';
   import {computed, ref} from 'vue';
-  import CpLink from '@/components/CpLink.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import UpdaterController from '@actions/Updates/UpdaterController';
   import {Form, router} from '@inertiajs/vue3';
 
diff --git a/resources/js/components/utilities/Updates/Updates.vue b/resources/js/modules/updater/components/Updates.vue
similarity index 97%
rename from resources/js/components/utilities/Updates/Updates.vue
rename to resources/js/modules/updater/components/Updates.vue
index 13360a723b3..3f1d8294880 100644
--- a/resources/js/components/utilities/Updates/Updates.vue
+++ b/resources/js/modules/updater/components/Updates.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {computed, ref, watch} from 'vue';
-  import {useApiClient, useFetch} from '@/composables/useFetch';
-  import Empty from '@/components/Empty.vue';
-  import Update from '@/components/utilities/Updates/Update.vue';
+  import {useApiClient, useFetch} from '@/common/composables/useFetch';
+  import Empty from '@/common/components/Empty.vue';
+  import Update from '@/modules/updater/components/Update.vue';
   import {router} from '@inertiajs/vue3';
   import UpdaterController from '@actions/Updates/UpdaterController';
   import UpdatesController from '@actions/Updates/UpdatesController';
diff --git a/resources/js/composables/useUpdater.ts b/resources/js/modules/updater/composables/useUpdater.ts
similarity index 100%
rename from resources/js/composables/useUpdater.ts
rename to resources/js/modules/updater/composables/useUpdater.ts
diff --git a/resources/js/types/settings.ts b/resources/js/modules/user/types/settings.ts
similarity index 100%
rename from resources/js/types/settings.ts
rename to resources/js/modules/user/types/settings.ts
diff --git a/resources/js/types/user.ts b/resources/js/modules/user/types/user.ts
similarity index 100%
rename from resources/js/types/user.ts
rename to resources/js/modules/user/types/user.ts
diff --git a/resources/js/components/utilities/DatabaseBackup.vue b/resources/js/modules/utilities/components/DatabaseBackup.vue
similarity index 96%
rename from resources/js/components/utilities/DatabaseBackup.vue
rename to resources/js/modules/utilities/components/DatabaseBackup.vue
index d4ca5a59d8b..45fb30275a6 100644
--- a/resources/js/components/utilities/DatabaseBackup.vue
+++ b/resources/js/modules/utilities/components/DatabaseBackup.vue
@@ -4,7 +4,7 @@
   import {useForm} from '@inertiajs/vue3';
   import CraftCheckbox from '@craftcms/cp/vue/CraftCheckbox.vue';
   import {useTemplateRef} from 'vue';
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
 
   const form = useForm({
     downloadBackup: true,
diff --git a/resources/js/components/utilities/Migrations.vue b/resources/js/modules/utilities/components/Migrations.vue
similarity index 91%
rename from resources/js/components/utilities/Migrations.vue
rename to resources/js/modules/utilities/components/Migrations.vue
index f209474c37e..0e275db90d8 100644
--- a/resources/js/components/utilities/Migrations.vue
+++ b/resources/js/modules/utilities/components/Migrations.vue
@@ -7,10 +7,10 @@
     useVueTable,
   } from '@tanstack/vue-table';
   import {computed, ref} from 'vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import Empty from '@/components/Empty.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import Empty from '@/common/components/Empty.vue';
   import {Form} from '@inertiajs/vue3';
-  import VarDump from '@/components/VarDump.vue';
+  import VarDump from '@/common/components/VarDump.vue';
 
   interface Migration {
     id?: number;
diff --git a/resources/js/components/utilities/AssetIndexes/AssetIndexes.vue b/resources/js/modules/utilities/components/asset-indexes/AssetIndexes.vue
similarity index 90%
rename from resources/js/components/utilities/AssetIndexes/AssetIndexes.vue
rename to resources/js/modules/utilities/components/asset-indexes/AssetIndexes.vue
index 0dcd9d0d190..57387b4f07d 100644
--- a/resources/js/components/utilities/AssetIndexes/AssetIndexes.vue
+++ b/resources/js/modules/utilities/components/asset-indexes/AssetIndexes.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import CheckboxGroup from '@/components/form/CheckboxGroup.vue';
-  import type {CheckboxOption} from '@/types';
-  import IndexingSessions from '@/components/utilities/AssetIndexes/IndexingSessions.vue';
+  import CheckboxGroup from '@/common/form/CheckboxGroup.vue';
+  import type {CheckboxOption} from '@/common/types';
+  import IndexingSessions from '@/modules/utilities/components/asset-indexes/IndexingSessions.vue';
   import {reactive} from 'vue';
-  import {useAssetIndexer} from '@/composables/useAssetIndexer';
+  import {useAssetIndexer} from '@/modules/utilities/composables/useAssetIndexer';
   import type {IndexingSession} from '@craftcms/cp/services/AssetIndexer.ts.mjs';
 
   const props = withDefaults(
diff --git a/resources/js/components/utilities/AssetIndexes/IndexingSessions.vue b/resources/js/modules/utilities/components/asset-indexes/IndexingSessions.vue
similarity index 90%
rename from resources/js/components/utilities/AssetIndexes/IndexingSessions.vue
rename to resources/js/modules/utilities/components/asset-indexes/IndexingSessions.vue
index 39121f901df..2e7b68fe788 100644
--- a/resources/js/components/utilities/AssetIndexes/IndexingSessions.vue
+++ b/resources/js/modules/utilities/components/asset-indexes/IndexingSessions.vue
@@ -6,14 +6,14 @@
   } from '@tanstack/vue-table';
   import {h, ref} from 'vue';
   import {t} from '@craftcms/cp';
-  import Badge from '@/components/Badge.vue';
-  import SessionProgress from '@/components/utilities/AssetIndexes/SessionProgress.vue';
-  import SessionActions from '@/components/utilities/AssetIndexes/SessionActions.vue';
-  import {useAssetIndexer} from '@/composables/useAssetIndexer';
+  import Badge from '@/common/components/Badge.vue';
+  import SessionProgress from '@/modules/utilities/components/asset-indexes/SessionProgress.vue';
+  import SessionActions from '@/modules/utilities/components/asset-indexes/SessionActions.vue';
+  import {useAssetIndexer} from '@/modules/utilities/composables/useAssetIndexer';
   import {type IndexingSession} from '@craftcms/cp/services/AssetIndexer.ts.mjs';
-  import ReviewSessionModal from '@/components/utilities/AssetIndexes/ReviewSessionModal.vue';
-  import SessionVolumes from '@/components/utilities/AssetIndexes/SessionVolumes.vue';
-  import Date from '@/components/Date.vue';
+  import ReviewSessionModal from '@/modules/utilities/components/asset-indexes/ReviewSessionModal.vue';
+  import SessionVolumes from '@/modules/utilities/components/asset-indexes/SessionVolumes.vue';
+  import Date from '@/common/components/Date.vue';
 
   const {
     sessionsArray,
diff --git a/resources/js/components/utilities/AssetIndexes/ReviewSessionModal.vue b/resources/js/modules/utilities/components/asset-indexes/ReviewSessionModal.vue
similarity index 96%
rename from resources/js/components/utilities/AssetIndexes/ReviewSessionModal.vue
rename to resources/js/modules/utilities/components/asset-indexes/ReviewSessionModal.vue
index ebe4531f4f5..b5d40e2dcc1 100644
--- a/resources/js/components/utilities/AssetIndexes/ReviewSessionModal.vue
+++ b/resources/js/modules/utilities/components/asset-indexes/ReviewSessionModal.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import ModalForm from '@/components/ModalForm.vue';
+  import ModalForm from '@/common/components/ModalForm.vue';
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import {useAssetIndexer} from '@/composables/useAssetIndexer';
+  import {useAssetIndexer} from '@/modules/utilities/composables/useAssetIndexer';
   import {computed, reactive} from 'vue';
   import {escapeHtml} from '@craftcms/cp/utilities/escapeHtml.ts.mjs';
-  import CheckboxGroup from '@/components/form/CheckboxGroup.vue';
+  import CheckboxGroup from '@/common/form/CheckboxGroup.vue';
   import type {FinishIndexingParams} from '@craftcms/cp/services/AssetIndexer.ts.mjs';
   import {router} from '@inertiajs/vue3';
   import {show} from '@routes/cp/utilities';
diff --git a/resources/js/components/utilities/AssetIndexes/SessionActions.vue b/resources/js/modules/utilities/components/asset-indexes/SessionActions.vue
similarity index 100%
rename from resources/js/components/utilities/AssetIndexes/SessionActions.vue
rename to resources/js/modules/utilities/components/asset-indexes/SessionActions.vue
diff --git a/resources/js/components/utilities/AssetIndexes/SessionProgress.vue b/resources/js/modules/utilities/components/asset-indexes/SessionProgress.vue
similarity index 100%
rename from resources/js/components/utilities/AssetIndexes/SessionProgress.vue
rename to resources/js/modules/utilities/components/asset-indexes/SessionProgress.vue
diff --git a/resources/js/components/utilities/AssetIndexes/SessionVolumes.vue b/resources/js/modules/utilities/components/asset-indexes/SessionVolumes.vue
similarity index 100%
rename from resources/js/components/utilities/AssetIndexes/SessionVolumes.vue
rename to resources/js/modules/utilities/components/asset-indexes/SessionVolumes.vue
diff --git a/resources/js/components/utilities/ClearCaches/ClearCaches.vue b/resources/js/modules/utilities/components/clear-caches/ClearCaches.vue
similarity index 92%
rename from resources/js/components/utilities/ClearCaches/ClearCaches.vue
rename to resources/js/modules/utilities/components/clear-caches/ClearCaches.vue
index 7d4c2826aca..8bb16e6f988 100644
--- a/resources/js/components/utilities/ClearCaches/ClearCaches.vue
+++ b/resources/js/modules/utilities/components/clear-caches/ClearCaches.vue
@@ -5,10 +5,10 @@
     clearCaches,
     invalidateTags,
   } from '@actions/Utilities/ClearCachesController';
-  import TransitionFade from '@/components/TransitionFade.vue';
-  import CheckboxGroup from '@/components/form/CheckboxGroup.vue';
-  import {useAnnouncer} from '@/composables/useAnnouncer';
-  import type {SelectOption} from '@/types';
+  import TransitionFade from '@/common/components/TransitionFade.vue';
+  import CheckboxGroup from '@/common/form/CheckboxGroup.vue';
+  import {useAnnouncer} from '@/common/composables/useAnnouncer';
+  import type {SelectOption} from '@/common/types';
 
   interface CacheOption extends SelectOption {
     info?: string;
diff --git a/resources/js/components/utilities/DeprecationErrors/DeleteLogButton.vue b/resources/js/modules/utilities/components/deprecation-errors/DeleteLogButton.vue
similarity index 84%
rename from resources/js/components/utilities/DeprecationErrors/DeleteLogButton.vue
rename to resources/js/modules/utilities/components/deprecation-errors/DeleteLogButton.vue
index ba99b51e077..c379ec9eef7 100644
--- a/resources/js/components/utilities/DeprecationErrors/DeleteLogButton.vue
+++ b/resources/js/modules/utilities/components/deprecation-errors/DeleteLogButton.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
   import {useForm} from '@inertiajs/vue3';
   import {deleteDeprecationError} from '@actions/Utilities/DeprecationErrorsController';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
 
   const {flash} = useFlashMessages();
 
diff --git a/resources/js/components/utilities/DeprecationErrors/DeprecationErrors.vue b/resources/js/modules/utilities/components/deprecation-errors/DeprecationErrors.vue
similarity index 80%
rename from resources/js/components/utilities/DeprecationErrors/DeprecationErrors.vue
rename to resources/js/modules/utilities/components/deprecation-errors/DeprecationErrors.vue
index 635aeb04ee0..7a27ba05d6e 100644
--- a/resources/js/components/utilities/DeprecationErrors/DeprecationErrors.vue
+++ b/resources/js/modules/utilities/components/deprecation-errors/DeprecationErrors.vue
@@ -2,11 +2,11 @@
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
   import {h, ref} from 'vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import DeleteLogButton from '@/components/utilities/DeprecationErrors/DeleteLogButton.vue';
-  import StackTraceButton from '@/components/utilities/DeprecationErrors/StackTraceButton.vue';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import Empty from '@/components/Empty.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import DeleteLogButton from '@/modules/utilities/components/deprecation-errors/DeleteLogButton.vue';
+  import StackTraceButton from '@/modules/utilities/components/deprecation-errors/StackTraceButton.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import Empty from '@/common/components/Empty.vue';
 
   export interface LogData {
     id: number;
diff --git a/resources/js/components/utilities/DeprecationErrors/DeprecationErrorsToolbar.vue b/resources/js/modules/utilities/components/deprecation-errors/DeprecationErrorsToolbar.vue
similarity index 85%
rename from resources/js/components/utilities/DeprecationErrors/DeprecationErrorsToolbar.vue
rename to resources/js/modules/utilities/components/deprecation-errors/DeprecationErrorsToolbar.vue
index 9a49db3fdf8..83c8cfa8519 100644
--- a/resources/js/components/utilities/DeprecationErrors/DeprecationErrorsToolbar.vue
+++ b/resources/js/modules/utilities/components/deprecation-errors/DeprecationErrorsToolbar.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {Form} from '@inertiajs/vue3';
-  import type {LogData} from '@/components/utilities/DeprecationErrors/DeprecationErrors.vue';
+  import type {LogData} from '@/modules/utilities/components/deprecation-errors/DeprecationErrors.vue';
   import {deleteAllDeprecationErrors} from '@actions/Utilities/DeprecationErrorsController';
 
   defineProps<{
diff --git a/resources/js/components/utilities/DeprecationErrors/StackTrace.vue b/resources/js/modules/utilities/components/deprecation-errors/StackTrace.vue
similarity index 94%
rename from resources/js/components/utilities/DeprecationErrors/StackTrace.vue
rename to resources/js/modules/utilities/components/deprecation-errors/StackTrace.vue
index 3249d025ced..76f74de11b2 100644
--- a/resources/js/components/utilities/DeprecationErrors/StackTrace.vue
+++ b/resources/js/modules/utilities/components/deprecation-errors/StackTrace.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import {onMounted, ref} from 'vue';
-  import Pane from '@/components/Pane.vue';
+  import Pane from '@/common/components/Pane.vue';
   import {useHttp} from '@inertiajs/vue3';
   import {getDeprecationErrorTracesModal} from '@actions/Utilities/DeprecationErrorsController';
 
diff --git a/resources/js/components/utilities/DeprecationErrors/StackTraceButton.vue b/resources/js/modules/utilities/components/deprecation-errors/StackTraceButton.vue
similarity index 77%
rename from resources/js/components/utilities/DeprecationErrors/StackTraceButton.vue
rename to resources/js/modules/utilities/components/deprecation-errors/StackTraceButton.vue
index edc73a30f0f..c50cc250c2b 100644
--- a/resources/js/components/utilities/DeprecationErrors/StackTraceButton.vue
+++ b/resources/js/modules/utilities/components/deprecation-errors/StackTraceButton.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import Modal from '@/components/Modal.vue';
+  import Modal from '@/common/components/Modal.vue';
   import {ref} from 'vue';
-  import StackTrace from '@/components/utilities/DeprecationErrors/StackTrace.vue';
+  import StackTrace from '@/modules/utilities/components/deprecation-errors/StackTrace.vue';
 
   const isActive = ref(false);
 
diff --git a/resources/js/components/utilities/FindReplace/FindReplace.vue b/resources/js/modules/utilities/components/find-replace/FindReplace.vue
similarity index 95%
rename from resources/js/components/utilities/FindReplace/FindReplace.vue
rename to resources/js/modules/utilities/components/find-replace/FindReplace.vue
index 97a074c5916..d95be1a8f06 100644
--- a/resources/js/components/utilities/FindReplace/FindReplace.vue
+++ b/resources/js/modules/utilities/components/find-replace/FindReplace.vue
@@ -3,7 +3,7 @@
   import findAndReplaceController from '@actions/Utilities/FindAndReplaceController.ts';
   import {useForm} from '@inertiajs/vue3';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
-  import InlineFlash from '@/components/InlineFlash.vue';
+  import InlineFlash from '@/common/components/InlineFlash.vue';
 
   const form = useForm({
     find: '',
diff --git a/resources/js/components/utilities/ProjectConfig/ProjectConfig.vue b/resources/js/modules/utilities/components/project-config/ProjectConfig.vue
similarity index 95%
rename from resources/js/components/utilities/ProjectConfig/ProjectConfig.vue
rename to resources/js/modules/utilities/components/project-config/ProjectConfig.vue
index 237ee202b48..c4b1f843385 100644
--- a/resources/js/components/utilities/ProjectConfig/ProjectConfig.vue
+++ b/resources/js/modules/utilities/components/project-config/ProjectConfig.vue
@@ -2,12 +2,12 @@
   import {computed} from 'vue';
   import {t} from '@craftcms/cp';
   import ProjectConfigDiff from './ProjectConfigDiff.vue';
-  import {useProjectConfig} from '@/composables/useProjectConfig';
-  import Pane from '@/components/Pane.vue';
+  import {useProjectConfig} from '@/modules/utilities/composables/useProjectConfig';
+  import Pane from '@/common/components/Pane.vue';
   import {Form} from '@inertiajs/vue3';
   import {discard, rebuild} from '@actions/Utilities/ProjectConfigController';
-  import SyncConfigButton from '@/components/utilities/ProjectConfig/SyncConfigButton.vue';
-  import TransitionFade from '@/components/TransitionFade.vue';
+  import SyncConfigButton from '@/modules/utilities/components/project-config/SyncConfigButton.vue';
+  import TransitionFade from '@/common/components/TransitionFade.vue';
 
   const props = defineProps<{
     readOnly: boolean;
diff --git a/resources/js/components/utilities/ProjectConfig/ProjectConfigDiff.vue b/resources/js/modules/utilities/components/project-config/ProjectConfigDiff.vue
similarity index 96%
rename from resources/js/components/utilities/ProjectConfig/ProjectConfigDiff.vue
rename to resources/js/modules/utilities/components/project-config/ProjectConfigDiff.vue
index 94ccf8f319e..93369d1c577 100644
--- a/resources/js/components/utilities/ProjectConfig/ProjectConfigDiff.vue
+++ b/resources/js/modules/utilities/components/project-config/ProjectConfigDiff.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {computed, ref, watch} from 'vue';
   import {t} from '@craftcms/cp';
-  import Pane from '@/components/Pane.vue';
+  import Pane from '@/common/components/Pane.vue';
   import ProjectConfigController from '@actions/Utilities/ProjectConfigController';
-  import {useFetch} from '@/composables/useFetch';
+  import {useFetch} from '@/common/composables/useFetch';
 
   const props = defineProps<{
     invert: boolean;
diff --git a/resources/js/components/utilities/ProjectConfig/SyncConfigButton.vue b/resources/js/modules/utilities/components/project-config/SyncConfigButton.vue
similarity index 100%
rename from resources/js/components/utilities/ProjectConfig/SyncConfigButton.vue
rename to resources/js/modules/utilities/components/project-config/SyncConfigButton.vue
diff --git a/resources/js/components/utilities/QueueManager/QueueManager.vue b/resources/js/modules/utilities/components/queue-manager/QueueManager.vue
similarity index 81%
rename from resources/js/components/utilities/QueueManager/QueueManager.vue
rename to resources/js/modules/utilities/components/queue-manager/QueueManager.vue
index 4881d1f6f59..e38e1e34933 100644
--- a/resources/js/components/utilities/QueueManager/QueueManager.vue
+++ b/resources/js/modules/utilities/components/queue-manager/QueueManager.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import QueueManagerIndex from '@/components/utilities/QueueManager/QueueManagerIndex.vue';
-  import QueueManagerShow from '@/components/utilities/QueueManager/QueueManagerShow.vue';
+  import QueueManagerIndex from '@/modules/utilities/components/queue-manager/QueueManagerIndex.vue';
+  import QueueManagerShow from '@/modules/utilities/components/queue-manager/QueueManagerShow.vue';
   import {inject, onMounted, ref} from 'vue';
   import type {JobInfo} from '@craftcms/cp/types/index.ts';
-  import {Queue} from '@/types/keys';
+  import {Queue} from '@/common/types/keys';
 
   const props = withDefaults(
     defineProps<{
diff --git a/resources/js/components/utilities/QueueManager/QueueManagerIndex.vue b/resources/js/modules/utilities/components/queue-manager/QueueManagerIndex.vue
similarity index 85%
rename from resources/js/components/utilities/QueueManager/QueueManagerIndex.vue
rename to resources/js/modules/utilities/components/queue-manager/QueueManagerIndex.vue
index 9ab3ce8cc92..599be2d158d 100644
--- a/resources/js/components/utilities/QueueManager/QueueManagerIndex.vue
+++ b/resources/js/modules/utilities/components/queue-manager/QueueManagerIndex.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import Pane from '@/components/Pane.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import Pane from '@/common/components/Pane.vue';
   import {h, ref} from 'vue';
   import {
     createColumnHelper,
     getCoreRowModel,
     useVueTable,
   } from '@tanstack/vue-table';
-  import CpLink from '@/components/CpLink.vue';
-  import Badge from '@/components/Badge.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import Badge from '@/common/components/Badge.vue';
   import {type JobInfo, JobStatus} from '@craftcms/cp/types/index.ts';
-  import RetryJobButton from '@/components/utilities/QueueManager/RetryJobButton.vue';
-  import ReleaseJobButton from '@/components/utilities/QueueManager/ReleaseJobButton.vue';
+  import RetryJobButton from '@/modules/utilities/components/queue-manager/RetryJobButton.vue';
+  import ReleaseJobButton from '@/modules/utilities/components/queue-manager/ReleaseJobButton.vue';
   import {show} from '@routes/cp/utilities';
-  import Empty from '@/components/Empty.vue';
+  import Empty from '@/common/components/Empty.vue';
 
   const props = withDefaults(
     defineProps<{
diff --git a/resources/js/components/utilities/QueueManager/QueueManagerShow.vue b/resources/js/modules/utilities/components/queue-manager/QueueManagerShow.vue
similarity index 97%
rename from resources/js/components/utilities/QueueManager/QueueManagerShow.vue
rename to resources/js/modules/utilities/components/queue-manager/QueueManagerShow.vue
index 089734eb0c3..4d61c1b60c8 100644
--- a/resources/js/components/utilities/QueueManager/QueueManagerShow.vue
+++ b/resources/js/modules/utilities/components/queue-manager/QueueManagerShow.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {type JobInfo} from '@craftcms/cp/types/index.ts';
-  import VarDump from '@/components/VarDump.vue';
-  import Badge from '@/components/Badge.vue';
+  import VarDump from '@/common/components/VarDump.vue';
+  import Badge from '@/common/components/Badge.vue';
 
   defineProps<{
     job: JobInfo;
diff --git a/resources/js/components/utilities/QueueManager/QueueManagerToolbar.vue b/resources/js/modules/utilities/components/queue-manager/QueueManagerToolbar.vue
similarity index 87%
rename from resources/js/components/utilities/QueueManager/QueueManagerToolbar.vue
rename to resources/js/modules/utilities/components/queue-manager/QueueManagerToolbar.vue
index 878f3ad401c..af96d2eb338 100644
--- a/resources/js/components/utilities/QueueManager/QueueManagerToolbar.vue
+++ b/resources/js/modules/utilities/components/queue-manager/QueueManagerToolbar.vue
@@ -2,15 +2,15 @@
   import {type JobInfo, JobStatus} from '@craftcms/cp/types/index.ts';
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {computed, inject, ref, watch} from 'vue';
-  import {Axios, Queue} from '@/types/keys';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
-  import TransitionFade from '@/components/TransitionFade.vue';
-  import {useActionClient} from '@/composables/useFetch';
+  import {Axios, Queue} from '@/common/types/keys';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import TransitionFade from '@/common/components/TransitionFade.vue';
+  import {useActionClient} from '@/common/composables/useFetch';
   import {router} from '@inertiajs/vue3';
   import {show} from '@routes/cp/utilities';
-  import CpLink from '@/components/CpLink.vue';
-  import RetryJobButton from '@/components/utilities/QueueManager/RetryJobButton.vue';
-  import ReleaseJobButton from '@/components/utilities/QueueManager/ReleaseJobButton.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import RetryJobButton from '@/modules/utilities/components/queue-manager/RetryJobButton.vue';
+  import ReleaseJobButton from '@/modules/utilities/components/queue-manager/ReleaseJobButton.vue';
 
   const props = withDefaults(
     defineProps<{
diff --git a/resources/js/components/utilities/QueueManager/ReleaseJobButton.vue b/resources/js/modules/utilities/components/queue-manager/ReleaseJobButton.vue
similarity index 90%
rename from resources/js/components/utilities/QueueManager/ReleaseJobButton.vue
rename to resources/js/modules/utilities/components/queue-manager/ReleaseJobButton.vue
index 9d15518d924..349cad1363c 100644
--- a/resources/js/components/utilities/QueueManager/ReleaseJobButton.vue
+++ b/resources/js/modules/utilities/components/queue-manager/ReleaseJobButton.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {type JobInfo} from '@craftcms/cp/types/index.ts';
-  import {useActionClient} from '@/composables/useFetch';
+  import {useActionClient} from '@/common/composables/useFetch';
   import {unref, watch} from 'vue';
   import {router} from '@inertiajs/vue3';
   import {show} from '@routes/cp/utilities';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
 
   const props = defineProps<{
     job: JobInfo;
diff --git a/resources/js/components/utilities/QueueManager/RetryJobButton.vue b/resources/js/modules/utilities/components/queue-manager/RetryJobButton.vue
similarity index 91%
rename from resources/js/components/utilities/QueueManager/RetryJobButton.vue
rename to resources/js/modules/utilities/components/queue-manager/RetryJobButton.vue
index 520336c744e..edf68cf10d7 100644
--- a/resources/js/components/utilities/QueueManager/RetryJobButton.vue
+++ b/resources/js/modules/utilities/components/queue-manager/RetryJobButton.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
   import {type JobInfo, JobStatus} from '@craftcms/cp/types/index.ts';
-  import {useActionClient} from '@/composables/useFetch';
+  import {useActionClient} from '@/common/composables/useFetch';
   import {unref, watch} from 'vue';
   import {router} from '@inertiajs/vue3';
   import {show} from '@routes/cp/utilities';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
 
   const props = defineProps<{
     job: JobInfo;
diff --git a/resources/js/components/utilities/SystemMessages/SystemMessageEditModal.vue b/resources/js/modules/utilities/components/system-messages/SystemMessageEditModal.vue
similarity index 97%
rename from resources/js/components/utilities/SystemMessages/SystemMessageEditModal.vue
rename to resources/js/modules/utilities/components/system-messages/SystemMessageEditModal.vue
index 32a3100c07d..d8344413474 100644
--- a/resources/js/components/utilities/SystemMessages/SystemMessageEditModal.vue
+++ b/resources/js/modules/utilities/components/system-messages/SystemMessageEditModal.vue
@@ -3,8 +3,8 @@
   import {t} from '@craftcms/cp';
   import {useHttp} from '@inertiajs/vue3';
   import {useEventListener} from '@vueuse/core';
-  import ModalForm from '@/components/ModalForm.vue';
-  import {useAnnouncer} from '@/composables/useAnnouncer';
+  import ModalForm from '@/common/components/ModalForm.vue';
+  import {useAnnouncer} from '@/common/composables/useAnnouncer';
   import {store} from '@actions/Utilities/SystemMessagesController';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
   import CraftTextarea from '@craftcms/cp/vue/CraftTextarea.vue';
diff --git a/resources/js/components/utilities/SystemMessages/SystemMessages.vue b/resources/js/modules/utilities/components/system-messages/SystemMessages.vue
similarity index 90%
rename from resources/js/components/utilities/SystemMessages/SystemMessages.vue
rename to resources/js/modules/utilities/components/system-messages/SystemMessages.vue
index 2e0701f0e43..0435d47edf5 100644
--- a/resources/js/components/utilities/SystemMessages/SystemMessages.vue
+++ b/resources/js/modules/utilities/components/system-messages/SystemMessages.vue
@@ -2,10 +2,10 @@
   import {t} from '@craftcms/cp';
   import {ref} from 'vue';
   import SystemMessageEditModal from './SystemMessageEditModal.vue';
-  import Pane from '@/components/Pane.vue';
-  import type {SelectOption} from '@/types';
-  import type {SystemMessageData} from '@/types/utilities';
-  import {useFlashMessages} from '@/composables/useFlashMessages';
+  import Pane from '@/common/components/Pane.vue';
+  import type {SelectOption} from '@/common/types';
+  import type {SystemMessageData} from '@/modules/utilities/types/utilities';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
 
   const props = defineProps<{
     messages: Array<SystemMessageData>;
diff --git a/resources/js/composables/useAssetIndexer.ts b/resources/js/modules/utilities/composables/useAssetIndexer.ts
similarity index 100%
rename from resources/js/composables/useAssetIndexer.ts
rename to resources/js/modules/utilities/composables/useAssetIndexer.ts
diff --git a/resources/js/composables/useProjectConfig.ts b/resources/js/modules/utilities/composables/useProjectConfig.ts
similarity index 100%
rename from resources/js/composables/useProjectConfig.ts
rename to resources/js/modules/utilities/composables/useProjectConfig.ts
diff --git a/resources/js/types/utilities.ts b/resources/js/modules/utilities/types/utilities.ts
similarity index 100%
rename from resources/js/types/utilities.ts
rename to resources/js/modules/utilities/types/utilities.ts
diff --git a/resources/js/pages/LoginPage.vue b/resources/js/pages/auth/Login.vue
similarity index 86%
rename from resources/js/pages/LoginPage.vue
rename to resources/js/pages/auth/Login.vue
index 0ca2252fd47..703e53971dd 100644
--- a/resources/js/pages/LoginPage.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {usePage} from '@inertiajs/vue3';
-  import useCraftData from '@/composables/useCraftData';
-  import AuthBase from '@/layout/AuthBase.vue';
+  import useCraftData from '@/common/composables/useCraftData';
+  import AuthBase from '@/common/layouts/AuthBase.vue';
   import {attemptLogin} from '@actions/Auth/LoginController';
   import '../components/Auth/login/login-form.js';
 
diff --git a/resources/js/pages/GraphQlSchemasPage.vue b/resources/js/pages/graphql/Schemas.vue
similarity index 85%
rename from resources/js/pages/GraphQlSchemasPage.vue
rename to resources/js/pages/graphql/Schemas.vue
index c703fb64bc7..0580bb2cc78 100644
--- a/resources/js/pages/GraphQlSchemasPage.vue
+++ b/resources/js/pages/graphql/Schemas.vue
@@ -1,19 +1,19 @@
 <script setup lang="ts">
   import {h} from 'vue';
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import Pane from '@/components/Pane.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
   import {
     create,
     destroy,
     edit,
     editPublic,
   } from '@actions/Gql/SchemasController';
-  import CpLink from '@/components/CpLink.vue';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
   import {router} from '@inertiajs/vue3';
 
   interface SchemaData {
diff --git a/resources/js/pages/GraphQlTokensPage.vue b/resources/js/pages/graphql/Tokens.vue
similarity index 84%
rename from resources/js/pages/GraphQlTokensPage.vue
rename to resources/js/pages/graphql/Tokens.vue
index 10b917e9d6e..ce5f4a2c052 100644
--- a/resources/js/pages/GraphQlTokensPage.vue
+++ b/resources/js/pages/graphql/Tokens.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
   import {h} from 'vue';
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import Pane from '@/components/Pane.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import CpLink from '@/components/CpLink.vue';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import CpLink from '@/common/components/CpLink.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
   import {router} from '@inertiajs/vue3';
   import {create, destroy, edit} from '@actions/Gql/TokensController';
-  import Empty from '@/components/Empty.vue';
+  import Empty from '@/common/components/Empty.vue';
 
   export interface TokenData {
     id: number;
diff --git a/resources/js/pages/Install.vue b/resources/js/pages/install/Install.vue
similarity index 93%
rename from resources/js/pages/Install.vue
rename to resources/js/pages/install/Install.vue
index 4745719a4ba..3caa063ca3d 100644
--- a/resources/js/pages/Install.vue
+++ b/resources/js/pages/install/Install.vue
@@ -3,17 +3,17 @@
   import {t} from '@craftcms/cp';
   import backgroundUrl from '../../public/images/install/installer-bg.png';
   import {computed, reactive, watchEffect} from 'vue';
-  import AccountFields from '@/components/install/AccountFields.vue';
-  import SiteFields from '@/components/install/SiteFields.vue';
-  import {useInstall} from '@/composables/useInstall';
+  import AccountFields from '@/modules/install/components/AccountFields.vue';
+  import SiteFields from '@/modules/install/components/SiteFields.vue';
+  import {useInstall} from '@/modules/install/composables/useInstall';
   import accountBg from '../../public/images/install/account.png';
   import siteBg from '../../public/images/install/site.png';
   import dbBg from '../../public/images/install/db.png';
-  import DbFields from '@/components/install/DbFields.vue';
-  import InstallingScreen from '@/components/install/InstallingScreen.vue';
-  import Pane from '@/components/Pane.vue';
-  import Modal from '@/components/Modal.vue';
-  import StepScreen from '@/components/install/StepScreen.vue';
+  import DbFields from '@/modules/install/components/DbFields.vue';
+  import InstallingScreen from '@/modules/install/components/InstallingScreen.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import Modal from '@/common/components/Modal.vue';
+  import StepScreen from '@/modules/install/components/StepScreen.vue';
 
   const backgroundImageUrl = computed(() => `url(${backgroundUrl})`);
   const props = defineProps<{
diff --git a/resources/js/pages/SettingsEmailPage.vue b/resources/js/pages/settings/Email.vue
similarity index 93%
rename from resources/js/pages/SettingsEmailPage.vue
rename to resources/js/pages/settings/Email.vue
index 7c185b28dfd..d26aa726fcb 100644
--- a/resources/js/pages/SettingsEmailPage.vue
+++ b/resources/js/pages/settings/Email.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import {useForm} from '@inertiajs/vue3';
   import {computed} from 'vue';
-  import type {SelectItem, SuggestionGroup} from '@/types';
-  import SiteOverridesTable from '@/components/Settings/Email/SiteOverridesTable.vue';
-  import CraftCombobox from '@/components/form/CraftCombobox.vue';
+  import type {SelectItem, SuggestionGroup} from '@/common/types';
+  import SiteOverridesTable from '@/modules/settings/components/email/SiteOverridesTable.vue';
+  import CraftCombobox from '@/common/form/CraftCombobox.vue';
   import {store, test} from '@routes/cp/settings/email';
-  import Pane from '@/components/Pane.vue';
-  import InlineFlash from '@/components/InlineFlash.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import InlineFlash from '@/common/components/InlineFlash.vue';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
-  import {useSettingsSave} from '@/composables/useSettingsSave';
+  import {useSettingsSave} from '@/modules/settings/composables/useSettingsSave';
 
   const props = defineProps<{
     readOnly?: boolean;
diff --git a/resources/js/pages/SettingsEntryTypesIndexPage.vue b/resources/js/pages/settings/EntryTypes.vue
similarity index 83%
rename from resources/js/pages/SettingsEntryTypesIndexPage.vue
rename to resources/js/pages/settings/EntryTypes.vue
index 5b1b3e82bed..b9e2a1f15c9 100644
--- a/resources/js/pages/SettingsEntryTypesIndexPage.vue
+++ b/resources/js/pages/settings/EntryTypes.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import {type PaginationData, type SortItem, TableSpacing} from '@/types';
+  import {type PaginationData, type SortItem, TableSpacing} from '@/common/types';
   import {computed, h, ref} from 'vue';
-  import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
+  import DynamicHtmlRenderer from '@/common/components/DynamicHtmlRenderer.vue';
   import {router} from '@inertiajs/vue3';
   import {create, destroy, index} from '@actions/Settings/EntryTypesController';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import Pane from '@/components/Pane.vue';
-  import {useServerPagination} from '@/composables/useServerPagination';
-  import SearchForm from '@/components/AdminTable/SearchForm.vue';
-  import {useServerSort} from '@/composables/useServerSort';
-  import CpLink from '@/components/CpLink.vue';
-  import Empty from '@/components/Empty.vue';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import {useServerPagination} from '@/modules/admin-table/composables/useServerPagination';
+  import SearchForm from '@/modules/admin-table/components/SearchForm.vue';
+  import {useServerSort} from '@/modules/admin-table/composables/useServerSort';
+  import CpLink from '@/common/components/CpLink.vue';
+  import Empty from '@/common/components/Empty.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
 
   type EntryTypeRow = {
     id: number;
diff --git a/resources/js/pages/SettingsFieldsIndexPage.vue b/resources/js/pages/settings/Fields.vue
similarity index 88%
rename from resources/js/pages/SettingsFieldsIndexPage.vue
rename to resources/js/pages/settings/Fields.vue
index a6c51827e46..c551e879fc1 100644
--- a/resources/js/pages/SettingsFieldsIndexPage.vue
+++ b/resources/js/pages/settings/Fields.vue
@@ -1,23 +1,23 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {
     createColumnHelper,
     getCoreRowModel,
     useVueTable,
   } from '@tanstack/vue-table';
   import {computed, h, ref} from 'vue';
-  import type {PaginationData, SortItem} from '@/types';
-  import {useServerPagination} from '@/composables/useServerPagination';
-  import Pane from '@/components/Pane.vue';
+  import type {PaginationData, SortItem} from '@/common/types';
+  import {useServerPagination} from '@/modules/admin-table/composables/useServerPagination';
+  import Pane from '@/common/components/Pane.vue';
   import {router} from '@inertiajs/vue3';
   import {create, destroy, index} from '@actions/FieldsController';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
-  import CpLink from '@/components/CpLink.vue';
-  import {useServerSort} from '@/composables/useServerSort';
-  import SearchForm from '@/components/AdminTable/SearchForm.vue';
-  import Empty from '@/components/Empty.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import {useServerSort} from '@/modules/admin-table/composables/useServerSort';
+  import SearchForm from '@/modules/admin-table/components/SearchForm.vue';
+  import Empty from '@/common/components/Empty.vue';
 
   type FieldRow = {
     id: number;
diff --git a/resources/js/pages/SettingsFilesystemsIndexPage.vue b/resources/js/pages/settings/Filesystems.vue
similarity index 83%
rename from resources/js/pages/SettingsFilesystemsIndexPage.vue
rename to resources/js/pages/settings/Filesystems.vue
index f2b79dda878..3f1fa8af8cf 100644
--- a/resources/js/pages/SettingsFilesystemsIndexPage.vue
+++ b/resources/js/pages/settings/Filesystems.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {
     createColumnHelper,
     getCoreRowModel,
     useVueTable,
   } from '@tanstack/vue-table';
   import {computed, h, ref} from 'vue';
-  import Empty from '@/components/Empty.vue';
-  import CpLink from '@/components/CpLink.vue';
+  import Empty from '@/common/components/Empty.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import {create, destroy, edit} from '@actions/Settings/FilesystemsController';
-  import IndexLayout from '@/layout/IndexLayout.vue';
-  import VarDump from '@/components/VarDump.vue';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
+  import VarDump from '@/common/components/VarDump.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
   import {router} from '@inertiajs/vue3';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import Pane from '@/components/Pane.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import Pane from '@/common/components/Pane.vue';
 
   interface FileSystemData {
     name: string;
diff --git a/resources/js/pages/SettingsGeneralPage.vue b/resources/js/pages/settings/General.vue
similarity index 91%
rename from resources/js/pages/SettingsGeneralPage.vue
rename to resources/js/pages/settings/General.vue
index d71978b0ad4..54f785a3636 100644
--- a/resources/js/pages/SettingsGeneralPage.vue
+++ b/resources/js/pages/settings/General.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import {store} from '@/actions/CraftCms/Cms/Http/Controllers/Settings/GeneralSettingsController';
-  import {type SystemData} from '@/types/settings';
+  import {type SystemData} from '@/modules/user/types/settings';
   import {useForm} from '@inertiajs/vue3';
   import {computed} from 'vue';
-  import type {SelectItem} from '@/types';
-  import {useSettingsSave} from '@/composables/useSettingsSave';
-  import Pane from '@/components/Pane.vue';
-  import CraftCombobox from '@/components/form/CraftCombobox.vue';
+  import type {SelectItem} from '@/common/types';
+  import {useSettingsSave} from '@/modules/settings/composables/useSettingsSave';
+  import Pane from '@/common/components/Pane.vue';
+  import CraftCombobox from '@/common/form/CraftCombobox.vue';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
-  import {transformBooleanOptions} from '@/utils/transformBooleanOptions';
-  import useCraftData from '@/composables/useCraftData';
+  import {transformBooleanOptions} from '@/common/utils/transformBooleanOptions';
+  import useCraftData from '@/common/composables/useCraftData';
 
   const props = defineProps<{
     system: SystemData;
diff --git a/resources/js/pages/SettingsImageTransformsIndexPage.vue b/resources/js/pages/settings/ImageTransforms.vue
similarity index 90%
rename from resources/js/pages/SettingsImageTransformsIndexPage.vue
rename to resources/js/pages/settings/ImageTransforms.vue
index bd368725a0a..01d5f01bd47 100644
--- a/resources/js/pages/SettingsImageTransformsIndexPage.vue
+++ b/resources/js/pages/settings/ImageTransforms.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
   import {capitalize, t} from '@craftcms/cp';
-  import IndexLayout from '@/layout/IndexLayout.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
   import {computed, h, ref} from 'vue';
-  import CpLink from '@/components/CpLink.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import {
     create,
     destroy,
     index as imageTransformsIndex,
   } from '@actions/Settings/ImageTransformsController';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
-  import Empty from '@/components/Empty.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import Empty from '@/common/components/Empty.vue';
   import {router} from '@inertiajs/vue3';
   import {index} from '@actions/Settings/VolumesController';
 
diff --git a/resources/js/pages/SettingsIndexPage.vue b/resources/js/pages/settings/Index.vue
similarity index 94%
rename from resources/js/pages/SettingsIndexPage.vue
rename to resources/js/pages/settings/Index.vue
index ff7c1761937..4fc7c039c37 100644
--- a/resources/js/pages/SettingsIndexPage.vue
+++ b/resources/js/pages/settings/Index.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import CalloutReadOnly from '@/components/CalloutReadOnly.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import CalloutReadOnly from '@/common/components/CalloutReadOnly.vue';
   import {default as settingsIndex} from '@actions/Settings/SettingsIndexController';
-  import CpLink from '@/components/CpLink.vue';
+  import CpLink from '@/common/components/CpLink.vue';
 
   interface SettingItem {
     icon?: string;
diff --git a/resources/js/pages/SettingsPluginsIndexPage.vue b/resources/js/pages/settings/Plugins.vue
similarity index 87%
rename from resources/js/pages/SettingsPluginsIndexPage.vue
rename to resources/js/pages/settings/Plugins.vue
index 1a6e236995c..61e59dbe219 100644
--- a/resources/js/pages/SettingsPluginsIndexPage.vue
+++ b/resources/js/pages/settings/Plugins.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import type {
     CmsLicenseData,
     PluginInfo,
     PluginLicenseResponseData,
-  } from '@/types/plugins';
-  import PluginsList from '@/components/Plugins/PluginsList.vue';
+  } from '@/modules/plugin-manager/types/plugins';
+  import PluginsList from '@/modules/plugin-manager/components/PluginsList.vue';
   import {useHttp} from '@inertiajs/vue3';
-  import {useApiClient} from '@/composables/useFetch';
+  import {useApiClient} from '@/common/composables/useFetch';
   import {computed, ref, watch} from 'vue';
   import PluginsController from '@actions/App/PluginsController';
 
diff --git a/resources/js/pages/SettingsSectionsIndexPage.vue b/resources/js/pages/settings/Sections.vue
similarity index 79%
rename from resources/js/pages/SettingsSectionsIndexPage.vue
rename to resources/js/pages/settings/Sections.vue
index f2cbf113eee..aa78f575011 100644
--- a/resources/js/pages/SettingsSectionsIndexPage.vue
+++ b/resources/js/pages/settings/Sections.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {h, ref} from 'vue';
   import {t} from '@craftcms/cp/utilities/translate.ts.mjs';
-  import DeleteSectionButton from '@/components/sections/DeleteSectionButton.vue';
+  import DeleteSectionButton from '@/modules/sections/components/DeleteSectionButton.vue';
   import {create, edit, index} from '@actions/Settings/SectionsController';
   import {router} from '@inertiajs/vue3';
-  import AppLayout from '@/layout/AppLayout.vue';
-  import Pane from '@/components/Pane.vue';
-  import CpLink from '@/components/CpLink.vue';
-  import useCraftData from '@/composables/useCraftData';
-  import CalloutReadOnly from '@/components/CalloutReadOnly.vue';
-  import type {PaginationData, SortItem} from '@/types';
-  import SearchForm from '@/components/AdminTable/SearchForm.vue';
-  import {useServerPagination} from '@/composables/useServerPagination';
-  import {useServerSort} from '@/composables/useServerSort';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
+  import Pane from '@/common/components/Pane.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import useCraftData from '@/common/composables/useCraftData';
+  import CalloutReadOnly from '@/common/components/CalloutReadOnly.vue';
+  import type {PaginationData, SortItem} from '@/common/types';
+  import SearchForm from '@/modules/admin-table/components/SearchForm.vue';
+  import {useServerPagination} from '@/modules/admin-table/composables/useServerPagination';
+  import {useServerSort} from '@/modules/admin-table/composables/useServerSort';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
 
   export interface SectionModel {
     id: number;
diff --git a/resources/js/pages/SettingsSectionsEditPage.vue b/resources/js/pages/settings/SectionsEdit.vue
similarity index 94%
rename from resources/js/pages/SettingsSectionsEditPage.vue
rename to resources/js/pages/settings/SectionsEdit.vue
index f6f688619f4..4c6aebebedb 100644
--- a/resources/js/pages/SettingsSectionsEditPage.vue
+++ b/resources/js/pages/settings/SectionsEdit.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import {useForm} from '@inertiajs/vue3';
   import {t, toHandle, toUriFormat} from '@craftcms/cp';
   import {computed} from 'vue';
@@ -7,19 +7,19 @@
   import CraftInputHandle from '@craftcms/cp/vue/CraftInputHandle.vue';
   import CraftSwitch from '@craftcms/cp/vue/CraftSwitch.vue';
   import CraftSelect from '@craftcms/cp/vue/CraftSelect.vue';
-  import EntryTypeSelect from '@/components/form/EntryTypeSelect.vue';
-  import {useInputGenerator} from '@/composables/useInputGenerator';
+  import EntryTypeSelect from '@/modules/entry-types/components/EntryTypeSelect.vue';
+  import {useInputGenerator} from '@/common/composables/useInputGenerator';
   import type {
     SectionResource,
     SectionSiteSettingsData,
     SelectOption,
-  } from '@/types';
-  import SiteSettingsTable from '@/components/sections/SiteSettingsTable.vue';
-  import PreviewTargetsTable from '@/components/sections/PreviewTargetsTable.vue';
-  import {useSettingsSave} from '@/composables/useSettingsSave';
-  import Pane from '@/components/Pane.vue';
+  } from '@/common/types';
+  import SiteSettingsTable from '@/modules/sections/components/SiteSettingsTable.vue';
+  import PreviewTargetsTable from '@/modules/sections/components/PreviewTargetsTable.vue';
+  import {useSettingsSave} from '@/modules/settings/composables/useSettingsSave';
+  import Pane from '@/common/components/Pane.vue';
   import {store} from '@actions/Settings/SectionsController';
-  import useCraftData from '@/composables/useCraftData';
+  import useCraftData from '@/common/composables/useCraftData';
 
   const props = defineProps<{
     title: string;
diff --git a/resources/js/pages/SettingsSitesIndex.vue b/resources/js/pages/settings/Sites.vue
similarity index 92%
rename from resources/js/pages/SettingsSitesIndex.vue
rename to resources/js/pages/settings/Sites.vue
index 6b811d53c53..c0f2f5a734f 100644
--- a/resources/js/pages/SettingsSitesIndex.vue
+++ b/resources/js/pages/settings/Sites.vue
@@ -1,23 +1,23 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import CalloutReadOnly from '@/components/CalloutReadOnly.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import CalloutReadOnly from '@/common/components/CalloutReadOnly.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
   import {computed, h, nextTick, ref, watch} from 'vue';
-  import type {SelectItem, Site, SiteGroup} from '@/types';
-  import ModalForm from '@/components/ModalForm.vue';
+  import type {SelectItem, Site, SiteGroup} from '@/common/types';
+  import ModalForm from '@/common/components/ModalForm.vue';
   import {Deferred, router, useForm} from '@inertiajs/vue3';
   import {destroy, store} from '@actions/Settings/SiteGroupsController.js';
   import {create, edit, reorder} from '@actions/Settings/SitesController';
-  import DeleteSiteButton from '@/components/sites/DeleteSiteButton.vue';
-  import CpLink from '@/components/CpLink.vue';
-  import Badge from '@/components/Badge.vue';
+  import DeleteSiteButton from '@/modules/sites/components/DeleteSiteButton.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import Badge from '@/common/components/Badge.vue';
   import {index} from '@routes/cp/settings/sites';
-  import InputCombobox from '@/components/form/InputCombobox.vue';
-  import IndexLayout from '@/layout/IndexLayout.vue';
-  import useCraftData from '@/composables/useCraftData';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import Empty from '@/components/Empty.vue';
+  import InputCombobox from '@/common/form/InputCombobox.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
+  import useCraftData from '@/common/composables/useCraftData';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import Empty from '@/common/components/Empty.vue';
 
   const props = defineProps<{
     group: SiteGroup | null;
diff --git a/resources/js/pages/SettingsSitesEdit.vue b/resources/js/pages/settings/SitesEdit.vue
similarity index 78%
rename from resources/js/pages/SettingsSitesEdit.vue
rename to resources/js/pages/settings/SitesEdit.vue
index 74f4eb65dd7..a3b63f8a14c 100644
--- a/resources/js/pages/SettingsSitesEdit.vue
+++ b/resources/js/pages/settings/SitesEdit.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import {useForm} from '@inertiajs/vue3';
-  import type {Site} from '@/types';
+  import type {Site} from '@/common/types';
   import {t} from '@craftcms/cp';
   import {store} from '@actions/Settings/SitesController';
-  import SiteFields from '@/components/sites/SiteFields.vue';
-  import DeleteSiteModal from '@/components/sites/DeleteSiteModal.vue';
+  import SiteFields from '@/modules/sites/components/SiteFields.vue';
+  import DeleteSiteModal from '@/modules/sites/components/DeleteSiteModal.vue';
   import {ref} from 'vue';
-  import Badge from '@/components/Badge.vue';
-  import {useSettingsSave} from '@/composables/useSettingsSave';
-  import Pane from '@/components/Pane.vue';
-  import useCraftData from '@/composables/useCraftData';
+  import Badge from '@/common/components/Badge.vue';
+  import {useSettingsSave} from '@/modules/settings/composables/useSettingsSave';
+  import Pane from '@/common/components/Pane.vue';
+  import useCraftData from '@/common/composables/useCraftData';
   import {useEventListener} from '@vueuse/core';
 
   const props = defineProps<{
diff --git a/resources/js/pages/SettingsUserGroupsIndexPage.vue b/resources/js/pages/settings/UserGroups.vue
similarity index 84%
rename from resources/js/pages/SettingsUserGroupsIndexPage.vue
rename to resources/js/pages/settings/UserGroups.vue
index db3b1727b89..58102868e71 100644
--- a/resources/js/pages/SettingsUserGroupsIndexPage.vue
+++ b/resources/js/pages/settings/UserGroups.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
   import {h} from 'vue';
-  import IndexLayout from '@/layout/IndexLayout.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
-  import Empty from '@/components/Empty.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import Empty from '@/common/components/Empty.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
   import {create, destroy, edit} from '@actions/Settings/UserGroupsController';
-  import CpLink from '@/components/CpLink.vue';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import CpLink from '@/common/components/CpLink.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
   import {router} from '@inertiajs/vue3';
-  import type {UserGroup} from '@/types';
+  import type {UserGroup} from '@/common/types';
 
   const props = defineProps<{
     groups: Array<UserGroup>;
diff --git a/resources/js/pages/SettingsUserGroupsEditPage.vue b/resources/js/pages/settings/UserGroupsEdit.vue
similarity index 91%
rename from resources/js/pages/SettingsUserGroupsEditPage.vue
rename to resources/js/pages/settings/UserGroupsEdit.vue
index 88188ba5b19..1a1b5b1f10c 100644
--- a/resources/js/pages/SettingsUserGroupsEditPage.vue
+++ b/resources/js/pages/settings/UserGroupsEdit.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import AppLayout from '@/layout/AppLayout.vue';
+  import AppLayout from '@/common/layouts/AppLayout.vue';
   import {router, useForm} from '@inertiajs/vue3';
-  import type {ActionItemData, UserGroup} from '@/types';
+  import type {ActionItemData, UserGroup} from '@/common/types';
   import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
   import CraftHandleInput from '@craftcms/cp/vue/CraftInputHandle.vue';
   import CraftTextarea from '@craftcms/cp/vue/CraftTextarea.vue';
-  import Pane from '@/components/Pane.vue';
-  import PermissionList from '@/components/PermissionList.vue';
-  import {hasNested, type PermissionItem} from '@/utils/permissions';
+  import Pane from '@/common/components/Pane.vue';
+  import PermissionList from '@/modules/permissions/components/PermissionList.vue';
+  import {hasNested, type PermissionItem} from '@/modules/permissions/helpers/permissions';
   import {destroy, store} from '@actions/Settings/UserGroupsController';
   import {computed} from 'vue';
-  import {useSettingsSave} from '@/composables/useSettingsSave';
+  import {useSettingsSave} from '@/modules/settings/composables/useSettingsSave';
 
   const props = defineProps<{
     group: UserGroup;
diff --git a/resources/js/pages/SettingsVolumesIndexPage.vue b/resources/js/pages/settings/Volumes.vue
similarity index 90%
rename from resources/js/pages/SettingsVolumesIndexPage.vue
rename to resources/js/pages/settings/Volumes.vue
index 9ddfabf619b..92965488e1c 100644
--- a/resources/js/pages/SettingsVolumesIndexPage.vue
+++ b/resources/js/pages/settings/Volumes.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
   import {t} from '@craftcms/cp';
-  import IndexLayout from '@/layout/IndexLayout.vue';
-  import AdminTable from '@/components/AdminTable/AdminTable.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
   import {computed, h, nextTick, ref, watch} from 'vue';
-  import {createCraftColumnHelper} from '@/components/AdminTable/createCraftColumnHelper';
-  import DeleteButton from '@/components/AdminTable/DeleteButton.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
   import {router} from '@inertiajs/vue3';
-  import Empty from '@/components/Empty.vue';
-  import CpLink from '@/components/CpLink.vue';
+  import Empty from '@/common/components/Empty.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import {
     create,
     destroy,
@@ -17,7 +17,7 @@
     reorder,
   } from '@actions/Settings/VolumesController';
   import {index as imageTransformsIndex} from '@actions/Settings/ImageTransformsController';
-  import type {SortItem} from '@/types';
+  import type {SortItem} from '@/common/types';
 
   interface VolumeData {
     id: number;
diff --git a/resources/js/pages/Updater.vue b/resources/js/pages/updater/Index.vue
similarity index 99%
rename from resources/js/pages/Updater.vue
rename to resources/js/pages/updater/Index.vue
index 0329404f051..9063ab809a9 100644
--- a/resources/js/pages/Updater.vue
+++ b/resources/js/pages/updater/Index.vue
@@ -6,7 +6,7 @@
     type UpdaterOption,
     type UpdaterState,
     useUpdater,
-  } from '@/composables/useUpdater';
+  } from '@/modules/updater/composables/useUpdater';
 
   const props = defineProps<{
     title: string;
diff --git a/resources/js/pages/UtilitiesShowPage.vue b/resources/js/pages/utilities/Show.vue
similarity index 87%
rename from resources/js/pages/UtilitiesShowPage.vue
rename to resources/js/pages/utilities/Show.vue
index bfef109e72f..379fcd7ee50 100644
--- a/resources/js/pages/UtilitiesShowPage.vue
+++ b/resources/js/pages/utilities/Show.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-  import IndexLayout from '@/layout/IndexLayout.vue';
-  import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
-  import CpLink from '@/components/CpLink.vue';
+  import IndexLayout from '@/common/layouts/IndexLayout.vue';
+  import DynamicHtmlRenderer from '@/common/components/DynamicHtmlRenderer.vue';
+  import CpLink from '@/common/components/CpLink.vue';
 
   interface UtilityItem {
     id: string;
diff --git a/src/Http/Controllers/Auth/LoginController.php b/src/Http/Controllers/Auth/LoginController.php
index 9f88faa605b..c1de15811d0 100644
--- a/src/Http/Controllers/Auth/LoginController.php
+++ b/src/Http/Controllers/Auth/LoginController.php
@@ -38,7 +38,7 @@ public function showLogin(Request $request, GeneralConfig $generalConfig, AuthMe
             return redirect()->action([TwoFactorAuthenticationController::class, 'showForm']);
         }
 
-        return $this->renderViewWithFallback(cpTemplate: 'login', inertiaComponent: 'LoginPage', inertiaProps: [
+        return $this->renderViewWithFallback(cpTemplate: 'login', inertiaComponent: 'auth/Login', inertiaProps: [
             'action' => action([LoginController::class, 'attemptLogin']),
             'username' => $generalConfig->rememberUsernameDuration ? $authMethods->getRememberedUsername() : '',
         ]);
diff --git a/src/Http/Controllers/ConfigSyncController.php b/src/Http/Controllers/ConfigSyncController.php
index 96c9cc4fcc3..1ebb2fb5ce2 100644
--- a/src/Http/Controllers/ConfigSyncController.php
+++ b/src/Http/Controllers/ConfigSyncController.php
@@ -60,7 +60,7 @@ public function index(): Response
         $state = $this->realInitialState();
         $state['data'] = Crypt::encrypt(Json::encode($this->data));
 
-        return Inertia::render('Updater', [
+        return Inertia::render('updater/Index', [
             'title' => $this->pageTitle(),
             'initialState' => $state,
             'actionPrefix' => 'config-sync',
diff --git a/src/Http/Controllers/FieldsController.php b/src/Http/Controllers/FieldsController.php
index 910aa09e977..d049f959bcd 100644
--- a/src/Http/Controllers/FieldsController.php
+++ b/src/Http/Controllers/FieldsController.php
@@ -88,7 +88,7 @@ public function index(Request $request)
 
         [$pagination, $tableData] = $this->fieldsService->getTableData($page, $limit, $searchTerm, $orderBy, $sortDir);
 
-        return Inertia::render('SettingsFieldsIndexPage', [
+        return Inertia::render('settings/Fields', [
             'crumbs' => fn () => [
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Fields')],
diff --git a/src/Http/Controllers/Gql/SchemasController.php b/src/Http/Controllers/Gql/SchemasController.php
index cd7964a824b..62f91b5f10b 100644
--- a/src/Http/Controllers/Gql/SchemasController.php
+++ b/src/Http/Controllers/Gql/SchemasController.php
@@ -33,7 +33,7 @@ public function index()
         // Ensure the public schema exists so the table stays aligned with the legacy UI.
         $this->gql->getPublicSchema();
 
-        return Inertia::render('GraphQlSchemasPage', [
+        return Inertia::render('graphql/Schemas', [
             'crumbs' => fn () => [
                 ['label' => t('GraphQL'), 'url' => Url::cpUrl('graphql/schemas')],
                 ['label' => t('Schemas')],
diff --git a/src/Http/Controllers/Gql/TokensController.php b/src/Http/Controllers/Gql/TokensController.php
index 20f93d20653..8fddcdac8bc 100644
--- a/src/Http/Controllers/Gql/TokensController.php
+++ b/src/Http/Controllers/Gql/TokensController.php
@@ -31,7 +31,7 @@ public function __construct(
 
     public function index()
     {
-        return Inertia::render('GraphQlTokensPage', [
+        return Inertia::render('graphql/Tokens', [
             'tokens' => GqlTokenResource::collection($this->gql->getTokens()),
         ]);
     }
diff --git a/src/Http/Controllers/InstallController.php b/src/Http/Controllers/InstallController.php
index ca2b3778449..c845d739502 100644
--- a/src/Http/Controllers/InstallController.php
+++ b/src/Http/Controllers/InstallController.php
@@ -76,7 +76,7 @@ public function index(GeneralConfig $generalConfig): \Inertia\Response
         $dbConfig = DB::getConfig();
         $postCpLoginRedirect = Cms::config()->postCpLoginRedirect;
 
-        return Inertia::render('Install', [
+        return Inertia::render('install/Install', [
             'showDbScreen' => $showDbScreen,
             'postCpLoginRedirect' => $postCpLoginRedirect,
             'licenseHtml' => Inertia::defer(function () {
@@ -231,7 +231,7 @@ public function install(Request $request, Migrator $migrator, LaravelMigrations
         // Run the install migration
         try {
             $migrator->track('craft')->runMigration($migration, 'up');
-            $migrator->getRepository()->log('Install', 1);
+            $migrator->getRepository()->log('install/Install', 1);
         } catch (Throwable $e) {
             return new JsonResponse([
                 'message' => $e->getMessage(),
diff --git a/src/Http/Controllers/PluginStore/RemoveController.php b/src/Http/Controllers/PluginStore/RemoveController.php
index fc828be36da..94fefb0b590 100644
--- a/src/Http/Controllers/PluginStore/RemoveController.php
+++ b/src/Http/Controllers/PluginStore/RemoveController.php
@@ -29,7 +29,7 @@ public function index(): Response
         $state = $this->realInitialState();
         $state['data'] = Crypt::encrypt(Json::encode($this->data));
 
-        return Inertia::render('Updater', [
+        return Inertia::render('updater/Index', [
             'title' => $this->pageTitle(),
             'initialState' => $state,
             'actionPrefix' => 'pluginstore/remove',
diff --git a/src/Http/Controllers/PluginsController.php b/src/Http/Controllers/PluginsController.php
index 5ad583f4a6f..2be238f240c 100644
--- a/src/Http/Controllers/PluginsController.php
+++ b/src/Http/Controllers/PluginsController.php
@@ -44,7 +44,7 @@ public function index(): CpScreenResponse
                 ['label' => t('Settings'), 'url' => 'settings'],
                 ['label' => t('Plugins')],
             ])
-            ->inertiaPage('SettingsPluginsIndexPage', [
+            ->inertiaPage('settings/Plugins', [
                 'pluginInfo' => fn () => $info,
             ]);
     }
diff --git a/src/Http/Controllers/Settings/EmailSettingsController.php b/src/Http/Controllers/Settings/EmailSettingsController.php
index be5980cdfe6..1ba9b01ecf7 100644
--- a/src/Http/Controllers/Settings/EmailSettingsController.php
+++ b/src/Http/Controllers/Settings/EmailSettingsController.php
@@ -48,7 +48,7 @@ public function index(GeneralConfig $generalConfig): CpScreenResponse
                 ['label' => t('Email')],
             ])
             ->redirectUrl('settings')
-            ->inertiaPage('SettingsEmailPage', [
+            ->inertiaPage('settings/Email', [
                 'emailConfig' => $this->projectConfig->get('email') ?? [],
                 'mailerOptions' => $this->getMailerOptions(),
                 'envSuggestions' => SelectOptions::getEnvSuggestions(),
diff --git a/src/Http/Controllers/Settings/EntryTypesController.php b/src/Http/Controllers/Settings/EntryTypesController.php
index 46f70d66162..9330901d06f 100644
--- a/src/Http/Controllers/Settings/EntryTypesController.php
+++ b/src/Http/Controllers/Settings/EntryTypesController.php
@@ -90,7 +90,7 @@ public function index(Request $request)
             sortDir: $sortDir,
         );
 
-        return Inertia::render('SettingsEntryTypesIndexPage', [
+        return Inertia::render('settings/EntryTypes', [
             'crumbs' => fn () => [
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Entry Types')],
diff --git a/src/Http/Controllers/Settings/FilesystemsController.php b/src/Http/Controllers/Settings/FilesystemsController.php
index 5b9b65bf611..7b8c869431c 100644
--- a/src/Http/Controllers/Settings/FilesystemsController.php
+++ b/src/Http/Controllers/Settings/FilesystemsController.php
@@ -35,7 +35,7 @@ public function __construct(
 
     public function index(): \Inertia\Response
     {
-        return Inertia::render('SettingsFilesystemsIndexPage', [
+        return Inertia::render('settings/Filesystems', [
             'crumbs' => fn () => [
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Filesystems')],
diff --git a/src/Http/Controllers/Settings/GeneralSettingsController.php b/src/Http/Controllers/Settings/GeneralSettingsController.php
index 22b12263d93..e308f3fc912 100644
--- a/src/Http/Controllers/Settings/GeneralSettingsController.php
+++ b/src/Http/Controllers/Settings/GeneralSettingsController.php
@@ -36,7 +36,7 @@ public function index(): CpScreenResponse
                 ['label' => t('General Settings')],
             ])
             ->redirectUrl('settings')
-            ->inertiaPage('SettingsGeneralPage', [
+            ->inertiaPage('settings/General', [
                 'system' => $this->projectConfig->get('system') ?? [],
                 'nameSuggestions' => SelectOptions::getEnvSuggestions(),
                 'timezoneOptions' => $timezoneOptions,
diff --git a/src/Http/Controllers/Settings/ImageTransformsController.php b/src/Http/Controllers/Settings/ImageTransformsController.php
index dd4bb4123c6..919b35e0bf3 100644
--- a/src/Http/Controllers/Settings/ImageTransformsController.php
+++ b/src/Http/Controllers/Settings/ImageTransformsController.php
@@ -38,7 +38,7 @@ public function index(ImageTransforms $imageTransforms)
             ->sort(fn (ImageTransform $a, ImageTransform $b): int => t($a->name, category: 'site') <=> t($b->name, category: 'site'))
             ->values();
 
-        return Inertia::render('SettingsImageTransformsIndexPage', [
+        return Inertia::render('settings/ImageTransforms', [
             'crumbs' => fn () => [
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Transforms')],
diff --git a/src/Http/Controllers/Settings/SectionsController.php b/src/Http/Controllers/Settings/SectionsController.php
index 82a35572284..c4e9c99b72e 100644
--- a/src/Http/Controllers/Settings/SectionsController.php
+++ b/src/Http/Controllers/Settings/SectionsController.php
@@ -78,7 +78,7 @@ public function index(Request $request, Sections $sections): CpScreenResponse
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Sections')],
             ])
-            ->inertiaPage('SettingsSectionsIndexPage', [
+            ->inertiaPage('settings/Sections', [
                 'data' => fn () => $tableData,
                 'pagination' => fn () => $pagination,
                 'sort' => $sort,
@@ -99,7 +99,7 @@ public function create(Sites $sites): CpScreenResponse
             ->addCrumb(t('Settings'), 'settings')
             ->redirectUrl('settings/sections')
             ->addCrumb(t('Sections'), 'settings/sections')
-            ->inertiaPage('SettingsSectionsEditPage', $this->sectionProps($section, $sites, brandNew: true));
+            ->inertiaPage('settings/SectionsEdit', $this->sectionProps($section, $sites, brandNew: true));
     }
 
     public function edit(Sections $sections, Sites $sites, SectionModel $section): CpScreenResponse
@@ -112,7 +112,7 @@ public function edit(Sections $sections, Sites $sites, SectionModel $section): C
             ->redirectUrl('settings/sections')
             ->addCrumb(t('Settings'), 'settings')
             ->addCrumb(t('Sections'), 'settings/sections')
-            ->inertiaPage('SettingsSectionsEditPage', $this->sectionProps($sectionData, $sites, brandNew: false));
+            ->inertiaPage('settings/SectionsEdit', $this->sectionProps($sectionData, $sites, brandNew: false));
     }
 
     private function sectionProps(SectionData $section, Sites $sites, bool $brandNew): array
diff --git a/src/Http/Controllers/Settings/SettingsIndexController.php b/src/Http/Controllers/Settings/SettingsIndexController.php
index db2d90093d3..5eb1d8f7494 100644
--- a/src/Http/Controllers/Settings/SettingsIndexController.php
+++ b/src/Http/Controllers/Settings/SettingsIndexController.php
@@ -14,7 +14,7 @@ class SettingsIndexController
 {
     public function __invoke(GeneralConfig $generalConfig, Settings $cpSettings)
     {
-        return Inertia::render('SettingsIndexPage', [
+        return Inertia::render('settings/Index', [
             'readOnly' => ! $generalConfig->allowAdminChanges,
             'crumbs' => [
                 ['label' => t('Settings')],
diff --git a/src/Http/Controllers/Settings/SitesController.php b/src/Http/Controllers/Settings/SitesController.php
index e4dd530b423..f725f1fdd94 100644
--- a/src/Http/Controllers/Settings/SitesController.php
+++ b/src/Http/Controllers/Settings/SitesController.php
@@ -55,7 +55,7 @@ public function index(Request $request, Sites $sitesService): Response
             (isset($group) ? ['label' => $group->getName()] : null),
         ]);
 
-        return Inertia::render('SettingsSitesIndex', [
+        return Inertia::render('settings/Sites', [
             'crumbs' => $crumbs,
             'newSiteUrl' => Url::cpUrl('settings/sites/new'),
             'nameSuggestions' => Inertia::defer(fn () => SelectOptions::getEnvSuggestions()),
@@ -96,7 +96,7 @@ public function create(Request $request)
                     'active' => true,
                 ],
             ])
-            ->inertiaPage('SettingsSitesEdit', [
+            ->inertiaPage('settings/SitesEdit', [
                 ...$this->getViewData(),
                 'site' => new Site([
                     'name' => '',
@@ -144,7 +144,7 @@ public function edit(SiteModel $site, Sites $sitesService): CpScreenResponse
 
             ])
             ->redirectUrl('settings/sites')
-            ->inertiaPage('SettingsSitesEdit', [
+            ->inertiaPage('settings/SitesEdit', [
                 ...$this->getViewData(),
                 'site' => $siteData,
                 'groupId' => $siteData->groupId,
diff --git a/src/Http/Controllers/Settings/UserGroupsController.php b/src/Http/Controllers/Settings/UserGroupsController.php
index 5544c08964b..8c13a15b7ff 100644
--- a/src/Http/Controllers/Settings/UserGroupsController.php
+++ b/src/Http/Controllers/Settings/UserGroupsController.php
@@ -45,7 +45,7 @@ public function index()
             return redirect()->action([self::class, 'edit'], $this->userGroups->getTeamGroup()->id);
         }
 
-        return Inertia::render('SettingsUserGroupsIndexPage', [
+        return Inertia::render('settings/UserGroups', [
             'crumbs' => [
                 ['label' => t('Settings'), 'url' => 'settings'],
                 ['label' => t('User Groups')],
@@ -72,7 +72,7 @@ public function create(UserPermissions $userPermissions): CpScreenResponse
             ->title(t('Create a new user group'))
             ->crumbs($crumbs)
             ->redirectUrl('settings/users')
-            ->inertiaPage('SettingsUserGroupsEditPage', [
+            ->inertiaPage('settings/UserGroupsEdit', [
                 'group' => new UserGroup,
                 'permissions' => $userPermissions->getAllPermissions(),
             ]);
@@ -102,7 +102,7 @@ public function edit(UserGroupModel $userGroup, UserPermissions $userPermissions
             ->title(trim($group->name) ?: t('Edit User Group'))
             ->crumbs($crumbs)
             ->redirectUrl('settings/users')
-            ->inertiaPage('SettingsUserGroupsEditPage', [
+            ->inertiaPage('settings/UserGroupsEdit', [
                 'group' => [
                     'id' => $group->id,
                     ...$group->getConfig(true),
diff --git a/src/Http/Controllers/Settings/VolumesController.php b/src/Http/Controllers/Settings/VolumesController.php
index ff5da91ca62..47bc582ccbe 100644
--- a/src/Http/Controllers/Settings/VolumesController.php
+++ b/src/Http/Controllers/Settings/VolumesController.php
@@ -52,7 +52,7 @@ public function index(Request $request, Volumes $volumes)
             default => SORT_ASC,
         };
 
-        return Inertia::render('SettingsVolumesIndexPage', [
+        return Inertia::render('settings/Volumes', [
             'crumbs' => fn () => [
                 ['label' => t('Settings'), 'url' => Url::cpUrl('settings')],
                 ['label' => t('Assets')],
diff --git a/src/Http/Controllers/Updates/UpdaterController.php b/src/Http/Controllers/Updates/UpdaterController.php
index 1eb824334ff..63c575da023 100644
--- a/src/Http/Controllers/Updates/UpdaterController.php
+++ b/src/Http/Controllers/Updates/UpdaterController.php
@@ -68,7 +68,7 @@ public function index(): Response
         $state = $this->realInitialState();
         $state['data'] = Crypt::encrypt(Json::encode($this->data));
 
-        return Inertia::render('Updater', [
+        return Inertia::render('updater/Index', [
             'title' => $this->pageTitle(),
             'initialState' => $state,
             'actionPrefix' => 'updater',
@@ -191,7 +191,7 @@ public function migrate(): Response
     #[Override]
     protected function pageTitle(): string
     {
-        return t('Updater');
+        return t('updater/Index');
     }
 
     #[Override]
diff --git a/src/Http/Controllers/Utilities/UtilitiesController.php b/src/Http/Controllers/Utilities/UtilitiesController.php
index 3fa63ce9c7b..677c705ade5 100644
--- a/src/Http/Controllers/Utilities/UtilitiesController.php
+++ b/src/Http/Controllers/Utilities/UtilitiesController.php
@@ -58,7 +58,7 @@ public function show(string $id)
             abort(403, sprintf('User not permitted to access the “%s” utility.', $class::displayName()));
         }
 
-        return Inertia::render('UtilitiesShowPage', [
+        return Inertia::render('utilities/Show', [
             'crumbs' => [
                 ['label' => 'Utilities', 'url' => Url::cpUrl('utilities')],
                 ['label' => $class::displayName(), 'url' => null],