diff --git a/plugins/bitrix-resources/src/components/mappings/CreateHRApplicationMapping.svelte b/plugins/bitrix-resources/src/components/mappings/CreateHRApplicationMapping.svelte
index a60de6c9c8..1362b1b599 100644
--- a/plugins/bitrix-resources/src/components/mappings/CreateHRApplicationMapping.svelte
+++ b/plugins/bitrix-resources/src/components/mappings/CreateHRApplicationMapping.svelte
@@ -9,8 +9,7 @@
   } from '@hcengineering/bitrix'
   import { AnyAttribute, Status } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { getClient } from '@hcengineering/presentation'
-  import InlineAttributeBarEditor from '@hcengineering/presentation/src/components/InlineAttributeBarEditor.svelte'
+  import { getClient, InlineAttributeBarEditor } from '@hcengineering/presentation'
   import recruit from '@hcengineering/recruit'
   import task from '@hcengineering/task'
   import { Button, DropdownLabels, DropdownLabelsIntl, DropdownTextItem, IconAdd } from '@hcengineering/ui'
diff --git a/plugins/calendar-resources/src/components/EventPresenter.svelte b/plugins/calendar-resources/src/components/EventPresenter.svelte
index 1a9040b88f..08d5cb0683 100644
--- a/plugins/calendar-resources/src/components/EventPresenter.svelte
+++ b/plugins/calendar-resources/src/components/EventPresenter.svelte
@@ -16,10 +16,9 @@
   import { Event } from '@hcengineering/calendar'
   import { DateRangeMode, Doc } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
-  import { DatePresenter, DateTimeRangePresenter, Label, showPopup } from '@hcengineering/ui'
+  import { DatePresenter, DateTimeRangePresenter, Label, showPopup, DateRangePresenter } from '@hcengineering/ui'
   import view, { ObjectEditor } from '@hcengineering/view'
   import calendar from '../plugin'
-  import DateRangePresenter from '@hcengineering/ui/src/components/calendar/DateRangePresenter.svelte'
 
   export let value: Event
   export let hideDetails: boolean = false
diff --git a/plugins/card-resources/src/components/Content.svelte b/plugins/card-resources/src/components/Content.svelte
index 62d282491a..48856e8f66 100644
--- a/plugins/card-resources/src/components/Content.svelte
+++ b/plugins/card-resources/src/components/Content.svelte
@@ -14,9 +14,8 @@
 -->
 <script lang="ts">
   import card, { Card } from '@hcengineering/card'
-  import { getClient } from '@hcengineering/presentation'
+  import { getClient, FilePreview } from '@hcengineering/presentation'
   import Description from './Description.svelte'
-  import FilePreview from '@hcengineering/presentation/src/components/FilePreview.svelte'
   import FilePlaceholder from './FilePlaceholder.svelte'
 
   export let doc: Card
diff --git a/plugins/controlled-documents-resources/src/components/FailedToCreateDocument.svelte b/plugins/controlled-documents-resources/src/components/FailedToCreateDocument.svelte
index f011d98582..6e5e0dd3a9 100644
--- a/plugins/controlled-documents-resources/src/components/FailedToCreateDocument.svelte
+++ b/plugins/controlled-documents-resources/src/components/FailedToCreateDocument.svelte
@@ -16,8 +16,7 @@
 -->
 
 <script lang="ts">
-  import { Notification, NotificationToast } from '@hcengineering/ui'
-  import Label from '@hcengineering/ui/src/components/Label.svelte'
+  import { Notification, NotificationToast, Label } from '@hcengineering/ui'
 
   import documents from '../plugin'
 
diff --git a/plugins/gmail-resources/src/components/FullMessage.svelte b/plugins/gmail-resources/src/components/FullMessage.svelte
index 69cc920933..01dea7e44c 100644
--- a/plugins/gmail-resources/src/components/FullMessage.svelte
+++ b/plugins/gmail-resources/src/components/FullMessage.svelte
@@ -15,9 +15,8 @@
 -->
 <script lang="ts">
   import { NewMessage, SharedMessage } from '@hcengineering/gmail'
-  import Button from '@hcengineering/ui/src/components/Button.svelte'
+  import { Button, IconArrowLeft, Label, Scroller, tooltip } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { IconArrowLeft, Label, Scroller, tooltip } from '@hcengineering/ui'
   import gmail from '../plugin'
   import FullMessageContent from './FullMessageContent.svelte'
   import { createQuery, getClient } from '@hcengineering/presentation'
