diff --git a/app/application-settings/application-settings-examples.module.ts b/app/application-settings/application-settings-examples.module.ts
index 495dce3d..7cc6c3f4 100644
--- a/app/application-settings/application-settings-examples.module.ts
+++ b/app/application-settings/application-settings-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ApplicationSettingsExamplesComponent } from "./application-settings-examples.component";
 import { ValuesExampleComponent } from "./values/values.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
 ],
diff --git a/app/application/application-examples.module.ts b/app/application/application-examples.module.ts
index 34c8fc71..5c82e3be 100644
--- a/app/application/application-examples.module.ts
+++ b/app/application/application-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ApplicationExamplesComponent } from "./application-examples.component";
 import { AppCheckingTargetExampleComponent } from "./app-checking-target/app-checking-target.component";
 import { AppUsingAndroidExampleComponent } from "./app-using-android-specifics/app-using-android-specifics.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/camera/camera-examples.module.ts b/app/camera/camera-examples.module.ts
index a5906321..08565335 100644
--- a/app/camera/camera-examples.module.ts
+++ b/app/camera/camera-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { CameraExamplesComponent } from "./camera-examples.component";
 import { UsingCameraExampleComponent } from "./using-camera/using-camera.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/color/color-examples.module.ts b/app/color/color-examples.module.ts
index e69df9b9..8580704c 100644
--- a/app/color/color-examples.module.ts
+++ b/app/color/color-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { ColorExamplesComponent } from "./color-examples.component";
 import { CreatingColorsExampleComponent } from "./creating-colors/creating-colors.component";
@@ -23,7 +23,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/common-screens-category/content-screens/content-screens-examples.module.ts b/app/common-screens-category/content-screens/content-screens-examples.module.ts
index 592694fb..8971c96b 100644
--- a/app/common-screens-category/content-screens/content-screens-examples.module.ts
+++ b/app/common-screens-category/content-screens/content-screens-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ContentScreensExamplesComponent } from "./content-screens-examples.component";
 import { ContentScrollablePageExampleComponent } from "./content-scrollable/content-scrollable-example.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts b/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts
index 19798db4..4def3971 100644
--- a/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts
+++ b/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ExtendedDataEntryExamplesComponent } from "./extended-dataentry-examples.component";
 import { SignupDataEntryExampleComponent } from "./dataentry-signup/dataentry-signup.component";
 import { SocialLoginDataEntryExampleComponent } from "./dataentry-sociallogin/dataentry-sociallogin.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/common-screens-category/lists-category/extended-listview-examples.module.ts b/app/common-screens-category/lists-category/extended-listview-examples.module.ts
index db82c671..ef71a9b5 100644
--- a/app/common-screens-category/lists-category/extended-listview-examples.module.ts
+++ b/app/common-screens-category/lists-category/extended-listview-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ExtendedListViewExamplesComponent } from "./extended-listview-examples.component";
 import { CardsListViewExampleComponent } from "./cards/cards-listview.component";
 import { HorizontalScrollingExampleComponent } from "./horizontal-scrolling/horizontal-scrolling.component";
@@ -69,7 +69,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts b/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts
index 9312e6f5..0585d217 100644
--- a/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts
+++ b/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ExtendedUserProfileExamplesComponent } from "./extended-userprofile-examples.component";
 import { UserFeedExampleComponent } from "./user-feed/user-feed.component";
 import { UserFeedImagesExampleComponent } from "./user-feed-images/user-feed-images.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/connectivity/connectivity-examples.module.ts b/app/connectivity/connectivity-examples.module.ts
index fc4cde1a..067082f1 100644
--- a/app/connectivity/connectivity-examples.module.ts
+++ b/app/connectivity/connectivity-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ConnectivityExamplesComponent } from "./connectivity-examples.component";
 import { UsingConnectivityExampleComponent } from "./using-connectivity/using-connectivity.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/examples-list.module.ts b/app/examples-list.module.ts
index d4cfb805..b9377623 100644
--- a/app/examples-list.module.ts
+++ b/app/examples-list.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ExamplesListComponent } from "./examples-list.component";
 import { TitleAndNavButtonModule } from "./directives/title-and-nav-button.module";
 
