diff --git a/blocksuite/affine/components/package.json b/blocksuite/affine/components/package.json
index bee8a8178a..974881b0fa 100644
--- a/blocksuite/affine/components/package.json
+++ b/blocksuite/affine/components/package.json
@@ -39,9 +39,11 @@
     "./peek": "./src/peek/index.ts",
     "./portal": "./src/portal/index.ts",
     "./hover": "./src/hover/index.ts",
+    "./icon-button": "./src/icon-button/index.ts",
     "./toolbar": "./src/toolbar/index.ts",
     "./toast": "./src/toast/index.ts",
     "./rich-text": "./src/rich-text/index.ts",
+    "./smooth-corner": "./src/smooth-corner/index.ts",
     "./caption": "./src/caption/index.ts",
     "./context-menu": "./src/context-menu/index.ts",
     "./date-picker": "./src/date-picker/index.ts",
@@ -49,6 +51,7 @@
     "./filterable-list": "./src/filterable-list/index.ts",
     "./virtual-keyboard": "./src/virtual-keyboard/index.ts",
     "./toggle-button": "./src/toggle-button/index.ts",
+    "./toggle-switch": "./src/toggle-switch/index.ts",
     "./notification": "./src/notification/index.ts",
     "./block-zero-width": "./src/block-zero-width/index.ts",
     "./block-selection": "./src/block-selection/index.ts"