diff --git a/plugins/rating-resources/src/components/RatingWidget.svelte b/plugins/rating-resources/src/components/RatingWidget.svelte
index 0729cdf61e..b0e52b5ac9 100644
--- a/plugins/rating-resources/src/components/RatingWidget.svelte
+++ b/plugins/rating-resources/src/components/RatingWidget.svelte
@@ -2,8 +2,7 @@
   import { getCurrentAccount, groupByArray, SortingOrder, type Class, type Doc, type Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import rating, { ReactionKind, type DocReaction } from '@hcengineering/rating'
-  import { NavGroup, Label } from '@hcengineering/ui'
-  import ScrollBox from '@hcengineering/ui/src/components/ScrollBox.svelte'
+  import { NavGroup, Label, ScrollBox } from '@hcengineering/ui'
   import NavigatorRating from './NavigatorRating.svelte'
 
   const current = getCurrentAccount()
diff --git a/plugins/setting-resources/src/components/Backup.svelte b/plugins/setting-resources/src/components/Backup.svelte
index a47ababddf..92805f652a 100644
--- a/plugins/setting-resources/src/components/Backup.svelte
+++ b/plugins/setting-resources/src/components/Backup.svelte
@@ -16,8 +16,7 @@
   import { AccountRole, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
   import { getMetadata } from '@hcengineering/platform'
   import presentation, { getFileUrl } from '@hcengineering/presentation'
-  import { Breadcrumb, Button, Expandable, Header, Label, Loading } from '@hcengineering/ui'
-  import Scroller from '@hcengineering/ui/src/components/Scroller.svelte'
+  import { Breadcrumb, Button, Expandable, Header, Label, Loading, Scroller } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { onMount } from 'svelte'
   import setting from '../plugin'
diff --git a/plugins/setting-resources/src/components/CreateRelation.svelte b/plugins/setting-resources/src/components/CreateRelation.svelte
index f63a950e72..69ed80212c 100644
--- a/plugins/setting-resources/src/components/CreateRelation.svelte
+++ b/plugins/setting-resources/src/components/CreateRelation.svelte
@@ -17,8 +17,7 @@
   import core, { Class, Doc, Ref } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import presentation, { Card, getClient } from '@hcengineering/presentation'
-  import { DropdownIntlItem, DropdownLabelsIntl, EditBox, Label } from '@hcengineering/ui'
-  import NestedDropdown from '@hcengineering/ui/src/components/NestedDropdown.svelte'
+  import { DropdownIntlItem, DropdownLabelsIntl, EditBox, Label, NestedDropdown } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { createEventDispatcher } from 'svelte'
   import setting from '../plugin'
diff --git a/plugins/text-editor-resources/src/components/extension/todo/ToDoItemNodeView.svelte b/plugins/text-editor-resources/src/components/extension/todo/ToDoItemNodeView.svelte
index 65de09f06c..446009d012 100644
--- a/plugins/text-editor-resources/src/components/extension/todo/ToDoItemNodeView.svelte
+++ b/plugins/text-editor-resources/src/components/extension/todo/ToDoItemNodeView.svelte
@@ -4,12 +4,11 @@
   import { MessageBox, createQuery, getClient } from '@hcengineering/presentation'
   import { makeRank } from '@hcengineering/rank'
   import time, { ToDo, ToDoPriority } from '@hcengineering/time'
-  import { CheckBox, getEventPositionElement, showPopup } from '@hcengineering/ui'
+  import { CheckBox, getEventPositionElement, showPopup, Component } from '@hcengineering/ui'
   import { onDestroy, onMount } from 'svelte'
   import { NodeViewProps } from '../../node-view'
   import NodeViewWrapper from '../../node-view/NodeViewWrapper.svelte'
   import NodeViewContent from '../../node-view/NodeViewContent.svelte'
-  import Component from '@hcengineering/ui/src/components/Component.svelte'
 
   export let node: NodeViewProps['node']
   export let editor: NodeViewProps['editor']
diff --git a/plugins/time-resources/src/components/EditWorkSlot.svelte b/plugins/time-resources/src/components/EditWorkSlot.svelte
index 2cbc3e9d38..620b34aed7 100644
--- a/plugins/time-resources/src/components/EditWorkSlot.svelte
+++ b/plugins/time-resources/src/components/EditWorkSlot.svelte
@@ -25,8 +25,7 @@
   import { DocumentUpdate } from '@hcengineering/core'
   import presentation, { createQuery, getClient } from '@hcengineering/presentation'
   import { StyledTextBox } from '@hcengineering/text-editor-resources'
-  import { Button, EditBox, Icon, IconClose, createFocusManager } from '@hcengineering/ui'
-  import FocusHandler from '@hcengineering/ui/src/components/FocusHandler.svelte'
+  import { Button, EditBox, Icon, IconClose, createFocusManager, FocusHandler } from '@hcengineering/ui'
   import { ToDo, WorkSlot } from '@hcengineering/time'
   import { deepEqual } from 'fast-equals'
   import { createEventDispatcher } from 'svelte'
diff --git a/plugins/time-resources/src/components/Workslots.svelte b/plugins/time-resources/src/components/Workslots.svelte
index 804a6cdd16..01e67ff92a 100644
--- a/plugins/time-resources/src/components/Workslots.svelte
+++ b/plugins/time-resources/src/components/Workslots.svelte
@@ -21,14 +21,14 @@
     Hotkey,
     HotkeyGroup,
     Scroller,
-    formatDuration
+    formatDuration,
+    Label
   } from '@hcengineering/ui'
   import { EventTimeEditor } from '@hcengineering/calendar-resources'
   import { WorkSlot } from '@hcengineering/time'
   import { createEventDispatcher } from 'svelte'
   import time from '../plugin'
   import { calculateEventsDuration } from '../utils'
-  import Label from '@hcengineering/ui/src/components/Label.svelte'
 
   export let slots: WorkSlot[] = []
   export let shortcuts: boolean = true
diff --git a/plugins/time-resources/src/components/team/agenda/EventItem.svelte b/plugins/time-resources/src/components/team/agenda/EventItem.svelte
index 9cc4013ca8..44fad7bb76 100644
--- a/plugins/time-resources/src/components/team/agenda/EventItem.svelte
+++ b/plugins/time-resources/src/components/team/agenda/EventItem.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
   import calendar, { Event } from '@hcengineering/calendar'
   import { DateRangeMode } from '@hcengineering/core'
-  import { Icon } from '@hcengineering/ui'
-  import DatePresenter from '@hcengineering/ui/src/components/calendar/DatePresenter.svelte'
-  import ArrowRight from '@hcengineering/ui/src/components/icons/ArrowRight.svelte'
+  import { Icon, DatePresenter, IconArrowRight } from '@hcengineering/ui'
   import TimePresenter from '../../presenters/TimePresenter.svelte'
 
   export let item: Event
@@ -25,7 +23,7 @@
         <div class="flex-row-center">
           <DatePresenter mode={DateRangeMode.TIMEONLY} value={item.date} />
           <div class="p-1">
-            <Icon icon={ArrowRight} size={'small'} />
+            <Icon icon={IconArrowRight} size={'small'} />
           </div>
           <DatePresenter mode={DateRangeMode.TIMEONLY} value={item.dueDate} />
         </div>
diff --git a/plugins/time-resources/src/components/team/agenda/PlanItem.svelte b/plugins/time-resources/src/components/team/agenda/PlanItem.svelte
index e0b3923283..8ef3e22e70 100644
--- a/plugins/time-resources/src/components/team/agenda/PlanItem.svelte
+++ b/plugins/time-resources/src/components/team/agenda/PlanItem.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
   import calendarPlugin from '@hcengineering/calendar'
-  import { Icon, Label } from '@hcengineering/ui'
+  import { Icon, Label, DatePresenter, IconArrowRight } from '@hcengineering/ui'
   import { WorkSlotMapping } from '../../../types'
   import ToDoPresenter from '../../ToDoPresenter.svelte'
   import TimePresenter from '../../presenters/TimePresenter.svelte'
-  import DatePresenter from '@hcengineering/ui/src/components/calendar/DatePresenter.svelte'
   import { DateRangeMode } from '@hcengineering/core'
-  import ArrowRight from '@hcengineering/ui/src/components/icons/ArrowRight.svelte'
 
   export let item: WorkSlotMapping
   export let showAssignee: boolean = false
@@ -32,7 +30,7 @@
           <div class="flex-row-center">
             <DatePresenter mode={DateRangeMode.TIMEONLY} value={slot.date} />
             <div class="p-1">
-              <Icon icon={ArrowRight} size={'small'} />
+              <Icon icon={IconArrowRight} size={'small'} />
             </div>
             <DatePresenter mode={DateRangeMode.TIMEONLY} value={slot.dueDate} />
           </div>
diff --git a/plugins/view-resources/src/components/Move.svelte b/plugins/view-resources/src/components/Move.svelte
index 1c9f949787..5532ecfd2e 100644
--- a/plugins/view-resources/src/components/Move.svelte
+++ b/plugins/view-resources/src/components/Move.svelte
@@ -14,12 +14,11 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { SpaceSelect, getClient } from '@hcengineering/presentation'
+  import { SpaceSelect, getClient, Card } from '@hcengineering/presentation'
   import { Label, Status as StatusControl, themeStore } from '@hcengineering/ui'
 
   import core, { Class, Client, Doc, Ref, SortingOrder, Space } from '@hcengineering/core'
   import { OK, Resource, Severity, Status, getResource, translate } from '@hcengineering/platform'
-  import Card from '@hcengineering/presentation/src/components/Card.svelte'
   import task, { Project, Task, makeRank } from '@hcengineering/task'
   import { createEventDispatcher } from 'svelte'
   import view from '../plugin'
diff --git a/plugins/workbench-resources/src/components/ServerManagerUsers.svelte b/plugins/workbench-resources/src/components/ServerManagerUsers.svelte
index 6a6713bfb3..63c6e73af2 100644
--- a/plugins/workbench-resources/src/components/ServerManagerUsers.svelte
+++ b/plugins/workbench-resources/src/components/ServerManagerUsers.svelte
@@ -3,8 +3,7 @@
   import { groupByArray, systemAccountUuid } from '@hcengineering/core'
   import { getEmbeddedLabel, getMetadata } from '@hcengineering/platform'
   import presentation, { isAdminUser, type OverviewStatistics } from '@hcengineering/presentation'
-  import { Button, CheckBox, ticker } from '@hcengineering/ui'
-  import Expandable from '@hcengineering/ui/src/components/Expandable.svelte'
+  import { Button, CheckBox, ticker, Expandable } from '@hcengineering/ui'
   import { FixedColumn, ObjectPresenter } from '@hcengineering/view-resources'
   import { employeeByPersonIdStore } from '@hcengineering/contact-resources'
   import { workspacesStore } from '../utils'
diff --git a/services/github/github-resources/src/components/ConnectProject.svelte b/services/github/github-resources/src/components/ConnectProject.svelte
index 9cfcec25f7..8cd1ffe888 100644
--- a/services/github/github-resources/src/components/ConnectProject.svelte
+++ b/services/github/github-resources/src/components/ConnectProject.svelte
@@ -10,9 +10,9 @@
     IconChevronDown,
     PaletteColorIndexes,
     getEventPopupPositionElement,
-    showPopup
+    showPopup,
+    DropdownLabelsPopup
   } from '@hcengineering/ui'