@@ -13,7 +13,7 @@ export const routerConfig = [{
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/file-system/file-system-examples.module.ts b/app/file-system/file-system-examples.module.ts
index 15fbb1f5..528b4162 100644
--- a/app/file-system/file-system-examples.module.ts
+++ b/app/file-system/file-system-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { FileSystemExamplesComponent } from "./file-system-examples.component";
 import { CreateExampleComponent } from "./create/create.component";
 import { DeleteExampleComponent } from "./delete/delete.component";
@@ -45,7 +45,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/fps-meter/fps-meter-examples.module.ts b/app/fps-meter/fps-meter-examples.module.ts
index 4e649d3e..33554946 100644
--- a/app/fps-meter/fps-meter-examples.module.ts
+++ b/app/fps-meter/fps-meter-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { FpsExamplesComponent } from "./fps-meter-examples.component";
@@ -24,7 +24,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/http/http-examples.module.ts b/app/http/http-examples.module.ts
index 9e4d9f0e..a97d44fa 100644
--- a/app/http/http-examples.module.ts
+++ b/app/http/http-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { NativeScriptHttpModule } from "nativescript-angular/http";
 
@@ -31,7 +31,7 @@ export const routerConfig = [
         TitleAndNavButtonModule,
         NativeScriptHttpModule,
         NativeScriptFormsModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/location/location-examples.module.ts b/app/location/location-examples.module.ts
index 44e557af..bf08ce23 100644
--- a/app/location/location-examples.module.ts
+++ b/app/location/location-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { LocationExamplesComponent } from "./location-examples.component";
 import { BasicLocationExampleComponent } from "./basic-location-example/basic-location-example";
 import { LocationMonitoringExampleComponent } from "./location-monitoring-example/location-monitoring-example";
@@ -29,7 +29,7 @@ export const routerConfig = [
     imports: [
         TitleAndNavButtonModule,
         NativeScriptFormsModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/modal-page/modal-page-examples.module.ts b/app/modal-page/modal-page-examples.module.ts
index 1488c85c..b795e240 100644
--- a/app/modal-page/modal-page-examples.module.ts
+++ b/app/modal-page/modal-page-examples.module.ts
@@ -1,7 +1,7 @@
 // tslint:disable:max-line-length
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ModalPageExamplesComponent } from "./modal-page-examples.component";
 import { SampleModalPageModuleExampleComponent } from "./sample-modal-page-module-example/sample-modal-page-module-example";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
@@ -23,7 +23,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/platform/platform-examples.module.ts b/app/platform/platform-examples.module.ts
index bbd54536..828a40a3 100644
--- a/app/platform/platform-examples.module.ts
+++ b/app/platform/platform-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { PlatformExamplesComponent } from "./platform-examples.component";
 import { PlatformModuleExampleComponent } from "./platform-module-example/platform-module-example";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/routing/routing-examples.module.ts b/app/routing/routing-examples.module.ts
index 444e7280..259807d0 100644
--- a/app/routing/routing-examples.module.ts
+++ b/app/routing/routing-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { RoutingExamplesComponent } from "./routing-examples.component";
@@ -30,7 +30,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/timer/timer-examples.module.ts b/app/timer/timer-examples.module.ts
index 0361dd04..381b595f 100644
--- a/app/timer/timer-examples.module.ts
+++ b/app/timer/timer-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { TimerExamplesComponent } from "./timer-examples.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/trace/trace-examples.module.ts b/app/trace/trace-examples.module.ts
index a63ed335..166b8bc5 100644
--- a/app/trace/trace-examples.module.ts
+++ b/app/trace/trace-examples.module.ts
@@ -1,7 +1,7 @@
 // tslint:disable:max-line-length
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { TraceExamplesComponent } from "./trace-examples.component";
@@ -30,7 +30,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/action-bar/action-bar-examples.module.ts b/app/ui-category/action-bar/action-bar-examples.module.ts
index 97962b5b..21fc7c19 100644
--- a/app/ui-category/action-bar/action-bar-examples.module.ts
+++ b/app/ui-category/action-bar/action-bar-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ActionBarExamplesComponent } from "./action-bar-examples.component";
 import { ActionItemsComponent } from "./action-items/action-items.component";
 import { NavigationButtonComponent } from "./navigation-button/navigation-button.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/activity-indicator/activity-indicator-examples.module.ts b/app/ui-category/activity-indicator/activity-indicator-examples.module.ts
index 0b5ff2a2..2bf1aaf9 100644
--- a/app/ui-category/activity-indicator/activity-indicator-examples.module.ts
+++ b/app/ui-category/activity-indicator/activity-indicator-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ActivityIndicatorExamplesComponent } from "./activity-indicator-examples.component";
 import { SettingBusyComponent } from "./setting-busy/setting-busy.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/animations/animations-examples.module.ts b/app/ui-category/animations/animations-examples.module.ts
index 9ec8c1e4..33231622 100644
--- a/app/ui-category/animations/animations-examples.module.ts
+++ b/app/ui-category/animations/animations-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { AnimationsExamplesComponent } from "./animations-examples.component";
 import { AnimatingPropertiesComponent } from "./animating-properties/animating-properties.component";
 import { ChainingAnimationsComponent } from "./chaining-animations/chaining-animations.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/button/button-examples.module.ts b/app/ui-category/button/button-examples.module.ts
index 11a27a88..ded038fe 100644
--- a/app/ui-category/button/button-examples.module.ts
+++ b/app/ui-category/button/button-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ButtonExamplesComponent } from "./button-examples.component";
 import { ButtonTapEventComponent } from "./tap-event/tap-event.component";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
@@ -22,7 +22,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/date-picker/date-picker-examples.module.ts b/app/ui-category/date-picker/date-picker-examples.module.ts
index 629f4a21..d2574dae 100644
--- a/app/ui-category/date-picker/date-picker-examples.module.ts
+++ b/app/ui-category/date-picker/date-picker-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { DatePickerExamplesComponent } from "./date-picker-examples.component";
 import { ConfigureDatePickerComponent } from "./configure-date-picker/configure-date-picker.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/dialogs/dialogs-examples.module.ts b/app/ui-category/dialogs/dialogs-examples.module.ts
index 24048f3c..740f4607 100644
--- a/app/ui-category/dialogs/dialogs-examples.module.ts
+++ b/app/ui-category/dialogs/dialogs-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { DialogsExamplesComponent } from "./dialogs-examples.component";
 import { ActionDialogComponent } from "./action-dialog/action-dialog.component";
 import { AlertDialogComponent } from "./alert-dialog/alert-dialog.component";
@@ -45,7 +45,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/formatted-string/formated-string-examples.module.ts b/app/ui-category/formatted-string/formated-string-examples.module.ts
index 0f738e81..e7271924 100644
--- a/app/ui-category/formatted-string/formated-string-examples.module.ts
+++ b/app/ui-category/formatted-string/formated-string-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { FormattedStringExamplesComponent } from "./formated-string-examples.component";
 import { CreateFormattedStringComponent } from "./create-formatted-string/create-formatted-string.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/gestures/gestures-examples.module.ts b/app/ui-category/gestures/gestures-examples.module.ts
index d75f8089..719a2d01 100644
--- a/app/ui-category/gestures/gestures-examples.module.ts
+++ b/app/ui-category/gestures/gestures-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { GesturesExamplesComponent } from "./gestures-examples.component";
 import { DoubleTapExampleComponent } from "./double-tap/double-tap.component";
 import { LongPressExampleComponent } from "./long-press/long-press.component";
@@ -63,7 +63,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/htmlview/htmlview-examples.module.ts b/app/ui-category/htmlview/htmlview-examples.module.ts
index a01dedd8..d4d0eb48 100644
--- a/app/ui-category/htmlview/htmlview-examples.module.ts
+++ b/app/ui-category/htmlview/htmlview-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { HtmlViewExamplesComponent } from "./htmlview-examples.component";
 import { CreatingHtmlViewExampleComponent } from "./creating-htmlview/creating-htmlview.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/image/image-examples.module.ts b/app/ui-category/image/image-examples.module.ts
index 768a7e20..f4936bb8 100644
--- a/app/ui-category/image/image-examples.module.ts
+++ b/app/ui-category/image/image-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ImageExamplesComponent } from "./image-examples.component";
 import { CreatingImageExampleComponent } from "./creating-image/creating-image.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/label/label-examples.module.ts b/app/ui-category/label/label-examples.module.ts
