diff --git a/components/date-picker/demo/basic.ts b/components/date-picker/demo/basic.ts
index 740037b4dde..9cdb46ca3c0 100644
--- a/components/date-picker/demo/basic.ts
+++ b/components/date-picker/demo/basic.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import getISOWeek from 'date-fns/get_iso_week';
-import { en_US, zh_CN, NzI18nService } from 'ng-zorro-antd';
+import { en_US, zh_CN, NzI18nService } from 'ng-zorro-antd/i18n';
 
 @Component({
   selector: 'nz-demo-date-picker-basic',
diff --git a/components/date-picker/nz-range-picker.component.spec.ts b/components/date-picker/nz-range-picker.component.spec.ts
index d6f2a894d30..9a2d38fa324 100644
--- a/components/date-picker/nz-range-picker.component.spec.ts
+++ b/components/date-picker/nz-range-picker.component.spec.ts
@@ -701,8 +701,11 @@ describe('NzRangePickerComponent', () => {
       rightInput.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       fixture.detectChanges();
       tick(500);
+      // @ts-ignore
       const result = nzOnChange.calls.allArgs()[0][0];
+      // @ts-ignore
       expect(result[0].getDate()).toBe(6);
+      // @ts-ignore
       expect(result[1].getDate()).toBe(10);
     }));
   }); // /specified date picker testing
diff --git a/components/drawer/demo/service.ts b/components/drawer/demo/service.ts
index 8390a6ff2f2..8fa18ec8d33 100644
--- a/components/drawer/demo/service.ts
+++ b/components/drawer/demo/service.ts
@@ -1,7 +1,7 @@
 /* entryComponents: NzDrawerCustomComponent */
 
 import { Component, Input, TemplateRef, ViewChild } from '@angular/core';
