diff --git a/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx b/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx
index f277111a91..0e28350877 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx
@@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import * as eventTracking from '../../../infrastructure/event-tracking'
 import getMeta from '../../../utils/meta'
-import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import OLTooltip from '@/shared/components/ol/ol-tooltip'
 import { useDetachCompileContext } from '../../../shared/context/detach-compile-context'
 import EditorManageTemplateModalWrapper from '../../template/components/manage-template-modal/editor-manage-template-modal-wrapper'
 import LeftMenuButton from './left-menu-button'
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx
index aed7c311f9..ffe20c311b 100644
--- a/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
 
 export default function GalleryHeaderAll() {
   const { t } = useTranslation()
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx
index ca2f37dbb5..aaf761fe5d 100644
--- a/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx
@@ -1,6 +1,6 @@
 import getMeta from '@/utils/meta'
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
 import GallerySearchSortHeader from './gallery-search-sort-header'
 
 export default function GalleryHeaderTagged({ category }) {
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx
index 128d379684..f52f920b76 100644
--- a/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx
@@ -1,8 +1,8 @@
 import { useTemplateGalleryContext } from '../context/template-gallery-context'
 import { useTranslation } from 'react-i18next'
 import SearchForm from './search-form'
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
 import useSort from '../hooks/use-sort'
 import withContent, { SortBtnProps } from './sort/with-content'
 import MaterialIcon from '@/shared/components/material-icon'
diff --git a/services/web/frontend/js/features/template-gallery/components/search-form.tsx b/services/web/frontend/js/features/template-gallery/components/search-form.tsx
index 75c9a8a313..f3f3f1ab11 100644
--- a/services/web/frontend/js/features/template-gallery/components/search-form.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/search-form.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import { MergeAndOverride } from '../../../../../types/utils'
-import OLForm from '@/features/ui/components/ol/ol-form'
-import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+import OLForm from '@/shared/components/ol/ol-form'
+import OLFormControl from '@/shared/components/ol/ol-form-control'
 import MaterialIcon from '@/shared/components/material-icon'
 
 type SearchFormOwnProps = {
diff --git a/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx b/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx
index d17250f33a..dfb7cb9f2d 100644
--- a/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx
@@ -4,8 +4,8 @@ import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
 import withErrorBoundary from '../../../infrastructure/error-boundary'
 import { GenericErrorBoundaryFallback } from '@/shared/components/generic-error-boundary-fallback'
 import getMeta from '@/utils/meta'
-import DefaultNavbar from '@/features/ui/components/bootstrap-5/navbar/default-navbar'
-import Footer from '@/features/ui/components/bootstrap-5/footer/footer'
+import DefaultNavbar from '@/shared/components/navbar/default-navbar'
+import Footer from '@/shared/components/footer/footer'
 import GalleryHeaderTagged from './gallery-header-tagged'
 import GalleryHeaderAll from './gallery-header-all'
 import TemplateGallery from './template-gallery'
diff --git a/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx b/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx
index 174fa2900e..789227b02d 100644
--- a/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx
+++ b/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLRow from '@/shared/components/ol/ol-row'
 import { useTemplateGalleryContext } from '../context/template-gallery-context'
 import TemplateGalleryEntry from './template-gallery-entry'
 import Pagination from './pagination'
diff --git a/services/web/frontend/js/features/template/components/delete-template-button.tsx b/services/web/frontend/js/features/template/components/delete-template-button.tsx
index f4a17043d8..c41205e373 100644
--- a/services/web/frontend/js/features/template/components/delete-template-button.tsx
+++ b/services/web/frontend/js/features/template/components/delete-template-button.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import useIsMounted from '@/shared/hooks/use-is-mounted'
-import OLButton from '@/features/ui/components/ol/ol-button'
+import OLButton from '@/shared/components/ol/ol-button'
 import DeleteTemplateModal from './modals/delete-template-modal'
 import { useTemplateContext } from '../context/template-context'
 import { deleteTemplate } from '../util/api'
diff --git a/services/web/frontend/js/features/template/components/edit-template-button.tsx b/services/web/frontend/js/features/template/components/edit-template-button.tsx
index ee1bd92df9..1d2992f5e9 100644
--- a/services/web/frontend/js/features/template/components/edit-template-button.tsx
+++ b/services/web/frontend/js/features/template/components/edit-template-button.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import useIsMounted from '@/shared/hooks/use-is-mounted'
-import OLButton from '@/features/ui/components/ol/ol-button'
+import OLButton from '@/shared/components/ol/ol-button'
 import EditTemplateModal from './modals/edit-template-modal'
 import { useTemplateContext } from '../context/template-context'
 import { updateTemplate } from '../util/api'
diff --git a/services/web/frontend/js/features/template/components/form/form-field-input.tsx b/services/web/frontend/js/features/template/components/form/form-field-input.tsx
index d99a19ff8c..add71c5b90 100644
--- a/services/web/frontend/js/features/template/components/form/form-field-input.tsx
+++ b/services/web/frontend/js/features/template/components/form/form-field-input.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+import OLFormControl from '@/shared/components/ol/ol-form-control'
 
 interface FormFieldInputProps extends React.ComponentProps<typeof OLFormControl> {
   value: string
diff --git a/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx b/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx
index 49eea6eeab..777629475c 100644
--- a/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx
+++ b/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
-import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
-import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
+import OLFormGroup from '@/shared/components/ol/ol-form-group'
+import OLFormLabel from '@/shared/components/ol/ol-form-label'
 
 interface LabeledRowFormGroupProps {
   controlId: string
diff --git a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx
index 46bc7fcf46..3e8416838a 100644
--- a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx
+++ b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx
@@ -8,9 +8,9 @@ import {
   OLModalFooter,
   OLModalHeader,
   OLModalTitle,
-} from '@/features/ui/components/ol/ol-modal'
-import OLForm from '@/features/ui/components/ol/ol-form'
-import OLButton from '@/features/ui/components/ol/ol-button'
+} from '@/shared/components/ol/ol-modal'
+import OLForm from '@/shared/components/ol/ol-form'
+import OLButton from '@/shared/components/ol/ol-button'
 import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
 import { useUserContext } from '@/shared/context/user-context'
 import { useFocusTrap } from '../../hooks/use-focus-trap'
diff --git a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx
index c48980c598..4b1e1ed5f0 100644
--- a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx
+++ b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useState } from 'react'
-import OLModal from '@/features/ui/components/ol/ol-modal'
+import OLModal from '@/shared/components/ol/ol-modal'
 import ManageTemplateModalContent from './manage-template-modal-content'
 import type { Template } from '../../../../../../types/template'
 
diff --git a/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx b/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx
index 3c7e8d274a..90a2d41e2c 100644
--- a/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx
+++ b/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx
@@ -1,9 +1,8 @@
 import React, { useReducer, useState, useEffect, useRef, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import OLForm from '@/features/ui/components/ol/ol-form'
-import OLButton from '@/features/ui/components/ol/ol-button'
+import OLForm from '@/shared/components/ol/ol-form'
+import OLButton from '@/shared/components/ol/ol-button'
 import withErrorBoundary from '@/infrastructure/error-boundary'
-//import { useFocusTrap } from '../../hooks/use-focus-trap'
 import TemplateActionModal from './template-action-modal'
 import { useTemplateContext } from '../../context/template-context'
 import TemplateFormFields from '../form/template-form-fields'
diff --git a/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx b/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx
index 24c78a0e29..cc5069a56a 100644
--- a/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx
+++ b/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx
@@ -5,13 +5,13 @@ import * as eventTracking from '@/infrastructure/event-tracking'
 import { isSmallDevice } from '@/infrastructure/event-tracking'
 import useIsMounted from '@/shared/hooks/use-is-mounted'
 import Notification from '@/shared/components/notification'
-import OLButton from '@/features/ui/components/ol/ol-button'
+import OLButton from '@/shared/components/ol/ol-button'
 import OLModal, {
   OLModalBody,
   OLModalFooter,
   OLModalHeader,
   OLModalTitle,
-} from '@/features/ui/components/ol/ol-modal'
+} from '@/shared/components/ol/ol-modal'
 import type { Template } from '../../../../../../types/template'
 import { useFocusTrap } from '../../hooks/use-focus-trap'
 
diff --git a/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx b/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx
index b1fa62226c..eaaff89a12 100644
--- a/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx
+++ b/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx
@@ -1,7 +1,7 @@
 import { ChangeEventHandler, useCallback, useRef, useEffect } from 'react'
-import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
-import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
-import OLFormSelect from '@/features/ui/components/ol/ol-form-select'
+import OLFormGroup from '@/shared/components/ol/ol-form-group'
+import OLFormLabel from '@/shared/components/ol/ol-form-label'
+import OLFormSelect from '@/shared/components/ol/ol-form-select'
 
 type PossibleValue = string | number | boolean
 
diff --git a/services/web/frontend/js/features/template/components/template-details.tsx b/services/web/frontend/js/features/template/components/template-details.tsx
index 6c1a9b1059..8c2bec5d40 100644
--- a/services/web/frontend/js/features/template/components/template-details.tsx
+++ b/services/web/frontend/js/features/template/components/template-details.tsx
@@ -1,8 +1,8 @@
 import { useTranslation } from 'react-i18next'
 import getMeta from '@/utils/meta'
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
-import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
+import OLTooltip from '@/shared/components/ol/ol-tooltip'
 import { formatDate, fromNowDate } from '../../../utils/dates'
 import { cleanHtml } from '../../../../../modules/template-gallery/app/src/CleanHtml.mjs'
 import { useTemplateContext } from '../context/template-context'
diff --git a/services/web/frontend/js/features/template/components/template-preview.tsx b/services/web/frontend/js/features/template/components/template-preview.tsx
index 547c86159d..b6ebddedc8 100644
--- a/services/web/frontend/js/features/template/components/template-preview.tsx
+++ b/services/web/frontend/js/features/template/components/template-preview.tsx
@@ -1,5 +1,5 @@
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
 import { useTemplateContext } from '../context/template-context'
 
 
diff --git a/services/web/frontend/js/features/template/components/template-root.tsx b/services/web/frontend/js/features/template/components/template-root.tsx
index ff15511202..c0961100cc 100644
--- a/services/web/frontend/js/features/template/components/template-root.tsx
+++ b/services/web/frontend/js/features/template/components/template-root.tsx
@@ -2,11 +2,11 @@ import { useTranslation } from 'react-i18next'
 import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
 import withErrorBoundary from '../../../infrastructure/error-boundary'
 import { GenericErrorBoundaryFallback } from '@/shared/components/generic-error-boundary-fallback'
-import DefaultNavbar from '@/features/ui/components/bootstrap-5/navbar/default-navbar'
-import Footer from '@/features/ui/components/bootstrap-5/footer/footer'
+import DefaultNavbar from '@/shared/components/navbar/default-navbar'
+import Footer from '@/shared/components/footer/footer'
 import getMeta from '@/utils/meta'
-import OLCol from '@/features/ui/components/ol/ol-col'
-import OLRow from '@/features/ui/components/ol/ol-row'
+import OLCol from '@/shared/components/ol/ol-col'
+import OLRow from '@/shared/components/ol/ol-row'
 import TemplateDetails from './template-details'
 import TemplatePreview from './template-preview'
 import { useTemplateContext, TemplateProvider } from '../context/template-context'