Use relative imports in tns-core-modules.

Use tns-core-modules/* imports in outside code (apps, tests, etc)

apps/app/css-perf-test/app.ts

@@ -1,4 +1,4 @@
-import * as application from "application";
+import * as application from "tns-core-modules/application";
 declare var CACurrentMediaTime;
 
 (<any>global).time = function(): number {

apps/app/css-perf-test/main-page.ts

@@ -1,4 +1,4 @@
-import {EventData as ObservableEventData} from "data/observable";
+import {EventData as ObservableEventData} from "tns-core-modules/data/observable";
 
 export function navigatedTo(args: ObservableEventData) {
     setTimeout(() => {

apps/app/css-perf-test/root.ts

@@ -1,4 +1,4 @@
-import {Page} from "ui/page";
+import {Page} from "tns-core-modules/ui/page";
 
 export function onTap(args: any) {
     (<any>global).startTime = (<any>global).time();

apps/app/cuteness.io/app.ts

@@ -1,5 +1,5 @@
-import * as application from "application";
-import * as fps from "fps-meter";
+import * as application from "tns-core-modules/application";
+import * as fps from "tns-core-modules/fps-meter";
 fps.addCallback(function (fps, minFps) {
     console.info("fps=" + fps + " minFps=" + minFps);
 });

apps/app/cuteness.io/main-page.ts

@@ -1,7 +1,7 @@
-import {EventData as ObservableEventData} from "data/observable";
-import {Page} from "ui/page";
-import {ItemEventData as ListViewItemEventData} from "ui/list-view";
-import {topmost as topmostFrame} from "ui/frame";
+import {EventData as ObservableEventData} from "tns-core-modules/data/observable";
+import {Page} from "tns-core-modules/ui/page";
+import {ItemEventData as ListViewItemEventData} from "tns-core-modules/ui/list-view";
+import {topmost as topmostFrame} from "tns-core-modules/ui/frame";
 import {AppViewModel} from "./reddit-app-view-model";
 
 var appViewModel = new AppViewModel();

apps/app/cuteness.io/reddit-app-view-model.ts

@@ -1,7 +1,7 @@
-import { ImageSource, fromFile as imageSourceFromFile } from "image-source";
-import { VirtualArray, ItemsLoading as virtualArrayItemsLoadingData } from "data/virtual-array";
-import { Observable } from "data/observable";
-import { Cache as ImageCache } from "ui/image-cache";
+import { ImageSource, fromFile as imageSourceFromFile } from "tns-core-modules/image-source";
+import { VirtualArray, ItemsLoading as virtualArrayItemsLoadingData } from "tns-core-modules/data/virtual-array";
+import { Observable } from "tns-core-modules/data/observable";
+import { Cache as ImageCache } from "tns-core-modules/ui/image-cache";
 
 import { Data as RedditData } from "./reddit-model";
 import { RedditViewModel } from "./reddit-item-view-model";

apps/app/cuteness.io/reddit-item-view-model.ts

@@ -1,5 +1,5 @@
-import { Observable } from "data/observable";
-import { ImageSource, fromFile as imageSourceFromFile, fromUrl as imageSourceFromUrl } from "image-source";
+import { Observable } from "tns-core-modules/data/observable";
+import { ImageSource, fromFile as imageSourceFromFile, fromUrl as imageSourceFromUrl } from "tns-core-modules/image-source";
 
 import { ItemData } from "./reddit-model";
 import { defaultThumbnailImageSource, defaultNoThumbnailImageSource, cache } from "./reddit-app-view-model";

apps/app/gallery-app/animations/css-keyframes.ts

@@ -1,4 +1,4 @@
-import { View, EventData } from "ui/core/view";
+import { View, EventData } from "tns-core-modules/ui/core/view";
 
 export function setClass(args: EventData) {
     const btn = (<View & { tag: any }>args.object);

apps/app/gallery-app/animations/js-configurable.ts

@@ -1,11 +1,11 @@
-import * as observable from "data/observable";
-import * as pages from "ui/page";
-import * as buttonModule from "ui/button";
-import * as abs from "ui/layouts/absolute-layout";
-import * as animationModule from "ui/animation";
-import * as colorModule from "color";
-import * as enums from "ui/enums";
-import * as frame from "ui/frame";
+import * as observable from "tns-core-modules/data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as buttonModule from "tns-core-modules/ui/button";
+import * as abs from "tns-core-modules/ui/layouts/absolute-layout";
+import * as animationModule from "tns-core-modules/ui/animation";
+import * as colorModule from "tns-core-modules/color";
+import * as enums from "tns-core-modules/ui/enums";
+import * as frame from "tns-core-modules/ui/frame";
 
 export class ViewModel extends observable.Observable {
     constructor() {

apps/app/gallery-app/animations/js-opacity.ts

@@ -1,9 +1,9 @@
-import observable = require("data/observable");
-import pages = require("ui/page");
-import view = require("ui/core/view");
-import animationModule = require("ui/animation");
-import slider = require("ui/slider");
-import wrapLayout = require("ui/layouts/wrap-layout");
+import observable = require("tns-core-modules/data/observable");
+import pages = require("tns-core-modules/ui/page");
+import view = require("tns-core-modules/ui/core/view");
+import animationModule = require("tns-core-modules/ui/animation");
+import slider = require("tns-core-modules/ui/slider");
+import wrapLayout = require("tns-core-modules/ui/layouts/wrap-layout");
 
 var page: pages.Page;
 var opacitySlider: slider.Slider;

apps/app/gallery-app/app.ts

@@ -1,4 +1,4 @@
-import * as application from "application";
+import * as application from "tns-core-modules/application";
 
 // Needed only for build infrastructure
 application.setCssFileName("gallery-app/app.css");

apps/app/gallery-app/main-page.ts

@@ -1,5 +1,5 @@
-import * as observable from "data/observable";
-import * as frame from "ui/frame";
+import * as observable from "tns-core-modules/data/observable";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function itemTap(args: observable.EventData) {
     frame.topmost().navigate({

apps/app/gallery-app/views/dialogs.ts

@@ -1,4 +1,4 @@
-import * as dialogs from "ui/dialogs";
+import * as dialogs from "tns-core-modules/ui/dialogs";
 
 export function alertTapped(args) {
     dialogs.alert("Hi there!");
@@ -107,4 +107,4 @@ export function actionWithOptionsTapped(args) {
         cancelButtonText: "Close",
         actions: ["One", "Two", "Three"]
     }).then(r=> console.log(`Action result: ${r}`));
-}
+}

apps/app/gallery-app/views/list-picker.ts

@@ -1,5 +1,5 @@
-import * as pages from "ui/page";
-import * as observableModule from "data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as observableModule from "tns-core-modules/data/observable";
 
 export function onPageLoaded(args: observableModule.EventData) {
     var page = <pages.Page>args.object;
@@ -7,4 +7,4 @@ export function onPageLoaded(args: observableModule.EventData) {
         items: ["Item 1", "Item 2", "Item 3", "Item 4", "Item 5"],
         selectedIndex: 2
     };
-}
+}

apps/app/ui-tests-app/action-bar/action-item-position.ts

@@ -1,6 +1,6 @@
-import { EventData } from "data/observable";
-import { Page } from "ui/page";
-import * as observable from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import * as observable from "tns-core-modules/data/observable";
 
 export function navigatingTo(args: EventData) {
     let page = <Page>args.object;
@@ -36,4 +36,4 @@ export class ActionItemPostitionView extends observable.Observable {
         let index = this._count++ % 3;
         this.text = this._values[index];
     }
-}
+}

apps/app/ui-tests-app/action-bar/action-view.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/all.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/background-css.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/background.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/clean.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().goBack();
-}
+}

apps/app/ui-tests-app/action-bar/color.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -27,4 +27,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/action-bar/system-icons.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/action-bar/transparent-bg-css.ts

@@ -1,5 +1,5 @@
-import frame = require("ui/frame");
+import frame = require("tns-core-modules/ui/frame");
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");
-}
+}

apps/app/ui-tests-app/animations/background.ts

@@ -1,7 +1,7 @@
-import * as observable from "data/observable";
-import * as pages from "ui/page";
-import * as viewModule from "ui/core/view";
-import * as color from "color";
+import * as observable from "tns-core-modules/data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as viewModule from "tns-core-modules/ui/core/view";
+import * as color from "tns-core-modules/color";
 
 var view: viewModule.View;
 
@@ -20,4 +20,4 @@ export function onAnimate(args: observable.EventData) {
 
 export function onReset(args: observable.EventData) {
     view.backgroundColor = new color.Color("White");
-}
+}

apps/app/ui-tests-app/app.ts

@@ -1,5 +1,5 @@
-import * as application from "application";
-import * as trace from "trace";
+import * as application from "tns-core-modules/application";
+import * as trace from "tns-core-modules/trace";
 trace.enable();
 trace.setCategories(trace.categories.concat(
     trace.categories.NativeLifecycle,
@@ -79,4 +79,4 @@ application.on(application.uncaughtErrorEvent, function (args: application.Unhan
 });
 
 application.setCssFileName("ui-tests-app/app.css");
-application.start({ moduleName: "ui-tests-app/mainPage" });
+application.start({ moduleName: "ui-tests-app/mainPage" });

apps/app/ui-tests-app/bindings/basics.ts

@@ -1,8 +1,8 @@
-import * as buttonModule from "ui/button";
-import * as pageModule from "ui/page";
-import * as textFieldModule from "ui/text-field";
-import * as stackLayoutModule from "ui/layouts/stack-layout";
-import * as observableModule from "data/observable";
+import * as buttonModule from "tns-core-modules/ui/button";
+import * as pageModule from "tns-core-modules/ui/page";
+import * as textFieldModule from "tns-core-modules/ui/text-field";
+import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
+import * as observableModule from "tns-core-modules/data/observable";
 
 export function createPage() {
 
@@ -77,4 +77,4 @@ export function createPage() {
 
     page.content = stack;
     return page;
-}
+}

apps/app/ui-tests-app/bindings/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -21,4 +21,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/bindings/xmlbasics.ts

@@ -1,7 +1,7 @@
-import * as buttonModule from "ui/button";
-import * as stackLayoutModule from "ui/layouts/stack-layout";
-import * as textFieldModule from "ui/text-field";
-import * as observable from "data/observable";
+import * as buttonModule from "tns-core-modules/ui/button";
+import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
+import * as textFieldModule from "tns-core-modules/ui/text-field";
+import * as observable from "tns-core-modules/data/observable";
 
 export function stack0Loaded(args: observable.EventData) {
     var source = new observable.Observable();
@@ -39,4 +39,4 @@ export function stack2Loaded(args: observable.EventData) {
 export function stack3Loaded(args: observable.EventData) {
     var stack3 = <stackLayoutModule.StackLayout>args.object;
     stack3.bindingContext = { myItems: [{ text: "Label1" }, { text: "Label2" }] };
-}
+}

apps/app/ui-tests-app/css/all-non-uniform-border.ts

@@ -1,7 +1,7 @@
-import { EventData} from "data/observable";
-import { Page } from "ui/page";
-import { SearchBar } from "ui/search-bar";
-import { isAndroid } from "platform";
+import { EventData} from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import { SearchBar } from "tns-core-modules/ui/search-bar";
+import { isAndroid } from "tns-core-modules/platform";
 
 export function onLoaded(args: EventData){
     var page = <Page>args.object;
@@ -9,4 +9,4 @@ export function onLoaded(args: EventData){
     if(isAndroid){
         searchBar.android.clearFocus();
     }
-}
+}

apps/app/ui-tests-app/css/all-uniform-border.ts

@@ -1,7 +1,7 @@
-import { EventData} from "data/observable";
-import { Page } from "ui/page";
-import { SearchBar } from "ui/search-bar";
-import { isAndroid } from "platform";
+import { EventData} from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import { SearchBar } from "tns-core-modules/ui/search-bar";
+import { isAndroid } from "tns-core-modules/platform";
 
 export function onLoaded(args: EventData){
     var page = <Page>args.object;
@@ -9,4 +9,4 @@ export function onLoaded(args: EventData){
     if(isAndroid){
         searchBar.android.clearFocus();
     }
-}
+}

apps/app/ui-tests-app/css/background.ts

@@ -1,5 +1,5 @@
-import * as view from "ui/core/view";
-import * as pages from "ui/page";
+import * as view from "tns-core-modules/ui/core/view";
+import * as pages from "tns-core-modules/ui/page";
 
 export function applyTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;

apps/app/ui-tests-app/css/border-playground.ts

@@ -1,9 +1,9 @@
-import { EventData } from "data/observable";
-import { View } from "ui/core/view";
-import { Button } from "ui/button";
-import { Color } from "color"; 
-import { TextView } from "ui/text-view";
-import { ScrollView } from "ui/scroll-view";
+import { EventData } from "tns-core-modules/data/observable";
+import { View } from "tns-core-modules/ui/core/view";
+import { Button } from "tns-core-modules/ui/button";
+import { Color } from "tns-core-modules/color"; 
+import { TextView } from "tns-core-modules/ui/text-view";
+import { ScrollView } from "tns-core-modules/ui/scroll-view";
 
 let red = new Color("red");
 let green = new Color("green");
@@ -36,4 +36,4 @@ export function onToggle(args: EventData){
     }
 
     scrollView.scrollToVerticalOffset(scrollView.scrollableHeight, true);
-}
+}

apps/app/ui-tests-app/css/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -52,4 +52,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts

@@ -1,7 +1,7 @@
-import * as view from "ui/core/view";
-import * as pages from "ui/page";
-import { EventData } from "data/observable";
-import * as button from "ui/button";
+import * as view from "tns-core-modules/ui/core/view";
+import * as pages from "tns-core-modules/ui/page";
+import { EventData } from "tns-core-modules/data/observable";
+import * as button from "tns-core-modules/ui/button";
 
 var cssPercentage = " Page { margin:5% 10% 15% 8%; background-color: orange; font-size:8; } GridLayout { margin:3%; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10%; } .test2 { padding:10%; background-color:lightblue; } .test3 { margin:1% 2% 3% 4%; } WrapLayout { orientation:vertical; width:75%; height:45% } Button { color:black }"
 var cssWithouPercentage = " Page { margin:15 10 15 30; background-color: orange; font-size:8; } GridLayout { margin:3; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10; } .test2 { padding:10; background-color:lightblue; } .test3 { margin:10 20 30 40; } WrapLayout { orientation:vertical; width:100; height:120 } Button { color:black }"
@@ -37,4 +37,4 @@ function getBtnText(args: EventData) {
             console.log(btn.text);
         }
     }
-}
+}

apps/app/ui-tests-app/css/text-decoration.ts

@@ -1,4 +1,4 @@
-import { EventData, TextBase, TextDecoration } from "ui/text-base";
+import { EventData, TextBase, TextDecoration } from "tns-core-modules/ui/text-base";
 
 const possibleValues = [
     TextDecoration.NONE, 

apps/app/ui-tests-app/css/text-transform.ts

@@ -1,8 +1,8 @@
-import { Label } from "ui/label";
-import { Button } from "ui/button";
-import { TextField } from "ui/text-field";
-import { TextView } from "ui/text-view";
-import { Page } from "ui/page";
+import { Label } from "tns-core-modules/ui/label";
+import { Button } from "tns-core-modules/ui/button";
+import { TextField } from "tns-core-modules/ui/text-field";
+import { TextView } from "tns-core-modules/ui/text-view";
+import { Page } from "tns-core-modules/ui/page";
 
 export function onChangeText(args) {
     const page = <Page>args.object.page;

apps/app/ui-tests-app/css/textview-hint-color.ts

@@ -1,6 +1,6 @@
-import { Page } from "ui/page";
-import { TextView } from "ui/text-view";
-import { Color } from "color";
+import { Page } from "tns-core-modules/ui/page";
+import { TextView } from "tns-core-modules/ui/text-view";
+import { Color } from "tns-core-modules/color";
 
 export function changeTextAndColor(args) {
     const page = <Page>args.object.page;
@@ -11,4 +11,4 @@ export function changeTextAndColor(args) {
     tv1Hint.color = new Color("blue");
     tv2Hint.text = "changed text only";
     tv3Hint.color = new Color("green");
-}
+}

apps/app/ui-tests-app/css/white-space.ts

@@ -1,9 +1,9 @@
-import * as view from "ui/core/view";
-import * as observable from "data/observable";
-import * as label from "ui/label";
-import * as button from "ui/button";
-import * as textField from "ui/text-field";
-import * as textView from "ui/text-view";
+import * as view from "tns-core-modules/ui/core/view";
+import * as observable from "tns-core-modules/data/observable";
+import * as label from "tns-core-modules/ui/label";
+import * as button from "tns-core-modules/ui/button";
+import * as textField from "tns-core-modules/ui/text-field";
+import * as textView from "tns-core-modules/ui/text-view";
 
 export function butonTap(args: observable.EventData) {
     var btnChange = <view.View>args.object;
@@ -23,4 +23,4 @@ export function butonTap(args: observable.EventData) {
         textField.style.whiteSpace = "normal";
         textView.style.whiteSpace = "normal";
     }
-}
+}

apps/app/ui-tests-app/dialogs/dialogs.ts

@@ -1,5 +1,5 @@
-import * as pages from "ui/page";
-import * as observable from "data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as observable from "tns-core-modules/data/observable";
 import * as vmModule from "./view-model";
 
 var viewModel = vmModule.settingsViewModel;
@@ -7,4 +7,4 @@ var viewModel = vmModule.settingsViewModel;
 export function pageLoaded(args: observable.EventData) {
     var page = <pages.Page>args.object;
     page.bindingContext = viewModel;
-}
+}

apps/app/ui-tests-app/dialogs/view-model.ts

@@ -1,5 +1,5 @@
-import * as dialogs from "ui/dialogs";
-import * as observable from "data/observable";
+import * as dialogs from "tns-core-modules/ui/dialogs";
+import * as observable from "tns-core-modules/data/observable";
 
 var name = "Harold Finch";
 
@@ -98,4 +98,4 @@ export class SettingsViewModel extends observable.Observable {
         });
     }
 }
-export var settingsViewModel = new SettingsViewModel();
+export var settingsViewModel = new SettingsViewModel();

apps/app/ui-tests-app/flexbox/flexbox-main-page.ts

@@ -1,8 +1,8 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
-import { getViewById } from "ui/core/view"
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
+import { getViewById } from "tns-core-modules/ui/core/view"
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -23,4 +23,4 @@ export class FlexboxMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/flexbox/flexbox-perf-comparison.ts

@@ -1,5 +1,5 @@
-import {TabView} from "ui/tab-view";
-import * as utils from "utils/utils";
+import {TabView} from "tns-core-modules/ui/tab-view";
+import * as utils from "tns-core-modules/utils/utils";
 
 const titles = ["Etiam lacinia", "Imperdiet ante", "A interdum", "Quisque tempus", "Sodales viverra"];
 const bodies = [

apps/app/ui-tests-app/flexbox/flexbox.ts

@@ -1,4 +1,4 @@
-import { FlexboxLayout } from "ui/layouts/flexbox-layout";
+import { FlexboxLayout } from "tns-core-modules/ui/layouts/flexbox-layout";
 
 function set(what: string) {
     return function(args) {

apps/app/ui-tests-app/font/all-fonts.ts

@@ -1,12 +1,12 @@
-import { View } from "ui/core/view";
-import { Page, NavigatedData } from "ui/page";
-import { StackLayout } from "ui/layouts/stack-layout";
-import { ScrollView } from "ui/scroll-view";
-import { Label } from "ui/label";
-import { FontStyle, FontWeight } from "ui/enums";
-import * as typeUtils from "utils/types";
-import { Color } from "color";
-import * as font from "ui/styling/font";
+import { View } from "tns-core-modules/ui/core/view";
+import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { ScrollView } from "tns-core-modules/ui/scroll-view";
+import { Label } from "tns-core-modules/ui/label";
+import { FontStyle, FontWeight } from "tns-core-modules/ui/enums";
+import * as typeUtils from "tns-core-modules/utils/types";
+import { Color } from "tns-core-modules/color";
+import * as font from "tns-core-modules/ui/styling/font";
 
 const genericFontFamilies = [
     "system",
@@ -172,4 +172,4 @@ function _getUIFont(view: any): UIFont {
             return view.ios.font;
         }
     }
-}
+}

apps/app/ui-tests-app/font/button.ts

@@ -1,6 +1,6 @@
-import * as stack from "ui/layouts/stack-layout";
-import * as view from "ui/core/view";
-import { unsetValue } from "ui/core/view";
+import * as stack from "tns-core-modules/ui/layouts/stack-layout";
+import * as view from "tns-core-modules/ui/core/view";
+import { unsetValue } from "tns-core-modules/ui/core/view";
 
 export function resetStyles(args) {
     var stackLayout = <stack.StackLayout>args.object.parent.parent;

apps/app/ui-tests-app/font/issue-3654-2.ts

@@ -1,5 +1,5 @@
-import { topmost } from "ui/frame";
+import { topmost } from "tns-core-modules/ui/frame";
 
 export function onTap(args){
     topmost().goBack();
-}
+}

apps/app/ui-tests-app/font/issue-3654.ts

@@ -1,5 +1,5 @@
-import { topmost } from "ui/frame";
+import { topmost } from "tns-core-modules/ui/frame";
 
 export function onTap(){
     topmost().navigate("ui-tests-app/font/issue-3654-2");
-}
+}

apps/app/ui-tests-app/font/label.ts

@@ -1,5 +1,5 @@
-import { StackLayout } from "ui/layouts/stack-layout";
-import { View, unsetValue, eachDescendant } from "ui/core/view";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { View, unsetValue, eachDescendant } from "tns-core-modules/ui/core/view";
 
 export function resetStyles(args) {
     var stackLayout = <StackLayout>args.object.parent;

apps/app/ui-tests-app/font/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -28,4 +28,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/font/text-field.ts

@@ -1,5 +1,5 @@
-import { StackLayout } from "ui/layouts/stack-layout";
-import { View, unsetValue, eachDescendant } from "ui/core/view";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { View, unsetValue, eachDescendant } from "tns-core-modules/ui/core/view";
 
 export function resetStyles(args) {
     var stackLayout = <StackLayout>args.object.parent;

apps/app/ui-tests-app/font/text-view.ts

@@ -1,5 +1,5 @@
-import { StackLayout } from "ui/layouts/stack-layout";
-import { View, unsetValue, eachDescendant } from "ui/core/view";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { View, unsetValue, eachDescendant } from "tns-core-modules/ui/core/view";
 
 export function resetStyles(args) {
     var stackLayout = <StackLayout>args.object.parent;

apps/app/ui-tests-app/image-view/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -22,4 +22,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/issues/issue-1657-ios.ts

@@ -1,4 +1,4 @@
-import { EventData } from 'data/observable';
+import { EventData } from "tns-core-modules/data/observable";
 var frameModule = require("ui/frame");
 var platform = require("platform");
 var defaultSpeed = -1;
@@ -30,4 +30,4 @@ export function changeLayerSpeed() {
 
 export function defaultLayerSpeed() {
   frameModule.topmost().ios.controller.view.layer.speed = defaultSpeed;
-}
+}

apps/app/ui-tests-app/issues/issue-2661-second.ts

@@ -1,5 +1,5 @@
-import { topmost } from "ui/frame";
+import { topmost } from "tns-core-modules/ui/frame";
 
 export function onTap() {
     topmost().goBack();
-}
+}

apps/app/ui-tests-app/issues/issue-2661.ts

@@ -1,5 +1,5 @@
-import { topmost } from "ui/frame";
+import { topmost } from "tns-core-modules/ui/frame";
 
 export function onTap() {
     topmost().navigate("ui-tests-app/issues/issue-2661-second");
-}
+}

apps/app/ui-tests-app/issues/issue-2942.ts

@@ -1,5 +1,5 @@
-import { ad } from "utils//utils";
-import { isAndroid } from "platform";
+import { ad } from "tns-core-modules/utils//utils";
+import { isAndroid } from "tns-core-modules/platform";
 
 export function onButtonLoaded(args) {
     if (args.object.android) {
@@ -17,4 +17,4 @@ export function hideKeyboard() {
     if (isAndroid) {
         ad.dismissSoftInput();
     }
-}
+}

apps/app/ui-tests-app/issues/issue-3164.ts

@@ -1,7 +1,7 @@
-import { Color } from "color";
-import { EventData } from "data/observable";
-import { Page } from "ui/page";
-import { View } from "ui/core/view";
+import { Color } from "tns-core-modules/color";
+import { EventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import { View } from "tns-core-modules/ui/core/view";
 
 var page: Page;
 var borderColor : Color = new Color("#ff0000");
@@ -27,4 +27,4 @@ export function onSetBorderWidthTo3() {
     let labelElement = <View>page.getViewById("label1");
     labelElement.borderColor = borderColor;
     labelElement.borderWidth = 3;
-}
+}

apps/app/ui-tests-app/issues/issue-3211.ts

@@ -1,4 +1,4 @@
-import { alert } from "ui/dialogs";
+import { alert } from "tns-core-modules/ui/dialogs";
 
 export function onTap() {
      var options = {
@@ -9,4 +9,4 @@ export function onTap() {
         alert(options).then(() => {
             console.log("Race chosen!");
         });
-}
+}

apps/app/ui-tests-app/issues/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -31,4 +31,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/layouts-percent/absolute.ts

@@ -1,5 +1,5 @@
-import * as pageModule from "ui/page";
-import * as absoluteLayout from "ui/layouts/absolute-layout";
+import * as pageModule from "tns-core-modules/ui/page";
+import * as absoluteLayout from "tns-core-modules/ui/layouts/absolute-layout";
 import * as model from "./myview";
 
 var count = 0;
@@ -19,4 +19,4 @@ export function onSetLeftSetTop(args: { eventName: string, object: any }) {
         absoluteLayout.AbsoluteLayout.setLeft(child, 0);
         absoluteLayout.AbsoluteLayout.setTop(child, 400);
     }
-}
+}

apps/app/ui-tests-app/layouts-percent/dock.ts

@@ -1,4 +1,4 @@
-import * as pageModule from "ui/page";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -13,4 +13,4 @@ export function onStretchLastChild(args: { eventName: string, object: any }) {
     } else {
         layout.stretchLastChild = true;
     }
-}
+}

apps/app/ui-tests-app/layouts-percent/grid.ts

@@ -1,7 +1,7 @@
 import * as model from "./myview";
-import { Button } from "ui/button";
-import { Page } from "ui/page";
-import { GridLayout, ItemSpec, GridUnitType } from "ui/layouts/grid-layout";
+import { Button } from "tns-core-modules/ui/button";
+import { Page } from "tns-core-modules/ui/page";
+import { GridLayout, ItemSpec, GridUnitType } from "tns-core-modules/ui/layouts/grid-layout";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <Page>args.object;
@@ -42,4 +42,4 @@ export function onRemoveRowColumn(args: { eventName: string, object: any }) {
     itemSpecs = layout.getColumns();
     count = itemSpecs.length;
     layout.removeColumn(itemSpecs[count - 1]);
-}
+}

apps/app/ui-tests-app/layouts-percent/myview.ts

@@ -1,4 +1,4 @@
-import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility, PercentLength, Length } from "ui/layouts/layout-base";
+import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility, PercentLength, Length } from "tns-core-modules/ui/layouts/layout-base";
 
 export class ViewModel extends Observable {
 
@@ -163,4 +163,4 @@ export class ViewModel extends Observable {
             layout.paddingBottom = 0;
         }
     }
-}
+}

apps/app/ui-tests-app/layouts-percent/stack.ts

@@ -1,5 +1,5 @@
-import * as enums from "ui/enums";
-import * as pageModule from "ui/page";
+import * as enums from "tns-core-modules/ui/enums";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -14,4 +14,4 @@ export function onOrientation(args: { eventName: string, object: any }) {
     } else {
         layout.orientation = enums.Orientation.vertical;
     }
-}
+}

apps/app/ui-tests-app/layouts-percent/wrap.ts

@@ -1,5 +1,5 @@
-import * as enums from "ui/enums";
-import * as pageModule from "ui/page";
+import * as enums from "tns-core-modules/ui/enums";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -20,4 +20,4 @@ export function onItemWidthItemHeight(args: { eventName: string, object: any })
     var layout = args.object.parent;
     layout.itemWidth = 100;
     layout.itemHeight = 100;
-}
+}

apps/app/ui-tests-app/layouts/absolute.ts

@@ -1,5 +1,5 @@
-import * as pageModule from "ui/page";
-import * as absoluteLayout from "ui/layouts/absolute-layout";
+import * as pageModule from "tns-core-modules/ui/page";
+import * as absoluteLayout from "tns-core-modules/ui/layouts/absolute-layout";
 import * as model from "./myview";
 
 var count = 0;
@@ -19,4 +19,4 @@ export function onSetLeftSetTop(args: { eventName: string, object: any }) {
         absoluteLayout.AbsoluteLayout.setLeft(child, 0);
         absoluteLayout.AbsoluteLayout.setTop(child, 400);
     }
-}
+}

apps/app/ui-tests-app/layouts/dock.ts

@@ -1,4 +1,4 @@
-import * as pageModule from "ui/page";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -13,4 +13,4 @@ export function onStretchLastChild(args: { eventName: string, object: any }) {
     } else {
         layout.stretchLastChild = true;
     }
-}
+}

apps/app/ui-tests-app/layouts/grid.ts

@@ -1,7 +1,7 @@
 import * as model from "./myview";
-import { Button } from "ui/button";
-import { Page } from "ui/page";
-import { GridLayout, ItemSpec } from "ui/layouts/grid-layout";
+import { Button } from "tns-core-modules/ui/button";
+import { Page } from "tns-core-modules/ui/page";
+import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <Page>args.object;
@@ -42,4 +42,4 @@ export function onRemoveRowColumn(args: { eventName: string, object: any }) {
     itemSpecs = layout.getColumns();
     count = itemSpecs.length;
     layout.removeColumn(itemSpecs[count - 1]);
-}
+}

apps/app/ui-tests-app/layouts/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -31,4 +31,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/layouts/myview.ts

@@ -1,4 +1,4 @@
-import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "ui/layouts/layout-base";
+import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "tns-core-modules/ui/layouts/layout-base";
 
 export class ViewModel extends Observable {
 
@@ -161,4 +161,4 @@ export class ViewModel extends Observable {
             layout.paddingBottom = 0;
         }
     }
-}
+}

apps/app/ui-tests-app/layouts/stack.ts

@@ -1,5 +1,5 @@
-import * as enums from "ui/enums";
-import * as pageModule from "ui/page";
+import * as enums from "tns-core-modules/ui/enums";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -14,4 +14,4 @@ export function onOrientation(args: { eventName: string, object: any }) {
     } else {
         layout.orientation = enums.Orientation.vertical;
     }
-}
+}

apps/app/ui-tests-app/layouts/wrap.ts

@@ -1,5 +1,5 @@
-import * as enums from "ui/enums";
-import * as pageModule from "ui/page";
+import * as enums from "tns-core-modules/ui/enums";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
@@ -20,4 +20,4 @@ export function onItemWidthItemHeight(args: { eventName: string, object: any })
     var layout = args.object.parent;
     layout.itemWidth = 40;
     layout.itemHeight = 60;
-}
+}

apps/app/ui-tests-app/list-view/list-view.ts

@@ -1,12 +1,12 @@
-import { EventData } from 'data/observable';
-import { ObservableArray } from "data/observable-array";
-import { View, KeyedTemplate } from "ui/core/view";
-import { Page } from 'ui/page';
+import { EventData } from "tns-core-modules/data/observable";
+import { ObservableArray } from "tns-core-modules/data/observable-array";
+import { View, KeyedTemplate } from "tns-core-modules/ui/core/view";
+import { Page } from "tns-core-modules/ui/page";
 import { ViewModel, Item } from './main-view-model';
-import { ListView } from "ui/list-view";
-import { Label } from "ui/label";
-import { GridLayout } from "ui/layouts/grid-layout";
-import { Color } from "color";
+import { ListView } from "tns-core-modules/ui/list-view";
+import { Label } from "tns-core-modules/ui/label";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
+import { Color } from "tns-core-modules/color";
 
 export function selectItemTemplate(item: Item, index: number, items: ObservableArray<Item>): string {
     return item.id % 10 === 0 ? "red" : item.id % 2 === 0 ? "green" : "yellow"; 
@@ -57,4 +57,4 @@ export function onScroll(args: EventData){
       listView.scrollToIndex(scrollToBottom ? listView.items.length - 1 : 0);
   }
   scrollToBottom = !scrollToBottom;
-}
+}

apps/app/ui-tests-app/list-view/main-view-model.ts

@@ -1,5 +1,5 @@
-import { Observable } from 'data/observable';
-import { ObservableArray } from 'data/observable-array';
+import { Observable } from "tns-core-modules/data/observable";
+import { ObservableArray } from "tns-core-modules/data/observable-array";
 
 export class Item extends Observable {
   private _name: string;
@@ -48,4 +48,4 @@ export class ViewModel extends Observable {
     }
     return this._items;
   }
-}
+}

apps/app/ui-tests-app/mainPage.ts

@@ -1,13 +1,13 @@
-import { EventData } from "data/observable";
-import { Page } from "ui/page";
-import * as buttonModule from "ui/button";
-import * as colorModule from "color";
-import * as platform from "platform";
-import * as frame from "ui/frame";
-import * as trace from "trace";
-import * as observable from "data/observable";
-import * as dialogs from "ui/dialogs";
-import { WrapLayout } from "ui/layouts/wrap-layout";
+import { EventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import * as buttonModule from "tns-core-modules/ui/button";
+import * as colorModule from "tns-core-modules/color";
+import * as platform from "tns-core-modules/platform";
+import * as frame from "tns-core-modules/ui/frame";
+import * as trace from "tns-core-modules/trace";
+import * as observable from "tns-core-modules/data/observable";
+import * as dialogs from "tns-core-modules/ui/dialogs";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 
 var examples: Map<string, string> = new Map<string, string>();
 //should be removed
@@ -226,4 +226,4 @@ export class MainPageViewModel extends observable.Observable {
             this.panel.addChild(btn)
         });
     }
-}
+}

apps/app/ui-tests-app/modal-view/login-page.ts

@@ -1,6 +1,6 @@
-import * as pages from "ui/page";
-import * as textField from "ui/text-field";
-import * as observable from "data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as textField from "tns-core-modules/ui/text-field";
+import * as observable from "tns-core-modules/data/observable";
 
 var context: any;
 var closeCallback: Function;
@@ -29,4 +29,4 @@ export function onUnloaded() {
 export function onLoginButtonTap() {
     console.log("login-page.onLoginButtonTap");
     closeCallback(usernameTextField.text, passwordTextField.text);
-}
+}

apps/app/ui-tests-app/modal-view/modal-view.ts

@@ -1,6 +1,6 @@
-import * as pages from "ui/page";
-import * as labelModule from "ui/label";
-import * as observable from "data/observable";
+import * as pages from "tns-core-modules/ui/page";
+import * as labelModule from "tns-core-modules/ui/label";
+import * as observable from "tns-core-modules/data/observable";
 
 var page: pages.Page;
 var label: labelModule.Label;
@@ -16,4 +16,4 @@ export function onTap(args: observable.EventData) {
         console.log(username + "/" + password);
         label.text = username + "/" + password;
     }, fullscreen);
-}
+}

apps/app/ui-tests-app/page/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -21,4 +21,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}  
+}  

apps/app/ui-tests-app/page/page-status-bar-css.ts

@@ -1,7 +1,7 @@
-import { Color } from "color";
-import { Page } from "ui/page";
-import { View } from "ui/core/view";
-import { unsetValue } from "ui/core/properties";
+import { Color } from "tns-core-modules/color";
+import { Page } from "tns-core-modules/ui/page";
+import { View } from "tns-core-modules/ui/core/view";
+import { unsetValue } from "tns-core-modules/ui/core/properties";
 
 export function applyTap(args) {
     let page = <Page>(<View>args.object).page;
@@ -64,4 +64,4 @@ function reset(page: Page) {
     page.actionBarHidden = false;
     page.backgroundSpanUnderStatusBar = false;
     page.actionBar.style.backgroundColor = unsetValue;
-} 
+} 

apps/app/ui-tests-app/pages/console.ts

@@ -1,9 +1,9 @@
-import * as app from "application";
-import * as pageModule from "ui/page";
-import * as labelModule from "ui/label";
-import * as stackLayoutModule from "ui/layouts/stack-layout";
-import * as textViewModule from "ui/text-view";
-import * as buttonModule from "ui/button";
+import * as app from "tns-core-modules/application";
+import * as pageModule from "tns-core-modules/ui/page";
+import * as labelModule from "tns-core-modules/ui/label";
+import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
+import * as textViewModule from "tns-core-modules/ui/text-view";
+import * as buttonModule from "tns-core-modules/ui/button";
 
 export function createPage() {
 
@@ -78,4 +78,4 @@ export function pageLoaded() {
 
     console.timeEnd("Time");
     console.log("### TEST END ###");
-}
+}

apps/app/ui-tests-app/pages/gestures.ts

@@ -1,9 +1,9 @@
-import * as labelModule from "ui/label";
-import * as gestures from "ui/gestures";
-import * as button from "ui/button";
-import * as pages from "ui/page";
-import * as deviceProperties from "platform";
-import * as stackLayoutModule from "ui/layouts/stack-layout";
+import * as labelModule from "tns-core-modules/ui/label";
+import * as gestures from "tns-core-modules/ui/gestures";
+import * as button from "tns-core-modules/ui/button";
+import * as pages from "tns-core-modules/ui/page";
+import * as deviceProperties from "tns-core-modules/platform";
+import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
 
 export function createPage() {
 
@@ -129,4 +129,4 @@ function getStateAsString(state: gestures.GestureStateTypes): string {
     }
 
     return ", states: " + states.join(",");
-}
+}

apps/app/ui-tests-app/pages/handlers.ts

@@ -1,6 +1,6 @@
-import * as observable from "data/observable";
-import * as gestures from "ui/gestures";
-import * as pages from "ui/page";
+import * as observable from "tns-core-modules/data/observable";
+import * as gestures from "tns-core-modules/ui/gestures";
+import * as pages from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: observable.EventData) {
     var page = <pages.Page>args.object;
@@ -13,4 +13,4 @@ export function tapAction(args: gestures.GestureEventData) {
 
 export function doubleTapAction(args: gestures.GestureEventData) {
     console.log("doubleTapAction")
-}
+}

apps/app/ui-tests-app/pages/i61.ts

@@ -1,6 +1,6 @@
-import * as pages from "ui/page";
-import * as button from "ui/button";
-import * as panelModule from "ui/layouts/stack-layout";
+import * as pages from "tns-core-modules/ui/page";
+import * as button from "tns-core-modules/ui/button";
+import * as panelModule from "tns-core-modules/ui/layouts/stack-layout";
 
 export function createPage() {
 
@@ -17,4 +17,4 @@ export function createPage() {
     page.getViewById<panelModule.StackLayout>("stackPanel").addChild(btn);
 
     return page;
-}
+}

apps/app/ui-tests-app/pages/i73.ts

@@ -1,6 +1,6 @@
-import * as pages from "ui/page";
-import * as button from "ui/button";
-import * as stackModule from "ui/layouts/stack-layout";
+import * as pages from "tns-core-modules/ui/page";
+import * as button from "tns-core-modules/ui/button";
+import * as stackModule from "tns-core-modules/ui/layouts/stack-layout";
 
 export function createPage() {
 

apps/app/ui-tests-app/pages/listview_binding.ts

@@ -1,8 +1,8 @@
-import * as pageModule from "ui/page";
-import * as gridLayoutModule from "ui/layouts/grid-layout";
-import * as listViewModule from "ui/list-view";
-import * as observable from "data/observable";
-import * as observableArr from "data/observable-array";
+import * as pageModule from "tns-core-modules/ui/page";
+import * as gridLayoutModule from "tns-core-modules/ui/layouts/grid-layout";
+import * as listViewModule from "tns-core-modules/ui/list-view";
+import * as observable from "tns-core-modules/data/observable";
+import * as observableArr from "tns-core-modules/data/observable-array";
 
 var arr = new observableArr.ObservableArray();
 for (var i = 0; i < 100; i++) {
@@ -20,4 +20,4 @@ export function createPage() {
     page.content = grid;
 
     return page;
-}
+}

apps/app/ui-tests-app/pages/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -28,4 +28,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/pages/pan-event.ts

@@ -1,8 +1,8 @@
-import { EventData } from "data/observable";
-import { Page } from "ui/page";
-import { PanGestureEventData } from "ui/gestures";
-import { View } from "ui/core/view";
-import { TextView } from "ui/text-view";
+import { EventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import { PanGestureEventData } from "tns-core-modules/ui/gestures";
+import { View } from "tns-core-modules/ui/core/view";
+import { TextView } from "tns-core-modules/ui/text-view";
 
 var view: View;
 export function navigatingTo(args: EventData) {
@@ -20,4 +20,4 @@ export function onPan(data: PanGestureEventData) {
 
 export function clear(args) {
     args.object.page.getViewById("output").text = "";
-}
+}

apps/app/ui-tests-app/pages/touch-event.ts

@@ -1,5 +1,5 @@
-import {TextView} from "ui/text-view";
-import * as gestures from "ui/gestures";
+import {TextView} from "tns-core-modules/ui/text-view";
+import * as gestures from "tns-core-modules/ui/gestures";
 
 export function onTouch(args: gestures.TouchGestureEventData) {
     var msg = " touch action: " + args.action +

apps/app/ui-tests-app/segmented-bar/all.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/segmented-bar/clean");
-}
+}

apps/app/ui-tests-app/segmented-bar/clean.ts

@@ -1,5 +1,5 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function navigate(args) {
     frame.topmost().goBack();
-}
+}

apps/app/ui-tests-app/tab-view/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -28,4 +28,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

apps/app/ui-tests-app/tab-view/tab-view-css.ts

@@ -1,5 +1,5 @@
-import * as view from "ui/core/view";
-import * as pages from "ui/page";
+import * as view from "tns-core-modules/ui/core/view";
+import * as pages from "tns-core-modules/ui/page";
 
 export function applyTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;
@@ -10,4 +10,4 @@ export function applyTap(args) {
 export function resetTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;
     page.css = "";
-}
+}

apps/app/ui-tests-app/tab-view/tab-view-icon.ts

@@ -1,6 +1,6 @@
-import { EventData } from "data/observable";
-import { Button } from "ui/button";
-import { TabView } from "ui/tab-view";
+import { EventData } from "tns-core-modules/data/observable";
+import { Button } from "tns-core-modules/ui/button";
+import { TabView } from "tns-core-modules/ui/tab-view";
 
 let iconModes = ["automatic", "alwaysOriginal", "alwaysTemplate", undefined];
 
@@ -13,4 +13,4 @@ export function onChangeRenderingMode(args: EventData){
     for(let i = 0, length = tabView.items.length; i < length; i++){
         (<Button>tabView.items[i].view).text = "" + tabView.iosIconRenderingMode; 
     }
-}
+}

apps/app/ui-tests-app/text-field/text-field.ts

@@ -1,4 +1,4 @@
-import * as observable from "data/observable";
+import * as observable from "tns-core-modules/data/observable";
 
 export function pageLoaded(args) {
     var page = args.object;
@@ -8,4 +8,4 @@ export function pageLoaded(args) {
     var obj = new observable.Observable();
     obj.set("textProperty", "text");
     page.bindingContext = obj;
-}
+}

apps/app/ui-tests-app/transitions/page0.ts

@@ -1,4 +1,4 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function onTap(args) {
     var navigationEntry = {

apps/app/ui-tests-app/transitions/page1.ts

@@ -1,4 +1,4 @@
-import * as frame from "ui/frame";
+import * as frame from "tns-core-modules/ui/frame";
 
 export function onTap(args) {
     var navigationEntry = {

apps/app/ui-tests-app/web-view/main-page.ts

@@ -1,7 +1,7 @@
-import { EventData } from "data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { MainPageViewModel } from "../mainPage";
-import { WrapLayout } from "ui/layouts/wrap-layout";
-import { Page } from "ui/page";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     let page = <Page>args.object;
@@ -22,4 +22,4 @@ export class SubMainPageViewModel extends MainPageViewModel {
     constructor(container: WrapLayout, examples: Map<string, string>) {
         super(container, examples);
     }
-}
+}

package.json

@@ -35,6 +35,7 @@
     "setup": "npm run dev-link-tns-platform-declarations && npm run dev-link-tns-core-modules && npm run dev-link-tests && npm run dev-link-apps",
     "tsc": "node  --max_old_space_size=4096 ./node_modules/typescript/bin/tsc",
     "compile-all": "npm run tsc -- -p tsconfig.json --outDir bin/dist",
+    "compile-modules": "npm run tsc -- -p tsconfig-modules.json --outDir bin/dist",
     "compile-check-base-dts": "npm run tsc -- -p tsconfig.base-dts.json",
     "compile-node-tests": "npm run tsc -- -p tsconfig.node-tests.json --outDir bin/dist/node-tests",
     "compile-check-combined-dts": "npm run tsc -- -p tsconfig.combined-dts.json",

tests/app/TKUnit.ts

@@ -10,13 +10,13 @@
  
 */
 
-import * as Application from "application";
-import * as timer from "timer";
-import * as trace from "trace";
-import * as types from "utils/types";
-import * as platform from "platform";
+import * as Application from "tns-core-modules/application";
+import * as timer from "tns-core-modules/timer";
+import * as trace from "tns-core-modules/trace";
+import * as types from "tns-core-modules/utils/types";
+import * as platform from "tns-core-modules/platform";
 
-import * as utils from "utils/utils";
+import * as utils from "tns-core-modules/utils/utils";
 
 var sdkVersion = parseInt(platform.device.sdkVersion);