-import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd';
+import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer';
 
 @Component({
   selector: 'nz-demo-drawer-service',
diff --git a/components/drawer/nz-drawer.spec.ts b/components/drawer/nz-drawer.spec.ts
index e25181c3673..7dc4d4af900 100644
--- a/components/drawer/nz-drawer.spec.ts
+++ b/components/drawer/nz-drawer.spec.ts
@@ -1,12 +1,12 @@
 import { ESCAPE } from '@angular/cdk/keycodes';
+import { OverlayContainer } from '@angular/cdk/overlay';
 import { Component, Input, TemplateRef, ViewChild } from '@angular/core';
-
 import { async, fakeAsync, inject, tick, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { OverlayContainer } from '@angular/cdk/overlay';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { dispatchKeyboardEvent } from 'ng-zorro-antd';
+
+import { dispatchKeyboardEvent } from 'ng-zorro-antd/core';
+
 import { NzDrawerRef } from './nz-drawer-ref';
 import { NzDrawerComponent } from './nz-drawer.component';
 import { NzDrawerModule } from './nz-drawer.module';
diff --git a/components/dropdown/demo/context-menu.ts b/components/dropdown/demo/context-menu.ts
index ffd7cd1662f..5b0514ee81c 100644
--- a/components/dropdown/demo/context-menu.ts
+++ b/components/dropdown/demo/context-menu.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd';
+import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
 
 @Component({
   selector: 'nz-demo-dropdown-context-menu',
diff --git a/components/empty/demo/config.ts b/components/empty/demo/config.ts
index 68b56827061..15f43b0611f 100644
--- a/components/empty/demo/config.ts
+++ b/components/empty/demo/config.ts
@@ -1,5 +1,5 @@
 import { Component, TemplateRef, ViewChild } from '@angular/core';
-import { NzEmptyService } from 'ng-zorro-antd';
+import { NzEmptyService } from 'ng-zorro-antd/empty';
 
 @Component({
   selector: 'nz-demo-empty-config',
diff --git a/components/icon/demo/iconfont.ts b/components/icon/demo/iconfont.ts
index 6c67f1e8400..0389cb5d8b8 100644
--- a/components/icon/demo/iconfont.ts
+++ b/components/icon/demo/iconfont.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzIconService } from 'ng-zorro-antd';
+import { NzIconService } from 'ng-zorro-antd/icon';
 
 @Component({
   selector: 'nz-demo-icon-iconfont',
diff --git a/components/icon/demo/namespace.ts b/components/icon/demo/namespace.ts
index 645f57def59..75dc59030cc 100644
--- a/components/icon/demo/namespace.ts
+++ b/components/icon/demo/namespace.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzIconService } from 'ng-zorro-antd';
+import { NzIconService } from 'ng-zorro-antd/icon';
 
 const ngZorroIconLiteral =
   '<svg viewBox="0 0 106 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n  <defs>\n    <linearGradient x1="68.1279872%" y1="-35.6905737%" x2="30.4400914%" y2="114.942679%" id="linearGradient-1">\n      <stop stop-color="#FA8E7D" offset="0%"></stop>\n      <stop stop-color="#F74A5C" offset="51.2635191%"></stop>\n      <stop stop-color="#F51D2C" offset="100%"></stop>\n    </linearGradient>\n    <linearGradient x1="68.1279872%" y1="-35.6905737%" x2="74.5363914%" y2="162.511755%" id="linearGradient-2">\n      <stop stop-color="#FA8E7D" offset="0%"></stop>\n      <stop stop-color="#F74A5C" offset="51.2635191%"></stop>\n      <stop stop-color="#F51D2C" offset="100%"></stop>\n    </linearGradient>\n    <linearGradient x1="69.644116%" y1="0%" x2="69.644116%" y2="100%" id="linearGradient-3">\n      <stop stop-color="#29CDFF" offset="0%"></stop>\n      <stop stop-color="#148EFF" offset="37.8600687%"></stop>\n      <stop stop-color="#0A60FF" offset="100%"></stop>\n    </linearGradient>\n    <linearGradient x1="-19.8191553%" y1="-36.7931464%" x2="138.57919%" y2="157.637507%" id="linearGradient-4">\n      <stop stop-color="#29CDFF" offset="0%"></stop>\n      <stop stop-color="#0F78FF" offset="100%"></stop>\n    </linearGradient>\n  </defs>\n  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n    <g id="Angular" transform="translate(-11.000000, -4.000000)">\n      <g id="Group-9" transform="translate(11.000000, 4.000000)">\n        <path d="M65.63,72.2 L53.23,53.2 L46,63.69 L53.37,63.69 C56.4075661,63.69 58.87,66.1524339 58.87,69.19 C58.87,72.2275661 56.4075661,74.69 53.37,74.69 L35.49,74.69 C33.4448986,74.6890667 31.569189,73.5534846 30.620326,71.7418281 C29.671463,69.9301715 29.8061511,67.7416349 30.97,66.06 L48.84,40.26 C49.879226,38.7527636 51.6013948,37.8627393 53.4320154,37.8868264 C55.2626361,37.9109135 56.960791,38.8459421 57.96,40.38 L74.84,66.18 C75.9449505,67.8698206 76.0352122,70.0292067 75.0751376,71.8053446 C74.115063,73.5814826 72.2590116,74.6888076 70.24,74.69 C68.3799194,74.6978131 66.6433454,73.7598372 65.63,72.2 Z" id="Path" fill="url(#linearGradient-1)"></path>\n        <path d="M70.28,25 C69.0616939,25.0004053 67.8648105,24.6796268 66.81,24.07 L52.87,16.07 L39,24 C36.8331842,25.2504298 34.1638674,25.249892 31.9975556,23.9985892 C29.8312438,22.7472865 28.4970513,20.4353214 28.4975555,17.933589 C28.4980597,15.4318566 29.833184,13.1204295 32,11.87 L49.34,1.87 C51.5058075,0.619570435 54.1741925,0.619570435 56.34,1.87 L73.76,11.87 C76.574107,13.4207731 77.9710889,16.688234 77.147902,19.7941088 C76.324715,22.8999837 73.492775,25.0466031 70.28,25 Z" id="Path" fill="url(#linearGradient-2)"></path>\n        <path d="M52.86,119.92 C51.6310454,119.919338 50.4239235,119.595139 49.36,118.98 L3.93,92.75 C1.76486614,91.4999595 0.43077789,89.190081 0.43,86.69 L0.43,34.23 C0.43077789,31.729919 1.76486614,29.4200405 3.93,28.17 L15.16,21.69 C17.3290879,20.369153 20.0434251,20.3267208 22.2527396,21.5791219 C24.4620541,22.831523 25.8197544,25.182284 25.8004986,27.7218131 C25.7812428,30.2613423 24.3880518,32.5912449 22.16,33.81 L14.43,38.27 L14.43,82.65 L52.86,104.83 L89.7896161,83.5159515 C90.7180357,82.9801111 91.29,81.9896088 91.29,80.9176536 L91.29,40.0028421 C91.29,38.9306213 90.7177545,37.9399157 89.7889721,37.4041727 L83.61,33.84 C81.4431842,32.5895704 80.1080601,30.2781434 80.1075559,27.7764111 C80.1070518,25.2746788 81.4412443,22.9627138 83.6075559,21.7114111 C85.7738676,20.4601083 88.4431842,20.4595704 90.61,21.71 L101.79,28.17 C103.955134,29.4200405 105.289222,31.729919 105.29,34.23 L105.29,86.69 C105.289222,89.190081 103.955134,91.4999595 101.79,92.75 L56.36,119 C55.2952279,119.610805 54.087499,119.928265 52.86,119.92 Z" id="Path" fill="url(#linearGradient-3)" fill-rule="nonzero"></path>\n        <path d="M78.06,106.45 C66.89,113 52.87,104.83 52.87,104.83 L15.9403839,83.5159515 C15.0119643,82.9801111 14.44,81.9896088 14.44,80.9176536 L14.44,40.0026171 C14.44,38.9305169 15.0121179,37.9399035 15.9407356,37.4041163 L22.17,33.81 C24.3980518,32.5912449 25.7912428,30.2613423 25.8104986,27.7218131 C25.8297544,25.182284 24.4720541,22.831523 22.2627396,21.5791219 C20.0534251,20.3267208 17.3390879,20.369153 15.17,21.69 L3.94,28.17 C1.77486614,29.4200405 0.44077789,31.729919 0.44,34.23 L0.44,86.69 C0.44077789,89.190081 1.77486614,91.4999595 3.94,92.75 L49.36,119 C51.5258075,120.25043 54.1941925,120.25043 56.36,119 L78.06,106.47 L78.06,106.45 Z" id="Path" fill="url(#linearGradient-4)" fill-rule="nonzero"></path>\n      </g>\n    </g>\n  </g>\n</svg>';
diff --git a/components/list/demo/loadmore.ts b/components/list/demo/loadmore.ts
index 52f1f27ab29..20a247770a3 100644
--- a/components/list/demo/loadmore.ts
+++ b/components/list/demo/loadmore.ts
@@ -1,7 +1,7 @@
 // tslint:disable:no-any
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 const count = 5;
 const fakeDataUrl = 'https://randomuser.me/api/?results=5&inc=name,gender,email,nat&noinfo';
diff --git a/components/list/demo/simple.ts b/components/list/demo/simple.ts
index 6045f4f5100..8a9ada789b5 100644
--- a/components/list/demo/simple.ts
+++ b/components/list/demo/simple.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-list-simple',
diff --git a/components/mention/demo/async.ts b/components/mention/demo/async.ts
index 147f65d49f0..39f17b1e977 100755
--- a/components/mention/demo/async.ts
+++ b/components/mention/demo/async.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation } from '@angular/core';
-import { MentionOnSearchTypes } from 'ng-zorro-antd';
+import { MentionOnSearchTypes } from 'ng-zorro-antd/mention';
 
 @Component({
   selector: 'nz-demo-mention-async',
diff --git a/components/mention/demo/multiple-trigger.ts b/components/mention/demo/multiple-trigger.ts
index fd3154f171c..21a4d4220e6 100755
--- a/components/mention/demo/multiple-trigger.ts
+++ b/components/mention/demo/multiple-trigger.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation } from '@angular/core';
-import { MentionOnSearchTypes } from 'ng-zorro-antd';
+import { MentionOnSearchTypes } from 'ng-zorro-antd/mention';
 
 @Component({
   selector: 'nz-demo-mention-multiple-trigger',
diff --git a/components/message/demo/close.ts b/components/message/demo/close.ts
index 5f8b429ae9a..1e08b273617 100644
--- a/components/message/demo/close.ts
+++ b/components/message/demo/close.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import { concatMap } from 'rxjs/operators';
 
 @Component({
diff --git a/components/message/demo/duration.ts b/components/message/demo/duration.ts
index d3da5124667..81335168f49 100644
--- a/components/message/demo/duration.ts
+++ b/components/message/demo/duration.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-message-duration',
diff --git a/components/message/demo/info.ts b/components/message/demo/info.ts
index 16edfe6d538..16fa77b4f79 100644
--- a/components/message/demo/info.ts
+++ b/components/message/demo/info.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-message-info',
diff --git a/components/message/demo/loading.ts b/components/message/demo/loading.ts
index 9edebaf95a1..d543bf9a705 100644
--- a/components/message/demo/loading.ts
+++ b/components/message/demo/loading.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-message-loading',
diff --git a/components/message/demo/other.ts b/components/message/demo/other.ts
index dc1aefeb3fa..b0ed18136ac 100644
--- a/components/message/demo/other.ts
+++ b/components/message/demo/other.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-message-other',
diff --git a/components/modal/demo/confirm-promise.ts b/components/modal/demo/confirm-promise.ts
index 2fcd334658d..88401c322f4 100644
--- a/components/modal/demo/confirm-promise.ts
+++ b/components/modal/demo/confirm-promise.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-confirm-promise',
diff --git a/components/modal/demo/confirm.ts b/components/modal/demo/confirm.ts
index aee248e5342..bd68274b4ee 100644
--- a/components/modal/demo/confirm.ts
+++ b/components/modal/demo/confirm.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzModalService } from 'ng-zorro-antd';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-confirm',
diff --git a/components/modal/demo/footer2.ts b/components/modal/demo/footer2.ts
index bbb8fc7f73d..000f2ab9181 100644
--- a/components/modal/demo/footer2.ts
+++ b/components/modal/demo/footer2.ts
@@ -1,7 +1,7 @@
 /* entryComponents: NzModalCustomFooterComponent */
 
 import { Component } from '@angular/core';
-import { NzModalService, NzModalRef } from 'ng-zorro-antd';
+import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-footer2',
@@ -9,8 +9,8 @@ import { NzModalService, NzModalRef } from 'ng-zorro-antd';
     <button nz-button nzType="primary" (click)="showModal1()">
       <span>In Template</span>
     </button>
-    <br>
-    <br>
+    <br />
+    <br />
     <button nz-button nzType="primary" (click)="showModal2()">
       <span>In Component</span>
     </button>
@@ -35,7 +35,7 @@ export class NzDemoModalFooter2Component {
   isVisible = false;
   isConfirmLoading = false;
 
-  constructor(private modalService: NzModalService) { }
+  constructor(private modalService: NzModalService) {}
 
   showModal1(): void {
     this.isVisible = true;
@@ -78,8 +78,7 @@ export class NzDemoModalFooter2Component {
   `
 })
 export class NzModalCustomFooterComponent {
-
-  constructor(private modal: NzModalRef) { }
+  constructor(private modal: NzModalRef) {}
 
   destroyModal(): void {
     this.modal.destroy();
diff --git a/components/modal/demo/info.ts b/components/modal/demo/info.ts
index 9b523b409e6..ec63c69ab12 100644
--- a/components/modal/demo/info.ts
+++ b/components/modal/demo/info.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzModalService } from 'ng-zorro-antd';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-info',
diff --git a/components/modal/demo/locale.ts b/components/modal/demo/locale.ts
index eed8ce0a823..1b1282b02f0 100644
--- a/components/modal/demo/locale.ts
+++ b/components/modal/demo/locale.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzModalService } from 'ng-zorro-antd';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-locale',
diff --git a/components/modal/demo/manual.ts b/components/modal/demo/manual.ts
index 07b1cb93dc4..712919ddc9f 100644
--- a/components/modal/demo/manual.ts
+++ b/components/modal/demo/manual.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzModalService } from 'ng-zorro-antd';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-manual',
diff --git a/components/modal/demo/service.ts b/components/modal/demo/service.ts
index a3dbb1e7601..9efb07517f4 100644
--- a/components/modal/demo/service.ts
+++ b/components/modal/demo/service.ts
@@ -1,7 +1,7 @@
 /* entryComponents: NzModalCustomComponent */
 
 import { Component, Input, TemplateRef } from '@angular/core';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'nz-demo-modal-service',
diff --git a/components/notification/demo/basic.ts b/components/notification/demo/basic.ts
index 67cd321ecf6..39e3a6df633 100644
--- a/components/notification/demo/basic.ts
+++ b/components/notification/demo/basic.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-basic',
diff --git a/components/notification/demo/custom-icon.ts b/components/notification/demo/custom-icon.ts
index 0c34b738190..fb70733c9c2 100644
--- a/components/notification/demo/custom-icon.ts
+++ b/components/notification/demo/custom-icon.ts
@@ -1,5 +1,5 @@
 import { Component, TemplateRef } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-custom-icon',
diff --git a/components/notification/demo/custom-style.ts b/components/notification/demo/custom-style.ts
index 2d83c4ea0af..fddd4417570 100644
--- a/components/notification/demo/custom-style.ts
+++ b/components/notification/demo/custom-style.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-custom-style',
diff --git a/components/notification/demo/duration.ts b/components/notification/demo/duration.ts
index 1a3fea16351..0b63d19a9b1 100644
--- a/components/notification/demo/duration.ts
+++ b/components/notification/demo/duration.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-duration',
diff --git a/components/notification/demo/placement.ts b/components/notification/demo/placement.ts
index 974eed27da3..c28345fe835 100644
--- a/components/notification/demo/placement.ts
+++ b/components/notification/demo/placement.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-placement',
diff --git a/components/notification/demo/template.ts b/components/notification/demo/template.ts
index 8dc6c2ed386..80866a8748e 100644
--- a/components/notification/demo/template.ts
+++ b/components/notification/demo/template.ts
@@ -1,5 +1,5 @@
 import { Component, TemplateRef, ViewChild } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-template',
diff --git a/components/notification/demo/update.ts b/components/notification/demo/update.ts
index 04b06328a72..bbd4e0c0adc 100644
--- a/components/notification/demo/update.ts
+++ b/components/notification/demo/update.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-update',
diff --git a/components/notification/demo/with-btn.ts b/components/notification/demo/with-btn.ts
index d9468087b34..207c812eb09 100644
--- a/components/notification/demo/with-btn.ts
+++ b/components/notification/demo/with-btn.ts
@@ -1,5 +1,5 @@
 import { Component, TemplateRef } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-with-btn',
diff --git a/components/notification/demo/with-icon.ts b/components/notification/demo/with-icon.ts
index e721708aab2..c466ae9ea76 100644
--- a/components/notification/demo/with-icon.ts
+++ b/components/notification/demo/with-icon.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzNotificationService } from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 
 @Component({
   selector: 'nz-demo-notification-with-icon',
diff --git a/components/popconfirm/demo/dynamic-trigger.ts b/components/popconfirm/demo/dynamic-trigger.ts
index 705456fed94..6970b57d040 100644
--- a/components/popconfirm/demo/dynamic-trigger.ts
+++ b/components/popconfirm/demo/dynamic-trigger.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-popconfirm-dynamic-trigger',
diff --git a/components/popconfirm/demo/locale.ts b/components/popconfirm/demo/locale.ts
index ac5c48a251e..c9366da0e2c 100644
--- a/components/popconfirm/demo/locale.ts
+++ b/components/popconfirm/demo/locale.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-popconfirm-locale',
diff --git a/components/popconfirm/demo/placement.ts b/components/popconfirm/demo/placement.ts
index 6fae777da70..8e7fb3d9b1e 100644
--- a/components/popconfirm/demo/placement.ts
+++ b/components/popconfirm/demo/placement.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-popconfirm-placement',
diff --git a/components/table/demo/edit-cell.ts b/components/table/demo/edit-cell.ts
index 71832e2f7e2..34552a8fd1a 100644
--- a/components/table/demo/edit-cell.ts
+++ b/components/table/demo/edit-cell.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core';
-import { NzInputDirective } from 'ng-zorro-antd';
+import { NzInputDirective } from 'ng-zorro-antd/input';
 
 @Component({
   selector: 'nz-demo-table-edit-cell',
diff --git a/components/table/demo/virtual.ts b/components/table/demo/virtual.ts
index 2dd15c1570e..49b3bf2e79d 100644
--- a/components/table/demo/virtual.ts
+++ b/components/table/demo/virtual.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { NzTableComponent } from 'ng-zorro-antd';
+import { NzTableComponent } from 'ng-zorro-antd/table';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
diff --git a/components/transfer/demo/advanced.ts b/components/transfer/demo/advanced.ts
index 9eb8f857ae4..8dade942f0e 100644
--- a/components/transfer/demo/advanced.ts
+++ b/components/transfer/demo/advanced.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-transfer-advanced',
diff --git a/components/transfer/demo/can-move.ts b/components/transfer/demo/can-move.ts
index de0d70e138b..dad4e9c6ed2 100644
--- a/components/transfer/demo/can-move.ts
+++ b/components/transfer/demo/can-move.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { TransferCanMove, TransferItem } from 'ng-zorro-antd';
+import { TransferCanMove, TransferItem } from 'ng-zorro-antd/transfer';
 import { of, Observable } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
diff --git a/components/transfer/demo/custom-item.ts b/components/transfer/demo/custom-item.ts
index 24c188eb6d8..9ed3b13614a 100644
--- a/components/transfer/demo/custom-item.ts
+++ b/components/transfer/demo/custom-item.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-transfer-custom-item',
diff --git a/components/tree-select/demo/async.ts b/components/tree-select/demo/async.ts
index c67b8364dff..c0c85017a30 100755
--- a/components/tree-select/demo/async.ts
+++ b/components/tree-select/demo/async.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent } from 'ng-zorro-antd';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-select-async',
diff --git a/components/tree/demo/basic-controlled.ts b/components/tree/demo/basic-controlled.ts
index 6d51c2503e3..43cb2809552 100644
--- a/components/tree/demo/basic-controlled.ts
+++ b/components/tree/demo/basic-controlled.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent } from 'ng-zorro-antd';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-basic-controlled',
diff --git a/components/tree/demo/basic.ts b/components/tree/demo/basic.ts
index cea36997175..73986ea0235 100644
--- a/components/tree/demo/basic.ts
+++ b/components/tree/demo/basic.ts
@@ -1,5 +1,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
-import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd';
+import { NzFormatEmitEvent, NzTreeNodeOptions } from 'ng-zorro-antd/core';
+import { NzTreeComponent } from 'ng-zorro-antd/tree';
 
 @Component({
   selector: 'nz-demo-tree-basic',
diff --git a/components/tree/demo/directory.ts b/components/tree/demo/directory.ts
index 2fc788c8b11..359f2bc47f7 100644
--- a/components/tree/demo/directory.ts
+++ b/components/tree/demo/directory.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { NzContextMenuService, NzDropdownMenuComponent, NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd';
+import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
+import { NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-directory',
diff --git a/components/tree/demo/draggable-confirm.ts b/components/tree/demo/draggable-confirm.ts
index a41f69127d5..0d5b87aa9c4 100644
--- a/components/tree/demo/draggable-confirm.ts
+++ b/components/tree/demo/draggable-confirm.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatBeforeDropEvent } from 'ng-zorro-antd';
+import { NzFormatBeforeDropEvent } from 'ng-zorro-antd/core';
 import { of, Observable } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
diff --git a/components/tree/demo/draggable.ts b/components/tree/demo/draggable.ts
index 42269bcec50..450fe85f9c9 100644
--- a/components/tree/demo/draggable.ts
+++ b/components/tree/demo/draggable.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent } from 'ng-zorro-antd';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-draggable',
diff --git a/components/tree/demo/dynamic.ts b/components/tree/demo/dynamic.ts
index 33d1f806fd4..708e1c4891b 100644
--- a/components/tree/demo/dynamic.ts
+++ b/components/tree/demo/dynamic.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent, NzTreeNodeOptions } from 'ng-zorro-antd';
+import { NzFormatEmitEvent, NzTreeNodeOptions } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-dynamic',
diff --git a/components/tree/demo/line.ts b/components/tree/demo/line.ts
index 2459dfeeafb..f13f6e13959 100644
--- a/components/tree/demo/line.ts
+++ b/components/tree/demo/line.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent } from 'ng-zorro-antd';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-line',
diff --git a/components/tree/demo/search.ts b/components/tree/demo/search.ts
index 95885d1126d..0adfccc1b8f 100644
--- a/components/tree/demo/search.ts
+++ b/components/tree/demo/search.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NzFormatEmitEvent } from 'ng-zorro-antd';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/core';
 
 @Component({
   selector: 'nz-demo-tree-search',
diff --git a/components/upload/demo/avatar.ts b/components/upload/demo/avatar.ts
index 819dd603d88..ffced959486 100644
--- a/components/upload/demo/avatar.ts
+++ b/components/upload/demo/avatar.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { NzMessageService, UploadFile } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { UploadFile } from 'ng-zorro-antd/upload';
 import { Observable, Observer } from 'rxjs';
 
 @Component({
diff --git a/components/upload/demo/custom-request.ts b/components/upload/demo/custom-request.ts
index aac3d2ed484..ec42216e38e 100644
--- a/components/upload/demo/custom-request.ts
+++ b/components/upload/demo/custom-request.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse } from '@angular/common/http';
 import { Component } from '@angular/core';
-import { UploadXHRArgs } from 'ng-zorro-antd';
+import { UploadXHRArgs } from 'ng-zorro-antd/upload';
 import { forkJoin } from 'rxjs';
 
 @Component({
diff --git a/components/upload/demo/drag.ts b/components/upload/demo/drag.ts
index 34d70b2e23d..9bcce043163 100644
--- a/components/upload/demo/drag.ts
+++ b/components/upload/demo/drag.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
   selector: 'nz-demo-upload-drag',
diff --git a/components/upload/demo/filter.ts b/components/upload/demo/filter.ts
index c94e651d7d8..6fe0e5a4d56 100644
--- a/components/upload/demo/filter.ts
+++ b/components/upload/demo/filter.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { NzMessageService, UploadFile, UploadFilter } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { UploadFile, UploadFilter } from 'ng-zorro-antd/upload';
 import { Observable, Observer } from 'rxjs';
 
 @Component({
diff --git a/components/upload/demo/manually.ts b/components/upload/demo/manually.ts
index 1253c12de07..0854c5b3835 100644
--- a/components/upload/demo/manually.ts
+++ b/components/upload/demo/manually.ts
@@ -1,6 +1,7 @@
 import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
 import { Component } from '@angular/core';
-import { NzMessageService, UploadFile } from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { UploadFile } from 'ng-zorro-antd/upload';
 import { filter } from 'rxjs/operators';
 
 @Component({
diff --git a/components/upload/demo/picture-card.ts b/components/upload/demo/picture-card.ts
index 030d643867f..433678e0ecf 100644
--- a/components/upload/demo/picture-card.ts
+++ b/components/upload/demo/picture-card.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { UploadFile } from 'ng-zorro-antd';
+import { UploadFile } from 'ng-zorro-antd/upload';
 
 @Component({
   selector: 'nz-demo-upload-picture-card',