-  import DropdownLabelsPopup from '@hcengineering/ui/src/components/DropdownLabelsPopup.svelte'
   import {
     GithubIntegration,
     GithubIntegrationRepository,
diff --git a/services/github/github-resources/src/components/GithubIssueHeader.svelte b/services/github/github-resources/src/components/GithubIssueHeader.svelte
index 0d9239c3be..979d900852 100644
--- a/services/github/github-resources/src/components/GithubIssueHeader.svelte
+++ b/services/github/github-resources/src/components/GithubIssueHeader.svelte
@@ -3,9 +3,7 @@
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import { NavLink, createQuery, getClient, isAdminUser } from '@hcengineering/presentation'
   import { Issue } from '@hcengineering/tracker'
-  import { ButtonKind, showPopup } from '@hcengineering/ui'
-  import Button from '@hcengineering/ui/src/components/Button.svelte'
-  import Icon from '@hcengineering/ui/src/components/Icon.svelte'
+  import { ButtonKind, showPopup, Button, Icon } from '@hcengineering/ui'
   import { DocSyncInfo, GithubIntegrationRepository, GithubProject } from '@hcengineering/github'
   import github from '../plugin'
   import MarkdownDescriptionDiff from './MarkdownDescriptionDiff.svelte'
diff --git a/services/github/github-resources/src/components/GithubRepositories.svelte b/services/github/github-resources/src/components/GithubRepositories.svelte
index 6cd4b08bfa..0a66f63380 100644
--- a/services/github/github-resources/src/components/GithubRepositories.svelte
+++ b/services/github/github-resources/src/components/GithubRepositories.svelte
@@ -2,9 +2,8 @@
   import { AttachedDoc, Ref, WithLookup } from '@hcengineering/core'
   import { GithubIntegration, GithubIntegrationRepository, GithubProject } from '@hcengineering/github'
   import { getMetadata } from '@hcengineering/platform'
-  import presentation, { NavLink, getClient, isAdminUser } from '@hcengineering/presentation'
-  import MessageBox from '@hcengineering/presentation/src/components/MessageBox.svelte'
-  import tracker, { Project } from '@hcengineering/tracker'
+  import presentation, { NavLink, getClient, isAdminUser, MessageBox } from '@hcengineering/presentation'
+    import tracker, { Project } from '@hcengineering/tracker'
   import ui, {
     Action,
     Button,