index b5354c5b..b378d6de 100644
--- a/app/ui-category/label/label-examples.module.ts
+++ b/app/ui-category/label/label-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { LabelExamplesComponent } from "./label-examples.component";
 import { CreatingLabelComponent } from "./creating-label/creating-label.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/layouts/layouts-examples.module.ts b/app/ui-category/layouts/layouts-examples.module.ts
index eb915425..40b33eb8 100644
--- a/app/ui-category/layouts/layouts-examples.module.ts
+++ b/app/ui-category/layouts/layouts-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { LayoutsExamplesComponent } from "./layouts-examples.component";
 import { AbsoluteLayoutComponent } from "./absolute-layout/absolute-layout.component";
 import { DockLayoutComponent } from "./dock-layout/dock-layout.component";
@@ -63,7 +63,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/listpicker/listpicker-examples.module.ts b/app/ui-category/listpicker/listpicker-examples.module.ts
index 29fe4913..03e68e6a 100644
--- a/app/ui-category/listpicker/listpicker-examples.module.ts
+++ b/app/ui-category/listpicker/listpicker-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { ListPickerExamplesComponent } from "./listpicker-examples.component";
 import { CreatingListPickerComponent } from "./creating-listpicker/creating-listpicker.component";
@@ -28,7 +28,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/listview/listview-examples.module.ts b/app/ui-category/listview/listview-examples.module.ts
index abad9645..d278dca1 100644
--- a/app/ui-category/listview/listview-examples.module.ts
+++ b/app/ui-category/listview/listview-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ListViewExamplesComponent } from "./listview-examples.component";
 import { CreatingListViewComponent } from "./creating-listview/creating-listview.component";
 import { CustomizingListViewComponent } from "./customizing-listview/customizing-listview.component";
