diff --git a/frontend/src/components/editor-page/sidebar/upload-input.tsx b/frontend/src/components/common/upload-input.tsx
similarity index 87%
rename from frontend/src/components/editor-page/sidebar/upload-input.tsx
rename to frontend/src/components/common/upload-input.tsx
index 152276a5b..7486dd148 100644
--- a/frontend/src/components/editor-page/sidebar/upload-input.tsx
+++ b/frontend/src/components/common/upload-input.tsx
@@ -1,11 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { PropsWithDataCypressId } from '../../../utils/cypress-attribute'
-import { cypressId } from '../../../utils/cypress-attribute'
-import { Logger } from '../../../utils/logger'
+import type { PropsWithDataCypressId } from '../../utils/cypress-attribute'
+import { cypressId } from '../../utils/cypress-attribute'
+import { Logger } from '../../utils/logger'
 import type { MutableRefObject } from 'react'
 import React, { useCallback, useEffect, useRef } from 'react'
 
diff --git a/frontend/src/components/document-read-only-page/document-infobar.tsx b/frontend/src/components/document-read-only-page/document-infobar.tsx
index d3822e5ad..5c4a7dbd7 100644
--- a/frontend/src/components/document-read-only-page/document-infobar.tsx
+++ b/frontend/src/components/document-read-only-page/document-infobar.tsx
@@ -1,13 +1,13 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { useApplicationState } from '../../hooks/common/use-application-state'
 import { InternalLink } from '../common/links/internal-link'
 import { ShowIf } from '../common/show-if/show-if'
-import { NoteInfoLineCreated } from '../editor-page/document-bar/note-info/note-info-line-created'
-import { NoteInfoLineUpdated } from '../editor-page/document-bar/note-info/note-info-line-updated'
+import { NoteInfoLineCreated } from '../editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-created'
+import { NoteInfoLineUpdated } from '../editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-updated'
 import styles from './document-infobar.module.scss'
 import React from 'react'
 import { Pencil as IconPencil } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/editor-page/editor-pane/tool-bar/upload-image-button/upload-image-button.tsx b/frontend/src/components/editor-page/editor-pane/tool-bar/upload-image-button/upload-image-button.tsx
index e813ddd2d..056d577e9 100644
--- a/frontend/src/components/editor-page/editor-pane/tool-bar/upload-image-button/upload-image-button.tsx
+++ b/frontend/src/components/editor-page/editor-pane/tool-bar/upload-image-button/upload-image-button.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
@@ -8,8 +8,8 @@ import { Logger } from '../../../../../utils/logger'
 import { UiIcon } from '../../../../common/icons/ui-icon'
 import { ShowIf } from '../../../../common/show-if/show-if'
 import { acceptedMimeTypes } from '../../../../common/upload-image-mimetypes'
+import { UploadInput } from '../../../../common/upload-input'
 import { useCodemirrorReferenceContext } from '../../../change-content-context/codemirror-reference-context'
-import { UploadInput } from '../../../sidebar/upload-input'
 import { useHandleUpload } from '../../hooks/use-handle-upload'
 import { extractSelectedText } from './extract-selected-text'
 import { Optional } from '@mrdrogdrog/optional'
diff --git a/frontend/src/components/editor-page/sidebar/sidebar.tsx b/frontend/src/components/editor-page/sidebar/sidebar.tsx
index a1ef206ff..58d62f69f 100644
--- a/frontend/src/components/editor-page/sidebar/sidebar.tsx
+++ b/frontend/src/components/editor-page/sidebar/sidebar.tsx
@@ -1,20 +1,20 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { DeleteNoteSidebarEntry } from './delete-note-sidebar-entry/delete-note-sidebar-entry'
-import { AliasesSidebarEntry } from './specific-sidebar-entries/aliases-sidebar-entry'
+import { AliasesSidebarEntry } from './specific-sidebar-entries/aliases-sidebar-entry/aliases-sidebar-entry'
+import { DeleteNoteSidebarEntry } from './specific-sidebar-entries/delete-note-sidebar-entry/delete-note-sidebar-entry'
 import { ExportMenuSidebarMenu } from './specific-sidebar-entries/export-menu-sidebar-menu'
 import { ImportMenuSidebarMenu } from './specific-sidebar-entries/import-menu-sidebar-menu'
-import { NoteInfoSidebarEntry } from './specific-sidebar-entries/note-info-sidebar-entry'
-import { PermissionsSidebarEntry } from './specific-sidebar-entries/permissions-sidebar-entry'
-import { PinNoteSidebarEntry } from './specific-sidebar-entries/pin-note-sidebar-entry'
-import { RevisionSidebarEntry } from './specific-sidebar-entries/revision-sidebar-entry'
-import { ShareSidebarEntry } from './specific-sidebar-entries/share-sidebar-entry'
+import { NoteInfoSidebarEntry } from './specific-sidebar-entries/note-info-sidebar-entry/note-info-sidebar-entry'
+import { PermissionsSidebarEntry } from './specific-sidebar-entries/permissions-sidebar-entry/permissions-sidebar-entry'
+import { PinNoteSidebarEntry } from './specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry'
+import { RevisionSidebarEntry } from './specific-sidebar-entries/revisions-sidebar-entry/revision-sidebar-entry'
+import { ShareNoteSidebarEntry } from './specific-sidebar-entries/share-note-sidebar-entry/share-note-sidebar-entry'
+import { UsersOnlineSidebarMenu } from './specific-sidebar-entries/users-online-sidebar-menu/users-online-sidebar-menu'
 import styles from './style/sidebar.module.scss'
 import { DocumentSidebarMenuSelection } from './types'
-import { UsersOnlineSidebarMenu } from './users-online-sidebar-menu/users-online-sidebar-menu'
 import React, { useCallback, useRef, useState } from 'react'
 import { useClickAway } from 'react-use'
 
