diff --git a/src/components/core/index.js b/src/components/core/index.js
deleted file mode 100644
index 83445b9e..00000000
--- a/src/components/core/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Vue from 'vue'
-
-import { GridLayout, GridItem } from 'vue-grid-layout'
-import SplitPane from 'vue-splitpane'
-
-import d2Container from '@/components/core/d2-container'
-
-Vue.component('d2-grid-layout', GridLayout)
-Vue.component('d2-grid-item', GridItem)
-Vue.component('SplitPane', SplitPane)
-
-Vue.component('d2-container', d2Container)
-Vue.component('d2-count-up', () => import('@/components/core/d2-count-up'))
-Vue.component('d2-highlight', () => import('@/components/core/d2-highlight'))
-Vue.component('d2-icon', () => import('@/components/core/d2-icon'))
-Vue.component('d2-icon-select', () => import('@/components/core/d2-icon-select/index.vue'))
-Vue.component('d2-icon-svg', () => import('@/components/core/d2-icon-svg/index.vue'))
-Vue.component('d2-markdown', () => import('@/components/core/d2-markdown'))
-Vue.component('d2-mde', () => import('@/components/core/d2-mde'))
-Vue.component('d2-quill', () => import('@/components/core/d2-quill'))
diff --git a/src/components/core/d2-container/components/d2-container-card-bs.vue b/src/components/d2-container/components/d2-container-card-bs.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-card-bs.vue
rename to src/components/d2-container/components/d2-container-card-bs.vue
diff --git a/src/components/core/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-card.vue
rename to src/components/d2-container/components/d2-container-card.vue
diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/d2-container/components/d2-container-full-bs.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-full-bs.vue
rename to src/components/d2-container/components/d2-container-full-bs.vue
diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-full.vue
rename to src/components/d2-container/components/d2-container-full.vue
diff --git a/src/components/core/d2-container/components/d2-container-ghost-bs.vue b/src/components/d2-container/components/d2-container-ghost-bs.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-ghost-bs.vue
rename to src/components/d2-container/components/d2-container-ghost-bs.vue
diff --git a/src/components/core/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue
similarity index 100%
rename from src/components/core/d2-container/components/d2-container-ghost.vue
rename to src/components/d2-container/components/d2-container-ghost.vue
diff --git a/src/components/core/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
similarity index 100%
rename from src/components/core/d2-container/components/mixins/bs.js
rename to src/components/d2-container/components/mixins/bs.js
diff --git a/src/components/core/d2-container/index.vue b/src/components/d2-container/index.vue
similarity index 100%
rename from src/components/core/d2-container/index.vue
rename to src/components/d2-container/index.vue
diff --git a/src/components/core/d2-count-up/index.vue b/src/components/d2-count-up/index.vue
similarity index 100%
rename from src/components/core/d2-count-up/index.vue
rename to src/components/d2-count-up/index.vue
diff --git a/src/components/core/d2-highlight/index.vue b/src/components/d2-highlight/index.vue
similarity index 100%
rename from src/components/core/d2-highlight/index.vue
rename to src/components/d2-highlight/index.vue
diff --git a/src/components/core/d2-highlight/libs/htmlFormat.js.REMOVED.git-id b/src/components/d2-highlight/libs/htmlFormat.js.REMOVED.git-id
similarity index 100%
rename from src/components/core/d2-highlight/libs/htmlFormat.js.REMOVED.git-id
rename to src/components/d2-highlight/libs/htmlFormat.js.REMOVED.git-id
diff --git a/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id b/src/components/d2-icon-select/data/index.js.REMOVED.git-id
similarity index 100%
rename from src/components/core/d2-icon-select/data/index.js.REMOVED.git-id
rename to src/components/d2-icon-select/data/index.js.REMOVED.git-id
diff --git a/src/components/core/d2-icon-select/index.vue b/src/components/d2-icon-select/index.vue
similarity index 100%
rename from src/components/core/d2-icon-select/index.vue
rename to src/components/d2-icon-select/index.vue
diff --git a/src/components/core/d2-icon-svg/index.vue b/src/components/d2-icon-svg/index.vue
similarity index 100%
rename from src/components/core/d2-icon-svg/index.vue
rename to src/components/d2-icon-svg/index.vue
diff --git a/src/components/core/d2-icon/index.vue b/src/components/d2-icon/index.vue
similarity index 100%
rename from src/components/core/d2-icon/index.vue
rename to src/components/d2-icon/index.vue
diff --git a/src/components/demo/d2-link-btn/index.vue b/src/components/d2-link-btn/index.vue
similarity index 100%
rename from src/components/demo/d2-link-btn/index.vue
rename to src/components/d2-link-btn/index.vue
diff --git a/src/components/core/d2-markdown/index.vue b/src/components/d2-markdown/index.vue
similarity index 100%
rename from src/components/core/d2-markdown/index.vue
rename to src/components/d2-markdown/index.vue
diff --git a/src/components/core/d2-markdown/plugin/baidupan.js b/src/components/d2-markdown/plugin/baidupan.js
similarity index 100%
rename from src/components/core/d2-markdown/plugin/baidupan.js
rename to src/components/d2-markdown/plugin/baidupan.js
diff --git a/src/components/core/d2-mde/index.vue b/src/components/d2-mde/index.vue
similarity index 100%
rename from src/components/core/d2-mde/index.vue
rename to src/components/d2-mde/index.vue
diff --git a/src/components/demo/d2-page-cover/index.vue b/src/components/d2-page-cover/index.vue
similarity index 100%
rename from src/components/demo/d2-page-cover/index.vue
rename to src/components/d2-page-cover/index.vue
diff --git a/src/components/core/d2-quill/index.vue b/src/components/d2-quill/index.vue
similarity index 100%
rename from src/components/core/d2-quill/index.vue
rename to src/components/d2-quill/index.vue
diff --git a/src/components/demo/index.js b/src/components/demo/index.js
deleted file mode 100644
index fd8ffe19..00000000
--- a/src/components/demo/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Vue from 'vue'
-
-import d2DemoLinkBtn from '@/components/demo/d2-link-btn'
-
-Vue.component('d2-link-btn', d2DemoLinkBtn)
-Vue.component('d2-page-cover', () => import('@/components/demo/d2-page-cover'))
diff --git a/src/components/index.js b/src/components/index.js
index c8745fcf..c254dc1d 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,4 +1,23 @@
-// 核心组件
-import './core'
-// 非核心组件 只是在很多演示页面中用到的组件
-import './demo'
+import Vue from 'vue'
+
+import { GridLayout, GridItem } from 'vue-grid-layout'
+import SplitPane from 'vue-splitpane'
+
+import d2Container from '@/components/d2-container'
+import d2LinkBtn from '@/components/d2-link-btn'
+
+Vue.component('d2-grid-layout', GridLayout)
+Vue.component('d2-grid-item', GridItem)
+Vue.component('SplitPane', SplitPane)
+
+Vue.component('d2-container', d2Container)
+Vue.component('d2-link-btn', d2LinkBtn)
+Vue.component('d2-page-cover', () => import('@/components/d2-page-cover'))
+Vue.component('d2-count-up', () => import('@/components/d2-count-up'))
+Vue.component('d2-highlight', () => import('@/components/d2-highlight'))
+Vue.component('d2-icon', () => import('@/components/d2-icon'))
+Vue.component('d2-icon-select', () => import('@/components/d2-icon-select/index.vue'))
+Vue.component('d2-icon-svg', () => import('@/components/d2-icon-svg/index.vue'))
+Vue.component('d2-markdown', () => import('@/components/d2-markdown'))
+Vue.component('d2-mde', () => import('@/components/d2-mde'))
+Vue.component('d2-quill', () => import('@/components/d2-quill'))