@@ -39,7 +39,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/ng-directives/ng-directives-examples.module.ts b/app/ui-category/ng-directives/ng-directives-examples.module.ts
index b4003b7f..b788a170 100644
--- a/app/ui-category/ng-directives/ng-directives-examples.module.ts
+++ b/app/ui-category/ng-directives/ng-directives-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { NgDirectivesExamplesComponent } from "./ng-directives-examples.component";
 import {
@@ -57,7 +57,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/progress/progress-examples.module.ts b/app/ui-category/progress/progress-examples.module.ts
index 31efd507..66986d9c 100644
--- a/app/ui-category/progress/progress-examples.module.ts
+++ b/app/ui-category/progress/progress-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ProgressExamplesComponent } from "./progress-examples.component";
 import { CreatingProgressComponent } from "./creating-progress/creating-progress.component";
 import { SettingProgressComponent } from "./setting-progress/setting-progress.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/scroll-view/scroll-view-examples.module.ts b/app/ui-category/scroll-view/scroll-view-examples.module.ts
index 4b5f9480..1c15797e 100644
--- a/app/ui-category/scroll-view/scroll-view-examples.module.ts
+++ b/app/ui-category/scroll-view/scroll-view-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { ScrollViewExamplesComponent } from "./scroll-view-examples.component";
 import { ScrollViewHorizontalComponent } from "./horizontal/scroll-view-horizontal.component";
 import { ScrollViewVerticalComponent } from "./vertical/scroll-view-vertical.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/search-bar/search-bar-examples.module.ts b/app/ui-category/search-bar/search-bar-examples.module.ts
index 98bcc1f3..81b94690 100644
--- a/app/ui-category/search-bar/search-bar-examples.module.ts
+++ b/app/ui-category/search-bar/search-bar-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { SearchBarExamplesComponent } from "./search-bar-examples.component";
 import { BasicSearchBarComponent } from "./basic-search-bar/basic-search-bar.component";
 import { ClearSearchBarComponent } from "./clear-search-bar/clear-search-bar.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/segmented-bar/segmented-bar-examples.module.ts b/app/ui-category/segmented-bar/segmented-bar-examples.module.ts
index 97b8d564..6691a823 100644
--- a/app/ui-category/segmented-bar/segmented-bar-examples.module.ts
+++ b/app/ui-category/segmented-bar/segmented-bar-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { SegmentedBarExamplesComponent } from "./segmented-bar-examples.component";
 import { BasicSegmentedBarComponent } from "./basic-segmented-bar/basic-segmented-bar.component";
 import { SegmentedBarViewsComponent } from "./segmented-bar-views/segmented-bar-views.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/slider/slider-examples.module.ts b/app/ui-category/slider/slider-examples.module.ts
index 360663ae..47821c02 100644
--- a/app/ui-category/slider/slider-examples.module.ts
+++ b/app/ui-category/slider/slider-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { SliderExamplesComponent } from "./slider-examples.component";
 import { BasicSliderComponent } from "./basic-slider/basic-slider.component";
@@ -28,7 +28,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/style/style-examples.module.ts b/app/ui-category/style/style-examples.module.ts
index 71238d17..7d585b2b 100644
--- a/app/ui-category/style/style-examples.module.ts
+++ b/app/ui-category/style/style-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { StyleExamplesComponent } from "./style-examples.component";
 import { ApplyStyleCodeComponent } from "./apply-style-via-code/apply-style-code.component";
 import { StyleCSSFileComponent } from "./style-css-file/style-css-file.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/switch/switch-examples.module.ts b/app/ui-category/switch/switch-examples.module.ts
