diff --git a/resources/js/components/accordion/AccordionItem.vue b/resources/js/components/accordion/AccordionItem.vue
index 07ff8dde..a0280519 100644
--- a/resources/js/components/accordion/AccordionItem.vue
+++ b/resources/js/components/accordion/AccordionItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ChevronDown from '@/icons/ChevronDown.vue';
+import { ChevronDown } from '@/icons';
 import { computed, inject, onMounted, ref, useId, watch } from 'vue';
 
 const accordion = inject<{
diff --git a/resources/js/components/editor/MarkdownToolbar.vue b/resources/js/components/editor/MarkdownToolbar.vue
index 39dcfe73..4226c635 100644
--- a/resources/js/components/editor/MarkdownToolbar.vue
+++ b/resources/js/components/editor/MarkdownToolbar.vue
@@ -1,51 +1,49 @@
 <script setup lang="ts">
 import VaultEditorApplyTemplateController from '@/actions/App/Http/Controllers/VaultEditorApplyTemplateController';
 import Menu from '@/components/menu/Menu.vue';
-import VaultEditorSearchFileModal from '@/components/modal/VaultEditorSearchModal.vue';
-import VaultEditorTemplateListModal from '@/components/modal/VaultEditorTemplateListModal.vue';
-import { useEditor } from '@/composables/useEditor';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useTiptapPreferences } from '@/composables/useTiptapPreferences';
-import AlignCenter from '@/icons/AlignCenter.vue';
-import AlignLeft from '@/icons/AlignLeft.vue';
-import AlignRight from '@/icons/AlignRight.vue';
-import Bold from '@/icons/Bold.vue';
-import Code from '@/icons/Code.vue';
-import CodeInline from '@/icons/CodeInline.vue';
-import DocumentPlus from '@/icons/DocumentPlus.vue';
-import Heading from '@/icons/Heading.vue';
-import Heading1 from '@/icons/Heading1.vue';
-import Heading2 from '@/icons/Heading2.vue';
-import Heading3 from '@/icons/Heading3.vue';
-import Heading4 from '@/icons/Heading4.vue';
-import Heading5 from '@/icons/Heading5.vue';
-import Heading6 from '@/icons/Heading6.vue';
-import HorizontalRule from '@/icons/HorizontalRule.vue';
-import Image from '@/icons/Image.vue';
-import Indent from '@/icons/Indent.vue';
-import Italic from '@/icons/Italic.vue';
-import Link from '@/icons/Link.vue';
-import List from '@/icons/List.vue';
-import ListOrdered from '@/icons/ListOrdered.vue';
-import ListTodo from '@/icons/ListTodo.vue';
-import Markdown from '@/icons/Markdown.vue';
-import Outdent from '@/icons/Outdent.vue';
-import PencilOff from '@/icons/PencilOff.vue';
-import Pilcrow from '@/icons/Pilcrow.vue';
-import Print from '@/icons/Print.vue';
-import Quote from '@/icons/Quote.vue';
-import Redo from '@/icons/Redo.vue';
-import Strike from '@/icons/Strike.vue';
-import TableAdd from '@/icons/TableAdd.vue';
-import TableAddColumn from '@/icons/TableAddColumn.vue';
-import TableAddRow from '@/icons/TableAddRow.vue';
-import TableDelete from '@/icons/TableDelete.vue';
-import TableDeleteColumn from '@/icons/TableDeleteColumn.vue';
-import TableDeleteRow from '@/icons/TableDeleteRow.vue';
-import Template from '@/icons/Template.vue';
-import Text from '@/icons/Text.vue';
-import Undo from '@/icons/Undo.vue';
+import { VaultEditorSearchFileModal, VaultEditorTemplateListModal } from '@/components/modal';
+import { useEditor, useModalManager, useRequest, useTiptapPreferences } from '@/composables';
+import {
+    AlignCenter,
+    AlignLeft,
+    AlignRight,
+    Bold,
+    Code,
+    CodeInline,
+    DocumentPlus,
+    Heading,
+    Heading1,
+    Heading2,
+    Heading3,
+    Heading4,
+    Heading5,
+    Heading6,
+    HorizontalRule,
+    Image,
+    Indent,
+    Italic,
+    Link,
+    List,
+    ListOrdered,
+    ListTodo,
+    Markdown,
+    Outdent,
+    PencilOff,
+    Pilcrow,
+    Print,
+    Quote,
+    Redo,
+    Strike,
+    TableAdd,
+    TableAddColumn,
+    TableAddRow,
+    TableDelete,
+    TableDeleteColumn,
+    TableDeleteRow,
+    Template,
+    Text,
+    Undo,
+} from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 import { computed, inject, type ShallowRef } from 'vue';
 import MarkdownToolbarButton from './MarkdownToolbarButton.vue';