@@ -61,7 +61,7 @@ export const Sidebar: React.FC = () => {
           selectedMenuId={selectedMenu}
           onClick={toggleValue}
         />
-        <ShareSidebarEntry hide={selectionIsNotNone} />
+        <ShareNoteSidebarEntry hide={selectionIsNotNone} />
         <DeleteNoteSidebarEntry hide={selectionIsNotNone} />
         <PinNoteSidebarEntry hide={selectionIsNotNone} />
       </div>
diff --git a/frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-add-form.spec.tsx.snap b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-add-form.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-add-form.spec.tsx.snap
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-add-form.spec.tsx.snap
diff --git a/frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-list-entry.spec.tsx.snap b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-list-entry.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-list-entry.spec.tsx.snap
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-list-entry.spec.tsx.snap
diff --git a/frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-list.spec.tsx.snap b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-list.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-list.spec.tsx.snap
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-list.spec.tsx.snap
diff --git a/frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-modal.spec.tsx.snap b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-modal.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/aliases/__snapshots__/aliases-modal.spec.tsx.snap
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/__snapshots__/aliases-modal.spec.tsx.snap
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.spec.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.spec.tsx
similarity index 69%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.spec.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.spec.tsx
index bdd18b4f4..9f774f796 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.spec.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.spec.tsx
@@ -3,21 +3,21 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import * as AliasModule from '../../../../api/alias'
-import * as NoteDetailsReduxModule from '../../../../redux/note-details/methods'
-import type { NoteDetails } from '../../../../redux/note-details/types/note-details'
-import { mockI18n } from '../../../../test-utils/mock-i18n'
-import { mockNoteOwnership } from '../../../../test-utils/note-ownership'
-import * as useUiNotificationsModule from '../../../notifications/ui-notification-boundary'
+import * as AliasModule from '../../../../../../api/alias'
+import * as NoteDetailsReduxModule from '../../../../../../redux/note-details/methods'
+import type { NoteDetails } from '../../../../../../redux/note-details/types/note-details'
+import { mockI18n } from '../../../../../../test-utils/mock-i18n'
+import { mockNoteOwnership } from '../../../../../../test-utils/note-ownership'
+import * as useUiNotificationsModule from '../../../../../notifications/ui-notification-boundary'
 import { AliasesAddForm } from './aliases-add-form'
 import { render, act, screen } from '@testing-library/react'
 import testEvent from '@testing-library/user-event'
 import React from 'react'
 
-jest.mock('../../../../api/alias')
-jest.mock('../../../../redux/note-details/methods')
-jest.mock('../../../../hooks/common/use-application-state')
-jest.mock('../../../notifications/ui-notification-boundary')
+jest.mock('../../../../../../api/alias')
+jest.mock('../../../../../../redux/note-details/methods')
+jest.mock('../../../../../../hooks/common/use-application-state')
+jest.mock('../../../../../notifications/ui-notification-boundary')
 
 const addPromise = Promise.resolve({ name: 'mock', primaryAlias: true, noteId: 'mock' })
 
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.tsx
similarity index 78%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.tsx
index 04c4b36bc..c636c9705 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-add-form.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-add-form.tsx
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { addAlias } from '../../../../api/alias'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { useIsOwner } from '../../../../hooks/common/use-is-owner'
-import { useOnInputChange } from '../../../../hooks/common/use-on-input-change'
-import { updateMetadata } from '../../../../redux/note-details/methods'
-import { testId } from '../../../../utils/test-id'
-import { UiIcon } from '../../../common/icons/ui-icon'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { addAlias } from '../../../../../../api/alias'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { useIsOwner } from '../../../../../../hooks/common/use-is-owner'
+import { useOnInputChange } from '../../../../../../hooks/common/use-on-input-change'
+import { updateMetadata } from '../../../../../../redux/note-details/methods'
+import { testId } from '../../../../../../utils/test-id'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import type { FormEvent } from 'react'
 import React, { useCallback, useMemo, useState } from 'react'
 import { Button, Form, InputGroup } from 'react-bootstrap'
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.spec.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.spec.tsx
similarity index 83%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.spec.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.spec.tsx
index d64c5597d..4bd445cdb 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.spec.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.spec.tsx
@@ -3,21 +3,21 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import * as AliasModule from '../../../../api/alias'
-import type { Alias } from '../../../../api/alias/types'
-import * as NoteDetailsReduxModule from '../../../../redux/note-details/methods'
-import { mockI18n } from '../../../../test-utils/mock-i18n'
-import { mockNoteOwnership } from '../../../../test-utils/note-ownership'
-import * as useUiNotificationsModule from '../../../notifications/ui-notification-boundary'
+import * as AliasModule from '../../../../../../api/alias'
+import type { Alias } from '../../../../../../api/alias/types'
+import * as NoteDetailsReduxModule from '../../../../../../redux/note-details/methods'
+import { mockI18n } from '../../../../../../test-utils/mock-i18n'
+import { mockNoteOwnership } from '../../../../../../test-utils/note-ownership'
+import * as useUiNotificationsModule from '../../../../../notifications/ui-notification-boundary'
 import { AliasesListEntry } from './aliases-list-entry'
 import { render, act, screen } from '@testing-library/react'
 import React from 'react'
 
-jest.mock('../../../../api/alias')
-jest.mock('../../../../redux/note-details/methods')
-jest.mock('../../../notifications/ui-notification-boundary')
+jest.mock('../../../../../../api/alias')
+jest.mock('../../../../../../redux/note-details/methods')
+jest.mock('../../../../../notifications/ui-notification-boundary')
 // This needs to be mocked here in addition to note-ownership.ts, because jest doesn't work otherwise
-jest.mock('../../../../hooks/common/use-application-state')
+jest.mock('../../../../../../hooks/common/use-application-state')
 
 const deletePromise = Promise.resolve()
 const markAsPrimaryPromise = Promise.resolve({ name: 'mock', primaryAlias: true, noteId: 'mock' })
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.tsx
similarity index 81%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.tsx
index a765c4597..b84c8e08b 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-list-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list-entry.tsx
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { deleteAlias, markAliasAsPrimary } from '../../../../api/alias'
-import type { Alias } from '../../../../api/alias/types'
-import { useIsOwner } from '../../../../hooks/common/use-is-owner'
-import { updateMetadata } from '../../../../redux/note-details/methods'
-import { testId } from '../../../../utils/test-id'
-import { UiIcon } from '../../../common/icons/ui-icon'
-import { ShowIf } from '../../../common/show-if/show-if'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { deleteAlias, markAliasAsPrimary } from '../../../../../../api/alias'
+import type { Alias } from '../../../../../../api/alias/types'
+import { useIsOwner } from '../../../../../../hooks/common/use-is-owner'
+import { updateMetadata } from '../../../../../../redux/note-details/methods'
+import { testId } from '../../../../../../utils/test-id'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
+import { ShowIf } from '../../../../../common/show-if/show-if'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import React, { useCallback } from 'react'
 import { Button } from 'react-bootstrap'
 import { StarFill as IconStarFill } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-list.spec.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.spec.tsx
similarity index 82%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-list.spec.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.spec.tsx
index 0d6047b01..6d51c38e2 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-list.spec.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.spec.tsx
@@ -3,16 +3,16 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { Alias } from '../../../../api/alias/types'
-import * as useApplicationStateModule from '../../../../hooks/common/use-application-state'
-import { mockI18n } from '../../../../test-utils/mock-i18n'
+import type { Alias } from '../../../../../../api/alias/types'
+import * as useApplicationStateModule from '../../../../../../hooks/common/use-application-state'
+import { mockI18n } from '../../../../../../test-utils/mock-i18n'
 import { AliasesList } from './aliases-list'
 import * as AliasesListEntryModule from './aliases-list-entry'
 import type { AliasesListEntryProps } from './aliases-list-entry'
 import { render } from '@testing-library/react'
 import React from 'react'
 
-jest.mock('../../../../hooks/common/use-application-state')
+jest.mock('../../../../../../hooks/common/use-application-state')
 jest.mock('./aliases-list-entry')
 
 describe('AliasesList', () => {
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-list.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.tsx
similarity index 71%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-list.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.tsx
index 284d9513c..de14d33f6 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-list.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-list.tsx
@@ -1,10 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import type { ApplicationState } from '../../../../redux/application-state'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import type { ApplicationState } from '../../../../../../redux/application-state'
 import { AliasesListEntry } from './aliases-list-entry'
 import React, { Fragment, useMemo } from 'react'
 
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-modal.spec.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.spec.tsx
similarity index 78%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-modal.spec.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.spec.tsx
index 8f09b2c5e..40bf4d297 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-modal.spec.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.spec.tsx
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { mockI18n } from '../../../../test-utils/mock-i18n'
-import type { CommonModalProps } from '../../../common/modals/common-modal'
-import * as CommonModalModule from '../../../common/modals/common-modal'
-import * as useUiNotificationsModule from '../../../notifications/ui-notification-boundary'
+import { mockI18n } from '../../../../../../test-utils/mock-i18n'
+import type { CommonModalProps } from '../../../../../common/modals/common-modal'
+import * as CommonModalModule from '../../../../../common/modals/common-modal'
+import * as useUiNotificationsModule from '../../../../../notifications/ui-notification-boundary'
 import * as AliasesAddFormModule from './aliases-add-form'
 import * as AliasesListModule from './aliases-list'
 import { AliasesModal } from './aliases-modal'
@@ -16,8 +16,8 @@ import type { PropsWithChildren } from 'react'
 
 jest.mock('./aliases-list')
 jest.mock('./aliases-add-form')
-jest.mock('../../../common/modals/common-modal')
-jest.mock('../../../notifications/ui-notification-boundary')
+jest.mock('../../../../../common/modals/common-modal')
+jest.mock('../../../../../notifications/ui-notification-boundary')
 
 describe('AliasesModal', () => {
   beforeEach(async () => {
diff --git a/frontend/src/components/editor-page/document-bar/aliases/aliases-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.tsx
similarity index 88%
rename from frontend/src/components/editor-page/document-bar/aliases/aliases-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.tsx
index 042201927..cbc9dd004 100644
--- a/frontend/src/components/editor-page/document-bar/aliases/aliases-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-modal/aliases-modal.tsx
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { CommonModalProps } from '../../../common/modals/common-modal'
-import { CommonModal } from '../../../common/modals/common-modal'
+import type { CommonModalProps } from '../../../../../common/modals/common-modal'
+import { CommonModal } from '../../../../../common/modals/common-modal'
 import { AliasesAddForm } from './aliases-add-form'
 import { AliasesList } from './aliases-list'
 import React from 'react'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-sidebar-entry.tsx
similarity index 73%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-sidebar-entry.tsx
index c7bc3b797..f45ce9473 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/aliases-sidebar-entry/aliases-sidebar-entry.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { AliasesModal } from '../../document-bar/aliases/aliases-modal'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
+import { AliasesModal } from './aliases-modal/aliases-modal'
 import React, { Fragment } from 'react'
 import { Tags as IconTags } from 'react-bootstrap-icons'
 import { Trans, useTranslation } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-modal.tsx
similarity index 87%
rename from frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-modal.tsx
index 0f3305a08..80092ccd5 100644
--- a/frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-modal.tsx
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { cypressId } from '../../../../utils/cypress-attribute'
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { DeletionModal } from '../../../common/modals/deletion-modal'
+import { useApplicationState } from '../../../../../hooks/common/use-application-state'
+import { cypressId } from '../../../../../utils/cypress-attribute'
+import type { ModalVisibilityProps } from '../../../../common/modals/common-modal'
+import { DeletionModal } from '../../../../common/modals/deletion-modal'
 import React from 'react'
 import { Trans } from 'react-i18next'
 
diff --git a/frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx
similarity index 74%
rename from frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx
index 9e8484762..95c04e8d2 100644
--- a/frontend/src/components/editor-page/sidebar/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-sidebar-entry.tsx
@@ -1,16 +1,16 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { deleteNote } from '../../../../api/notes'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { cypressId } from '../../../../utils/cypress-attribute'
-import { Logger } from '../../../../utils/logger'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { deleteNote } from '../../../../../api/notes'
+import { useApplicationState } from '../../../../../hooks/common/use-application-state'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { cypressId } from '../../../../../utils/cypress-attribute'
+import { Logger } from '../../../../../utils/logger'
+import { useUiNotifications } from '../../../../notifications/ui-notification-boundary'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
 import { DeleteNoteModal } from './delete-note-modal'
 import { useRouter } from 'next/router'
 import type { PropsWithChildren } from 'react'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/import-markdown-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/import-markdown-sidebar-entry.tsx
index c003dc0d2..da136afd0 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/import-markdown-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/import-markdown-sidebar-entry.tsx
@@ -1,14 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { cypressId } from '../../../../utils/cypress-attribute'
 import { FileContentFormat, readFile } from '../../../../utils/read-file'
 import { ShowIf } from '../../../common/show-if/show-if'
+import { UploadInput } from '../../../common/upload-input'
 import { useChangeEditorContentCallback } from '../../change-content-context/use-change-editor-content-callback'
 import { SidebarButton } from '../sidebar-button/sidebar-button'
-import { UploadInput } from '../upload-input'
 import React, { Fragment, useCallback, useRef } from 'react'
 import { FileText as IconFileText } from 'react-bootstrap-icons'
 import { Trans, useTranslation } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-contributors.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-contributors.tsx
similarity index 82%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-line-contributors.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-contributors.tsx
index f0bc8b0a0..9685b2ebd 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-contributors.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-contributors.tsx
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
 import { NoteInfoLine } from './note-info-line'
 import { UnitalicBoldContent } from './unitalic-bold-content'
 import React from 'react'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-created.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-created.tsx
similarity index 87%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-line-created.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-created.tsx
index 3f356e1c8..047ae6d56 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-created.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-created.tsx
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
 import { NoteInfoLine } from './note-info-line'
 import type { NoteInfoTimeLineProps } from './note-info-time-line'
 import { UnitalicBoldTimeFromNow } from './utils/unitalic-bold-time-from-now'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-updated.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-updated.tsx
similarity index 86%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-line-updated.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-updated.tsx
index fe8d863e9..2a3f862fc 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-updated.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-updated.tsx
@@ -1,10 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { UserAvatarForUsername } from '../../../common/user-avatar/user-avatar-for-username'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { UserAvatarForUsername } from '../../../../../common/user-avatar/user-avatar-for-username'
 import { NoteInfoLine } from './note-info-line'
 import type { NoteInfoTimeLineProps } from './note-info-time-line'
 import { UnitalicBoldTimeFromNow } from './utils/unitalic-bold-time-from-now'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-word-count.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-word-count.tsx
similarity index 68%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-line-word-count.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-word-count.tsx
index 665eb9ecf..f02028873 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-line-word-count.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line-word-count.tsx
@@ -1,15 +1,15 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { cypressId } from '../../../../utils/cypress-attribute'
-import { ShowIf } from '../../../common/show-if/show-if'
-import { useEditorReceiveHandler } from '../../../render-page/window-post-message-communicator/hooks/use-editor-receive-handler'
-import type { OnWordCountCalculatedMessage } from '../../../render-page/window-post-message-communicator/rendering-message'
-import { CommunicationMessageType } from '../../../render-page/window-post-message-communicator/rendering-message'
-import { useEditorToRendererCommunicator } from '../../render-context/editor-to-renderer-communicator-context-provider'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { cypressId } from '../../../../../../utils/cypress-attribute'
+import { ShowIf } from '../../../../../common/show-if/show-if'
+import { useEditorReceiveHandler } from '../../../../../render-page/window-post-message-communicator/hooks/use-editor-receive-handler'
+import type { OnWordCountCalculatedMessage } from '../../../../../render-page/window-post-message-communicator/rendering-message'
+import { CommunicationMessageType } from '../../../../../render-page/window-post-message-communicator/rendering-message'
+import { useEditorToRendererCommunicator } from '../../../../render-context/editor-to-renderer-communicator-context-provider'
 import { NoteInfoLine } from './note-info-line'
 import { UnitalicBoldContent } from './unitalic-bold-content'
 import type { PropsWithChildren } from 'react'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-line.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line.tsx
similarity index 86%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-line.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line.tsx
index d89fdd9b5..c443659ba 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-line.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-line.tsx
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { UiIcon } from '../../../common/icons/ui-icon'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
 import type { PropsWithChildren } from 'react'
 import React from 'react'
 import type { Icon } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-modal.tsx
similarity index 87%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-modal.tsx
index b628a1caf..043236a8a 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-modal.tsx
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { cypressId } from '../../../../utils/cypress-attribute'
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { CommonModal } from '../../../common/modals/common-modal'
+import { cypressId } from '../../../../../../utils/cypress-attribute'
+import type { ModalVisibilityProps } from '../../../../../common/modals/common-modal'
+import { CommonModal } from '../../../../../common/modals/common-modal'
 import { NoteInfoLineContributors } from './note-info-line-contributors'
 import { NoteInfoLineCreated } from './note-info-line-created'
 import { NoteInfoLineUpdated } from './note-info-line-updated'
diff --git a/frontend/src/components/editor-page/document-bar/note-info/note-info-time-line.ts b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-time-line.ts
similarity index 66%
rename from frontend/src/components/editor-page/document-bar/note-info/note-info-time-line.ts
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-time-line.ts
index 414ab8082..e191a6300 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/note-info-time-line.ts
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/note-info-time-line.ts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/note-info/time-from-now.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/time-from-now.tsx
similarity index 88%
rename from frontend/src/components/editor-page/document-bar/note-info/time-from-now.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/time-from-now.tsx
index 78d5cfafb..0de3f0c46 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/time-from-now.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/time-from-now.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/note-info/unitalic-bold-content.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/unitalic-bold-content.tsx
similarity index 76%
rename from frontend/src/components/editor-page/document-bar/note-info/unitalic-bold-content.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/unitalic-bold-content.tsx
index 44dcdb3e1..d5f7d54a3 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/unitalic-bold-content.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/unitalic-bold-content.tsx
@@ -1,10 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { PropsWithDataCypressId } from '../../../../utils/cypress-attribute'
-import { cypressId } from '../../../../utils/cypress-attribute'
+import type { PropsWithDataCypressId } from '../../../../../../utils/cypress-attribute'
+import { cypressId } from '../../../../../../utils/cypress-attribute'
 import type { PropsWithChildren } from 'react'
 import React from 'react'
 
diff --git a/frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-time-from-now.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-time-from-now.tsx
similarity index 87%
rename from frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-time-from-now.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-time-from-now.tsx
index 36b694ba9..609613df7 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-time-from-now.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-time-from-now.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-trans.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-trans.tsx
similarity index 87%
rename from frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-trans.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-trans.tsx
index a85e5874d..345df41b0 100644
--- a/frontend/src/components/editor-page/document-bar/note-info/utils/unitalic-bold-trans.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-modal/utils/unitalic-bold-trans.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-sidebar-entry.tsx
similarity index 72%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-sidebar-entry.tsx
index 80a4068db..81c920de0 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/note-info-sidebar-entry/note-info-sidebar-entry.tsx
@@ -1,13 +1,13 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { cypressId } from '../../../../utils/cypress-attribute'
-import { NoteInfoModal } from '../../document-bar/note-info/note-info-modal'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { cypressId } from '../../../../../utils/cypress-attribute'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
+import { NoteInfoModal } from './note-info-modal/note-info-modal'
 import React, { Fragment } from 'react'
 import { GraphUp as IconGraphUp } from 'react-bootstrap-icons'
 import { Trans, useTranslation } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-add-entry-field.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-add-entry-field.tsx
similarity index 92%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-add-entry-field.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-add-entry-field.tsx
index f4e71e666..5e7f1a02c 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-add-entry-field.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-add-entry-field.tsx
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useOnInputChange } from '../../../../hooks/common/use-on-input-change'
-import { UiIcon } from '../../../common/icons/ui-icon'
+import { useOnInputChange } from '../../../../../../hooks/common/use-on-input-change'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import React, { useCallback, useState } from 'react'
 import { Button, FormControl, InputGroup } from 'react-bootstrap'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-disabled.prop.ts b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-disabled.prop.ts
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-disabled.prop.ts
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-disabled.prop.ts
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-buttons.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-buttons.tsx
similarity index 98%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-entry-buttons.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-buttons.tsx
index 2b5094c9b..fae0fecdb 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-buttons.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-buttons.tsx
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { UiIcon } from '../../../common/icons/ui-icon'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { AccessLevel } from '@hedgedoc/commons'
 import React, { useMemo } from 'react'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-special-group.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-special-group.tsx
similarity index 91%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-entry-special-group.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-special-group.tsx
index 68ac37a48..b50051999 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-special-group.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-special-group.tsx
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { removeGroupPermission, setGroupPermission } from '../../../../api/permissions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { setNotePermissionsFromServer } from '../../../../redux/note-details/methods'
-import { IconButton } from '../../../common/icon-button/icon-button'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { removeGroupPermission, setGroupPermission } from '../../../../../../api/permissions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { setNotePermissionsFromServer } from '../../../../../../redux/note-details/methods'
+import { IconButton } from '../../../../../common/icon-button/icon-button'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { AccessLevel, SpecialGroup } from '@hedgedoc/commons'
 import React, { useCallback, useMemo } from 'react'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-user.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-user.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-entry-user.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-user.tsx
index c4aa58061..80fe884d2 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-entry-user.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-entry-user.tsx
@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { removeUserPermission, setUserPermission } from '../../../../api/permissions'
-import { getUser } from '../../../../api/users'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { setNotePermissionsFromServer } from '../../../../redux/note-details/methods'
-import { ShowIf } from '../../../common/show-if/show-if'
-import { UserAvatarForUser } from '../../../common/user-avatar/user-avatar-for-user'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { removeUserPermission, setUserPermission } from '../../../../../../api/permissions'
+import { getUser } from '../../../../../../api/users'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { setNotePermissionsFromServer } from '../../../../../../redux/note-details/methods'
+import { ShowIf } from '../../../../../common/show-if/show-if'
+import { UserAvatarForUser } from '../../../../../common/user-avatar/user-avatar-for-user'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { PermissionEntryButtons, PermissionType } from './permission-entry-buttons'
 import type { NoteUserPermissionEntry } from '@hedgedoc/commons'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-modal.tsx
similarity index 82%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-modal.tsx
index 5cf8e015c..da59e74e5 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-modal.tsx
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useIsOwner } from '../../../../hooks/common/use-is-owner'
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { CommonModal } from '../../../common/modals/common-modal'
+import { useIsOwner } from '../../../../../../hooks/common/use-is-owner'
+import type { ModalVisibilityProps } from '../../../../../common/modals/common-modal'
+import { CommonModal } from '../../../../../common/modals/common-modal'
 import { PermissionSectionOwner } from './permission-section-owner'
 import { PermissionSectionSpecialGroups } from './permission-section-special-groups'
 import { PermissionSectionUsers } from './permission-section-users'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-owner-change.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-change.tsx
similarity index 88%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-owner-change.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-change.tsx
index 5cad33660..bd4eecafb 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-owner-change.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-change.tsx
@@ -1,10 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useOnInputChange } from '../../../../hooks/common/use-on-input-change'
-import { UiIcon } from '../../../common/icons/ui-icon'
+import { useOnInputChange } from '../../../../../../hooks/common/use-on-input-change'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
 import React, { useCallback, useMemo, useState } from 'react'
 import { Button, FormControl, InputGroup } from 'react-bootstrap'
 import { Check as IconCheck } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-owner-info.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-info.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-owner-info.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-info.tsx
index 0d4047520..f6e5de271 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-owner-info.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-owner-info.tsx
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { UiIcon } from '../../../common/icons/ui-icon'
-import { UserAvatarForUsername } from '../../../common/user-avatar/user-avatar-for-username'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
+import { UserAvatarForUsername } from '../../../../../common/user-avatar/user-avatar-for-username'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import React, { Fragment } from 'react'
 import { Button } from 'react-bootstrap'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-section-owner.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-owner.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-section-owner.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-owner.tsx
index 2a1685d93..3a9fdfd1d 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-section-owner.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-owner.tsx
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { setNoteOwner } from '../../../../api/permissions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { setNotePermissionsFromServer } from '../../../../redux/note-details/methods'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { setNoteOwner } from '../../../../../../api/permissions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { setNotePermissionsFromServer } from '../../../../../../redux/note-details/methods'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { PermissionOwnerChange } from './permission-owner-change'
 import { PermissionOwnerInfo } from './permission-owner-info'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-section-special-groups.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-special-groups.tsx
similarity index 92%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-section-special-groups.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-special-groups.tsx
index 898692bde..fd234557d 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-section-special-groups.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-special-groups.tsx
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { useIsOwner } from '../../../../hooks/common/use-is-owner'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { useIsOwner } from '../../../../../../hooks/common/use-is-owner'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { PermissionEntrySpecialGroup } from './permission-entry-special-group'
 import { AccessLevel, SpecialGroup } from '@hedgedoc/commons'
diff --git a/frontend/src/components/editor-page/document-bar/permissions/permission-section-users.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-users.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/permissions/permission-section-users.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-users.tsx
index 18ce6a360..1e05d4d96 100644
--- a/frontend/src/components/editor-page/document-bar/permissions/permission-section-users.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-modal/permission-section-users.tsx
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { setUserPermission } from '../../../../api/permissions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { setNotePermissionsFromServer } from '../../../../redux/note-details/methods'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { setUserPermission } from '../../../../../../api/permissions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { setNotePermissionsFromServer } from '../../../../../../redux/note-details/methods'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import { PermissionAddEntryField } from './permission-add-entry-field'
 import type { PermissionDisabledProps } from './permission-disabled.prop'
 import { PermissionEntryUser } from './permission-entry-user'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-sidebar-entry.tsx
similarity index 72%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-sidebar-entry.tsx
index fb7fb8a3d..6f6e89cbf 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/permissions-sidebar-entry/permissions-sidebar-entry.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { PermissionModal } from '../../document-bar/permissions/permission-modal'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
+import { PermissionModal } from './permissions-modal/permission-modal'
 import React, { Fragment } from 'react'
 import { Lock as IconLock } from 'react-bootstrap-icons'
 import { Trans, useTranslation } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.module.css b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.module.css
similarity index 63%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.module.css
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.module.css
index ffc3e1545..1b4340a7c 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.module.css
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.module.css
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.tsx
similarity index 77%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.tsx
index b2f1416b0..bd3f6c83b 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/pin-note-sidebar-entry/pin-note-sidebar-entry.tsx
@@ -1,13 +1,13 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { toggleHistoryEntryPinning } from '../../../../redux/history/methods'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useApplicationState } from '../../../../../hooks/common/use-application-state'
+import { toggleHistoryEntryPinning } from '../../../../../redux/history/methods'
+import { useUiNotifications } from '../../../../notifications/ui-notification-boundary'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
 import styles from './pin-note-sidebar-entry.module.css'
 import React, { useCallback, useMemo } from 'react'
 import { Pin as IconPin } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revision-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revision-sidebar-entry.tsx
similarity index 71%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revision-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revision-sidebar-entry.tsx
index c93282ce6..82c360964 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revision-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revision-sidebar-entry.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { RevisionModal } from '../../document-bar/revisions/revision-modal'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
+import { RevisionModal } from './revisions-modal/revision-modal'
 import React, { Fragment } from 'react'
 import { ClockHistory as IconClockHistory } from 'react-bootstrap-icons'
 import { Trans } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/invert-unified-patch.spec.ts b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/invert-unified-patch.spec.ts
similarity index 100%
rename from frontend/src/components/editor-page/document-bar/revisions/invert-unified-patch.spec.ts
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/invert-unified-patch.spec.ts
diff --git a/frontend/src/components/editor-page/document-bar/revisions/invert-unified-patch.ts b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/invert-unified-patch.ts
similarity index 94%
rename from frontend/src/components/editor-page/document-bar/revisions/invert-unified-patch.ts
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/invert-unified-patch.ts
index 80698adbf..049b26f95 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/invert-unified-patch.ts
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/invert-unified-patch.ts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.module.scss b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.module.scss
similarity index 63%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.module.scss
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.module.scss
index 2a3447038..fe919a857 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.module.scss
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.module.scss
@@ -1,5 +1,5 @@
-/*
- * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
+/*!
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.tsx
similarity index 83%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.tsx
index 28b5051be..77ca6b888 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-list-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list-entry.tsx
@@ -1,14 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { RevisionMetadata } from '../../../../api/revisions/types'
-import { UiIcon } from '../../../common/icons/ui-icon'
-import { ShowIf } from '../../../common/show-if/show-if'
-import { UserAvatarForUser } from '../../../common/user-avatar/user-avatar-for-user'
-import { WaitSpinner } from '../../../common/wait-spinner/wait-spinner'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import type { RevisionMetadata } from '../../../../../../api/revisions/types'
+import { UiIcon } from '../../../../../common/icons/ui-icon'
+import { ShowIf } from '../../../../../common/show-if/show-if'
+import { UserAvatarForUser } from '../../../../../common/user-avatar/user-avatar-for-user'
+import { WaitSpinner } from '../../../../../common/wait-spinner/wait-spinner'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import styles from './revision-list-entry.module.scss'
 import { getUserDataForRevision } from './utils'
 import { DateTime } from 'luxon'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-list.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-list.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list.tsx
index ace3a2926..f3ccf27a4 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-list.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-list.tsx
@@ -1,11 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { getAllRevisions } from '../../../../api/revisions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { AsyncLoadingBoundary } from '../../../common/async-loading-boundary/async-loading-boundary'
+import { getAllRevisions } from '../../../../../../api/revisions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { AsyncLoadingBoundary } from '../../../../../common/async-loading-boundary/async-loading-boundary'
 import { RevisionListEntry } from './revision-list-entry'
 import { DateTime } from 'luxon'
 import React, { useMemo } from 'react'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-modal-footer.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal-footer.tsx
similarity index 84%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-modal-footer.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal-footer.tsx
index 77950e0ce..20b854f69 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-modal-footer.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal-footer.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { getRevision } from '../../../../api/revisions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { useUiNotifications } from '../../../notifications/ui-notification-boundary'
+import { getRevision } from '../../../../../../api/revisions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import type { ModalVisibilityProps } from '../../../../../common/modals/common-modal'
+import { useUiNotifications } from '../../../../../notifications/ui-notification-boundary'
 import { downloadRevision } from './utils'
 import React, { useCallback } from 'react'
 import { Button, Modal } from 'react-bootstrap'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-modal.module.scss b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.module.scss
similarity index 66%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-modal.module.scss
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.module.scss
index 1dd4ab219..3d33bc8c2 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-modal.module.scss
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.module.scss
@@ -1,5 +1,5 @@
-/*
- * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
+/*!
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.tsx
similarity index 91%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.tsx
index 035b80d67..57307f927 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-modal.tsx
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { CommonModal } from '../../../common/modals/common-modal'
+import type { ModalVisibilityProps } from '../../../../../common/modals/common-modal'
+import { CommonModal } from '../../../../../common/modals/common-modal'
 import { RevisionList } from './revision-list'
 import { RevisionModalFooter } from './revision-modal-footer'
 import styles from './revision-modal.module.scss'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/revision-viewer.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-viewer.tsx
similarity index 82%
rename from frontend/src/components/editor-page/document-bar/revisions/revision-viewer.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-viewer.tsx
index f3fed0d1f..76b092a39 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/revision-viewer.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/revision-viewer.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { getRevision } from '../../../../api/revisions'
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { useDarkModeState } from '../../../../hooks/common/use-dark-mode-state'
-import { AsyncLoadingBoundary } from '../../../common/async-loading-boundary/async-loading-boundary'
+import { getRevision } from '../../../../../../api/revisions'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { useDarkModeState } from '../../../../../../hooks/common/use-dark-mode-state'
+import { AsyncLoadingBoundary } from '../../../../../common/async-loading-boundary/async-loading-boundary'
 import { invertUnifiedPatch } from './invert-unified-patch'
 import { Optional } from '@mrdrogdrog/optional'
 import { applyPatch, parsePatch } from 'diff'
diff --git a/frontend/src/components/editor-page/document-bar/revisions/utils.ts b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/utils.ts
similarity index 77%
rename from frontend/src/components/editor-page/document-bar/revisions/utils.ts
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/utils.ts
index f9a76bdfe..740e2d2be 100644
--- a/frontend/src/components/editor-page/document-bar/revisions/utils.ts
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/revisions-sidebar-entry/revisions-modal/utils.ts
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import type { RevisionDetails } from '../../../../api/revisions/types'
-import { getUser } from '../../../../api/users'
-import type { UserInfo } from '../../../../api/users/types'
-import { download } from '../../../common/download/download'
+import type { RevisionDetails } from '../../../../../../api/revisions/types'
+import { getUser } from '../../../../../../api/users'
+import type { UserInfo } from '../../../../../../api/users/types'
+import { download } from '../../../../../common/download/download'
 
 const DISPLAY_MAX_USERS_PER_REVISION = 9
 
diff --git a/frontend/src/components/editor-page/document-bar/share/note-url-field.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/note-url-field.tsx
similarity index 77%
rename from frontend/src/components/editor-page/document-bar/share/note-url-field.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/note-url-field.tsx
index 01e6efb04..cc4f3452b 100644
--- a/frontend/src/components/editor-page/document-bar/share/note-url-field.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/note-url-field.tsx
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { useBaseUrl } from '../../../../hooks/common/use-base-url'
-import { CopyableField } from '../../../common/copyable/copyable-field/copyable-field'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import { useBaseUrl } from '../../../../../../hooks/common/use-base-url'
+import { CopyableField } from '../../../../../common/copyable/copyable-field/copyable-field'
 import React, { useMemo } from 'react'
 
 export enum LinkType {
diff --git a/frontend/src/components/editor-page/document-bar/share/share-modal.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/share-modal.tsx
similarity index 82%
rename from frontend/src/components/editor-page/document-bar/share/share-modal.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/share-modal.tsx
index 5912cf482..0f2dfe5c4 100644
--- a/frontend/src/components/editor-page/document-bar/share/share-modal.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-modal/share-modal.tsx
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import type { ModalVisibilityProps } from '../../../common/modals/common-modal'
-import { CommonModal } from '../../../common/modals/common-modal'
-import { ShowIf } from '../../../common/show-if/show-if'
+import { useApplicationState } from '../../../../../../hooks/common/use-application-state'
+import type { ModalVisibilityProps } from '../../../../../common/modals/common-modal'
+import { CommonModal } from '../../../../../common/modals/common-modal'
+import { ShowIf } from '../../../../../common/show-if/show-if'
 import { LinkType, NoteUrlField } from './note-url-field'
 import { NoteType } from '@hedgedoc/commons'
 import React from 'react'
diff --git a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-sidebar-entry.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-note-sidebar-entry.tsx
similarity index 64%
rename from frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-sidebar-entry.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-note-sidebar-entry.tsx
index ea5978463..7181ce7ae 100644
--- a/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-sidebar-entry.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/share-note-sidebar-entry/share-note-sidebar-entry.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useBooleanState } from '../../../../hooks/common/use-boolean-state'
-import { ShareModal } from '../../document-bar/share/share-modal'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import type { SpecificSidebarEntryProps } from '../types'
+import { useBooleanState } from '../../../../../hooks/common/use-boolean-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import type { SpecificSidebarEntryProps } from '../../types'
+import { ShareModal } from './share-modal/share-modal'
 import React, { Fragment } from 'react'
 import { Share as IconShare } from 'react-bootstrap-icons'
 import { Trans, useTranslation } from 'react-i18next'
@@ -17,7 +17,7 @@ import { Trans, useTranslation } from 'react-i18next'
  * @param className Additional classes directly given to the button
  * @param hide If the button should be hidden
  */
-export const ShareSidebarEntry: React.FC<SpecificSidebarEntryProps> = ({ className, hide }) => {
+export const ShareNoteSidebarEntry: React.FC<SpecificSidebarEntryProps> = ({ className, hide }) => {
   const [modalVisibility, showModal, closeModal] = useBooleanState()
   useTranslation()
 
diff --git a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/active-indicator.module.scss b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/active-indicator.module.scss
similarity index 100%
rename from frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/active-indicator.module.scss
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/active-indicator.module.scss
diff --git a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/active-indicator.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/active-indicator.tsx
similarity index 90%
rename from frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/active-indicator.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/active-indicator.tsx
index 8616eae81..cd46a6254 100644
--- a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/active-indicator.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/active-indicator.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/online-counter.module.scss b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/online-counter.module.scss
similarity index 85%
rename from frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/online-counter.module.scss
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/online-counter.module.scss
index f913b117e..aaa2e144e 100644
--- a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/online-counter.module.scss
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/online-counter.module.scss
@@ -1,5 +1,5 @@
-/*
- * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
+/*!
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/own-user-line.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/own-user-line.tsx
similarity index 77%
rename from frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/own-user-line.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/own-user-line.tsx
index e90ab74ff..c10523e18 100644
--- a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/own-user-line.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/own-user-line.tsx
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import { UserLine } from '../user-line/user-line'
+import { useApplicationState } from '../../../../../hooks/common/use-application-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import { UserLine } from './user-line/user-line'
 import React from 'react'
 
 /**
diff --git a/frontend/src/components/editor-page/sidebar/user-line/user-line.module.scss b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.module.scss
similarity index 81%
rename from frontend/src/components/editor-page/sidebar/user-line/user-line.module.scss
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.module.scss
index bc789558c..f831cf57e 100644
--- a/frontend/src/components/editor-page/sidebar/user-line/user-line.module.scss
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.module.scss
@@ -1,5 +1,5 @@
-/*
- * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
+/*!
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/editor-page/sidebar/user-line/user-line.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.tsx
similarity index 80%
rename from frontend/src/components/editor-page/sidebar/user-line/user-line.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.tsx
index 53c04e94a..2f95c9778 100644
--- a/frontend/src/components/editor-page/sidebar/user-line/user-line.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/user-line/user-line.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { UserAvatar } from '../../../common/user-avatar/user-avatar'
-import { UserAvatarForUsername } from '../../../common/user-avatar/user-avatar-for-username'
-import { createCursorCssClass } from '../../editor-pane/codemirror-extensions/remote-cursors/create-cursor-css-class'
-import { ActiveIndicator } from '../users-online-sidebar-menu/active-indicator'
+import { UserAvatar } from '../../../../../common/user-avatar/user-avatar'
+import { UserAvatarForUsername } from '../../../../../common/user-avatar/user-avatar-for-username'
+import { createCursorCssClass } from '../../../../editor-pane/codemirror-extensions/remote-cursors/create-cursor-css-class'
+import { ActiveIndicator } from '../active-indicator'
 import styles from './user-line.module.scss'
 import React, { useMemo } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
diff --git a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/users-online-sidebar-menu.tsx b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/users-online-sidebar-menu.tsx
similarity index 86%
rename from frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/users-online-sidebar-menu.tsx
rename to frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/users-online-sidebar-menu.tsx
index 48663bcfb..430755997 100644
--- a/frontend/src/components/editor-page/sidebar/users-online-sidebar-menu/users-online-sidebar-menu.tsx
+++ b/frontend/src/components/editor-page/sidebar/specific-sidebar-entries/users-online-sidebar-menu/users-online-sidebar-menu.tsx
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { useApplicationState } from '../../../../hooks/common/use-application-state'
-import { SidebarButton } from '../sidebar-button/sidebar-button'
-import { SidebarMenu } from '../sidebar-menu/sidebar-menu'
-import type { SpecificSidebarMenuProps } from '../types'
-import { DocumentSidebarMenuSelection } from '../types'
-import { UserLine } from '../user-line/user-line'
+import { useApplicationState } from '../../../../../hooks/common/use-application-state'
+import { SidebarButton } from '../../sidebar-button/sidebar-button'
+import { SidebarMenu } from '../../sidebar-menu/sidebar-menu'
+import type { SpecificSidebarMenuProps } from '../../types'
+import { DocumentSidebarMenuSelection } from '../../types'
 import styles from './online-counter.module.scss'
 import { OwnUserLine } from './own-user-line'
+import { UserLine } from './user-line/user-line'
 import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react'
 import { ArrowLeft as IconArrowLeft } from 'react-bootstrap-icons'
 import { People as IconPeople } from 'react-bootstrap-icons'
diff --git a/frontend/src/components/history-page/entry-menu/dropdown-item-with-deletion-modal.tsx b/frontend/src/components/history-page/entry-menu/dropdown-item-with-deletion-modal.tsx
index ba78c6ee0..8299d75b8 100644
--- a/frontend/src/components/history-page/entry-menu/dropdown-item-with-deletion-modal.tsx
+++ b/frontend/src/components/history-page/entry-menu/dropdown-item-with-deletion-modal.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { useBooleanState } from '../../../hooks/common/use-boolean-state'
 import { UiIcon } from '../../common/icons/ui-icon'
-import type { DeleteHistoryNoteModalProps } from '../../editor-page/sidebar/delete-note-sidebar-entry/delete-note-modal'
-import { DeleteNoteModal } from '../../editor-page/sidebar/delete-note-sidebar-entry/delete-note-modal'
+import type { DeleteHistoryNoteModalProps } from '../../editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-modal'
+import { DeleteNoteModal } from '../../editor-page/sidebar/specific-sidebar-entries/delete-note-sidebar-entry/delete-note-modal'
 import React, { Fragment, useCallback } from 'react'
 import { Dropdown } from 'react-bootstrap'
 import type { Icon } from 'react-bootstrap-icons'