index 1ae14fb6..79d84cba 100644
--- a/app/ui-category/switch/switch-examples.module.ts
+++ b/app/ui-category/switch/switch-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { SwitchExamplesComponent } from "./switch-examples.component";
 import { BasicSwitchComponent } from "./basic-switch/basic-switch.component";
 import { DisableSwitchComponent } from "./disable-switch/disable-switch.component";
@@ -33,7 +33,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/tab-view/tab-view-examples.module.ts b/app/ui-category/tab-view/tab-view-examples.module.ts
index 3ebc846e..1937c9fe 100644
--- a/app/ui-category/tab-view/tab-view-examples.module.ts
+++ b/app/ui-category/tab-view/tab-view-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { TabViewExamplesComponent } from "./tab-view-examples.component";
 import { BasicTabViewComponent } from "./basic-tab-view/basic-tab-view.component";
 import { TabViewItemsComponent } from "./tab-view-items/tab-view-items.component";
@@ -40,7 +40,7 @@ export const routerConfig = [
     imports: [
         TitleAndNavButtonModule,
         NativeScriptFormsModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/text-field/text-field-examples.module.ts b/app/ui-category/text-field/text-field-examples.module.ts
index 3029cb81..f478f65f 100644
--- a/app/ui-category/text-field/text-field-examples.module.ts
+++ b/app/ui-category/text-field/text-field-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { TextFieldExamplesComponent } from "./text-field-examples.component";
 import { BasicTextFieldComponent } from "./basic-text-field/basic-text-field.component";
 import { TextFieldBindingComponent } from "./text-field-binding/text-field-binding.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/text-view/text-view-examples.module.ts b/app/ui-category/text-view/text-view-examples.module.ts
index 15743edc..bad35ba0 100644
--- a/app/ui-category/text-view/text-view-examples.module.ts
+++ b/app/ui-category/text-view/text-view-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 import { TextViewExamplesComponent } from "./text-view-examples.component";
 import { BasicTextViewComponent } from "./basic-text-view/basic-text-view.component";
@@ -22,7 +22,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptFormsModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
diff --git a/app/ui-category/time-picker/time-picker-examples.module.ts b/app/ui-category/time-picker/time-picker-examples.module.ts
index 0b025760..8766c41c 100644
--- a/app/ui-category/time-picker/time-picker-examples.module.ts
+++ b/app/ui-category/time-picker/time-picker-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { TimePickerExamplesComponent } from "./time-picker-examples.component";
 import { ConfigureTimePickerComponent } from "./configure-time-picker/configure-time-picker.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
@@ -21,7 +21,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/app/ui-category/web-view/web-view-examples.module.ts b/app/ui-category/web-view/web-view-examples.module.ts
index ad4feb09..261667cb 100644
--- a/app/ui-category/web-view/web-view-examples.module.ts
+++ b/app/ui-category/web-view/web-view-examples.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { WebViewExamplesComponent } from "./web-view-examples.component";
 import { BasicWebViewComponent } from "./basic-web-view/basic-web-view.component";
 import { WebViewHtmlComponent } from "./web-view-html/web-view-html.component";
@@ -27,7 +27,7 @@ export const routerConfig = [
     schemas: [NO_ERRORS_SCHEMA],
     imports: [
         TitleAndNavButtonModule,
-        NativeScriptModule,
+        NativeScriptCommonModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
diff --git a/package.json b/package.json
index 5392f76c..2f6e04ec 100644
--- a/package.json
+++ b/package.json
@@ -29,14 +29,14 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "~4.1.3",
-    "@angular/common": "~4.1.3",
-    "@angular/compiler": "~4.1.3",
-    "@angular/core": "~4.1.3",
-    "@angular/forms": "~4.1.3",
-    "@angular/http": "~4.1.3",
-    "@angular/platform-browser": "~4.1.3",
-    "@angular/router": "~4.1.3",
+    "@angular/animations": "~4.2.6",
+    "@angular/common": "~4.2.6",
+    "@angular/compiler": "~4.2.6",
+    "@angular/core": "~4.2.6",
+    "@angular/forms": "~4.2.6",
+    "@angular/http": "~4.2.6",
+    "@angular/platform-browser": "~4.2.6",
+    "@angular/router": "~4.2.6",
     "nativescript-angular": "next",
     "nativescript-camera": "~3.0.0",
     "nativescript-geolocation": "^3.0.0",
@@ -48,7 +48,7 @@
     "zone.js": "^0.8.11"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.1.3",
+    "@angular/compiler-cli": "~4.2.6",
     "@ngtools/webpack": "~1.5.3",
     "babel-traverse": "6.11.4",
     "babel-types": "6.11.1",