diff --git a/resources/js/components/form/SecondarySubmit.vue b/resources/js/components/form/SecondarySubmit.vue
index aefaec5a..31c2b3c6 100644
--- a/resources/js/components/form/SecondarySubmit.vue
+++ b/resources/js/components/form/SecondarySubmit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import Spinner from '@/icons/Spinner.vue';
+import { Spinner } from '@/icons';
 
 defineProps<{
     label: string;
diff --git a/resources/js/components/form/Submit.vue b/resources/js/components/form/Submit.vue
index 13d0266a..1ee74945 100644
--- a/resources/js/components/form/Submit.vue
+++ b/resources/js/components/form/Submit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import PrimaryButton from '@/components/ui/PrimaryButton.vue';
-import Spinner from '@/icons/Spinner.vue';
+import { Spinner } from '@/icons';
 
 defineProps<{
     label: string;
diff --git a/resources/js/components/form/index.ts b/resources/js/components/form/index.ts
new file mode 100644
index 00000000..114d9b91
--- /dev/null
+++ b/resources/js/components/form/index.ts
@@ -0,0 +1,10 @@
+export { default as Checkbox } from './Checkbox.vue';
+export { default as CheckboxToggle } from './CheckboxToggle.vue';
+export { default as Input } from './Input.vue';
+export { default as LinkButton } from './LinkButton.vue';
+export { default as ModelInput } from './ModelInput.vue';
+export { default as SecondarySubmit } from './SecondarySubmit.vue';
+export { default as Submit } from './Submit.vue';
+export { default as TextError } from './TextError.vue';
+export { default as TextLink } from './TextLink.vue';
+export { default as TextSuccess } from './TextSuccess.vue';
diff --git a/resources/js/components/menu/Menu.vue b/resources/js/components/menu/Menu.vue
index 9a5e2e44..32e6de1c 100644
--- a/resources/js/components/menu/Menu.vue
+++ b/resources/js/components/menu/Menu.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useMenu } from '@/composables/useMenu';
+import { useMenu } from '@/composables';
 
 type MenuType = 'dropdown' | 'hover';
 
diff --git a/resources/js/components/menu/NotificationMenu.vue b/resources/js/components/menu/NotificationMenu.vue
index 9bcde134..90dbdeec 100644
--- a/resources/js/components/menu/NotificationMenu.vue
+++ b/resources/js/components/menu/NotificationMenu.vue
@@ -3,7 +3,7 @@ import Menu from '@/components/menu/Menu.vue';
 import VaultCollaborationAccepted from '@/components/notification/VaultCollaborationAccepted.vue';
 import VaultCollaborationDeclined from '@/components/notification/VaultCollaborationDeclined.vue';
 import VaultCollaborationInvitationReceived from '@/components/notification/VaultCollaborationInvitationReceived.vue';
-import Bell from '@/icons/Bell.vue';
+import { Bell } from '@/icons';
 import { useNotificationStore } from '@/stores/notification';
 import { type Component } from 'vue';
 
diff --git a/resources/js/components/menu/UserMenu.vue b/resources/js/components/menu/UserMenu.vue
index 493c3806..a89a2403 100644
--- a/resources/js/components/menu/UserMenu.vue
+++ b/resources/js/components/menu/UserMenu.vue
@@ -2,24 +2,26 @@
 import Menu from '@/components/menu/Menu.vue';
 import MenuDivider from '@/components/menu/MenuDivider.vue';
 import MenuItem from '@/components/menu/MenuItem.vue';
-import AboutModal from '@/components/modal/AboutModal.vue';
-import HelpModal from '@/components/modal/HelpModal.vue';
-import PasswordEditModal from '@/components/modal/PasswordEditModal.vue';
-import ProfileEditModal from '@/components/modal/ProfileEditModal.vue';
-import SettingEditModal from '@/components/modal/SettingEditModal.vue';
+import {
+    AboutModal,
+    HelpModal,
+    PasswordEditModal,
+    ProfileEditModal,
+    SettingEditModal,
+} from '@/components/modal';
 import Avatar from '@/components/ui/Avatar.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useTheme } from '@/composables/useTheme';
-import { useTiptapPreferences } from '@/composables/useTiptapPreferences';
-import ArrowUpTray from '@/icons/ArrowUpTray.vue';
-import CircleStack from '@/icons/CircleStack.vue';
-import Cog6Tooth from '@/icons/Cog6Tooth.vue';
-import InformationCircle from '@/icons/InformationCircle.vue';
-import Lock from '@/icons/Lock.vue';
-import MessageCircleQuestionMark from '@/icons/MessageCircleQuestionMark.vue';
-import Moon from '@/icons/Moon.vue';
-import Spellcheck from '@/icons/Spellcheck.vue';
-import User from '@/icons/User.vue';
+import { useModalManager, useTheme, useTiptapPreferences } from '@/composables';
+import {
+    ArrowUpTray,
+    CircleStack,
+    Cog6Tooth,
+    InformationCircle,
+    Lock,
+    MessageCircleQuestionMark,
+    Moon,
+    Spellcheck,
+    User,
+} from '@/icons';
 import { logout } from '@/routes/index';
 import { index } from '@/routes/vaults';
 import { useSettingStore } from '@/stores/setting';
diff --git a/resources/js/components/modal/AboutModal.vue b/resources/js/components/modal/AboutModal.vue
index 895f8eee..ebd40a1e 100644
--- a/resources/js/components/modal/AboutModal.vue
+++ b/resources/js/components/modal/AboutModal.vue
@@ -2,8 +2,7 @@
 import { usePage } from '@inertiajs/vue3';
 import { computed } from 'vue';
 import Avatar from '../ui/Avatar.vue';
-import Link from '@/icons/Link.vue';
-import Heart from '@/icons/Heart.vue';
+import { Link, Heart } from '@/icons';
 import ExternalLinkButton from '../ui/ExternalLinkButton.vue';
 
 const page = usePage();
diff --git a/resources/js/components/modal/CollaborationConfirmModal.vue b/resources/js/components/modal/CollaborationConfirmModal.vue
index 42520a5b..3efdb755 100644
--- a/resources/js/components/modal/CollaborationConfirmModal.vue
+++ b/resources/js/components/modal/CollaborationConfirmModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import VaultCollaborationAcceptController from '@/actions/App/Http/Controllers/VaultCollaborationAcceptController';
 import VaultCollaborationDeclineController from '@/actions/App/Http/Controllers/VaultCollaborationDeclineController';
-import SecondarySubmit from '@/components/form/SecondarySubmit.vue';
-import Submit from '@/components/form/Submit.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { SecondarySubmit, Submit } from '@/components/form';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { useNotificationStore } from '@/stores/notification';
 import { AppNotification } from '@/types';
 
diff --git a/resources/js/components/modal/ModalManager.vue b/resources/js/components/modal/ModalManager.vue
index 7147d569..54239e16 100644
--- a/resources/js/components/modal/ModalManager.vue
+++ b/resources/js/components/modal/ModalManager.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import BaseButton from '@/components/ui/BaseButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import XMark from '@/icons/XMark.vue';
+import { useModalManager } from '@/composables';
+import { XMark } from '@/icons';
 import { computed, nextTick, ref, watch } from 'vue';
 
 const { activeModal, closeModal } = useModalManager();
diff --git a/resources/js/components/modal/PasswordEditModal.vue b/resources/js/components/modal/PasswordEditModal.vue
index ac1fa6b0..5d2d59e4 100644
--- a/resources/js/components/modal/PasswordEditModal.vue
+++ b/resources/js/components/modal/PasswordEditModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import { update } from '@/actions/App/Http/Controllers/PasswordController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 
 const { closeModal } = useModalManager();
 const { createToast } = useToast();
diff --git a/resources/js/components/modal/ProfileEditModal.vue b/resources/js/components/modal/ProfileEditModal.vue
index e4dd8fbb..3c92abad 100644
--- a/resources/js/components/modal/ProfileEditModal.vue
+++ b/resources/js/components/modal/ProfileEditModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import { update } from '@/actions/App/Http/Controllers/ProfileController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { useSettingStore } from '@/stores/setting';
 import { useUserStore } from '@/stores/user';
 import { User } from '@/types';
diff --git a/resources/js/components/modal/RequestConfirmationModal.vue b/resources/js/components/modal/RequestConfirmationModal.vue
index dbff7258..23b3cdba 100644
--- a/resources/js/components/modal/RequestConfirmationModal.vue
+++ b/resources/js/components/modal/RequestConfirmationModal.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import Submit from '@/components/form/Submit.vue';
+import { Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 
 const props = defineProps<{
     url: string;
diff --git a/resources/js/components/modal/SettingEditModal.vue b/resources/js/components/modal/SettingEditModal.vue
index 09f2302d..4bf785e8 100644
--- a/resources/js/components/modal/SettingEditModal.vue
+++ b/resources/js/components/modal/SettingEditModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import { update } from '@/actions/App/Http/Controllers/SettingController';
-import CheckboxToggle from '@/components/form/CheckboxToggle.vue';
-import Submit from '@/components/form/Submit.vue';
+import { CheckboxToggle, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { useSettingStore } from '@/stores/setting';
 import { AdminEditableSettings } from '@/types/settings';
 
diff --git a/resources/js/components/modal/VaultCollaborationModal.vue b/resources/js/components/modal/VaultCollaborationModal.vue
index f1ba872b..fe2ff8f7 100644
--- a/resources/js/components/modal/VaultCollaborationModal.vue
+++ b/resources/js/components/modal/VaultCollaborationModal.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import { destroy, store } from '@/actions/App/Http/Controllers/VaultCollaborationController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import Tab from '@/components/tabs/Tab.vue';
 import TabPanel from '@/components/tabs/TabPanel.vue';
 import Tabs from '@/components/tabs/Tabs.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import Trash from '@/icons/Trash.vue';
+import { useModalManager, useRequest } from '@/composables';
+import { Trash } from '@/icons';
 import { useVaultStore } from '@/stores/vault';
 import { VaultCollaborator } from '@/types/vault';
 import { ref } from 'vue';
diff --git a/resources/js/components/modal/VaultCreateModal.vue b/resources/js/components/modal/VaultCreateModal.vue
index cbd04406..ba489496 100644
--- a/resources/js/components/modal/VaultCreateModal.vue
+++ b/resources/js/components/modal/VaultCreateModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import { store } from '@/actions/App/Http/Controllers/VaultController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { show } from '@/routes/vaults';
 import { useLayoutStore } from '@/stores/layout';
 import { VaultCreated } from '@/types/vault';
diff --git a/resources/js/components/modal/VaultEditModal.vue b/resources/js/components/modal/VaultEditModal.vue
index 46f88342..a4003915 100644
--- a/resources/js/components/modal/VaultEditModal.vue
+++ b/resources/js/components/modal/VaultEditModal.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
 import { update } from '@/actions/App/Http/Controllers/VaultController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { VaultUpdated } from '@/types/vault.events';
 
 const props = defineProps<{
diff --git a/resources/js/components/modal/VaultEditorSearchModal.vue b/resources/js/components/modal/VaultEditorSearchModal.vue
index 630ddc81..a0948b68 100644
--- a/resources/js/components/modal/VaultEditorSearchModal.vue
+++ b/resources/js/components/modal/VaultEditorSearchModal.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import VaultEditorSearchController from '@/actions/App/Http/Controllers/VaultEditorSearchController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import VaultFileIcon from '@/components/vault/VaultFileIcon.vue';
-import { useRequest } from '@/composables/useRequest';
-import { useModalManager } from '@/composables/useModalManager';
-import { useVaultSearch } from '@/composables/useVaultSearch';
-import Link from '@/icons/Link.vue';
+import { ModelInput } from '@/components/form';
+import { VaultFileIcon } from '@/components/vault';
+import { useRequest, useModalManager, useVaultSearch } from '@/composables';
+import { Link } from '@/icons';
 import { useVaultStore } from '@/stores/vault';
 import { VaultEditorSearchFile } from '@/types/vault';
 import { isValidEmail, isValidUrl } from '@/utils/link';
diff --git a/resources/js/components/modal/VaultEditorTemplateListModal.vue b/resources/js/components/modal/VaultEditorTemplateListModal.vue
index 11accf40..c6204cd2 100644
--- a/resources/js/components/modal/VaultEditorTemplateListModal.vue
+++ b/resources/js/components/modal/VaultEditorTemplateListModal.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import VaultFileIcon from '@/components/vault/VaultFileIcon.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useVaultSearch } from '@/composables/useVaultSearch';
+import { VaultFileIcon } from '@/components/vault';
+import { useModalManager, useVaultSearch } from '@/composables';
 import { useVaultTemplateStore } from '@/stores/vaultTemplate';
 import { formatElapsedTime, formatExtendedDate } from '@/utils/time';
 import { storeToRefs } from 'pinia';
diff --git a/resources/js/components/modal/VaultFilesImportModal.vue b/resources/js/components/modal/VaultFilesImportModal.vue
index c40c4fba..b1f8df00 100644
--- a/resources/js/components/modal/VaultFilesImportModal.vue
+++ b/resources/js/components/modal/VaultFilesImportModal.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import { useModalManager } from '@/composables/useModalManager';
-import { useToast } from '@/composables/useToast';
-import { useVaultFileUpload } from '@/composables/useVaultFileUpload';
+import { useModalManager, useToast, useVaultFileUpload } from '@/composables';
 import { usePage } from '@inertiajs/vue3';
 import { computed, onMounted, ref } from 'vue';
 
diff --git a/resources/js/components/modal/VaultImportModal.vue b/resources/js/components/modal/VaultImportModal.vue
index 585d1cc3..1242d4c0 100644
--- a/resources/js/components/modal/VaultImportModal.vue
+++ b/resources/js/components/modal/VaultImportModal.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import VaultImportController from '@/actions/App/Http/Controllers/VaultImportController';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useToast } from '@/composables';
 import { router, usePage } from '@inertiajs/vue3';
 import { computed, ref } from 'vue';
 
diff --git a/resources/js/components/modal/VaultNodeCreateModal.vue b/resources/js/components/modal/VaultNodeCreateModal.vue
index 95f37b70..d31eeedf 100644
--- a/resources/js/components/modal/VaultNodeCreateModal.vue
+++ b/resources/js/components/modal/VaultNodeCreateModal.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { store } from '@/actions/App/Http/Controllers/VaultNodeController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useScreenSize } from '@/composables/useScreenSize';
-import { useToast } from '@/composables/useToast';
-import { useVaultActions } from '@/composables/useVaultActions';
+import {
+    useModalManager,
+    useRequest,
+    useScreenSize,
+    useToast,
+    useVaultActions,
+} from '@/composables';
 import { useLayoutStore } from '@/stores/layout';
 import { useVaultRecentFileStore } from '@/stores/vaultRecentFile';
 import { useVaultTreeStore } from '@/stores/vaultTree';
diff --git a/resources/js/components/modal/VaultNodeEditModal.vue b/resources/js/components/modal/VaultNodeEditModal.vue
index d5ae016e..aad7bf19 100644
--- a/resources/js/components/modal/VaultNodeEditModal.vue
+++ b/resources/js/components/modal/VaultNodeEditModal.vue
@@ -1,12 +1,8 @@
 <script setup lang="ts">
 import { update } from '@/actions/App/Http/Controllers/VaultNodeController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import Submit from '@/components/form/Submit.vue';
+import { ModelInput, Submit } from '@/components/form';
 import SecondaryButton from '@/components/ui/SecondaryButton.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useScreenSize } from '@/composables/useScreenSize';
-import { useToast } from '@/composables/useToast';
+import { useModalManager, useRequest, useScreenSize, useToast } from '@/composables';
 import { useLayoutStore } from '@/stores/layout';
 import { useVaultRecentFileStore } from '@/stores/vaultRecentFile';
 import { useVaultTreeStore } from '@/stores/vaultTree';
diff --git a/resources/js/components/modal/VaultSearchModal.vue b/resources/js/components/modal/VaultSearchModal.vue
index 32dc66f0..c925778e 100644
--- a/resources/js/components/modal/VaultSearchModal.vue
+++ b/resources/js/components/modal/VaultSearchModal.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
 import VaultSearchController from '@/actions/App/Http/Controllers/VaultSearchController';
-import ModelInput from '@/components/form/ModelInput.vue';
-import VaultFileIcon from '@/components/vault/VaultFileIcon.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useRequest } from '@/composables/useRequest';
-import { useVaultSearch } from '@/composables/useVaultSearch';
+import { ModelInput } from '@/components/form';
+import { VaultFileIcon } from '@/components/vault';
+import { useModalManager, useRequest, useVaultSearch } from '@/composables';
 import { useVaultStore } from '@/stores/vault';
 import { VaultSearchFile } from '@/types/vault';
 import { formatElapsedTime, formatExtendedDate } from '@/utils/time';
diff --git a/resources/js/components/modal/index.ts b/resources/js/components/modal/index.ts
new file mode 100644
index 00000000..731e1c08
--- /dev/null
+++ b/resources/js/components/modal/index.ts
@@ -0,0 +1,18 @@
+export { default as AboutModal } from './AboutModal.vue';
+export { default as CollaborationConfirmModal } from './CollaborationConfirmModal.vue';
+export { default as HelpModal } from './HelpModal.vue';
+export { default as ModalManager } from './ModalManager.vue';
+export { default as PasswordEditModal } from './PasswordEditModal.vue';
+export { default as ProfileEditModal } from './ProfileEditModal.vue';
+export { default as RequestConfirmationModal } from './RequestConfirmationModal.vue';
+export { default as SettingEditModal } from './SettingEditModal.vue';
+export { default as VaultCollaborationModal } from './VaultCollaborationModal.vue';
+export { default as VaultCreateModal } from './VaultCreateModal.vue';
+export { default as VaultEditModal } from './VaultEditModal.vue';
+export { default as VaultEditorSearchFileModal } from './VaultEditorSearchModal.vue';
+export { default as VaultEditorTemplateListModal } from './VaultEditorTemplateListModal.vue';
+export { default as VaultFilesImportModal } from './VaultFilesImportModal.vue';
+export { default as VaultImportModal } from './VaultImportModal.vue';
+export { default as VaultNodeCreateModal } from './VaultNodeCreateModal.vue';
+export { default as VaultNodeEditModal } from './VaultNodeEditModal.vue';
+export { default as VaultSearchModal } from './VaultSearchModal.vue';
diff --git a/resources/js/components/notification/VaultCollaborationAccepted.vue b/resources/js/components/notification/VaultCollaborationAccepted.vue
index 46b3e80b..b2421d72 100644
--- a/resources/js/components/notification/VaultCollaborationAccepted.vue
+++ b/resources/js/components/notification/VaultCollaborationAccepted.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { destroy } from '@/actions/App/Http/Controllers/NotificationController';
 import MenuItem from '@/components/menu/MenuItem.vue';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useRequest, useToast } from '@/composables';
 import { useNotificationStore } from '@/stores/notification';
 import { AppNotification } from '@/types';
 
diff --git a/resources/js/components/notification/VaultCollaborationDeclined.vue b/resources/js/components/notification/VaultCollaborationDeclined.vue
index 595d6759..e65c3686 100644
--- a/resources/js/components/notification/VaultCollaborationDeclined.vue
+++ b/resources/js/components/notification/VaultCollaborationDeclined.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { destroy } from '@/actions/App/Http/Controllers/NotificationController';
 import MenuItem from '@/components/menu/MenuItem.vue';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useRequest, useToast } from '@/composables';
 import { useNotificationStore } from '@/stores/notification';
 import { AppNotification } from '@/types';
 
diff --git a/resources/js/components/notification/VaultCollaborationInvitationReceived.vue b/resources/js/components/notification/VaultCollaborationInvitationReceived.vue
index 1c98b2d3..d9f658bd 100644
--- a/resources/js/components/notification/VaultCollaborationInvitationReceived.vue
+++ b/resources/js/components/notification/VaultCollaborationInvitationReceived.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import MenuItem from '@/components/menu/MenuItem.vue';
-import CollaborationConfirmModal from '@/components/modal/CollaborationConfirmModal.vue';
-import { useModalManager } from '@/composables/useModalManager';
+import { CollaborationConfirmModal } from '@/components/modal';
+import { useModalManager } from '@/composables';
 import { AppNotification } from '@/types';
 
 defineProps<{
diff --git a/resources/js/components/toast/Toast.vue b/resources/js/components/toast/Toast.vue
index 42725f8a..3d1f33c2 100644
--- a/resources/js/components/toast/Toast.vue
+++ b/resources/js/components/toast/Toast.vue
@@ -1,9 +1,6 @@
 <script setup lang="ts">
-import { useToast } from '@/composables/useToast';
-import CheckCircle from '@/icons/CheckCircle.vue';
-import ExclamationCircle from '@/icons/ExclamationCircle.vue';
-import ExclamationTriangle from '@/icons/ExclamationTriangle.vue';
-import InformationCircle from '@/icons/InformationCircle.vue';
+import { useToast } from '@/composables';
+import { CheckCircle, ExclamationCircle, ExclamationTriangle, InformationCircle } from '@/icons';
 
 const { toasts, destroyToast } = useToast();
 
diff --git a/resources/js/components/tree/VaultTree.vue b/resources/js/components/tree/VaultTree.vue
index e7899a07..780baf03 100644
--- a/resources/js/components/tree/VaultTree.vue
+++ b/resources/js/components/tree/VaultTree.vue
@@ -1,19 +1,22 @@
 <script setup lang="ts">
 import Menu from '@/components/menu/Menu.vue';
 import MenuItem from '@/components/menu/MenuItem.vue';
-import VaultCollaborationModal from '@/components/modal/VaultCollaborationModal.vue';
-import VaultEditModal from '@/components/modal/VaultEditModal.vue';
-import VaultFilesImportModal from '@/components/modal/VaultFilesImportModal.vue';
-import VaultNodeCreateModal from '@/components/modal/VaultNodeCreateModal.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useVaultActions } from '@/composables/useVaultActions';
-import ArrowUpTray from '@/icons/ArrowUpTray.vue';
-import Bars3 from '@/icons/Bars3.vue';
-import DocumentPlus from '@/icons/DocumentPlus.vue';
-import FolderPlus from '@/icons/FolderPlus.vue';
-import PencilSquare from '@/icons/PencilSquare.vue';
-import Spinner from '@/icons/Spinner.vue';
-import UserGroup from '@/icons/UserGroup.vue';
+import {
+    VaultCollaborationModal,
+    VaultEditModal,
+    VaultFilesImportModal,
+    VaultNodeCreateModal,
+} from '@/components/modal';
+import { useModalManager, useVaultActions } from '@/composables';
+import {
+    ArrowUpTray,
+    Bars3,
+    DocumentPlus,
+    FolderPlus,
+    PencilSquare,
+    Spinner,
+    UserGroup,
+} from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 import { useVaultStore } from '@/stores/vault';
 import { useVaultTreeStore } from '@/stores/vaultTree';
diff --git a/resources/js/components/tree/VaultTreeNode.vue b/resources/js/components/tree/VaultTreeNode.vue
index b60467d8..00196c94 100644
--- a/resources/js/components/tree/VaultTreeNode.vue
+++ b/resources/js/components/tree/VaultTreeNode.vue
@@ -2,28 +2,34 @@
 import { destroy } from '@/actions/App/Http/Controllers/VaultNodeController';
 import Menu from '@/components/menu/Menu.vue';
 import MenuItem from '@/components/menu/MenuItem.vue';
-import RequestConfirmationModal from '@/components/modal/RequestConfirmationModal.vue';
-import VaultFilesImportModal from '@/components/modal/VaultFilesImportModal.vue';
-import VaultNodeCreateModal from '@/components/modal/VaultNodeCreateModal.vue';
-import VaultNodeEditModal from '@/components/modal/VaultNodeEditModal.vue';
-import { useModalManager } from '@/composables/useModalManager';
-import { useScreenSize } from '@/composables/useScreenSize';
-import { useVaultActions } from '@/composables/useVaultActions';
-import { useVaultTreeActions } from '@/composables/useVaultTreeActions';
-import ArrowUpTray from '@/icons/ArrowUpTray.vue';
-import ChevronDown from '@/icons/ChevronDown.vue';
-import DocumentDuplicate from '@/icons/DocumentDuplicate.vue';
-import DocumentPlus from '@/icons/DocumentPlus.vue';
-import EllipsisVertical from '@/icons/EllipsisVertical.vue';
-import FileAudio from '@/icons/FileAudio.vue';
-import FileImage from '@/icons/FileImage.vue';
-import FileMarkdown from '@/icons/FileMarkdown.vue';
-import FilePDF from '@/icons/FilePDF.vue';
-import FileVideo from '@/icons/FileVideo.vue';
-import FolderPlus from '@/icons/FolderPlus.vue';
-import PencilSquare from '@/icons/PencilSquare.vue';
-import Spinner from '@/icons/Spinner.vue';
-import Trash from '@/icons/Trash.vue';
+import {
+    RequestConfirmationModal,
+    VaultFilesImportModal,
+    VaultNodeCreateModal,
+    VaultNodeEditModal,
+} from '@/components/modal';
+import {
+    useModalManager,
+    useScreenSize,
+    useVaultActions,
+    useVaultTreeActions,
+} from '@/composables';
+import {
+    ArrowUpTray,
+    ChevronDown,
+    DocumentDuplicate,
+    DocumentPlus,
+    EllipsisVertical,
+    FileAudio,
+    FileImage,
+    FileMarkdown,
+    FilePDF,
+    FileVideo,
+    FolderPlus,
+    PencilSquare,
+    Spinner,
+    Trash,
+} from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 import { useVaultStore } from '@/stores/vault';
 import { useVaultTreeStore } from '@/stores/vaultTree';
diff --git a/resources/js/components/vault/VaultFile.vue b/resources/js/components/vault/VaultFile.vue
index 31885b6c..e3bac0f1 100644
--- a/resources/js/components/vault/VaultFile.vue
+++ b/resources/js/components/vault/VaultFile.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import VaultNodeController from '@/actions/App/Http/Controllers/VaultNodeController';
-import TextError from '@/components/form/TextError.vue';
-import VaultFileUpdatingSpinner from '@/components/vault/VaultFileUpdatingSpinner.vue';
-import VaultToggleContentWidthButton from '@/components/vault/VaultToggleContentWidthButton.vue';
-import { useRequest } from '@/composables/useRequest';
-import { useVaultActions } from '@/composables/useVaultActions';
-import XMark from '@/icons/XMark.vue';
+import { TextError } from '@/components/form';
+import { VaultFileUpdatingSpinner, VaultToggleContentWidthButton } from '@/components/vault';
+import { useRequest, useVaultActions } from '@/composables';
+import { XMark } from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 import { useVaultTreeStore } from '@/stores/vaultTree';
 import { VaultNode } from '@/types/vault';
diff --git a/resources/js/components/vault/VaultFileIcon.vue b/resources/js/components/vault/VaultFileIcon.vue
index e0e0315f..1bf4be57 100644
--- a/resources/js/components/vault/VaultFileIcon.vue
+++ b/resources/js/components/vault/VaultFileIcon.vue
@@ -1,9 +1,5 @@
 <script setup lang="ts">
-import FileAudio from '@/icons/FileAudio.vue';
-import FileImage from '@/icons/FileImage.vue';
-import FileMarkdown from '@/icons/FileMarkdown.vue';
-import FilePDF from '@/icons/FilePDF.vue';
-import FileVideo from '@/icons/FileVideo.vue';
+import { FileAudio, FileImage, FileMarkdown, FilePDF, FileVideo } from '@/icons';
 
 defineProps<{
     file: {
diff --git a/resources/js/components/vault/VaultFileNote.vue b/resources/js/components/vault/VaultFileNote.vue
index e5593ac3..1de70ebb 100644
--- a/resources/js/components/vault/VaultFileNote.vue
+++ b/resources/js/components/vault/VaultFileNote.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import VaultNodeController from '@/actions/App/Http/Controllers/VaultNodeController';
-import { useEditor } from '@/composables/useEditor';
-import { useTiptapPreferences } from '@/composables/useTiptapPreferences';
-import { useRequest } from '@/composables/useRequest';
-import { useVaultActions } from '@/composables/useVaultActions';
-import { useVaultFileUpload } from '@/composables/useVaultFileUpload';
+import {
+    useEditor,
+    useRequest,
+    useTiptapPreferences,
+    useVaultActions,
+    useVaultFileUpload,
+} from '@/composables';
 import { useLayoutStore } from '@/stores/layout';
 import { VaultNode } from '@/types/vault';
 import { inject, onMounted, onUnmounted, ref, ShallowRef } from 'vue';
diff --git a/resources/js/components/vault/VaultFileUpdatingSpinner.vue b/resources/js/components/vault/VaultFileUpdatingSpinner.vue
index 51ab728c..fdd1fdce 100644
--- a/resources/js/components/vault/VaultFileUpdatingSpinner.vue
+++ b/resources/js/components/vault/VaultFileUpdatingSpinner.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Spinner from '@/icons/Spinner.vue';
+import { Spinner } from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 
 const layoutStore = useLayoutStore();
diff --git a/resources/js/components/vault/VaultToggleContentWidthButton.vue b/resources/js/components/vault/VaultToggleContentWidthButton.vue
index d8a530ff..d3cab0c0 100644
--- a/resources/js/components/vault/VaultToggleContentWidthButton.vue
+++ b/resources/js/components/vault/VaultToggleContentWidthButton.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Fullscreen from '@/icons/Fullscreen.vue';
+import { Fullscreen } from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 
 const layoutStore = useLayoutStore();
diff --git a/resources/js/components/vault/index.ts b/resources/js/components/vault/index.ts
new file mode 100644
index 00000000..47ba8ba1
--- /dev/null
+++ b/resources/js/components/vault/index.ts
@@ -0,0 +1,9 @@
+export { default as VaultFile } from './VaultFile.vue';
+export { default as VaultFileAudio } from './VaultFileAudio.vue';
+export { default as VaultFileIcon } from './VaultFileIcon.vue';
+export { default as VaultFileImage } from './VaultFileImage.vue';
+export { default as VaultFileNote } from './VaultFileNote.vue';
+export { default as VaultFilePdf } from './VaultFilePdf.vue';
+export { default as VaultFileUpdatingSpinner } from './VaultFileUpdatingSpinner.vue';
+export { default as VaultFileVideo } from './VaultFileVideo.vue';
+export { default as VaultToggleContentWidthButton } from './VaultToggleContentWidthButton.vue';
diff --git a/resources/js/composables/index.ts b/resources/js/composables/index.ts
new file mode 100644
index 00000000..bd9289e8
--- /dev/null
+++ b/resources/js/composables/index.ts
@@ -0,0 +1,15 @@
+export { useContentWidthPreference } from './useContentWidthPreference';
+export { useDownload } from './useDownload';
+export { useEditor } from './useEditor';
+export { useMenu } from './useMenu';
+export { useModalManager } from './useModalManager';
+export { useReloadOnPopstate } from './useReloadOnPopstate';
+export { useRequest } from './useRequest';
+export { useScreenSize } from './useScreenSize';
+export { useTheme } from './useTheme';
+export { useTiptapPreferences } from './useTiptapPreferences';
+export { useToast } from './useToast';
+export { useVaultActions } from './useVaultActions';
+export { getUploadableClipboardFiles, useVaultFileUpload } from './useVaultFileUpload';
+export { useVaultSearch } from './useVaultSearch';
+export { useVaultTreeActions } from './useVaultTreeActions';
diff --git a/resources/js/composables/useRequest.ts b/resources/js/composables/useRequest.ts
index b91c5c33..fbb0d157 100644
--- a/resources/js/composables/useRequest.ts
+++ b/resources/js/composables/useRequest.ts
@@ -1,4 +1,4 @@
-import { useToast } from '@/composables/useToast';
+import { useToast } from '@/composables';
 import type { Errors, FormDataType, HttpRequestHeaders } from '@inertiajs/core';
 import { useHttp } from '@inertiajs/vue3';
 import { useSocketId } from '@laravel/echo-vue';
diff --git a/resources/js/composables/useVaultFileUpload.ts b/resources/js/composables/useVaultFileUpload.ts
index 1b009a6f..87efdc36 100644
--- a/resources/js/composables/useVaultFileUpload.ts
+++ b/resources/js/composables/useVaultFileUpload.ts
@@ -1,6 +1,5 @@
 import VaultNodeImportController from '@/actions/App/Http/Controllers/VaultNodeImportController';
-import { useRequest } from '@/composables/useRequest';
-import { useToast } from '@/composables/useToast';
+import { useRequest, useToast } from '@/composables';
 import { useVaultRecentFileStore } from '@/stores/vaultRecentFile';
 import { useVaultTreeStore } from '@/stores/vaultTree';
 import { VaultNode } from '@/types/vault';
diff --git a/resources/js/icons/index.ts b/resources/js/icons/index.ts
new file mode 100644
index 00000000..75d113da
--- /dev/null
+++ b/resources/js/icons/index.ts
@@ -0,0 +1,74 @@
+export { default as AlignCenter } from './AlignCenter.vue';
+export { default as AlignLeft } from './AlignLeft.vue';
+export { default as AlignRight } from './AlignRight.vue';
+export { default as ArrowDownTray } from './ArrowDownTray.vue';
+export { default as ArrowUpTray } from './ArrowUpTray.vue';
+export { default as Bars3 } from './Bars3.vue';
+export { default as Bars3BottomLeft } from './Bars3BottomLeft.vue';
+export { default as Bars3BottomRight } from './Bars3BottomRight.vue';
+export { default as Bell } from './Bell.vue';
+export { default as Bold } from './Bold.vue';
+export { default as CheckCircle } from './CheckCircle.vue';
+export { default as ChevronDown } from './ChevronDown.vue';
+export { default as CircleStack } from './CircleStack.vue';
+export { default as Code } from './Code.vue';
+export { default as CodeInline } from './CodeInline.vue';
+export { default as Cog6Tooth } from './Cog6Tooth.vue';
+export { default as DocumentDuplicate } from './DocumentDuplicate.vue';
+export { default as DocumentPlus } from './DocumentPlus.vue';
+export { default as EllipsisVertical } from './EllipsisVertical.vue';
+export { default as ExclamationCircle } from './ExclamationCircle.vue';
+export { default as ExclamationTriangle } from './ExclamationTriangle.vue';
+export { default as FileAudio } from './FileAudio.vue';
+export { default as FileImage } from './FileImage.vue';
+export { default as FileMarkdown } from './FileMarkdown.vue';
+export { default as FilePDF } from './FilePDF.vue';
+export { default as FileVideo } from './FileVideo.vue';
+export { default as FolderPlus } from './FolderPlus.vue';
+export { default as Fullscreen } from './Fullscreen.vue';
+export { default as Heading } from './Heading.vue';
+export { default as Heading1 } from './Heading1.vue';
+export { default as Heading2 } from './Heading2.vue';
+export { default as Heading3 } from './Heading3.vue';
+export { default as Heading4 } from './Heading4.vue';
+export { default as Heading5 } from './Heading5.vue';
+export { default as Heading6 } from './Heading6.vue';
+export { default as Heart } from './Heart.vue';
+export { default as HorizontalRule } from './HorizontalRule.vue';
+export { default as Image } from './Image.vue';
+export { default as Indent } from './Indent.vue';
+export { default as InformationCircle } from './InformationCircle.vue';
+export { default as Italic } from './Italic.vue';
+export { default as Link } from './Link.vue';
+export { default as List } from './List.vue';
+export { default as ListOrdered } from './ListOrdered.vue';
+export { default as ListTodo } from './ListTodo.vue';
+export { default as Lock } from './Lock.vue';
+export { default as MagnifyingGlass } from './MagnifyingGlass.vue';
+export { default as Markdown } from './Markdown.vue';
+export { default as MessageCircleQuestionMark } from './MessageCircleQuestionMark.vue';
+export { default as Moon } from './Moon.vue';
+export { default as Outdent } from './Outdent.vue';
+export { default as PencilOff } from './PencilOff.vue';
+export { default as PencilSquare } from './PencilSquare.vue';
+export { default as Pilcrow } from './Pilcrow.vue';
+export { default as Plus } from './Plus.vue';
+export { default as Print } from './Print.vue';
+export { default as Quote } from './Quote.vue';
+export { default as Redo } from './Redo.vue';
+export { default as Spellcheck } from './Spellcheck.vue';
+export { default as Spinner } from './Spinner.vue';
+export { default as Strike } from './Strike.vue';
+export { default as TableAdd } from './TableAdd.vue';
+export { default as TableAddColumn } from './TableAddColumn.vue';
+export { default as TableAddRow } from './TableAddRow.vue';
+export { default as TableDelete } from './TableDelete.vue';
+export { default as TableDeleteColumn } from './TableDeleteColumn.vue';
+export { default as TableDeleteRow } from './TableDeleteRow.vue';
+export { default as Template } from './Template.vue';
+export { default as Text } from './Text.vue';
+export { default as Trash } from './Trash.vue';
+export { default as Undo } from './Undo.vue';
+export { default as User } from './User.vue';
+export { default as UserGroup } from './UserGroup.vue';
+export { default as XMark } from './XMark.vue';
diff --git a/resources/js/layouts/AuthLayout.vue b/resources/js/layouts/AuthLayout.vue
index 2fbe0102..26145841 100644
--- a/resources/js/layouts/AuthLayout.vue
+++ b/resources/js/layouts/AuthLayout.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ModalManager from '@/components/modal/ModalManager.vue';
+import { ModalManager } from '@/components/modal';
 import Toast from '@/components/toast/Toast.vue';
-import Spinner from '@/icons/Spinner.vue';
+import { Spinner } from '@/icons';
 import { useLayoutStore } from '@/stores/layout';
 import { useNotificationStore } from '@/stores/notification';
 import { hydrateStoresFromPageProps } from '@/inertia/hydrateStores';
diff --git a/resources/js/pages/Error.vue b/resources/js/pages/Error.vue
index 21f4065e..7c221a83 100644
--- a/resources/js/pages/Error.vue
+++ b/resources/js/pages/Error.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TextLink from '@/components/form/TextLink.vue';
+import { TextLink } from '@/components/form';
 import GuestLayout from '@/layouts/GuestLayout.vue';
 import { Head } from '@inertiajs/vue3';
 import { computed } from 'vue';
diff --git a/resources/js/pages/auth/ForgotPassword.vue b/resources/js/pages/auth/ForgotPassword.vue
index 6546e011..3418bbdc 100644
--- a/resources/js/pages/auth/ForgotPassword.vue
+++ b/resources/js/pages/auth/ForgotPassword.vue
@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import ForgotPasswordController from '@/actions/App/Http/Controllers/Auth/ForgotPasswordController';
-import Input from '@/components/form/Input.vue';
-import Submit from '@/components/form/Submit.vue';
-import TextLink from '@/components/form/TextLink.vue';
-import TextSuccess from '@/components/form/TextSuccess.vue';
+import { Input, Submit, TextLink, TextSuccess } from '@/components/form';
 import GuestLayout from '@/layouts/GuestLayout.vue';
 import { login } from '@/routes';
 import { Form, Head, usePage } from '@inertiajs/vue3';
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index 73fed2a8..b03e8056 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import LoginController from '@/actions/App/Http/Controllers/Auth/LoginController';
-import Checkbox from '@/components/form/Checkbox.vue';
-import Input from '@/components/form/Input.vue';
-import LinkButton from '@/components/form/LinkButton.vue';
-import Submit from '@/components/form/Submit.vue';
-import TextError from '@/components/form/TextError.vue';
-import TextLink from '@/components/form/TextLink.vue';
-import TextSuccess from '@/components/form/TextSuccess.vue';
-import ArrowDownTray from '@/icons/ArrowDownTray.vue';
+import {
+    Checkbox,
+    Input,
+    LinkButton,
+    Submit,
+    TextError,
+    TextLink,
+    TextSuccess,
+} from '@/components/form';
+import { ArrowDownTray } from '@/icons';
 import GuestLayout from '@/layouts/GuestLayout.vue';
 import { register } from '@/routes';
 import { Form, Head, usePage } from '@inertiajs/vue3';
diff --git a/resources/js/pages/auth/Register.vue b/resources/js/pages/auth/Register.vue
index 607d40dd..14fa2dec 100644
--- a/resources/js/pages/auth/Register.vue
+++ b/resources/js/pages/auth/Register.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import RegisterController from '@/actions/App/Http/Controllers/Auth/RegisterController';
-import Input from '@/components/form/Input.vue';
-import Submit from '@/components/form/Submit.vue';
-import TextLink from '@/components/form/TextLink.vue';
+import { Input, Submit, TextLink } from '@/components/form';
 import GuestLayout from '@/layouts/GuestLayout.vue';
 import { login } from '@/routes';
 import { Form, Head } from '@inertiajs/vue3';
diff --git a/resources/js/pages/auth/ResetPassword.vue b/resources/js/pages/auth/ResetPassword.vue
index c9322f7d..0a7d5c61 100644
--- a/resources/js/pages/auth/ResetPassword.vue
+++ b/resources/js/pages/auth/ResetPassword.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import ResetPasswordController from '@/actions/App/Http/Controllers/Auth/ResetPasswordController';
-import Input from '@/components/form/Input.vue';
-import Submit from '@/components/form/Submit.vue';
-import TextLink from '@/components/form/TextLink.vue';
+import { Input, Submit, TextLink } from '@/components/form';
 import GuestLayout from '@/layouts/GuestLayout.vue';
 import { login } from '@/routes';
 import { Form, Head } from '@inertiajs/vue3';
diff --git a/resources/js/pages/vault/Index.vue b/resources/js/pages/vault/Index.vue
index f875f2bc..e02029ed 100644
--- a/resources/js/pages/vault/Index.vue
+++ b/resources/js/pages/vault/Index.vue
@@ -4,20 +4,22 @@ import Menu from '@/components/menu/Menu.vue';
 import MenuItem from '@/components/menu/MenuItem.vue';
 import NotificationMenu from '@/components/menu/NotificationMenu.vue';
 import UserMenu from '@/components/menu/UserMenu.vue';
-import RequestConfirmationModal from '@/components/modal/RequestConfirmationModal.vue';
-import VaultCreateModal from '@/components/modal/VaultCreateModal.vue';
-import VaultEditModal from '@/components/modal/VaultEditModal.vue';
-import VaultImportModal from '@/components/modal/VaultImportModal.vue';
-import { useDownload } from '@/composables/useDownload';
-import { useModalManager } from '@/composables/useModalManager';
-import { useToast } from '@/composables/useToast';
-import ArrowDownTray from '@/icons/ArrowDownTray.vue';
-import ArrowUpTray from '@/icons/ArrowUpTray.vue';
-import EllipsisVertical from '@/icons/EllipsisVertical.vue';
-import PencilSquare from '@/icons/PencilSquare.vue';
-import Plus from '@/icons/Plus.vue';
-import Trash from '@/icons/Trash.vue';
-import UserGroup from '@/icons/UserGroup.vue';
+import {
+    RequestConfirmationModal,
+    VaultCreateModal,
+    VaultEditModal,
+    VaultImportModal,
+} from '@/components/modal';
+import { useDownload, useModalManager, useToast } from '@/composables';
+import {
+    ArrowDownTray,
+    ArrowUpTray,
+    EllipsisVertical,
+    PencilSquare,
+    Plus,
+    Trash,
+    UserGroup,
+} from '@/icons';
 import { reloadWithLoading } from '@/inertia/reloadWithLoading';
 import AuthLayout from '@/layouts/AuthLayout.vue';
 import { exportMethod } from '@/routes/vaults';
diff --git a/resources/js/pages/vault/Show.vue b/resources/js/pages/vault/Show.vue
index 1b10410c..dcf0bcc3 100644
--- a/resources/js/pages/vault/Show.vue
+++ b/resources/js/pages/vault/Show.vue
@@ -2,29 +2,29 @@
 import MarkdownToolbar from '@/components/editor/MarkdownToolbar.vue';
 import NotificationMenu from '@/components/menu/NotificationMenu.vue';
 import UserMenu from '@/components/menu/UserMenu.vue';
-import VaultNodeCreateModal from '@/components/modal/VaultNodeCreateModal.vue';
-import VaultSearchModal from '@/components/modal/VaultSearchModal.vue';
+import { VaultNodeCreateModal, VaultSearchModal } from '@/components/modal';
 import VaultTree from '@/components/tree/VaultTree.vue';
-import VaultFile from '@/components/vault/VaultFile.vue';
-import VaultFileAudio from '@/components/vault/VaultFileAudio.vue';
-import VaultFileIcon from '@/components/vault/VaultFileIcon.vue';
-import VaultFileImage from '@/components/vault/VaultFileImage.vue';
-import VaultFileNote from '@/components/vault/VaultFileNote.vue';
-import VaultFilePdf from '@/components/vault/VaultFilePdf.vue';
-import VaultFileVideo from '@/components/vault/VaultFileVideo.vue';
-import VaultToggleContentWidthButton from '@/components/vault/VaultToggleContentWidthButton.vue';
-import { useContentWidthPreference } from '@/composables/useContentWidthPreference';
-import { useEditor } from '@/composables/useEditor';
-import { useModalManager } from '@/composables/useModalManager';
-import { useReloadOnPopstate } from '@/composables/useReloadOnPopstate';
-import { useScreenSize } from '@/composables/useScreenSize';
-import { useToast } from '@/composables/useToast';
-import { useVaultActions } from '@/composables/useVaultActions';
-import { useVaultTreeActions } from '@/composables/useVaultTreeActions';
-import Bars3BottomLeft from '@/icons/Bars3BottomLeft.vue';
-import Bars3BottomRight from '@/icons/Bars3BottomRight.vue';
-import MagnifyingGlass from '@/icons/MagnifyingGlass.vue';
-import Plus from '@/icons/Plus.vue';
+import {
+    VaultFile,
+    VaultFileAudio,
+    VaultFileIcon,
+    VaultFileImage,
+    VaultFileNote,
+    VaultFilePdf,
+    VaultFileVideo,
+    VaultToggleContentWidthButton,
+} from '@/components/vault';
+import {
+    useContentWidthPreference,
+    useEditor,
+    useModalManager,
+    useReloadOnPopstate,
+    useScreenSize,
+    useToast,
+    useVaultActions,
+    useVaultTreeActions,
+} from '@/composables';
+import { Bars3BottomLeft, Bars3BottomRight, MagnifyingGlass, Plus } from '@/icons';
 import AuthLayout from '@/layouts/AuthLayout.vue';
 import { index } from '@/routes/vaults';
 import { useLayoutStore } from '@/stores/layout';
diff --git a/resources/js/services/tiptap/extension-vault-file-upload.ts b/resources/js/services/tiptap/extension-vault-file-upload.ts
index 6150d148..39cc3d36 100644
--- a/resources/js/services/tiptap/extension-vault-file-upload.ts
+++ b/resources/js/services/tiptap/extension-vault-file-upload.ts
@@ -1,4 +1,4 @@
-import { getUploadableClipboardFiles } from '@/composables/useVaultFileUpload';
+import { getUploadableClipboardFiles } from '@/composables';
 import { createVaultFileNode, insertInlineNodes } from '@/services/tiptap/utils';
 import { VaultNode } from '@/types/vault';
 import { Extension } from '@tiptap/core';