diff --git a/src/frontend/apps/impress/src/components/index.ts b/src/frontend/apps/impress/src/components/index.ts
index b6eb2cd8..205b7224 100644
--- a/src/frontend/apps/impress/src/components/index.ts
+++ b/src/frontend/apps/impress/src/components/index.ts
@@ -6,7 +6,8 @@ export * from './DropdownMenu';
export * from './Icon';
export * from './InfiniteScroll';
export * from './Link';
+export * from './LoadMoreText';
export * from './SideModal';
-export * from './separators/SeparatedSection';
+export * from './separators';
export * from './Text';
export * from './TextErrors';
diff --git a/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx b/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx
index 1cf5dae2..2fa88e54 100644
--- a/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx
+++ b/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx
@@ -3,7 +3,7 @@ import { Command } from 'cmdk';
import { ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
-import { HorizontalSeparator } from '@/components/separators/HorizontalSeparator';
+import { HorizontalSeparator } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
import { Box } from '../Box';
diff --git a/src/frontend/apps/impress/src/components/separators/index.ts b/src/frontend/apps/impress/src/components/separators/index.ts
new file mode 100644
index 00000000..f8d2100c
--- /dev/null
+++ b/src/frontend/apps/impress/src/components/separators/index.ts
@@ -0,0 +1,2 @@
+export * from './HorizontalSeparator';
+export * from './SeparatedSection';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocHeader.tsx b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocHeader.tsx
index f40e7248..042c5a9b 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocHeader.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocHeader.tsx
@@ -2,8 +2,7 @@ import { DateTime } from 'luxon';
import { useTranslation } from 'react-i18next';
import { css } from 'styled-components';
-import { Box, Icon, Text } from '@/components';
-import { HorizontalSeparator } from '@/components/separators/HorizontalSeparator';
+import { Box, HorizontalSeparator, Icon, Text } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
import {
Doc,
diff --git a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx
index 2144fa12..adf3ce5c 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx
@@ -20,14 +20,13 @@ import { useAuthStore } from '@/core';
import { useCunninghamTheme } from '@/cunningham';
import { useEditorStore } from '@/features/docs/doc-editor/';
import { Doc, ModalRemoveDoc } from '@/features/docs/doc-management';
+import { DocShareModal } from '@/features/docs/doc-share';
import {
KEY_LIST_DOC_VERSIONS,
ModalSelectVersion,
} from '@/features/docs/doc-versioning';
import { useResponsiveStore } from '@/stores';
-import { DocShareModal } from '../../doc-share/component/DocShareModal';
-
import { ModalPDF } from './ModalExport';
interface DocToolBoxProps {
diff --git a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocVersionHeader.tsx b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocVersionHeader.tsx
index 5625c36a..12be2d40 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-header/components/DocVersionHeader.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-header/components/DocVersionHeader.tsx
@@ -1,7 +1,6 @@
import { useTranslation } from 'react-i18next';
-import { Box } from '@/components';
-import { HorizontalSeparator } from '@/components/separators/HorizontalSeparator';
+import { Box, HorizontalSeparator } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
import { DocTitleText } from './DocTitle';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/api/index.ts b/src/frontend/apps/impress/src/features/docs/doc-management/api/index.ts
index f6f44e9f..11123c6b 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-management/api/index.ts
+++ b/src/frontend/apps/impress/src/features/docs/doc-management/api/index.ts
@@ -1,4 +1,5 @@
export * from './useCreateDoc';
+export * from './useDeleteFavoriteDoc';
export * from './useDoc';
export * from './useDocOptions';
export * from './useDocs';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/assets/pinned-document.svg b/src/frontend/apps/impress/src/features/docs/doc-management/assets/pinned-document.svg
deleted file mode 100644
index c5084262..00000000
--- a/src/frontend/apps/impress/src/features/docs/doc-management/assets/pinned-document.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/assets/simple-document.svg b/src/frontend/apps/impress/src/features/docs/doc-management/assets/simple-document.svg
deleted file mode 100644
index 0ba43b24..00000000
--- a/src/frontend/apps/impress/src/features/docs/doc-management/assets/simple-document.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchItem.tsx b/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchItem.tsx
index e066193a..28387193 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchItem.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchItem.tsx
@@ -1,7 +1,7 @@
import { Box, Icon } from '@/components';
-import { QuickSearchItemContent } from '@/components/quick-search/QuickSearchItemContent';
+import { QuickSearchItemContent } from '@/components/quick-search/';
import { Doc } from '@/features/docs/doc-management';
-import { SimpleDocItem } from '@/features/docs/docs-grid/components/SimpleDocItem';
+import { SimpleDocItem } from '@/features/docs/docs-grid/';
import { useResponsiveStore } from '@/stores';
type DocSearchItemProps = {
diff --git a/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx b/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx
index 634d50f0..7585ba4a 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx
@@ -12,10 +12,10 @@ import {
QuickSearchData,
QuickSearchGroup,
} from '@/components/quick-search';
-import EmptySearchIcon from '@/features/docs/doc-search/assets/illustration-docs-empty.png';
+import { Doc, useInfiniteDocs } from '@/features/docs/doc-management';
import { useResponsiveStore } from '@/stores';
-import { Doc, useInfiniteDocs } from '../../doc-management';
+import EmptySearchIcon from '../assets/illustration-docs-empty.png';
import { DocSearchItem } from './DocSearchItem';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-search/components/index.ts b/src/frontend/apps/impress/src/features/docs/doc-search/components/index.ts
new file mode 100644
index 00000000..a5cb9885
--- /dev/null
+++ b/src/frontend/apps/impress/src/features/docs/doc-search/components/index.ts
@@ -0,0 +1 @@
+export * from './DocSearchModal';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-search/index.ts b/src/frontend/apps/impress/src/features/docs/doc-search/index.ts
new file mode 100644
index 00000000..07635cbb
--- /dev/null
+++ b/src/frontend/apps/impress/src/features/docs/doc-search/index.ts
@@ -0,0 +1 @@
+export * from './components';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocRoleDropdown.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocRoleDropdown.tsx
similarity index 92%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocRoleDropdown.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocRoleDropdown.tsx
index 352b2a3e..1e523755 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocRoleDropdown.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocRoleDropdown.tsx
@@ -1,9 +1,7 @@
import { css } from 'styled-components';
import { DropdownMenu, DropdownMenuOption, Text } from '@/components';
-
-import { useTrans } from '../../doc-management/hooks';
-import { Role } from '../../doc-management/types';
+import { Role, useTrans } from '@/features/docs/doc-management/';
type Props = {
currentRole: Role;
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareAddMemberList.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberList.tsx
similarity index 96%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareAddMemberList.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberList.tsx
index 322b4382..786cc38f 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareAddMemberList.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberList.tsx
@@ -12,13 +12,11 @@ import { Box } from '@/components';
import { User } from '@/core';
import { useCunninghamTheme } from '@/cunningham';
import { Doc, Role } from '@/features/docs';
-import {
- useCreateDocAccess,
- useCreateDocInvitation,
-} from '@/features/docs/doc-share';
-import { OptionType } from '@/features/docs/doc-share/types';
import { useLanguage } from '@/i18n/hooks/useLanguage';
+import { useCreateDocAccess, useCreateDocInvitation } from '../api';
+import { OptionType } from '../types';
+
import { DocRoleDropdown } from './DocRoleDropdown';
import { DocShareAddMemberListItem } from './DocShareAddMemberListItem';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareAddMemberListItem.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberListItem.tsx
similarity index 100%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareAddMemberListItem.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberListItem.tsx
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareInvitationItem.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitationItem.tsx
similarity index 91%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareInvitationItem.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitationItem.tsx
index de253de2..bc05d17d 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareInvitationItem.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitationItem.tsx
@@ -10,14 +10,12 @@ import {
import { User } from '@/core';
import { useCunninghamTheme } from '@/cunningham';
import { Doc, Role } from '@/features/docs/doc-management';
-import {
- useDeleteDocInvitation,
- useUpdateDocInvitation,
-} from '@/features/docs/doc-share';
-import { SearchUserRow } from '@/features/docs/doc-share/component/SearchUserRow';
-import { Invitation } from '@/features/docs/doc-share/types';
+
+import { useDeleteDocInvitation, useUpdateDocInvitation } from '../api';
+import { Invitation } from '../types';
import { DocRoleDropdown } from './DocRoleDropdown';
+import { SearchUserRow } from './SearchUserRow';
type Props = {
doc: Doc;
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareMemberItem.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareMemberItem.tsx
similarity index 90%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareMemberItem.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareMemberItem.tsx
index 7dee295d..1b09154e 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareMemberItem.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareMemberItem.tsx
@@ -8,14 +8,14 @@ import {
IconOptions,
} from '@/components';
import { useCunninghamTheme } from '@/cunningham';
-import { SearchUserRow } from '@/features/docs/doc-share/component/SearchUserRow';
-import { useWhoAmI } from '@/features/docs/doc-share/hooks/useWhoAmI';
+import { Access, Doc, Role } from '@/features/docs/doc-management/';
import { useResponsiveStore } from '@/stores';
-import { Access, Doc, Role } from '../../doc-management/types';
-import { useDeleteDocAccess, useUpdateDocAccess } from '../index';
+import { useDeleteDocAccess, useUpdateDocAccess } from '../api';
+import { useWhoAmI } from '../hooks/';
import { DocRoleDropdown } from './DocRoleDropdown';
+import { SearchUserRow } from './SearchUserRow';
type Props = {
doc: Doc;
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModal.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModal.tsx
similarity index 96%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModal.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModal.tsx
index 32b4f196..ea44a0e3 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModal.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModal.tsx
@@ -4,24 +4,24 @@ import { useTranslation } from 'react-i18next';
import { createGlobalStyle, css } from 'styled-components';
import { useDebouncedCallback } from 'use-debounce';
-import { Box } from '@/components';
-import { LoadMoreText } from '@/components/LoadMoreText';
+import { Box, LoadMoreText } from '@/components';
import {
QuickSearch,
QuickSearchData,
-} from '@/components/quick-search/QuickSearch';
-import { QuickSearchGroup } from '@/components/quick-search/QuickSearchGroup';
+ QuickSearchGroup,
+} from '@/components/quick-search/';
import { User } from '@/core';
import { Access, Doc } from '@/features/docs';
+import { useResponsiveStore } from '@/stores';
+import { isValidEmail } from '@/utils';
+
import {
KEY_LIST_USER,
useDocAccessesInfinite,
useDocInvitationsInfinite,
useUsers,
-} from '@/features/docs/doc-share';
-import { Invitation } from '@/features/docs/doc-share/types';
-import { useResponsiveStore } from '@/stores';
-import { isValidEmail } from '@/utils';
+} from '../api';
+import { Invitation } from '../types';
import { DocShareAddMemberList } from './DocShareAddMemberList';
import { DocShareInvitationItem } from './DocShareInvitationItem';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalFooter.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalFooter.tsx
similarity index 93%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalFooter.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalFooter.tsx
index c48f048f..ea812726 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalFooter.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalFooter.tsx
@@ -6,8 +6,7 @@ import {
import { useTranslation } from 'react-i18next';
import { css } from 'styled-components';
-import { Box } from '@/components';
-import { HorizontalSeparator } from '@/components/separators/HorizontalSeparator';
+import { Box, HorizontalSeparator } from '@/components';
import { Doc } from '@/features/docs';
import { DocVisibility } from './DocVisibility';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalInviteUserByEmail.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalInviteUserByEmail.tsx
similarity index 92%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalInviteUserByEmail.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalInviteUserByEmail.tsx
index 0f8b80ff..da6c0925 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocShareModalInviteUserByEmail.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModalInviteUserByEmail.tsx
@@ -3,7 +3,8 @@ import { css } from 'styled-components';
import { Box, Icon, Text } from '@/components';
import { User } from '@/core';
-import { SearchUserRow } from '@/features/docs/doc-share/component/SearchUserRow';
+
+import { SearchUserRow } from './SearchUserRow';
type Props = {
user: User;
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocVisibility.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocVisibility.tsx
similarity index 98%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/DocVisibility.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/DocVisibility.tsx
index 2e55da90..8a032148 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/DocVisibility.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocVisibility.tsx
@@ -19,9 +19,10 @@ import {
LinkRole,
useUpdateDocLink,
} from '@/features/docs';
-import { useTranslatedShareSettings } from '@/features/docs/doc-share';
import { useResponsiveStore } from '@/stores';
+import { useTranslatedShareSettings } from '../hooks/';
+
interface DocVisibilityProps {
doc: Doc;
}
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/SearchUserRow.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/SearchUserRow.tsx
similarity index 95%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/SearchUserRow.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/SearchUserRow.tsx
index bb3746bd..ce4f9e50 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/component/SearchUserRow.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/SearchUserRow.tsx
@@ -2,7 +2,7 @@ import { Box, Text } from '@/components';
import {
QuickSearchItemContent,
QuickSearchItemContentProps,
-} from '@/components/quick-search/QuickSearchItemContent';
+} from '@/components/quick-search';
import { User } from '@/core';
import { useCunninghamTheme } from '@/cunningham';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/component/UserAvatar.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/UserAvatar.tsx
similarity index 100%
rename from src/frontend/apps/impress/src/features/docs/doc-share/component/UserAvatar.tsx
rename to src/frontend/apps/impress/src/features/docs/doc-share/components/UserAvatar.tsx
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/components/index.ts b/src/frontend/apps/impress/src/features/docs/doc-share/components/index.ts
new file mode 100644
index 00000000..aa4746c3
--- /dev/null
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/index.ts
@@ -0,0 +1 @@
+export * from './DocShareModal';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/index.ts b/src/frontend/apps/impress/src/features/docs/doc-share/index.ts
index 3fdace48..14fa9fe2 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/index.ts
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/index.ts
@@ -1,2 +1,4 @@
export * from './api';
+export * from './components';
export * from './hooks';
+export * from './types';
diff --git a/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalSelectVersion.tsx b/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalSelectVersion.tsx
index 05a920be..9485f64b 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalSelectVersion.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalSelectVersion.tsx
@@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next';
import { createGlobalStyle, css } from 'styled-components';
import { Box, Icon, Text } from '@/components';
+import { DocEditor } from '@/features/docs/doc-editor';
+import { Doc } from '@/features/docs/doc-management';
-import { DocEditor } from '../../doc-editor/components/DocEditor';
-import { Doc } from '../../doc-management';
import { Versions } from '../types';
import { ModalConfirmationVersion } from './ModalConfirmationVersion';
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/assets/pinned-document.svg b/src/frontend/apps/impress/src/features/docs/docs-grid/assets/pinned-document.svg
new file mode 100644
index 00000000..af34c0b0
--- /dev/null
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/assets/pinned-document.svg
@@ -0,0 +1,51 @@
+
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/assets/simple-document.svg b/src/frontend/apps/impress/src/features/docs/docs-grid/assets/simple-document.svg
new file mode 100644
index 00000000..817cf203
--- /dev/null
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/assets/simple-document.svg
@@ -0,0 +1,37 @@
+
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx
index a62c7e41..e74d7f62 100644
--- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx
@@ -4,10 +4,12 @@ import { InView } from 'react-intersection-observer';
import { css } from 'styled-components';
import { Box, Card, Text } from '@/components';
+import {
+ DocDefaultFilter,
+ useInfiniteDocs,
+} from '@/features/docs/doc-management';
import { useResponsiveStore } from '@/stores';
-import { DocDefaultFilter, useInfiniteDocs } from '../../doc-management';
-
import { DocsGridItem } from './DocsGridItem';
import { DocsGridLoader } from './DocsGridLoader';
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx
index 05c520ad..c6326eb1 100644
--- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx
@@ -7,10 +7,9 @@ import {
KEY_LIST_DOC,
ModalRemoveDoc,
useCreateFavoriteDoc,
+ useDeleteFavoriteDoc,
} from '@/features/docs/doc-management';
-import { useDeleteFavoriteDoc } from '../../doc-management/api/useDeleteFavoriteDoc';
-
interface DocsGridActionsProps {
doc: Doc;
openShareModal?: () => void;
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridItem.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridItem.tsx
index 120a69b6..43ab0ad3 100644
--- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridItem.tsx
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridItem.tsx
@@ -3,11 +3,10 @@ import { DateTime } from 'luxon';
import { css } from 'styled-components';
import { Box, Icon, StyledLink, Text } from '@/components';
-import { DocShareModal } from '@/features/docs/doc-share/component/DocShareModal';
+import { Doc, LinkReach } from '@/features/docs/doc-management';
+import { DocShareModal } from '@/features/docs/doc-share';
import { useResponsiveStore } from '@/stores';
-import { Doc, LinkReach } from '../../doc-management';
-
import { DocsGridActions } from './DocsGridActions';
import { SimpleDocItem } from './SimpleDocItem';
diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/SimpleDocItem.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/SimpleDocItem.tsx
index 8732f998..919f9387 100644
--- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/SimpleDocItem.tsx
+++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/SimpleDocItem.tsx
@@ -3,11 +3,12 @@ import { css } from 'styled-components';
import { Box, Icon, Text } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
-import { Doc, LinkReach } from '@/features/docs';
-import PinnedDocumentIcon from '@/features/docs/doc-management/assets/pinned-document.svg';
-import SimpleFileIcon from '@/features/docs/doc-management/assets/simple-document.svg';
+import { Doc, LinkReach } from '@/features/docs/doc-management';
import { useResponsiveStore } from '@/stores';
+import PinnedDocumentIcon from '../assets/pinned-document.svg';
+import SimpleFileIcon from '../assets/simple-document.svg';
+
const ItemTextCss = css`
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelDocContent.tsx b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelDocContent.tsx
index d571b698..7439b466 100644
--- a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelDocContent.tsx
+++ b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelDocContent.tsx
@@ -2,8 +2,8 @@ import { css } from 'styled-components';
import { Box, SeparatedSection } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
-import { useDocStore } from '@/features/docs';
-import { SimpleDocItem } from '@/features/docs/docs-grid/components/SimpleDocItem';
+import { useDocStore } from '@/features/docs/doc-management';
+import { SimpleDocItem } from '@/features/docs/docs-grid';
export const LeftPanelDocContent = () => {
const { currentDoc } = useDocStore();
diff --git a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavoriteItem.tsx b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavoriteItem.tsx
index 374e67c6..02abb3ec 100644
--- a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavoriteItem.tsx
+++ b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavoriteItem.tsx
@@ -3,8 +3,9 @@ import { css } from 'styled-components';
import { Box, StyledLink } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
-import { Doc, DocsGridActions, SimpleDocItem } from '@/features/docs';
-import { DocShareModal } from '@/features/docs/doc-share/component/DocShareModal';
+import { Doc } from '@/features/docs/doc-management';
+import { DocShareModal } from '@/features/docs/doc-share';
+import { DocsGridActions, SimpleDocItem } from '@/features/docs/docs-grid';
import { useResponsiveStore } from '@/stores';
type LeftPanelFavoriteItemProps = {
diff --git a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavorites.tsx b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavorites.tsx
index 8ab80bd7..b9abc370 100644
--- a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavorites.tsx
+++ b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelFavorites.tsx
@@ -1,9 +1,8 @@
import { useTranslation } from 'react-i18next';
-import { Box, InfiniteScroll, Text } from '@/components';
-import { HorizontalSeparator } from '@/components/separators/HorizontalSeparator';
+import { Box, HorizontalSeparator, InfiniteScroll, Text } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
-import { useInfiniteDocs } from '@/features/docs';
+import { useInfiniteDocs } from '@/features/docs/doc-management';
import { LeftPanelFavoriteItem } from './LeftPanelFavoriteItem';
diff --git a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelHeader.tsx b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelHeader.tsx
index 0d1257b3..66f59c0c 100644
--- a/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelHeader.tsx
+++ b/src/frontend/apps/impress/src/features/left-panel/components/LeftPanelHeader.tsx
@@ -4,8 +4,8 @@ import { useRouter } from 'next/navigation';
import { PropsWithChildren } from 'react';
import { Box, Icon, SeparatedSection } from '@/components';
-import { useCreateDoc } from '@/features/docs';
-import { DocSearchModal } from '@/features/docs/doc-search/components/DocSearchModal';
+import { useCreateDoc } from '@/features/docs/doc-management';
+import { DocSearchModal } from '@/features/docs/doc-search';
import { useCmdK } from '@/hook/useCmdK';
import { useLeftPanelStore } from '../stores';
diff --git a/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx b/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx
index ede0f454..95b29a5d 100644
--- a/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx
+++ b/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx
@@ -4,8 +4,7 @@ import Head from 'next/head';
import { useRouter } from 'next/router';
import { useEffect, useState } from 'react';
-import { Box, Text } from '@/components';
-import { TextErrors } from '@/components/TextErrors';
+import { Box, Text, TextErrors } from '@/components';
import { useAuthStore } from '@/core/auth';
import { DocEditor } from '@/features/docs/doc-editor';
import {
diff --git a/src/frontend/apps/impress/src/pages/docs/index.tsx b/src/frontend/apps/impress/src/pages/docs/index.tsx
index 899e2d7f..4609c048 100644
--- a/src/frontend/apps/impress/src/pages/docs/index.tsx
+++ b/src/frontend/apps/impress/src/pages/docs/index.tsx
@@ -2,7 +2,7 @@ import { useSearchParams } from 'next/navigation';
import type { ReactElement } from 'react';
import { DocDefaultFilter } from '@/features/docs';
-import { DocsGrid } from '@/features/docs/docs-grid/components/DocsGrid';
+import { DocsGrid } from '@/features/docs/docs-grid';
import { MainLayout } from '@/layouts';
import { NextPageWithLayout } from '@/types/next';