diff --git a/blocksuite/blocks/src/_common/components/button.ts b/blocksuite/affine/components/src/icon-button/index.ts
similarity index 100%
rename from blocksuite/blocks/src/_common/components/button.ts
rename to blocksuite/affine/components/src/icon-button/index.ts
diff --git a/blocksuite/blocks/src/_common/components/smooth-corner.ts b/blocksuite/affine/components/src/smooth-corner/index.ts
similarity index 96%
rename from blocksuite/blocks/src/_common/components/smooth-corner.ts
rename to blocksuite/affine/components/src/smooth-corner/index.ts
index 71ffde7bdb..86af60b6fe 100644
--- a/blocksuite/blocks/src/_common/components/smooth-corner.ts
+++ b/blocksuite/affine/components/src/smooth-corner/index.ts
@@ -112,19 +112,19 @@ export class SmoothCorner extends LitElement {
   override render() {
     return html`${this._getSvg(
         'smooth-corner-bg',
-        svg`<path 
-          d="${this._path}" 
-          fill="${this.bgColor}" 
+        svg`<path
+          d="${this._path}"
+          fill="${this.bgColor}"
           fill-opacity="${this.bgOpacity}"
           transform="translate(${this.borderWidth / 2} ${this.borderWidth / 2})"
         >`
       )}
       ${this._getSvg(
         'smooth-corner-border',
-        svg`<path 
+        svg`<path
           fill="none"
-          d="${this._path}" 
-          stroke="${this.borderColor}" 
+          d="${this._path}"
+          stroke="${this.borderColor}"
           stroke-width="${this.borderWidth}"
           transform="translate(${this.borderWidth / 2} ${this.borderWidth / 2})"
         >`
diff --git a/blocksuite/blocks/src/_common/components/toggle-switch.ts b/blocksuite/affine/components/src/toggle-switch/index.ts
similarity index 100%
rename from blocksuite/blocks/src/_common/components/toggle-switch.ts
rename to blocksuite/affine/components/src/toggle-switch/index.ts
diff --git a/blocksuite/blocks/src/effects.ts b/blocksuite/blocks/src/effects.ts
index 6fa06df409..8e1b47c739 100644
--- a/blocksuite/blocks/src/effects.ts
+++ b/blocksuite/blocks/src/effects.ts
@@ -9,9 +9,12 @@ import { effects as componentContextMenuEffects } from '@blocksuite/affine-compo
 import { effects as componentDatePickerEffects } from '@blocksuite/affine-components/date-picker';
 import { effects as componentDragIndicatorEffects } from '@blocksuite/affine-components/drag-indicator';
 import { FilterableListComponent } from '@blocksuite/affine-components/filterable-list';
+import { IconButton } from '@blocksuite/affine-components/icon-button';
 import { effects as componentPortalEffects } from '@blocksuite/affine-components/portal';
 import { effects as componentRichTextEffects } from '@blocksuite/affine-components/rich-text';
+import { SmoothCorner } from '@blocksuite/affine-components/smooth-corner';
 import { effects as componentToggleButtonEffects } from '@blocksuite/affine-components/toggle-button';
+import { ToggleSwitch } from '@blocksuite/affine-components/toggle-switch';
 import { effects as componentToolbarEffects } from '@blocksuite/affine-components/toolbar';
 import { effects as widgetScrollAnchoringEffects } from '@blocksuite/affine-widget-scroll-anchoring/effects';
 import type { BlockComponent } from '@blocksuite/block-std';
@@ -22,16 +25,12 @@ import type { BlockModel } from '@blocksuite/store';
 
 import { AIItem } from './_common/components/ai-item/ai-item.js';
 import { AISubItemList } from './_common/components/ai-item/ai-sub-item-list.js';
-import { IconButton } from './_common/components/button.js';
 import { EmbedCardMoreMenu } from './_common/components/embed-card/embed-card-more-menu-popper.js';
 import { EmbedCardStyleMenu } from './_common/components/embed-card/embed-card-style-popper.js';
 import { EmbedCardEditCaptionEditModal } from './_common/components/embed-card/modal/embed-card-caption-edit-modal.js';
 import { EmbedCardCreateModal } from './_common/components/embed-card/modal/embed-card-create-modal.js';
 import { EmbedCardEditModal } from './_common/components/embed-card/modal/embed-card-edit-modal.js';
 import { AIItemList } from './_common/components/index.js';
-import { Loader } from './_common/components/loader.js';
-import { SmoothCorner } from './_common/components/smooth-corner.js';
-import { ToggleSwitch } from './_common/components/toggle-switch.js';
 import { registerSpecs } from './_specs/register-specs.js';
 import { AttachmentEdgelessBlockComponent } from './attachment-block/attachment-edgeless-block.js';
 import {
@@ -246,6 +245,7 @@ import { AFFINE_IMAGE_TOOLBAR_WIDGET } from './root-block/widgets/image-toolbar/
 import { AFFINE_INNER_MODAL_WIDGET } from './root-block/widgets/inner-modal/inner-modal.js';
 import { effects as widgetMobileToolbarEffects } from './root-block/widgets/keyboard-toolbar/effects.js';
 import { effects as widgetLinkedDocEffects } from './root-block/widgets/linked-doc/effects.js';
+import { Loader } from './root-block/widgets/linked-doc/import-doc/loader';
 import { AffineCustomModal } from './root-block/widgets/modal/custom-modal.js';
 import { AFFINE_MODAL_WIDGET } from './root-block/widgets/modal/modal.js';
 import { AFFINE_PAGE_DRAGGING_AREA_WIDGET } from './root-block/widgets/page-dragging-area/page-dragging-area.js';
diff --git a/blocksuite/blocks/src/_common/components/loader.ts b/blocksuite/blocks/src/root-block/widgets/linked-doc/import-doc/loader.ts
similarity index 100%
rename from blocksuite/blocks/src/_common/components/loader.ts
rename to blocksuite/blocks/src/root-block/widgets/linked-doc/import-doc/loader.ts
diff --git a/blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts b/blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts
index f8c9ff9ce2..cb47a7b845 100644
--- a/blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts
+++ b/blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts
@@ -1,3 +1,4 @@
+import type { IconButton } from '@blocksuite/affine-components/icon-button';
 import { MoreHorizontalIcon } from '@blocksuite/affine-components/icons';
 import {
   getCurrentNativeRange,
@@ -13,7 +14,6 @@ import { html, LitElement, nothing } from 'lit';
 import { property, query, queryAll, state } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
-import type { IconButton } from '../../../_common/components/button.js';
 import {
   cleanSpecifiedTail,
   createKeydownObserver,