diff --git a/apps/.vscode/settings.json b/apps/.vscode/settings.json
index c7c1623bc..4367a83fc 100644
--- a/apps/.vscode/settings.json
+++ b/apps/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "typescript.tsdk": "./node_modules/typescript/lib"
+   
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/pages/console.ts b/apps/app/ui-tests-app/pages/console.ts
index 05aecdb72..e691adfab 100644
--- a/apps/app/ui-tests-app/pages/console.ts
+++ b/apps/app/ui-tests-app/pages/console.ts
@@ -61,16 +61,16 @@ export function pageLoaded() {
     console.assert(true, "1 equals 1");
 
     if (app.android) {
-        console.dump(true);
-        console.dump(false);
-        console.dump(null);
-        console.dump(undef);
+        console.dir(true);
+        console.dir(false);
+        console.dir(null);
+        console.dir(undef);
 
-        console.dump(num);
-        console.dump(str);
+        console.dir(num);
+        console.dir(str);
 
         console.dir(obj);
-        console.dump(foo);
+        console.dir(foo);
         console.log("%j", button);
     }
 
diff --git a/apps/tsconfig.json b/apps/tsconfig.json
index c06a3a67e..8c440e6af 100644
--- a/apps/tsconfig.json
+++ b/apps/tsconfig.json
@@ -4,4 +4,4 @@
         "node_modules",
         "platforms"
     ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 90b06fa63..e890298b0 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "dev-declarations": "npm run setup && rm -rf tns-platform-declarations/ios/objc* && TNS_TYPESCRIPT_DECLARATIONS_PATH=$PWD/tns-platform-declarations/ios/objc tns build ios --path tests",
     "test": "npm run test-android && npm run test-ios",
     "pretest": "npm run setup && npm run tsc",
-    "test-android": "tns run android --path tests --justlaunch",
-    "test-ios": "tns run ios --path tests --justlaunch",
+    "test-android": "tns run android --path tests --justlaunch --no-watch",
+    "test-ios": "tns run ios --path tests --justlaunch --no-watch",
     "test-watch-android": "npm run pretest && concurrently --kill-others \"npm run tsc-tiw\" \"tns livesync android --path tests --watch\"",
     "test-watch-ios": "npm run pretest && concurrently --kill-others \"npm run tsc-tiw\" \"tns livesync ios --path tests --watch\"",
     "prepublish": "echo \"Development reminder: npm run setup\n\"",
diff --git a/tests/.vscode/launch.json b/tests/.vscode/launch.json
index abcaa7450..f0ef4397b 100644
--- a/tests/.vscode/launch.json
+++ b/tests/.vscode/launch.json
@@ -8,7 +8,8 @@
             "platform": "ios",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": true
+            "watch": true,
+            "stopOnEntry": true
         },
         {
             "name": "Attach on iOS",
@@ -26,7 +27,8 @@
             "platform": "android",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": true
+            "watch": true,
+            "stopOnEntry": true
         },
         {
             "name": "Attach on Android",
diff --git a/tests/app/app/location-example.ts b/tests/app/app/location-example.ts
deleted file mode 100644
index 5cbd92b5e..000000000
--- a/tests/app/app/location-example.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import * as pages from "ui/page";
-import * as locationModule from "location";
-import * as dialogsModule from "ui/dialogs";
-import * as platformModule from "platform";
-import * as textViewModule from "ui/text-view";
-import * as observable from "data/observable";
-import * as appModule from "application";
-
-var locationManager = new locationModule.LocationManager();
-
-export function onStartButtonTap(args: observable.EventData) {
-	console.log("Start button tapped");
-	var textView = <textViewModule.TextView>(page.getViewById("textView"));
-	locationManager.startLocationMonitoring(function (location) {
-		console.log("location-example.location: " + printLocation(location));
-		textView.text = printLocation(location) + "\r\n" + textView.text;
-	}, null, { desiredAccuracy: 300, maximumAge: 20000, minimumUpdateTime: 5000, updateDistance: 20 });
-}
-
-function printLocation(location: locationModule.Location) {
-	return "longitude: " + location.longitude + ", " +
-		"latitude: " + location.latitude + ", " +
-		"timeStamp: " + location.timestamp + ", " +
-		"horizontalAccuracy: " + location.horizontalAccuracy + ", " +
-		"verticalAccuracy: " + location.verticalAccuracy;
-}
-
-export function onStopButtonTap(args: observable.EventData) {
-	locationManager.stopLocationMonitoring();
-}
-
-export function onRequestButtonTap(args: observable.EventData) {
-	checkLocationService(page);
-}
-
-var page: pages.Page;
-
-export function pageLoaded(args: observable.EventData) {
-	page = <pages.Page>(args.object);
-}
-
-var checkLocationService = function (page: pages.Page) {
-	if (locationModule.LocationManager.isEnabled()) {
-		console.log("LocationManager.isEnabled");
-	}
-	else {
-		console.log("LocationManager.is not Enabled");
-		if (page.android) {
-			dialogsModule.confirm({
-				message: "Location service is not enabled!",
-				okButtonText: "Open location settings ...",
-				cancelButtonText: "Cancel", title: "Confirm"
-			}).then((r) => {
-				if (r) {
-					// do not forget to add android.permission.ACCESS_FINE_LOCATION in your manifest file
-					(<android.app.Activity>appModule.android.currentContext).startActivityForResult(new android.content.Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS), 0);
-				}
-			}, null);
-		}
-		else if (page.ios) {
-			if (platformModule.device.osVersion.indexOf("8") === 0) {
-				// we need special handling of iOS 8.0 version, since some breaking changes regarding location
-				// do not forget to put NSLocationWhenInUseUsageDescription in app.plist file
-				var iosLocationManager = CLLocationManager.alloc().init();
-				iosLocationManager.requestWhenInUseAuthorization();
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/app/app/location-example.xml b/tests/app/app/location-example.xml
deleted file mode 100644
index ab17efc7d..000000000
--- a/tests/app/app/location-example.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Page loaded="pageLoaded">
-	<GridLayout rows="50, *" columns="*, *, *">
-		<Button text="Request" tap="onRequestButtonTap" col="0" row="0" />
-		<Button text="Start" tap="onStartButtonTap" col="1" row="0" />
-		<Button text="Stop" tap="onStopButtonTap" col="2" row="0" />
-		<TextView id="textView" colSpan="3" row="1" editable="false" style.fontSize="8"/>
-	</GridLayout>
-</Page>
diff --git a/tests/app/camera-tests.ts b/tests/app/camera-tests.ts
deleted file mode 100644
index fbd60f12f..000000000
--- a/tests/app/camera-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// >> camera-require
-import * as camera from "camera";
-// << camera-require
-
-import * as TKUnit from "./TKUnit";
-
-export var test_takePicture = function () {
-    // >> camera-take-picture
-    camera.takePicture().then(result => {
-        // result is ImageSource
-    });
-    // << camera-take-picture
-};
-
-export var test_isCameraAvailable = function () {
-    // >> camera-is-availabile
-    var availability = camera.isAvailable();
-    // << camera-is-availabile
-    TKUnit.assertTrue(availability === true || availability === false, "Availability should return a Boolean");
-};
diff --git a/tests/app/camera.md b/tests/app/camera.md
deleted file mode 100644
index 36b7ee6b4..000000000
--- a/tests/app/camera.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-nav-title: "camera How-To"
-title: "camera"
-environment: nativescript
-description: "Examples for using camera"
-previous_url: /ApiReference/camera/HOW-TO
----
-# Camera module
-Using a camera requires the camera module.
-{%snippet camera-require%}
-
-### Taking a picture.
-{%snippet camera-take-picture%}
-
-### Check for availability
-{%snippet camera-is-availabile%}
diff --git a/tests/app/console-tests.ts b/tests/app/console-tests.ts
index 5e287aefb..f674a8a40 100644
--- a/tests/app/console-tests.ts
+++ b/tests/app/console-tests.ts
@@ -29,13 +29,6 @@ export var test_DummyTestForSnippetOnly3 = function () {
     // << console-dir
 }
 
-export var test_DummyTestForSnippetOnly4 = function () {
-    // >> console-dump
-    var obj = { name: "John", age: 34 };
-    console.dump(obj);
-    // << console-dump
-}
-
 export var test_DummyTestForSnippetOnly5 = function () {
     // >> console-trace
     console.trace();
diff --git a/tests/app/file-system-tests.ts b/tests/app/file-system-tests.ts
index 1f20510b4..120a49977 100644
--- a/tests/app/file-system-tests.ts
+++ b/tests/app/file-system-tests.ts
@@ -60,14 +60,14 @@ export var testFileFromPath = function () {
                     file.remove();
                 }, function (error) {
                     TKUnit.assert(false, "Failed to read/write text");
-                    //console.dump(error);
+                    //console.dir(error);
                 });
             // << (hide)
         }, function (error) {
             // Failed to write to the file.
             // >> (hide)
             TKUnit.assert(false, "Failed to read/write text");
-            //console.dump(error);
+            //console.dir(error);
             // << (hide)
         });
     // << file-system-create
@@ -101,14 +101,14 @@ export var testFileWrite = function () {
                     file.remove();
                 }, function (error) {
                     TKUnit.assert(false, "Failed to read/write text");
-                    //console.dump(error);
+                    //console.dir(error);
                 });
             // << (hide)
         }, function (error) {
             // Failed to write to the file.
             // >> (hide)
             TKUnit.assert(false, "Failed to read/write text");
-            //console.dump(error);
+            //console.dir(error);
             // << (hide)
         });
     // << file-system-write-string
@@ -162,14 +162,14 @@ export var testFileRead = function () {
                     // Failed to read from the file.
                     // >> (hide)
                     TKUnit.assert(false, "Failed to read/write text");
-                    //console.dump(error);
+                    //console.dir(error);
                     // << (hide)
                 });
         }, function (error) {
             // Failed to write to the file.
             // >> (hide)
             TKUnit.assert(false, "Failed to read/write text");
-            //console.dump(error);
+            //console.dir(error);
             // << (hide)
         });
     // << file-system-example-text
diff --git a/tests/app/image-source-tests.ts b/tests/app/image-source-tests.ts
index 187ec1364..fd40d12dd 100644
--- a/tests/app/image-source-tests.ts
+++ b/tests/app/image-source-tests.ts
@@ -8,7 +8,6 @@
 
 import * as imageSource from "image-source";
 import * as fs from "file-system";
-import * as enums from "ui/enums";
 import * as app from "application";
 import * as TKUnit from "./TKUnit";
 import * as platform from "platform";
@@ -59,7 +58,7 @@ export function testSaveToFile() {
     var img = imageSource.fromFile(imagePath);
     var folder = fs.knownFolders.documents();
     var path = fs.path.join(folder.path, "Test.png");
-    var saved = img.saveToFile(path, enums.ImageFormat.png);
+    var saved = img.saveToFile(path, "png");
     // << imagesource-save-to
     TKUnit.assert(saved, "Image not saved to file");
     TKUnit.assert(fs.File.exists(path), "Image not saved to file");
@@ -111,7 +110,7 @@ export function testBase64Encode_PNG() {
         }
     }
 
-    var result = img.toBase64String(enums.ImageFormat.png);
+    var result = img.toBase64String("png");
     TKUnit.assertEqual(
         result,
         expected,
@@ -121,7 +120,7 @@ export function testBase64Encode_PNG() {
 export function testBase64Encode_JPEG() {
     var img = imageSource.fromFile(smallImagePath);
 
-    var result = img.toBase64String(enums.ImageFormat.jpeg);
+    var result = img.toBase64String("jpeg");
     result = result.substr(0, expectedJpegStart.length);
 
     TKUnit.assertEqual(
diff --git a/tests/app/ui/border/border-tests.ts b/tests/app/ui/border/border-tests.ts
index a57bb5b53..0548aee33 100644
--- a/tests/app/ui/border/border-tests.ts
+++ b/tests/app/ui/border/border-tests.ts
@@ -1,4 +1,4 @@
 // >> border-require
 var borderModule = require("ui/border");
 // << border-require
-console.dump(borderModule);
+console.dir(borderModule);
diff --git a/tests/app/ui/list-view/list-view-tests.ts b/tests/app/ui/list-view/list-view-tests.ts
index 92bebf2e2..ec8753a82 100644
--- a/tests/app/ui/list-view/list-view-tests.ts
+++ b/tests/app/ui/list-view/list-view-tests.ts
@@ -23,7 +23,7 @@ import * as labelModule from "ui/label";
 function listViewItemTap(args) {
     var itemIndex = args.index;
     // >> (hide)
-    console.dump(itemIndex);
+    console.log(itemIndex);
     // << (hide)
 }
 exports.listViewItemTap = listViewItemTap;
diff --git a/tests/app/xml-declaration/mainPage.ts b/tests/app/xml-declaration/mainPage.ts
index bc8bd8c8a..b3bbceca2 100644
--- a/tests/app/xml-declaration/mainPage.ts
+++ b/tests/app/xml-declaration/mainPage.ts
@@ -5,8 +5,6 @@ import * as button from "ui/button";
 import * as image from "ui/image";
 import * as pages from "ui/page";
 import * as http from "http";
-import * as camera from "camera";
-import * as dialogs from "ui/dialogs";
 
 var obj = new observable.Observable();
 obj.set("id", 0);
@@ -39,11 +37,11 @@ export function buttonTap(args: observable.EventData) {
         }
     }
 
-    http.getString("http://it-ebooks-api.info/v1/book/1615005640").then(r=> {
+    http.getString("http://it-ebooks-api.info/v1/book/1615005640").then(r => {
         console.log("R: " + r)
     });
 
-    http.getString("http://www.telerik.com").then(r=> {
+    http.getString("http://www.telerik.com").then(r => {
         console.log("R: " + r)
     });
 }
@@ -56,11 +54,5 @@ export function MyPageLoaded(args: observable.EventData) {
 }
 
 export function setPicture(args: observable.EventData) {
-    var btn = <button.Button>args.object;
-    var parent = btn.parent;
-    var img = parent.getViewById<image.Image>("cameraImage");
-
-    camera.takePicture().then(r=> {
-        img.src = r;
-    }).catch(e => dialogs.alert("ERROR: " + e));
+    // 
 }
\ No newline at end of file
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index c06a3a67e..8c440e6af 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -4,4 +4,4 @@
         "node_modules",
         "platforms"
     ]
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/application-settings/application-settings.android.ts b/tns-core-modules/application-settings/application-settings.android.ts
index 56c6d6408..ac23cb326 100644
--- a/tns-core-modules/application-settings/application-settings.android.ts
+++ b/tns-core-modules/application-settings/application-settings.android.ts
@@ -1,10 +1,10 @@
 import * as common from "./application-settings-common";
-import * as utils from "utils/utils";
+import { getNativeApplication } from "application";
 
 var sharedPreferences;
 function ensureSharedPreferences() {
     if (!sharedPreferences) {
-        sharedPreferences = utils.ad.getApplicationContext().getSharedPreferences("prefs.db", 0);
+        sharedPreferences = (<android.app.Application>getNativeApplication()).getApplicationContext().getSharedPreferences("prefs.db", 0);
     }
 }
 
@@ -13,13 +13,13 @@ function verify(key: string) {
     ensureSharedPreferences();
 }
 
-export var hasKey = function (key: string): boolean {
+export function hasKey(key: string): boolean {
     verify(key);
     return sharedPreferences.contains(key);
 }
 
 // getters
-export var getBoolean = function (key: string, defaultValue?: boolean): boolean {
+export function getBoolean(key: string, defaultValue?: boolean): boolean {
     verify(key);
     if (hasKey(key)) {
         return sharedPreferences.getBoolean(key, false);
@@ -27,7 +27,7 @@ export var getBoolean = function (key: string, defaultValue?: boolean): boolean
     return defaultValue;
 }
 
-export var getString = function (key: string, defaultValue?: string): string {
+export function getString(key: string, defaultValue?: string): string {
     verify(key);
     if (hasKey(key)) {
         return sharedPreferences.getString(key, "");
@@ -35,7 +35,7 @@ export var getString = function (key: string, defaultValue?: string): string {
     return defaultValue;
 }
 
-export var getNumber = function (key: string, defaultValue?: number): number {
+export function getNumber(key: string, defaultValue?: number): number {
     verify(key);
     if (hasKey(key)) {
         return sharedPreferences.getFloat(key, float(0.0));
@@ -44,7 +44,7 @@ export var getNumber = function (key: string, defaultValue?: number): number {
 }
 
 // setters
-export var setBoolean = function (key: string, value: boolean): void {
+export function setBoolean(key: string, value: boolean): void {
     verify(key);
     common.ensureValidValue(value, "boolean");
     var editor = sharedPreferences.edit();
@@ -52,7 +52,7 @@ export var setBoolean = function (key: string, value: boolean): void {
     editor.commit();
 }
 
-export var setString = function (key: string, value: string): void {
+export function setString(key: string, value: string): void {
     verify(key);
     common.ensureValidValue(value, "string");
     var editor = sharedPreferences.edit();
@@ -60,7 +60,7 @@ export var setString = function (key: string, value: string): void {
     editor.commit();
 }
 
-export var setNumber = function (key: string, value: number): void {
+export function setNumber(key: string, value: number): void {
     verify(key);
     common.ensureValidValue(value, "number");
     var editor = sharedPreferences.edit();
@@ -68,14 +68,14 @@ export var setNumber = function (key: string, value: number): void {
     editor.commit();
 }
 
-export var remove = function (key: string): void {
+export function remove(key: string): void {
     verify(key);
     var editor = sharedPreferences.edit();
     editor.remove(key);
     editor.commit();
 }
 
-export var clear = function (): void {
+export function clear(): void {
     ensureSharedPreferences();
     sharedPreferences.edit().clear().commit();
-}
+}
\ No newline at end of file
diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts
index c880d3f6e..b52b5b0bc 100644
--- a/tns-core-modules/application/application-common.ts
+++ b/tns-core-modules/application/application-common.ts
@@ -1,156 +1,58 @@
 require("globals");
-import * as observable from "data/observable";
-// TODO: Raise event on("livesync") and attach this handler in the ui/frame module. 
-import { NavigationEntry, reloadPage } from "ui/frame";
-import { RuleSet } from "ui/styling/css-selector";
-import * as fileSystemModule from "file-system";
-import * as styleScopeModule from "ui/styling/style-scope";
-import * as fileResolverModule from "file-system/file-name-resolver";
-import * as builderModule from "ui/builder";
-import * as platformModule from "platform";
+
+import { NativeScriptError, UnhandledErrorEventData, iOSApplication, AndroidApplication, CssChangedEventData } from "application";
+import { Observable, EventData } from "data/observable";
+import { NavigationEntry } from "ui/frame";
 import "../bundle-entry-points";
 
-var builder: typeof builderModule;
-function ensureBuilder() {
-    if (!builder) {
-        builder = require("ui/builder");
-    }
-}
-
-var platform: typeof platformModule;
-function ensurePlatform() {
-    if (!platform) {
-        platform = require("platform");
-    }
-}
-
-var fileNameResolver: typeof fileResolverModule;
-function ensureFileNameResolver() {
-    if (!fileNameResolver) {
-        fileNameResolver = require("file-system/file-name-resolver");
-    }
-}
-
-var styleScope: typeof styleScopeModule = undefined;
-
-var events = new observable.Observable();
+const events = new Observable();
 global.moduleMerge(events, exports);
 
-export var launchEvent = "launch";
-export var suspendEvent = "suspend";
-export var resumeEvent = "resume";
-export var exitEvent = "exit";
-export var lowMemoryEvent = "lowMemory";
-export var uncaughtErrorEvent = "uncaughtError";
-export var orientationChangedEvent = "orientationChanged";
+export { Observable };
 
-export var mainModule: string;
-export var mainEntry: NavigationEntry;
+export const launchEvent = "launch";
+export const suspendEvent = "suspend";
+export const resumeEvent = "resume";
+export const exitEvent = "exit";
+export const lowMemoryEvent = "lowMemory";
+export const uncaughtErrorEvent = "uncaughtError";
+export const orientationChangedEvent = "orientationChanged";
 
-export var cssFile: string = "app.css";
+export let cssFile: string = "app.css";
 
-export var appSelectors: RuleSet[] = [];
-export var additionalSelectors: RuleSet[] = [];
-export var cssSelectors: RuleSet[] = [];
-export var cssSelectorVersion: number = 0;
-export var keyframes: any = {};
+export let mainModule: string;
+export let mainEntry: NavigationEntry;
 
-export var resources: any = {};
+export let resources: any = {};
 
 export function setResources(res: any) {
     resources = res;
 }
 
-export var onUncaughtError: (error: NativeScriptError) => void = undefined;
+export let android = undefined;
+export let ios = undefined;
 
-export var onLaunch: (context: any) => any = undefined;
-
-export var onSuspend: () => any = undefined;
-
-export var onResume: () => any = undefined;
-
-export var onExit: () => any = undefined;
-
-export var onLowMemory: () => any = undefined;
-
-export var android = undefined;
-
-export var ios = undefined;
-
-export function loadCss(cssFile?: string): RuleSet[] {
-    if (!cssFile) {
-        return undefined;
-    }
-
-    var result: RuleSet[];
-
-    var fs: typeof fileSystemModule = require("file-system");
-    if (!styleScope) {
-        styleScope = require("ui/styling/style-scope");
-    }
-
-    var cssFileName = fs.path.join(fs.knownFolders.currentApp().path, cssFile);
-    if (fs.File.exists(cssFileName)) {
-        var file = fs.File.fromPath(cssFileName);
-        var applicationCss = file.readTextSync();
-        if (applicationCss) {
-            result = parseCss(applicationCss, cssFileName);
-        }
-    }
-
-    return result;
+export function notify(args: EventData): void {
+    events.notify(args);
 }
 
-export function mergeCssSelectors(module: any): void {
-    //HACK: pass the merged module and work with its exported vars.
-    module.cssSelectors = module.appSelectors.slice();
-    module.cssSelectors.push.apply(module.cssSelectors, module.additionalSelectors);
-    module.cssSelectorVersion++;
+let app: iOSApplication | AndroidApplication;
+export function setApplication(instance: iOSApplication | AndroidApplication): void {
+    app = instance;
 }
 
-export function parseCss(cssText: string, cssFileName?: string): RuleSet[] {
-    if (!styleScope) {
-        styleScope = require("ui/styling/style-scope");
-    }
-    return styleScope.StyleScope.createSelectorsFromCss(cssText, cssFileName, keyframes);
+export function livesync() {
+    events.notify(<EventData>{ eventName: "livesync", object: app });  
 }
 
-export function __onLiveSync() {
-    // Close the error page if available and remove the reference from global context.
-    if ((<any>global).errorPage) {
-        (<any>global).errorPage.closeModal();
-        (<any>global).errorPage = undefined;
-    }
-
-    try {
-        ensureFileNameResolver();
-
-        // Clear file resolver cache to respect newly added files.
-        fileNameResolver.clearCache();
-
-        // Reload app.css in case it was changed.
-        loadCss();
-
-        (<any>global).__onLiveSyncCore();
-
-    } catch (ex) {
-        // Show the error as modal page, save reference to the page in global context.
-        ensureBuilder();
-        (<any>global).errorPage = builder.parse(`<Page><ScrollView><Label text="${ex}" textWrap="true" style="color: red;" /></ScrollView></Page>`);
-        (<any>global).errorPage.showModal();
-    }
+export function setCssFileName(cssFileName: string) {
+    cssFile = cssFileName;
 }
 
-export function __onLiveSyncCore() {
-    // Reload current page.
-    reloadPage();
+export function addCss(cssText: string): void {
+    events.notify(<CssChangedEventData>{ eventName: "cssChanged", object: app, cssText: cssText });
 }
-(<any>global).__onLiveSyncCore = __onLiveSyncCore;
 
-export function _onOrientationChanged(){
-    ensurePlatform();
-    platform.screen.mainScreen._invalidate();
-
-    ensureFileNameResolver();
-    fileNameResolver._invalidateResolverInstance();
+global.__onUncaughtError = function (error: NativeScriptError) {
+    events.notify(<UnhandledErrorEventData>{ eventName: uncaughtErrorEvent, object: app, android: error, ios: error, error: error });
 }
diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
index 8b8aede58..a4476ab71 100644
--- a/tns-core-modules/application/application.android.ts
+++ b/tns-core-modules/application/application.android.ts
@@ -1,171 +1,40 @@
-import * as appModule from "./application-common";
-import * as definition from "application";
-import * as frame from "ui/frame";
-import * as observable from "data/observable";
-import * as typesModule from "utils/types";
+import {
+    AndroidActivityBundleEventData, AndroidActivityEventData, ApplicationEventData, OrientationChangedEventData,
+    AndroidApplication as AndroidApplicationDefinition
+} from "application";
 
-global.moduleMerge(appModule, exports);
-const typedExports: typeof definition = exports;
+import {
+    notify, lowMemoryEvent, orientationChangedEvent, suspendEvent, resumeEvent,
+    setApplication, livesync, Observable
+} from "./application-common";
 
-function initLifecycleCallbacks() {
-    // TODO: Verify whether the logic for triggerring application-wide events based on Activity callbacks is working properly
-    let lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({
-        onActivityCreated: function (activity: any, bundle: any) {
-            // Set app theme after launch screen was used during startup
-            let activityInfo = activity.getPackageManager().getActivityInfo(activity.getComponentName(), android.content.pm.PackageManager.GET_META_DATA);
-            if (activityInfo.metaData) {
-                let setThemeOnLaunch = activityInfo.metaData.getInt("SET_THEME_ON_LAUNCH", -1);
-                if (setThemeOnLaunch !== -1) {
-                    activity.setTheme(setThemeOnLaunch);
-                }
-            }
+// First reexport so that app module is initialized.
+export * from "./application-common";
 
-            if (!androidApp.startActivity) {
-                androidApp.startActivity = activity;
-            }
+import { NavigationEntry } from "ui/frame";
 
-            androidApp.notify(<definition.AndroidActivityBundleEventData>{ eventName: "activityCreated", object: androidApp, activity: activity, bundle: bundle });
-            if (androidApp.onActivityCreated) {
-                androidApp.onActivityCreated(activity, bundle);
-            }
-        },
+const ActivityCreated = "activityCreated";
+const ActivityDestroyed = "activityDestroyed";
+const ActivityStarted = "activityStarted";
+const ActivityPaused = "activityPaused";
+const ActivityResumed = "activityResumed";
+const ActivityStopped = "activityStopped";
+const SaveActivityState = "saveActivityState";
+const ActivityResult = "activityResult";
+const ActivityBackPressed = "activityBackPressed";
+const ActivityRequestPermissions = "activityRequestPermissions";
 
-        onActivityDestroyed: function (activity: any) {
-            if (activity === androidApp.foregroundActivity) {
-                androidApp.foregroundActivity = undefined;
-            }
-            
-            if (activity === androidApp.startActivity) {
-                androidApp.startActivity = undefined;
-            }
-
-            androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityDestroyed", object: androidApp, activity: activity });
-            if (androidApp.onActivityDestroyed) {
-                androidApp.onActivityDestroyed(activity);
-            }
-
-            // TODO: This is a temporary workaround to force the V8's Garbage Collector, which will force the related Java Object to be collected.
-            gc();
-        },
-
-        onActivityPaused: function (activity: any) {
-            if (activity.isNativeScriptActivity) {
-                androidApp.paused = true;
-
-                if (typedExports.onSuspend) {
-                    typedExports.onSuspend();
-                }
-                typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.suspendEvent, object: androidApp, android: activity });
-            }
-
-            androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityPaused", object: androidApp, activity: activity });
-            if (androidApp.onActivityPaused) {
-                androidApp.onActivityPaused(activity);
-            }
-        },
-
-        onActivityResumed: function (activity: any) {
-            androidApp.foregroundActivity = activity;
-
-            if (activity.isNativeScriptActivity) {
-                if (typedExports.onResume) {
-                    typedExports.onResume();
-                }
-                typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.resumeEvent, object: androidApp, android: activity });
-
-                androidApp.paused = false;
-            }
-
-            androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityResumed", object: androidApp, activity: activity });
-            if (androidApp.onActivityResumed) {
-                androidApp.onActivityResumed(activity);
-            }
-        },
-
-        onActivitySaveInstanceState: function (activity: any, bundle: any) {
-            androidApp.notify(<definition.AndroidActivityBundleEventData>{ eventName: "saveActivityState", object: androidApp, activity: activity, bundle: bundle });
-
-            if (androidApp.onSaveActivityState) {
-                androidApp.onSaveActivityState(activity, bundle);
-            }
-        },
-
-        onActivityStarted: function (activity: any) {
-            androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityStarted", object: androidApp, activity: activity });
-            if (androidApp.onActivityStarted) {
-                androidApp.onActivityStarted(activity);
-            }
-        },
-
-        onActivityStopped: function (activity: any) {
-            androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityStopped", object: androidApp, activity: activity });
-            if (androidApp.onActivityStopped) {
-                androidApp.onActivityStopped(activity);
-            }
-        }
-    });
-
-    return lifecycleCallbacks;
-}
-
-let currentOrientation: number;
-function initComponentCallbacks() {
-    let componentCallbacks = new android.content.ComponentCallbacks2({
-        onLowMemory: function () {
-            gc();
-            java.lang.System.gc();
-            typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.lowMemoryEvent, object: this, android: this });
-        },
-
-        onTrimMemory: function (level: number) {
-            // TODO: This is skipped for now, test carefully for OutOfMemory exceptions
-        },
-
-        onConfigurationChanged: function (newConfig: android.content.res.Configuration) {
-            let newOrientation = newConfig.orientation;
-            if (newOrientation === currentOrientation) {
-                return;
-            }
-
-            currentOrientation = newOrientation;
-            let newValue;
-
-            switch (newOrientation) {
-                case android.content.res.Configuration.ORIENTATION_LANDSCAPE:
-                    newValue = "landscape";
-                    break;
-                case android.content.res.Configuration.ORIENTATION_PORTRAIT:
-                    newValue = "portrait";
-                    break;
-                default:
-                    newValue = "unknown";
-                    break;
-            }
-
-            appModule._onOrientationChanged();
-            typedExports.notify(<definition.OrientationChangedEventData>{
-                eventName: typedExports.orientationChangedEvent,
-                android: androidApp.nativeApp,
-                newValue: newValue,
-                object: typedExports.android,
-            });
-        }
-    });
-
-    return componentCallbacks;
-}
-
-export class AndroidApplication extends observable.Observable implements definition.AndroidApplication {
-    public static activityCreatedEvent = "activityCreated";
-    public static activityDestroyedEvent = "activityDestroyed";
-    public static activityStartedEvent = "activityStarted";
-    public static activityPausedEvent = "activityPaused";
-    public static activityResumedEvent = "activityResumed";
-    public static activityStoppedEvent = "activityStopped";
-    public static saveActivityStateEvent = "saveActivityState";
-    public static activityResultEvent = "activityResult";
-    public static activityBackPressedEvent = "activityBackPressed";
-    public static activityRequestPermissionsEvent = "activityRequestPermissions";
+export class AndroidApplication extends Observable implements AndroidApplicationDefinition {
+    public static activityCreatedEvent = ActivityCreated;
+    public static activityDestroyedEvent = ActivityDestroyed;
+    public static activityStartedEvent = ActivityStarted;
+    public static activityPausedEvent = ActivityPaused;
+    public static activityResumedEvent = ActivityResumed;
+    public static activityStoppedEvent = ActivityStopped;
+    public static saveActivityStateEvent = SaveActivityState;
+    public static activityResultEvent = ActivityResult;
+    public static activityBackPressedEvent = ActivityBackPressed;
+    public static activityRequestPermissionsEvent = ActivityRequestPermissions;
 
     public paused: boolean;
     public nativeApp: android.app.Application;
@@ -173,28 +42,11 @@ export class AndroidApplication extends observable.Observable implements definit
     public foregroundActivity: android.app.Activity;
     public startActivity: android.app.Activity;
     public packageName: string;
-    public hasActionBar: boolean;
 
     public get currentContext(): android.content.Context {
         return this.foregroundActivity;
     }
 
-    public onActivityCreated: (activity: android.app.Activity, bundle: android.os.Bundle) => void;
-
-    public onActivityDestroyed: (activity: android.app.Activity) => void;
-
-    public onActivityStarted: (activity: android.app.Activity) => void;
-
-    public onActivityPaused: (activity: android.app.Activity) => void;
-
-    public onActivityResumed: (activity: android.app.Activity) => void;
-
-    public onActivityStopped: (activity: android.app.Activity) => void;
-
-    public onSaveActivityState: (activity: android.app.Activity, bundle: android.os.Bundle) => void;
-
-    public onActivityResult: (requestCode: number, resultCode: number, data: android.content.Intent) => void;
-
     public init(nativeApp: any) {
         if (this.nativeApp) {
             throw new Error("application.android already initialized.");
@@ -215,15 +67,8 @@ export class AndroidApplication extends observable.Observable implements definit
     private _registeredReceivers = {};
     private _pendingReceiverRegistrations = new Array<(context: android.content.Context) => void>();
     private _registerPendingReceivers() {
-        if (this._pendingReceiverRegistrations) {
-            let i = 0;
-            const length = this._pendingReceiverRegistrations.length;
-            for (; i < length; i++) {
-                const registerFunc = this._pendingReceiverRegistrations[i];
-                registerFunc(this.context);
-            }
-            this._pendingReceiverRegistrations = new Array<(context: android.content.Context) => void>();
-        }
+        this._pendingReceiverRegistrations.forEach(func => func(this.context));
+        this._pendingReceiverRegistrations.length = 0;
     }
 
     public registerBroadcastReceiver(intentFilter: string, onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void) {
@@ -253,9 +98,189 @@ export class AndroidApplication extends observable.Observable implements definit
     }
 }
 
-let androidApp = new AndroidApplication();
+const androidApp = new AndroidApplication();
 // use the exports object instead of 'export var' due to global namespace collision
-typedExports.android = androidApp;
+exports.android = androidApp;
+setApplication(androidApp);
+
+let started = false;
+export function start(entry?: NavigationEntry) {
+    if (started) {
+        throw new Error("Application is already started.");
+    }
+
+    if (!androidApp.nativeApp) {
+        const nativeApp = getNativeApplication();
+        androidApp.init(nativeApp);
+    }
+
+    started = true;
+    if (entry) {
+        exports.mainEntry = entry;
+    }
+}
+
+export function getNativeApplication(): android.app.Application {
+    // Try getting it from module - check whether application.android.init has been explicitly called
+    let nativeApp = androidApp.nativeApp;
+    if (!nativeApp) {
+        // check whether the com.tns.NativeScriptApplication type exists
+        if (!nativeApp && com.tns.NativeScriptApplication) {
+            nativeApp = com.tns.NativeScriptApplication.getInstance();
+        }
+
+        // the getInstance might return null if com.tns.NativeScriptApplication exists but is  not the starting app type
+        if (!nativeApp) {
+            // TODO: Should we handle the case when a custom application type is provided and the user has not explicitly initialized the application module? 
+            const clazz = java.lang.Class.forName("android.app.ActivityThread");
+            if (clazz) {
+                const method = clazz.getMethod("currentApplication", null);
+                if (method) {
+                    nativeApp = method.invoke(null, null);
+                }
+            }
+        }
+
+        // we cannot work without having the app instance
+        if (!nativeApp) {
+            throw new Error("Failed to retrieve native Android Application object. If you have a custom android.app.Application type implemented make sure that you've called the '<application-module>.android.init' method.")
+        }
+    }
+
+    return nativeApp;
+}
+
+global.__onLiveSync = function () {
+    if (androidApp && androidApp.paused) {
+        return;
+    }
+
+    livesync();
+};
+
+declare namespace com {
+    namespace tns {
+        class NativeScriptApplication extends android.app.Application {
+            static getInstance(): NativeScriptApplication;
+        }
+    }
+}
+
+function initLifecycleCallbacks() {
+    // TODO: Verify whether the logic for triggerring application-wide events based on Activity callbacks is working properly
+    const lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({
+        onActivityCreated: function (activity: android.app.Activity, savedInstanceState: android.os.Bundle) {
+            // Set app theme after launch screen was used during startup
+            const activityInfo = activity.getPackageManager().getActivityInfo(activity.getComponentName(), android.content.pm.PackageManager.GET_META_DATA);
+            if (activityInfo.metaData) {
+                const setThemeOnLaunch = activityInfo.metaData.getInt("SET_THEME_ON_LAUNCH", -1);
+                if (setThemeOnLaunch !== -1) {
+                    activity.setTheme(setThemeOnLaunch);
+                }
+            }
+
+            if (!androidApp.startActivity) {
+                androidApp.startActivity = activity;
+            }
+
+            androidApp.notify(<AndroidActivityBundleEventData>{ eventName: ActivityCreated, object: androidApp, activity: activity, bundle: savedInstanceState });
+        },
+
+        onActivityDestroyed: function (activity: android.app.Activity) {
+            if (activity === androidApp.foregroundActivity) {
+                androidApp.foregroundActivity = undefined;
+            }
+
+            if (activity === androidApp.startActivity) {
+                androidApp.startActivity = undefined;
+            }
+
+            androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityDestroyed, object: androidApp, activity: activity });
+            // TODO: This is a temporary workaround to force the V8's Garbage Collector, which will force the related Java Object to be collected.
+            gc();
+        },
+
+        onActivityPaused: function (activity: android.app.Activity) {
+            if ((<any>activity).isNativeScriptActivity) {
+                androidApp.paused = true;
+                notify(<ApplicationEventData>{ eventName: suspendEvent, object: androidApp, android: activity });
+            }
+
+            androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityPaused, object: androidApp, activity: activity });
+        },
+
+        onActivityResumed: function (activity: android.app.Activity) {
+            androidApp.foregroundActivity = activity;
+
+            if ((<any>activity).isNativeScriptActivity) {
+                notify(<ApplicationEventData>{ eventName: resumeEvent, object: androidApp, android: activity });
+                androidApp.paused = false;
+            }
+
+            androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityResumed, object: androidApp, activity: activity });
+        },
+
+        onActivitySaveInstanceState: function (activity: android.app.Activity, outState: android.os.Bundle) {
+            androidApp.notify(<AndroidActivityBundleEventData>{ eventName: SaveActivityState, object: androidApp, activity: activity, bundle: outState });
+        },
+
+        onActivityStarted: function (activity: android.app.Activity) {
+            androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityStarted, object: androidApp, activity: activity });
+        },
+
+        onActivityStopped: function (activity: android.app.Activity) {
+            androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityStopped, object: androidApp, activity: activity });
+        }
+    });
+
+    return lifecycleCallbacks;
+}
+
+let currentOrientation: number;
+function initComponentCallbacks() {
+    let componentCallbacks = new android.content.ComponentCallbacks2({
+        onLowMemory: function () {
+            gc();
+            java.lang.System.gc();
+            notify(<ApplicationEventData>{ eventName: lowMemoryEvent, object: this, android: this });
+        },
+
+        onTrimMemory: function (level: number) {
+            // TODO: This is skipped for now, test carefully for OutOfMemory exceptions
+        },
+
+        onConfigurationChanged: function (newConfig: android.content.res.Configuration) {
+            let newOrientation = newConfig.orientation;
+            if (newOrientation === currentOrientation) {
+                return;
+            }
+
+            currentOrientation = newOrientation;
+            let newValue;
+
+            switch (newOrientation) {
+                case android.content.res.Configuration.ORIENTATION_LANDSCAPE:
+                    newValue = "landscape";
+                    break;
+                case android.content.res.Configuration.ORIENTATION_PORTRAIT:
+                    newValue = "portrait";
+                    break;
+                default:
+                    newValue = "unknown";
+                    break;
+            }
+
+            notify(<OrientationChangedEventData>{
+                eventName: orientationChangedEvent,
+                android: androidApp.nativeApp,
+                newValue: newValue,
+                object: androidApp
+            });
+        }
+    });
+
+    return componentCallbacks;
+}
 
 let BroadcastReceiverClass;
 function ensureBroadCastReceiverClass() {
@@ -281,66 +306,3 @@ function ensureBroadCastReceiverClass() {
 
     BroadcastReceiverClass = BroadcastReceiver;
 }
-
-let started = false;
-export function start(entry?: frame.NavigationEntry) {
-    if (started) {
-        throw new Error("Application is already started.");
-    }
-
-    if (!androidApp.nativeApp) {
-        // we are still not initialized, this is possible if no 'androidApp.init' call has been made
-        let utils = require("utils/utils");
-        let nativeApp = utils.ad.getApplication();
-        androidApp.init(nativeApp);
-    }
-
-    started = true;
-    if (entry) {
-        typedExports.mainEntry = entry;
-    }
-
-    loadCss();
-}
-
-function loadCss() {
-    //HACK: identical to application.ios.ts
-    typedExports.appSelectors = typedExports.loadCss(typedExports.cssFile) || [];
-    if (typedExports.appSelectors.length > 0) {
-        typedExports.mergeCssSelectors(typedExports);
-    }
-}
-
-export function setCssFileName(cssFileName: string) {
-    typedExports.cssFile = cssFileName;
-}
-
-export function addCss(cssText: string) {
-    //HACK: identical to application.ios.ts
-    const parsed = typedExports.parseCss(cssText);
-    if (parsed) {
-        typedExports.additionalSelectors.push.apply(typedExports.additionalSelectors, parsed);
-        typedExports.mergeCssSelectors(typedExports);
-    }
-}
-
-global.__onLiveSync = function () {
-    if (typedExports.android && typedExports.android.paused) {
-        return;
-    }
-
-    appModule.__onLiveSync();
-
-    loadCss();
-};
-
-global.__onUncaughtError = function (error: NativeScriptError) {
-    const types: typeof typesModule = require("utils/types");
-
-    // TODO: Obsolete this
-    if (types.isFunction(typedExports.onUncaughtError)) {
-        typedExports.onUncaughtError(error);
-    }
-
-    typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: appModule.android, android: error, error });
-};
diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
index ee1052cc6..1e4dd247e 100644
--- a/tns-core-modules/application/application.d.ts
+++ b/tns-core-modules/application/application.d.ts
@@ -2,8 +2,7 @@
  * Contains the application abstraction with all related methods.
  */
 declare module "application" {
-    import { RuleSet } from "ui/styling/css-selector";
-    import { NavigationEntry, View, Observable } from "ui/frame";
+    import { NavigationEntry, View, Observable, EventData } from "ui/frame";
 
     /**
      * String value used when hooking to launch event.
@@ -40,10 +39,20 @@ declare module "application" {
      */
     export var orientationChangedEvent: string;
 
+    /**
+     * An extended JavaScript Error which will have the nativeError property initialized in case the error is caused by executing platform-specific code.
+     */
+    export interface NativeScriptError extends Error {
+        /**
+         * Represents the native error object.
+         */
+        nativeError: any;
+    }
+
     /**
      * Event data containing information for the application events.
      */
-    export interface ApplicationEventData {
+    export interface ApplicationEventData extends EventData {
         /**
          * Gets the native iOS event arguments. Valid only when running on iOS.
          */
@@ -85,7 +94,7 @@ declare module "application" {
          */
         newValue: "portrait" | "landscape" | "unknown";
     }
-    
+
     /**
      * Event data containing information about unhandled application errors.
      */
@@ -95,6 +104,14 @@ declare module "application" {
         error: NativeScriptError;
     }
 
+    /**
+     * Event data containing information about application css change.
+     */
+    export interface CssChangedEventData extends EventData {
+        cssFile?: string;
+        cssText?: string;
+    }
+
     /**
      * The main page path (without the file extension) for the application starting from the application root. 
      * For example if you have page called "main.js" in a folder called "subFolder" and your root folder is "app" you can specify mainModule like this:
@@ -128,67 +145,25 @@ declare module "application" {
     /**
      * Sets css file name for the application. 
      */
-    export function setCssFileName(cssFile: string);
-
-    //@private
-    export var appSelectors: RuleSet[];
-    export var additionalSelectors: RuleSet[];
-    /**
-     * Cached css selectors created from the content of the css file.
-     */
-    export var cssSelectors: RuleSet[];
-    export var cssSelectorVersion: number;
-    export var keyframes: any;
-    export function parseCss(cssText: string, cssFileName?: string): RuleSet[];
-    export function mergeCssSelectors(module: any): void;
-    //@endprivate
+    export function setCssFileName(cssFile: string): void;
 
     export function addCss(cssText: string): void;
 
     /**
-     * Loads css file and parses to a css syntax tree.
-     * @param cssFile Optional parameter to point to an arbitrary css file. If not specified, the cssFile property is used.
+     * This event is raised when application css is changed.
      */
-    export function loadCss(cssFile?: string): RuleSet[];
+    export function on(event: "cssChanged", callback: (args: CssChangedEventData) => void, thisArg?: any);
+
+    /**
+     * Event raised then livesync operation is performed.
+     */
+    export function on(event: "livesync", callback: (args: EventData) => void);
 
     /**
      * Call this method to start the application. Important: All code after this method call will not be executed!
      */
     export function start(entry?: NavigationEntry);
 
-    /**
-     * The main entry point event. This method is expected to use the root frame to navigate to the main application page.
-     */
-    export function onLaunch(context?: any): void;
-
-    /**
-     * A callback to be used when an uncaught error occurs while the application is running.
-     * The application will be shut down after this method returns.
-     * Loading new UI at this point is erroneous and may lead to unpredictable results.
-     * The method is intended to be used for crash reports and/or application restart. 
-     */
-    export function onUncaughtError(error: NativeScriptError): void;
-
-    /**
-     * This method will be called when the Application is suspended.
-     */
-    export function onSuspend();
-
-    /**
-     * This method will be called when the Application is resumed after it has been suspended.
-     */
-    export function onResume();
-
-    /**
-     * This method will be called when the Application is about to exitEvent.
-     */
-    export function onExit();
-
-    /**
-     * This method will be called when there is low memory on the target device.
-     */
-    export function onLowMemory();
-
     /**
      * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
      * @param eventNames - String corresponding to events (e.g. "onLaunch"). Optionally could be used more events separated by `,` (e.g. "onLaunch", "onSuspend"). 
@@ -257,14 +232,14 @@ declare module "application" {
      * Encapsulates methods and properties specific to the Android platform.
      * Will be undefined when TargetOS is iOS.
      */
-    export var android: AndroidApplication;
+    export let android: AndroidApplication;
 
     /**
      * This is the iOS-specific application object instance.
      * Encapsulates methods and properties specific to the iOS platform.
      * Will be undefined when TargetOS is Android.
      */
-    export var ios: iOSApplication;
+    export let ios: iOSApplication;
 
     /**
      * Data for the Android activity events.
@@ -392,46 +367,6 @@ declare module "application" {
          */
         init: (nativeApp) => void;
 
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityCreated method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityCreated: (activity: any /* android.app.Activity */, bundle: any /* android.os.Bundle */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityDestroyed method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityDestroyed: (activity: any /* android.app.Activity */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityDestroyed method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityStarted: (activity: any /* android.app.Activity */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityPaused method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityPaused: (activity: any /* android.app.Activity */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityResumed method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityResumed: (activity: any /* android.app.Activity */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivityStopped method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onActivityStopped: (activity: any /* android.app.Activity */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the [onActivitySaveInstanceState method](http://developer.android.com/reference/android/app/Application.ActivityLifecycleCallbacks.html).
-         */
-        onSaveActivityState: (activity: any /* android.app.Activity */, bundle: any /* android.os.Bundle */) => void;
-
-        /**
-         * [Deprecated. Please use the respective event instead.] Direct handler of the onActivityResult method.
-         */
-        onActivityResult: (requestCode: number, resultCode: number, data: any /* android.content.Intent */) => void;
-
         /**
          * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
          * @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change"). 
@@ -603,8 +538,8 @@ declare module "application" {
 
     /* tslint:disable */
     export interface RootViewControllerImpl {
-
         contentController: any;
-
     }
+
+    export function getNativeApplication(): any;
 }
diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index 19057d850..8297fac2b 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -1,41 +1,37 @@
-import * as common from "./application-common";
-import {Frame, NavigationEntry} from "ui/frame";
-import * as definition from "application";
-import * as uiUtils from "ui/utils";
-import * as typesModule from "utils/types";
-import * as utils from "utils/utils";
+import { iOSApplication as IOSApplicationDefinition, LaunchEventData, ApplicationEventData, OrientationChangedEventData } from "application";
 
-global.moduleMerge(common, exports);
-var typedExports: typeof definition = exports;
+import {
+    notify, launchEvent, resumeEvent, suspendEvent, exitEvent, lowMemoryEvent,
+    orientationChangedEvent, setApplication, livesync
+} from "./application-common";
+
+// First reexport so that app module is initialized.
+export * from "./application-common";
+
+import { Frame, View, NavigationEntry } from "ui/frame";
+import { ios } from "ui/utils";
+import * as utils from "utils/utils";
 
 class Responder extends UIResponder {
     //
 }
 
 class Window extends UIWindow {
-
-    private _content;
+    public content;
 
     initWithFrame(frame: CGRect): this {
-        var window = <this>super.initWithFrame(frame);
+        const window = <this>super.initWithFrame(frame);
         if (window) {
             window.autoresizingMask = UIViewAutoresizing.None;
         }
         return window;
     }
 
-    public get content() {
-        return this._content;
-    }
-    public set content(value) {
-        this._content = value;
-    }
-
     public layoutSubviews(): void {
         if (utils.ios.MajorVersion < 9) {
-            uiUtils.ios._layoutRootView(this._content, utils.ios.getter(UIScreen, UIScreen.mainScreen).bounds);
-        }else{
-            uiUtils.ios._layoutRootView(this._content, this.frame);
+            ios._layoutRootView(this.content, utils.ios.getter(UIScreen, UIScreen.mainScreen).bounds);
+        } else {
+            ios._layoutRootView(this.content, this.frame);
         }
     }
 }
@@ -43,13 +39,10 @@ class Window extends UIWindow {
 class NotificationObserver extends NSObject {
     private _onReceiveCallback: (notification: NSNotification) => void;
 
-    static new(): NotificationObserver {
-        return <NotificationObserver>super.new();
-    }
-
-    public initWithCallback(onReceiveCallback: (notification: NSNotification) => void): NotificationObserver {
-        this._onReceiveCallback = onReceiveCallback;
-        return this;
+    public static initWithCallback(onReceiveCallback: (notification: NSNotification) => void): NotificationObserver {
+        const observer = <NotificationObserver>super.new();
+        observer._onReceiveCallback = onReceiveCallback;
+        return observer;
     }
 
     public onReceive(notification: NSNotification): void {
@@ -61,7 +54,7 @@ class NotificationObserver extends NSObject {
     };
 }
 
-class IOSApplication implements definition.iOSApplication {
+class IOSApplication implements IOSApplicationDefinition {
     public rootController: any;
 
     private _delegate: typeof UIApplicationDelegate;
@@ -85,7 +78,7 @@ class IOSApplication implements definition.iOSApplication {
 
     get window(): Window {
         return this._window;
-    }    
+    }
 
     get delegate(): typeof UIApplicationDelegate {
         return this._delegate;
@@ -97,7 +90,7 @@ class IOSApplication implements definition.iOSApplication {
     }
 
     public addNotificationObserver(notificationName: string, onReceiveCallback: (notification: NSNotification) => void): NotificationObserver {
-        var observer = NotificationObserver.new().initWithCallback(onReceiveCallback);
+        const observer = NotificationObserver.initWithCallback(onReceiveCallback);
         utils.ios.getter(NSNotificationCenter, NSNotificationCenter.defaultCenter).addObserverSelectorNameObject(observer, "onReceive", notificationName, null);
         this._observers.push(observer);
         return observer;
@@ -115,17 +108,13 @@ class IOSApplication implements definition.iOSApplication {
         this._window = <Window>Window.alloc().initWithFrame(utils.ios.getter(UIScreen, UIScreen.mainScreen).bounds);
         this._window.backgroundColor = utils.ios.getter(UIColor, UIColor.whiteColor);
 
-        if (typedExports.onLaunch) {
-            typedExports.onLaunch(undefined);
-        }
-
-        let args: definition.LaunchEventData = {
-            eventName: typedExports.launchEvent,
+        const args: LaunchEventData = {
+            eventName: launchEvent,
             object: this,
             ios: notification.userInfo && notification.userInfo.objectForKey("UIApplicationLaunchOptionsLocalNotificationKey") || null
         };
 
-        typedExports.notify(args);
+        notify(args);
 
         let rootView = createRootView(args.root);
         this._window.content = rootView;
@@ -149,39 +138,23 @@ class IOSApplication implements definition.iOSApplication {
     }
 
     private didBecomeActive(notification: NSNotification) {
-        if (typedExports.onResume) {
-            typedExports.onResume();
-        }
-
-        typedExports.notify({ eventName: typedExports.resumeEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
+        notify(<ApplicationEventData>{ eventName: resumeEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
     }
 
     private didEnterBackground(notification: NSNotification) {
-        if (typedExports.onSuspend) {
-            typedExports.onSuspend();
-        }
-
-        typedExports.notify({ eventName: typedExports.suspendEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
+        notify(<ApplicationEventData>{ eventName: suspendEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
     }
 
     private willTerminate(notification: NSNotification) {
-        if (typedExports.onExit) {
-            typedExports.onExit();
-        }
-
-        typedExports.notify({ eventName: typedExports.exitEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
+        notify(<ApplicationEventData>{ eventName: exitEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
     }
 
     private didReceiveMemoryWarning(notification: NSNotification) {
-        if (typedExports.onLowMemory) {
-            typedExports.onLowMemory();
-        }
-
-        typedExports.notify({ eventName: typedExports.lowMemoryEvent, object: this, android: undefined, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
+        notify(<ApplicationEventData>{ eventName: lowMemoryEvent, object: this, ios: utils.ios.getter(UIApplication, UIApplication.sharedApplication) });
     }
 
     private orientationDidChange(notification: NSNotification) {
-        var orientation = utils.ios.getter(UIDevice, UIDevice.currentDevice).orientation;
+        const orientation = utils.ios.getter(UIDevice, UIDevice.currentDevice).orientation;
 
         if (this._currentOrientation !== orientation) {
             this._currentOrientation = orientation;
@@ -201,9 +174,8 @@ class IOSApplication implements definition.iOSApplication {
                     break;
             }
 
-            common._onOrientationChanged();
-            typedExports.notify(<definition.OrientationChangedEventData>{
-                eventName: typedExports.orientationChangedEvent,
+            notify(<OrientationChangedEventData>{
+                eventName: orientationChangedEvent,
                 ios: this,
                 newValue: newValue,
                 object: this
@@ -212,55 +184,20 @@ class IOSApplication implements definition.iOSApplication {
     }
 }
 
-var iosApp = new IOSApplication();
-typedExports.ios = iosApp;
+const iosApp = new IOSApplication();
+exports.ios = iosApp;
+setApplication(iosApp);
 
-global.__onUncaughtError = function (error: NativeScriptError) {
-    var types: typeof typesModule = require("utils/types");
-
-    // TODO: This should be obsoleted
-    if (types.isFunction(typedExports.onUncaughtError)) {
-        typedExports.onUncaughtError(error);
-    }
-    
-    typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: typedExports.ios, ios: error, error });
-}
-
-function loadCss() {
-    //HACK: identical to application.ios.ts
-    typedExports.appSelectors = typedExports.loadCss(typedExports.cssFile) || [];
-    if (typedExports.appSelectors.length > 0) {
-        typedExports.mergeCssSelectors(typedExports);
-    }
-}
-
-export function setCssFileName(cssFileName: string) {
-    typedExports.cssFile = cssFileName;
-}
-
-export function addCss(cssText: string) {
-    //HACK: identical to application.android.ts
-    const parsed = typedExports.parseCss(cssText);
-    if (parsed) {
-        typedExports.additionalSelectors.push.apply(typedExports.additionalSelectors, parsed);
-        typedExports.mergeCssSelectors(typedExports);
-    }
-}
-
-function createRootView(v?) {
+function createRootView(v?: View) {
     let rootView = v;
     let frame: Frame;
-    let navParam: Object;
+    let main: string | NavigationEntry;
     if (!rootView) {
         // try to navigate to the mainEntry/Module (if specified)
-        navParam = typedExports.mainEntry;
-        if (!navParam) {
-            navParam = typedExports.mainModule;
-        }
-
-        if (navParam) {
+        main = exports.mainEntry || exports.mainModule;
+        if (main) {
             frame = new Frame();
-            frame.navigate(navParam);
+            frame.navigate(main);
         } else {
             // TODO: Throw an exception?
             throw new Error("A Frame must be used to navigate to a Page.");
@@ -272,39 +209,39 @@ function createRootView(v?) {
     return rootView;
 }
 
-var started: boolean = false;
-typedExports.start = function (entry?: NavigationEntry) {
+let started: boolean = false;
+exports.start = function (entry?: NavigationEntry) {
     if (entry) {
         exports.mainEntry = entry;
     }
 
-    loadCss();
-
-    if(!iosApp.nativeApp) {
+    if (!iosApp.nativeApp) {
         // Normal NativeScript app will need UIApplicationMain. 
-        UIApplicationMain(0, null, null, typedExports.ios && typedExports.ios.delegate ? NSStringFromClass(typedExports.ios.delegate) : NSStringFromClass(Responder));
+        UIApplicationMain(0, null, null, iosApp && iosApp.delegate ? NSStringFromClass(<any>iosApp.delegate) : NSStringFromClass(Responder));
     } else {
         let rootView = createRootView();
-        if(rootView) {
+        if (rootView) {
             // Attach to the existing iOS app
             var window = iosApp.nativeApp.keyWindow || (iosApp.nativeApp.windows.count > 0 && iosApp.nativeApp.windows[0]);
-            if(window) {
+            if (window) {
                 var rootController = window.rootViewController;
-                if(rootController) {
+                if (rootController) {
                     rootController.presentViewControllerAnimatedCompletion(rootView.ios.controller, true, null);
-                    uiUtils.ios._layoutRootView(rootView, utils.ios.getter(UIScreen, UIScreen.mainScreen).bounds);
+                    ios._layoutRootView(rootView, utils.ios.getter(UIScreen, UIScreen.mainScreen).bounds);
                 }
             }
         }
     }
 }
 
+export function getNativeApplication(): UIApplication {
+    return iosApp.nativeApp;
+}
+
 global.__onLiveSync = function () {
     if (!started) {
         return;
     }
 
-    common.__onLiveSync();
-
-    loadCss();
+    livesync();
 }
diff --git a/tns-core-modules/camera/Readme.md b/tns-core-modules/camera/Readme.md
deleted file mode 100644
index 670d2e842..000000000
--- a/tns-core-modules/camera/Readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated. Please use same functionality from `nativescript-camera` npm module.
diff --git a/tns-core-modules/camera/camera-common.ts b/tns-core-modules/camera/camera-common.ts
deleted file mode 100644
index 08addc5fb..000000000
--- a/tns-core-modules/camera/camera-common.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export function getAspectSafeDimensions(sourceWidth, sourceHeight, reqWidth, reqHeight) {
-    let widthCoef = sourceWidth / reqWidth;
-    let heightCoef = sourceHeight / reqHeight;
-
-    let aspectCoef = widthCoef > heightCoef ? widthCoef : heightCoef;
-
-    return {
-        width: Math.floor(sourceWidth / aspectCoef),
-        height: Math.floor(sourceHeight / aspectCoef)
-    };
-}
\ No newline at end of file
diff --git a/tns-core-modules/camera/camera.android.ts b/tns-core-modules/camera/camera.android.ts
deleted file mode 100644
index 05acb1f7b..000000000
--- a/tns-core-modules/camera/camera.android.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import * as typesModule from "utils/types";
-import * as utilsModule from "utils/utils";
-import * as applicationModule from "application";
-import * as imageSourceModule from "image-source";
-import * as cameraCommonModule from "./camera-common";
-import * as platform from "platform";
-
-var REQUEST_IMAGE_CAPTURE = 3453;
-
-/**
- * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
- */
-export var takePicture = function (options?): Promise<any> {
-    return new Promise((resolve, reject) => {
-        try {
-            let types: typeof typesModule = require("utils/types");
-            let utils: typeof utilsModule = require("utils/utils");
-            
-            let saveToGallery;
-            let reqWidth;
-            let reqHeight;
-            let shouldKeepAspectRatio;
-
-            let density = utils.layout.getDisplayDensity();
-            if (options) {
-                saveToGallery = options.saveToGallery ? true : false;
-                reqWidth = options.width ? options.width * density : 0;
-                reqHeight = options.height ? options.height * density : reqWidth;
-                shouldKeepAspectRatio = types.isNullOrUndefined(options.keepAspectRatio) ? true : options.keepAspectRatio;
-            }
-            let takePictureIntent = new android.content.Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
-            let dateStamp = createDateTimeStamp();
-            
-            let picturePath: string;
-            let nativeFile;
-            let tempPictureUri;
-
-            if (saveToGallery) {
-                picturePath = android.os.Environment.getExternalStoragePublicDirectory(
-                    android.os.Environment.DIRECTORY_PICTURES).getAbsolutePath() + "/" + "cameraPicture_" + dateStamp + ".jpg";
-                nativeFile = new java.io.File(picturePath);
-                tempPictureUri = android.net.Uri.fromFile(nativeFile);
-                takePictureIntent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, tempPictureUri);
-            } else {
-                picturePath = utils.ad.getApplicationContext().getExternalFilesDir(null).getAbsolutePath() + "/" + "cameraPicture_" + dateStamp + ".jpg";
-                nativeFile = new java.io.File(picturePath);
-                tempPictureUri = android.net.Uri.fromFile(nativeFile);
-                takePictureIntent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, tempPictureUri);
-            }
-
-            if (takePictureIntent.resolveActivity(utils.ad.getApplicationContext().getPackageManager()) != null) {
-
-                let appModule: typeof applicationModule = require("application");
-
-                let previousResult = appModule.android.onActivityResult;
-                appModule.android.onActivityResult = (requestCode: number, resultCode: number, data: android.content.Intent) => {
-                    appModule.android.onActivityResult = previousResult;
-
-                    if (requestCode === REQUEST_IMAGE_CAPTURE && resultCode === android.app.Activity.RESULT_OK) {
-                        let imageSource: typeof imageSourceModule = require("image-source");
-                        let options = new android.graphics.BitmapFactory.Options();
-                        options.inJustDecodeBounds = true;
-                        let bitmap = android.graphics.BitmapFactory.decodeFile(picturePath, options);
-
-                        let sampleSize = calculateInSampleSize(options.outWidth, options.outHeight, reqWidth, reqHeight);
-
-                        let finalBitmapOptions = new android.graphics.BitmapFactory.Options();
-                        finalBitmapOptions.inSampleSize = sampleSize;
-                        bitmap = android.graphics.BitmapFactory.decodeFile(picturePath, finalBitmapOptions);
-                        let scaledSizeImage = null;
-                        if (reqHeight > 0 && reqWidth > 0) {
-                            if (shouldKeepAspectRatio) {
-
-                                let common: typeof cameraCommonModule = require("./camera-common");
-
-                                let aspectSafeSize = common.getAspectSafeDimensions(bitmap.getWidth(), bitmap.getHeight(), reqWidth, reqHeight);
-                                scaledSizeImage = android.graphics.Bitmap.createScaledBitmap(bitmap, aspectSafeSize.width, aspectSafeSize.height, true);
-                            }
-                            else {
-                                scaledSizeImage = android.graphics.Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, true);
-                            }
-                        }
-                        else {
-                            scaledSizeImage = bitmap;
-                        }
-
-                        resolve(imageSource.fromNativeSource(scaledSizeImage));
-                    }
-                };
-
-                appModule.android.foregroundActivity.startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE);
-
-            }
-        } catch (e) {
-            if (reject) {
-                reject(e);
-            }
-        }
-    });
-}
-
-/**
- * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
- */
-export var isAvailable = function () {
-    var utils: typeof utilsModule = require("utils/utils");
-    
-    return utils.ad.getApplicationContext().getPackageManager().hasSystemFeature(android.content.pm.PackageManager.FEATURE_CAMERA)
-}
-
-var calculateInSampleSize = function (imageWidth, imageHeight, reqWidth, reqHeight) {
-    let sampleSize = 1;
-    let displayWidth = platform.screen.mainScreen.widthDIPs;
-    let displayHeigth = platform.screen.mainScreen.heightDIPs;
-    reqWidth = (reqWidth > 0 && reqWidth < displayWidth) ? reqWidth : displayWidth;
-    reqHeight = (reqHeight > 0 && reqHeight < displayHeigth) ? reqHeight : displayHeigth;
-    if (imageWidth > reqWidth && imageHeight > reqHeight) {
-        let halfWidth = imageWidth / 2;
-        let halfHeight = imageHeight / 2;
-        while ((halfWidth / sampleSize) > reqWidth && (halfHeight / sampleSize) > reqHeight) {
-            sampleSize *= 2;
-        }
-    }
-    return sampleSize;
-}
-
-var createDateTimeStamp = function () {
-    let result = "";
-    let date = new Date();
-    result = (date.getDate() < 10 ? "0" + date.getDate().toString() : date.getDate().toString()) +
-        ((date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1).toString() : (date.getMonth() + 1).toString()) +
-        date.getFullYear().toString() +
-        date.getHours().toString() +
-        date.getMinutes().toString() +
-        date.getSeconds().toString();
-    return result;
-}
diff --git a/tns-core-modules/camera/camera.d.ts b/tns-core-modules/camera/camera.d.ts
deleted file mode 100644
index 8c0f91413..000000000
--- a/tns-core-modules/camera/camera.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Allows you to take pictrues with the device's camera.
- */
-declare module "camera" {
-
-    import * as imageSource from "image-source";
-
-    /**
-     * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
-     */
-    export function takePicture(options?: CameraOptions): Promise<imageSource.ImageSource>;
-    
-    /**
-     * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
-     */
-    export function isAvailable(): Boolean;
-
-    /**
-     * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
-     */
-    export interface CameraOptions {
-        /**
-         * Defines the desired width (in device independent pixels) of the taken image. It should be used with height property.
-         * If `keepAspectRatio` actual image width could be different in order to keep the aspect ratio of the original camera image.
-         * The actual image width will be greater than requested if the display density of the device is higher (than 1) (full HD+ resolutions).
-         */
-        width?: number;
-
-        /**
-         * Defines the desired height (in device independent pixels) of the taken image. It should be used with width property.
-         * If `keepAspectRatio` actual image width could be different in order to keep the aspect ratio of the original camera image.
-         * The actual image height will be greater than requested if the display density of the device is higher (than 1) (full HD+ resolutions).
-         */
-        height?: number;
-
-        /**
-         * Defines if camera picture aspect ratio should be kept during picture resizing.
-         * This property could affect width or heigth return values.
-         */
-        keepAspectRatio?: boolean;
-        
-        /**
-         * Defines if camera picture should be copied to photo Gallery (Android) or Photos (iOS) 
-         */
-        saveToGallery?: boolean;
-    }
-}
diff --git a/tns-core-modules/camera/camera.ios.ts b/tns-core-modules/camera/camera.ios.ts
deleted file mode 100644
index acdd59d95..000000000
--- a/tns-core-modules/camera/camera.ios.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import * as types from "utils/types";
-import * as cameraCommonModule from "./camera-common";
-import * as imageSourceModule from "image-source";
-import * as frameModule from "ui/frame";
-
-@Deprecated
-class UIImagePickerControllerDelegateImpl extends NSObject implements UIImagePickerControllerDelegate {
-    public static ObjCProtocols = [UIImagePickerControllerDelegate];
-
-    static new(): UIImagePickerControllerDelegateImpl {
-        return <UIImagePickerControllerDelegateImpl>super.new();
-    }
-
-    private _callback: (result?) => void;
-
-    private _width: number;
-    private _height: number;
-    private _keepAspectRatio: boolean;
-    private _saveToGallery: boolean;
-
-    public initWithCallback(callback: (result?) => void): UIImagePickerControllerDelegateImpl {
-        this._callback = callback;
-        return this;
-    }
-
-    public initWithCallbackAndOptions(callback: (result?) => void, options?): UIImagePickerControllerDelegateImpl {
-        this._callback = callback;
-        if (options) {
-            this._width = options.width;
-            this._height = options.height;
-            this._saveToGallery = options.saveToGallery;
-            this._keepAspectRatio = types.isNullOrUndefined(options.keepAspectRatio) ? true : options.keepAspectRatio;
-        }
-        return this;
-    }
-
-    imagePickerControllerDidFinishPickingMediaWithInfo(picker, info): void {
-        if (info) {
-            let source = info.valueForKey(UIImagePickerControllerOriginalImage);
-            if (source) {
-                let image = null;
-                if (this._width || this._height) {
-                    let newSize = null;
-                    if (this._keepAspectRatio) {
-                        let common: typeof cameraCommonModule = require("./camera-common");
-
-                        let aspectSafeSize = common.getAspectSafeDimensions(source.size.width, source.size.height, this._width, this._height);
-                        newSize = CGSizeMake(aspectSafeSize.width, aspectSafeSize.height);
-                    }
-                    else {
-                        newSize = CGSizeMake(this._width, this._height);
-                    }
-                    UIGraphicsBeginImageContextWithOptions(newSize, false, 0.0);
-                    source.drawInRect(CGRectMake(0, 0, newSize.width, newSize.height));
-                    image = UIGraphicsGetImageFromCurrentImageContext();
-                    UIGraphicsEndImageContext();
-                }
-
-                let imageSource: typeof imageSourceModule = require("image-source");
-
-                let imageSourceResult = image ? imageSource.fromNativeSource(image) : imageSource.fromNativeSource(source);
-
-                if (this._callback) {
-                    this._callback(imageSourceResult);
-                    if (this._saveToGallery) {
-                        UIImageWriteToSavedPhotosAlbum(imageSourceResult.ios, null, null, null);
-                    }
-                }
-            }
-        }
-        picker.presentingViewController.dismissViewControllerAnimatedCompletion(true, null);
-        listener = null;
-    }
-
-    imagePickerControllerDidCancel(picker): void {
-        picker.presentingViewController.dismissViewControllerAnimatedCompletion(true, null);
-        listener = null;
-    }
-}
-
-var listener;
-
-/**
- * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
- */
-export var takePicture = function (options): Promise<any> {
-    return new Promise((resolve, reject) => {
-        listener = null;
-        let imagePickerController = UIImagePickerController.new();
-        let reqWidth = 0;
-        let reqHeight = 0;
-        let keepAspectRatio = true;
-        let saveToGallery = true;
-        if (options) {
-            reqWidth = options.width || 0;
-            reqHeight = options.height || reqWidth;
-            keepAspectRatio = types.isNullOrUndefined(options.keepAspectRatio) ? true : options.keepAspectRatio;
-            saveToGallery = options.saveToGallery ? true : false;
-        }
-        if (reqWidth && reqHeight) {
-            listener = UIImagePickerControllerDelegateImpl.new().initWithCallbackAndOptions(resolve, { width: reqWidth, height: reqHeight, keepAspectRatio: keepAspectRatio, saveToGallery: saveToGallery });
-        } else if (saveToGallery) {
-            listener = UIImagePickerControllerDelegateImpl.new().initWithCallbackAndOptions(resolve, { saveToGallery: saveToGallery });
-        }
-        else {
-            listener = UIImagePickerControllerDelegateImpl.new().initWithCallback(resolve);
-        }
-        imagePickerController.delegate = listener;
-
-        let sourceType = UIImagePickerControllerSourceType.Camera;
-        let mediaTypes = UIImagePickerController.availableMediaTypesForSourceType(sourceType);
-
-        if (mediaTypes) {
-            imagePickerController.mediaTypes = mediaTypes;
-            imagePickerController.sourceType = sourceType;
-        }
-
-        imagePickerController.modalPresentationStyle = UIModalPresentationStyle.CurrentContext;
-
-        let frame: typeof frameModule = require("ui/frame");
-
-        let topMostFrame = frame.topmost();
-        if (topMostFrame) {
-            let viewController: UIViewController = topMostFrame.currentPage && topMostFrame.currentPage.ios;
-            if (viewController) {
-                viewController.presentViewControllerAnimatedCompletion(imagePickerController, true, null);
-            }
-        }
-    });
-}
-
-/**
- * [Deprecated. Please use same functionality from `nativescript-camera` npm module]
- */
-export var isAvailable = function () {
-    return UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.Camera);
-}
diff --git a/tns-core-modules/camera/package.json b/tns-core-modules/camera/package.json
deleted file mode 100644
index 489de5472..000000000
--- a/tns-core-modules/camera/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ 
-	"name" : "camera",
-  	"main" : "camera",
-	"nativescript": {}
-}
-
diff --git a/tns-core-modules/connectivity/connectivity-common.ts b/tns-core-modules/connectivity/connectivity-common.ts
deleted file mode 100644
index 0bff17c1c..000000000
--- a/tns-core-modules/connectivity/connectivity-common.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export module connectionType {
-    export var none = 0;
-    export var wifi = 1;
-    export var mobile = 2;
-}
\ No newline at end of file
diff --git a/tns-core-modules/connectivity/connectivity.android.ts b/tns-core-modules/connectivity/connectivity.android.ts
index b01f30e09..3e47c5ca9 100644
--- a/tns-core-modules/connectivity/connectivity.android.ts
+++ b/tns-core-modules/connectivity/connectivity.android.ts
@@ -1,15 +1,17 @@
-import * as appModule from "application";
-import * as common from "./connectivity-common";
-import * as utils from "utils/utils";
+import { getNativeApplication, android as androidApp} from "application";
 
-global.moduleMerge(common, exports);
+export const enum connectionType {
+    none = 0,
+    wifi = 1,
+    mobile = 2,
+}
 
-let wifi = "wifi";
-let mobile = "mobile";
+const wifi = "wifi";
+const mobile = "mobile";
 
 // Get Connection Type
 function getConnectivityManager(): android.net.ConnectivityManager {
-    return utils.ad.getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
+    return getNativeApplication().getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
 }
 
 function getActiveNetworkInfo(): android.net.NetworkInfo {
@@ -24,19 +26,19 @@ function getActiveNetworkInfo(): android.net.NetworkInfo {
 export function getConnectionType(): number {
     let activeNetworkInfo = getActiveNetworkInfo();
     if (!activeNetworkInfo || !activeNetworkInfo.isConnected()) {
-        return common.connectionType.none;
+        return connectionType.none;
     }
 
-    let connectionType = activeNetworkInfo.getTypeName().toLowerCase();
-    if (connectionType.indexOf(wifi) !== -1){
-        return common.connectionType.wifi;
+    let type = activeNetworkInfo.getTypeName().toLowerCase();
+    if (type.indexOf(wifi) !== -1){
+        return connectionType.wifi;
     }
     
-    if (connectionType.indexOf(mobile) !== -1){
-        return common.connectionType.mobile;
+    if (type.indexOf(mobile) !== -1){
+        return connectionType.mobile;
     }
         
-    return common.connectionType.none;
+    return connectionType.none;
 }
 
 export function startMonitoring(connectionTypeChangedCallback: (newConnectionType: number) => void): void {
@@ -44,9 +46,9 @@ export function startMonitoring(connectionTypeChangedCallback: (newConnectionTyp
         let newConnectionType = getConnectionType();
         connectionTypeChangedCallback(newConnectionType);
     }
-    appModule.android.registerBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION, onReceiveCallback);
+    androidApp.registerBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION, onReceiveCallback);
 }
 
 export function stopMonitoring(): void {
-    appModule.android.unregisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION);
+    androidApp.unregisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION);
 }
diff --git a/tns-core-modules/connectivity/connectivity.d.ts b/tns-core-modules/connectivity/connectivity.d.ts
index 6481d45ad..2aead76e7 100644
--- a/tns-core-modules/connectivity/connectivity.d.ts
+++ b/tns-core-modules/connectivity/connectivity.d.ts
@@ -12,21 +12,21 @@ declare module "connectivity" {
     /**
      * Defines the different connection types.
      */
-    export module connectionType {
+    export const enum connectionType {
         /**
          * Denotes no connection.
          */
-        export var none: number;
+        none = 0,
 
         /**
          * Denotes a WiFi connection.
          */
-        export var wifi: number;
+        wifi = 1,
 
         /**
          * Denotes a mobile connection, i.e. cellular network or WAN
          */
-        export var mobile: number;
+        mobile = 2
     }
 
     /**
diff --git a/tns-core-modules/connectivity/connectivity.ios.ts b/tns-core-modules/connectivity/connectivity.ios.ts
index 7703fe16a..64ab7d0e1 100644
--- a/tns-core-modules/connectivity/connectivity.ios.ts
+++ b/tns-core-modules/connectivity/connectivity.ios.ts
@@ -1,15 +1,16 @@
-import * as common from "./connectivity-common";
-
-global.moduleMerge(common, exports);
+export const enum connectionType {
+    none = 0,
+    wifi = 1,
+    mobile = 2,
+}
 
 // Get Connection Type
-declare var sockaddr;
+declare const sockaddr;
 function _createReachability(host?: string): any {
     if (host) {
         return SCNetworkReachabilityCreateWithName(null, host);
-    }
-    else {
-        var zeroAddress = new interop.Reference<sockaddr>(sockaddr, {
+    } else {
+        const zeroAddress = new interop.Reference<sockaddr>(sockaddr, {
             sa_len: 16,
             sa_family: 2
         });
@@ -18,9 +19,9 @@ function _createReachability(host?: string): any {
 }
 
 function _getReachabilityFlags(host?: string): number {
-    var reachability = _createReachability(host);
-    var flagsRef = new interop.Reference<number>();
-    var gotFlags = SCNetworkReachabilityGetFlags(reachability, flagsRef);
+    const reachability = _createReachability(host);
+    const flagsRef = new interop.Reference<number>();
+    const gotFlags = SCNetworkReachabilityGetFlags(reachability, flagsRef);
     if (!gotFlags) {
         return null;
     }
@@ -28,27 +29,27 @@ function _getReachabilityFlags(host?: string): number {
 }
 
 function _getConnectionType(host?: string): number {
-    var flags = _getReachabilityFlags(host);
+    const flags = _getReachabilityFlags(host);
     return _getConnectionTypeFromFlags(flags);
 }
 
 function _getConnectionTypeFromFlags(flags: number): number {
     if (!flags) {
-        return common.connectionType.none;
+        return connectionType.none;
     }
 
-    var isReachable = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsReachable;
-    var connectionRequired = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsConnectionRequired;
+    const isReachable = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsReachable;
+    const connectionRequired = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsConnectionRequired;
     if (!isReachable || connectionRequired) {
-        return common.connectionType.none;
+        return connectionType.none;
     }
 
-    var isWWAN = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsIsWWAN;
+    const isWWAN = flags & SCNetworkReachabilityFlags.kSCNetworkReachabilityFlagsIsWWAN;
     if (isWWAN) {
-        return common.connectionType.mobile;
+        return connectionType.mobile;
     }
 
-    return common.connectionType.wifi;
+    return connectionType.wifi;
 }
 
 export function getConnectionType(): number {
@@ -58,14 +59,15 @@ export function getConnectionType(): number {
 // Start/Stop Monitoring
 function _reachabilityCallback(target: any, flags: number, info: any) {
     if (_connectionTypeChangedCallback) {
-        var newConnectionType = _getConnectionTypeFromFlags(flags);
+        const newConnectionType = _getConnectionTypeFromFlags(flags);
         _connectionTypeChangedCallback(newConnectionType);
     }
 }
-var _reachabilityCallbackFunctionRef = new interop.FunctionReference(_reachabilityCallback)
 
-var _monitorReachabilityRef: any;
-var _connectionTypeChangedCallback: (newConnectionType: number) => void;
+const _reachabilityCallbackFunctionRef = new interop.FunctionReference(_reachabilityCallback);
+
+let _monitorReachabilityRef: any;
+let _connectionTypeChangedCallback: (newConnectionType: number) => void;
 
 export function startMonitoring(connectionTypeChangedCallback: (newConnectionType: number) => void): void {
     if (!_monitorReachabilityRef) {
@@ -82,4 +84,4 @@ export function stopMonitoring(): void {
         _monitorReachabilityRef = undefined;
         _connectionTypeChangedCallback = undefined;
     }
-}
+}
\ No newline at end of file
diff --git a/tns-core-modules/console/Readme.md b/tns-core-modules/console/Readme.md
index c051eb598..65d192516 100644
--- a/tns-core-modules/console/Readme.md
+++ b/tns-core-modules/console/Readme.md
@@ -13,7 +13,5 @@ console.assert((2 == 1), 'assertion failed:', 'error');
 console.warn('calling trace');
 console.trace();
 
-console.dump(console);
-
 console.timeEnd('test');
 ```
\ No newline at end of file
diff --git a/tns-core-modules/console/console.ts b/tns-core-modules/console/console.ts
index 1f66cded6..2557710be 100644
--- a/tns-core-modules/console/console.ts
+++ b/tns-core-modules/console/console.ts
@@ -1,5 +1,9 @@
-import * as trace from "trace";
-import * as platform from "platform";
+const enum MessageType {
+    log = 0,
+    info = 1,
+    warn = 2,
+    error = 3
+}
 
 function __message(message: any, level: string) {
     if ((<any>global).__consoleMessage) {
@@ -254,64 +258,63 @@ export class Console {
         if (!test) {
             Array.prototype.shift.apply(arguments);
             let formatedMessage = this.formatParams.apply(this, arguments);
-            this.error(formatedMessage, trace.messageType.error);
+            this.error(formatedMessage, MessageType.error);
             __message(formatedMessage, "error");
         }
     }
 
     public info(message: any, ...formatParams: any[]): void {
-        this.logMessage(this.formatParams.apply(this, arguments), trace.messageType.info);
+        this.logMessage(this.formatParams.apply(this, arguments), MessageType.info);
     }
 
     public warn(message: any, ...formatParams: any[]): void {
         let formatedMessage = this.formatParams.apply(this, arguments);
-        this.logMessage(formatedMessage, trace.messageType.warn);
+        this.logMessage(formatedMessage, MessageType.warn);
         __message(formatedMessage, "warning");
     }
 
     public error(message: any, ...formatParams: any[]): void {
         let formatedMessage = this.formatParams.apply(this, arguments);
-        this.logMessage(formatedMessage, trace.messageType.error);
+        this.logMessage(formatedMessage, MessageType.error);
         __message(formatedMessage, "error");
     }
 
     public log(message: any, ...formatParams: any[]): void {
         let formatedMessage = this.formatParams.apply(this, arguments);
-        this.logMessage(formatedMessage, trace.messageType.log);
+        this.logMessage(formatedMessage, MessageType.log);
         __message(formatedMessage, "log");
     }
 
-    private logMessage(message: string, messageType: number): void {
+    private logMessage(message: string, messageType: MessageType): void {
         if (!(<any>global).android) {
             // This case may be entered during heap snapshot where the global.android is not present
             return;
         }
 
-        var arrayToLog = [];
+        const arrayToLog = [];
         if (message.length > 4000) {
-            var i;
-            for (i = 0; i * 4000 < message.length; i++) {
+            for (let i = 0; i * 4000 < message.length; i++) {
                 arrayToLog.push(message.substr((i * 4000), 4000));
             }
         }
         else {
             arrayToLog.push(message);
         }
-        for (i = 0; i < arrayToLog.length; i++) {
+        for (let i = 0; i < arrayToLog.length; i++) {
             switch (messageType) {
-                case trace.messageType.log: {
+                case MessageType.log: {
                     android.util.Log.v(this.TAG, arrayToLog[i]);
                     break;
                 }
-                case trace.messageType.warn: {
+                case MessageType.warn: {
                     android.util.Log.w(this.TAG, arrayToLog[i]);
                     break;
                 }
-                case trace.messageType.error: {
+                case MessageType.error: {
                     android.util.Log.e(this.TAG, arrayToLog[i]);
                     break;
                 }
-                case trace.messageType.info: {
+                case MessageType.info: {
                     android.util.Log.i(this.TAG, arrayToLog[i]);
                     break;
                 }
@@ -374,15 +377,8 @@ export class Console {
         return result.join('');
     }
 
-    public dump(obj: any): void {
-        var dump = this.createDump(obj);
-
-        if (platform.device.os === platform.platformNames.android) {
-            this.log(dump);
-        } else if (platform.device.os === platform.platformNames.ios) {
-            console.log(dump);
-        }
+    public dir(obj: any): void {
+        const dump = this.createDump(obj);
+        this.log(dump);
     }
-
-    public dir = this.dump;
 }
diff --git a/tns-core-modules/debugger/webinspector.ios.ts b/tns-core-modules/debugger/webinspector.ios.ts
index 770f546e8..47fcf8045 100644
--- a/tns-core-modules/debugger/webinspector.ios.ts
+++ b/tns-core-modules/debugger/webinspector.ios.ts
@@ -58,6 +58,12 @@ export class Request {
 
     set mimeType(value: string) {
         if (this._mimeType !== value) {
+            if (!value) {
+                this._mimeType = "text/plain";
+                this._resourceType = "Other";
+                return;
+            }
+            
             this._mimeType = value;
 
             var resourceType = "Other";
diff --git a/tns-core-modules/declarations.d.ts b/tns-core-modules/declarations.d.ts
index 325f386a0..5627ff435 100644
--- a/tns-core-modules/declarations.d.ts
+++ b/tns-core-modules/declarations.d.ts
@@ -98,25 +98,16 @@ declare type RequestInfo = Request|string;
 
 declare function fetch(url: string, init?: RequestInit): Promise<Response>;
 
-/**
- * Allows printing messages to the device's console. 
- */
-interface Console {
-    /**
-     * Prints the current stack trace in the console.
-     */
-    trace(): void;
-
-    /**
-     * Prints the state of the specified object to the console.
-     * @param obj The object instance to be dumped.
-     */
-    dump(obj: any): void;
-}
-
 declare var console: Console;
 declare var require: NodeRequire;
 
+declare var __dirname: string;
+declare var __filename: string;
+
+declare var module: NodeModule;
+// Same as module.exports
+declare var exports: any;
+
 // Global functions
 declare function Deprecated(target: Object, key?: string | symbol, value?: any): void;
 declare function Experimental(target: Object, key?: string | symbol, value?: any): void;
@@ -144,9 +135,6 @@ declare function Log(data: any): void;
 declare function log(data: any): void;
 declare function fail(data: any): void;
 
-declare var __dirname: string;
-declare var __filename: string;
-
 /**
  * Calls a function after a specified delay.
  * @param callback The function to be called.
@@ -181,10 +169,6 @@ declare class WeakRef<T> {
     clear(): void;
 }
 
-declare var module: NodeModule;
-// Same as module.exports
-declare var exports: any;
-
 interface Array<T> {
     filter<U extends T>(pred: (a: T) => a is U): U[];
 }
diff --git a/tns-core-modules/file-system/file-name-resolver.ts b/tns-core-modules/file-system/file-name-resolver.ts
index f821b77cc..d4a7db1ad 100644
--- a/tns-core-modules/file-system/file-name-resolver.ts
+++ b/tns-core-modules/file-system/file-name-resolver.ts
@@ -1,36 +1,35 @@
-import * as definition from "file-system/file-name-resolver";
-import * as fs from "file-system";
-import * as types from "utils/types";
+import { PlatformContext, FileNameResolver as FileNameResolverDefinition } from "file-system/file-name-resolver";
+import { screen, device } from "platform";
+import { path as fsPath, Folder, File } from "file-system";
 import * as trace from "trace";
-import * as platform from "platform";
+import * as appModule from "application";
 
 declare module "file-system/file-name-resolver" {
     export function _findFileMatch(path: string, ext: string, candidates: Array<string>, context: PlatformContext): string
-    export function _invalidateResolverInstance(): void;
 }
 
-var MIN_WH: string = "minWH";
-var MIN_W: string = "minW";
-var MIN_H: string = "minH";
-var PRIORITY_STEP = 10000;
+const MIN_WH: string = "minWH";
+const MIN_W: string = "minW";
+const MIN_H: string = "minH";
+const PRIORITY_STEP = 10000;
 
 interface QualifierSpec {
     isMatch(value: string): boolean;
-    getMatchValue(value: string, context: definition.PlatformContext): number;
+    getMatchValue(value: string, context: PlatformContext): number;
 }
 
-var minWidthHeightQualifier: QualifierSpec = {
+const minWidthHeightQualifier: QualifierSpec = {
     isMatch: function (value: string): boolean {
         return value.indexOf(MIN_WH) === 0;
 
     },
-    getMatchValue(value: string, context: definition.PlatformContext): number {
-        var numVal = parseInt(value.substr(MIN_WH.length));
+    getMatchValue(value: string, context: PlatformContext): number {
+        const numVal = parseInt(value.substr(MIN_WH.length));
         if (isNaN(numVal)) {
             return -1;
         }
 
-        var actualLength = Math.min(context.width, context.height);
+        const actualLength = Math.min(context.width, context.height);
         if (actualLength < numVal) {
             return -1;
         }
@@ -39,18 +38,18 @@ var minWidthHeightQualifier: QualifierSpec = {
     }
 }
 
-var minWidthQualifier: QualifierSpec = {
+const minWidthQualifier: QualifierSpec = {
     isMatch: function (value: string): boolean {
         return value.indexOf(MIN_W) === 0 && value.indexOf(MIN_WH) < 0;
 
     },
-    getMatchValue(value: string, context: definition.PlatformContext): number {
-        var numVal = parseInt(value.substr(MIN_W.length));
+    getMatchValue(value: string, context: PlatformContext): number {
+        const numVal = parseInt(value.substr(MIN_W.length));
         if (isNaN(numVal)) {
             return -1;
         }
 
-        var actualWidth = context.width;
+        const actualWidth = context.width;
         if (actualWidth < numVal) {
             return -1;
         }
@@ -59,18 +58,18 @@ var minWidthQualifier: QualifierSpec = {
     }
 }
 
-var minHeightQualifier: QualifierSpec = {
+const minHeightQualifier: QualifierSpec = {
     isMatch: function (value: string): boolean {
         return value.indexOf(MIN_H) === 0 && value.indexOf(MIN_WH) < 0;
 
     },
-    getMatchValue(value: string, context: definition.PlatformContext): number {
-        var numVal = parseInt(value.substr(MIN_H.length));
+    getMatchValue(value: string, context: PlatformContext): number {
+        const numVal = parseInt(value.substr(MIN_H.length));
         if (isNaN(numVal)) {
             return -1;
         }
 
-        var actualHeight = context.height;
+        const actualHeight = context.height;
         if (actualHeight < numVal) {
             return -1;
         }
@@ -79,31 +78,31 @@ var minHeightQualifier: QualifierSpec = {
     }
 }
 
-var platformQualifier: QualifierSpec = {
+const platformQualifier: QualifierSpec = {
     isMatch: function (value: string): boolean {
         return value === "android" ||
             value === "ios";
 
     },
-    getMatchValue(value: string, context: definition.PlatformContext): number {
+    getMatchValue(value: string, context: PlatformContext): number {
         return value === context.os.toLowerCase() ? 1 : -1;
     }
 }
 
-var orientationQualifier: QualifierSpec = {
+const orientationQualifier: QualifierSpec = {
     isMatch: function (value: string): boolean {
         return value === "land" ||
             value === "port";
 
     },
-    getMatchValue(value: string, context: definition.PlatformContext): number {
-        var isLandscape: number = (context.width > context.height) ? 1 : -1;
+    getMatchValue(value: string, context: PlatformContext): number {
+        const isLandscape: number = (context.width > context.height) ? 1 : -1;
         return (value === "land") ? isLandscape : -isLandscape;
     }
 }
 
 // List of supported qualifiers ordered by priority
-var supportedQualifiers: Array<QualifierSpec> = [
+const supportedQualifiers: Array<QualifierSpec> = [
     minWidthHeightQualifier,
     minWidthQualifier,
     minHeightQualifier,
@@ -111,18 +110,18 @@ var supportedQualifiers: Array<QualifierSpec> = [
     platformQualifier
 ];
 
-export class FileNameResolver implements definition.FileNameResolver {
-    private _context: definition.PlatformContext;
+export class FileNameResolver implements FileNameResolverDefinition {
+    private _context: PlatformContext;
     private _cache = {};
 
-    constructor(context: definition.PlatformContext) {
+    constructor(context: PlatformContext) {
         this._context = context;
     }
 
     public resolveFileName(path: string, ext: string): string {
-        var key = path + ext;
-        var result: string = this._cache[key];
-        if (types.isUndefined(result)) {
+        const key = path + ext;
+        let result: string = this._cache[key];
+        if (result === undefined) {
             result = this.resolveFileNameImpl(path, ext);
             this._cache[key] = result;
         }
@@ -135,25 +134,25 @@ export class FileNameResolver implements definition.FileNameResolver {
     }
 
     private resolveFileNameImpl(path: string, ext: string): string {
-        var result: string = null;
-        path = fs.path.normalize(path);
+        let result: string = null;
+        path = fsPath.normalize(path);
         ext = "." + ext;
 
-        var candidates = this.getFileCandidatesFromFolder(path, ext);
+        const candidates = this.getFileCandidatesFromFolder(path, ext);
         result = _findFileMatch(path, ext, candidates, this._context);
 
         return result;
     }
 
     private getFileCandidatesFromFolder(path: string, ext: string): Array<string> {
-        var candidates = new Array<string>();
-        var folderPath = path.substring(0, path.lastIndexOf(fs.path.separator) + 1);
+        const candidates = new Array<string>();
+        const folderPath = path.substring(0, path.lastIndexOf(fsPath.separator) + 1);
 
-        if (fs.Folder.exists(folderPath)) {
-            var folder = fs.Folder.fromPath(folderPath);
+        if (Folder.exists(folderPath)) {
+            const folder = Folder.fromPath(folderPath);
             folder.eachEntity((e) => {
-                if (e instanceof fs.File) {
-                    var file = <fs.File>e;
+                if (e instanceof File) {
+                    const file = e;
                     if (file.path.indexOf(path) === 0 && file.extension === ext) {
                         candidates.push(file.path);
                     }
@@ -172,17 +171,17 @@ export class FileNameResolver implements definition.FileNameResolver {
     }
 }
 
-export function _findFileMatch(path: string, ext: string, candidates: Array<string>, context: definition.PlatformContext): string {
-    var bestValue = -1
-    var result: string = null;
+export function _findFileMatch(path: string, ext: string, candidates: Array<string>, context: PlatformContext): string {
+    let bestValue = -1
+    let result: string = null;
 
-    for (var i = 0; i < candidates.length; i++) {
-        var filePath = candidates[i];
-        var qualifiersStr: string = filePath.substr(path.length, filePath.length - path.length - ext.length);
+    for (let i = 0; i < candidates.length; i++) {
+        const filePath = candidates[i];
+        const qualifiersStr: string = filePath.substr(path.length, filePath.length - path.length - ext.length);
 
-        var qualifiers = qualifiersStr.split(".");
+        const qualifiers = qualifiersStr.split(".");
 
-        var value = checkQualifiers(qualifiers, context);
+        const value = checkQualifiers(qualifiers, context);
 
         if (value >= 0 && value > bestValue) {
             bestValue = value;
@@ -193,8 +192,8 @@ export function _findFileMatch(path: string, ext: string, candidates: Array<stri
     return result;
 }
 
-function checkQualifiers(qualifiers: Array<string>, context: definition.PlatformContext): number {
-    var result = 0;
+function checkQualifiers(qualifiers: Array<string>, context: PlatformContext): number {
+    let result = 0;
     for (var i = 0; i < qualifiers.length; i++) {
         if (qualifiers[i]) {
             var value = checkQualifier(qualifiers[i], context);
@@ -210,8 +209,8 @@ function checkQualifiers(qualifiers: Array<string>, context: definition.Platform
     return result;
 }
 
-function checkQualifier(value: string, context: definition.PlatformContext) {
-    for (var i = 0; i < supportedQualifiers.length; i++) {
+function checkQualifier(value: string, context: PlatformContext) {
+for (var i = 0; i < supportedQualifiers.length; i++) {
         if (supportedQualifiers[i].isMatch(value)) {
             var result = supportedQualifiers[i].getMatchValue(value, context);
             if (result > 0) {
@@ -224,27 +223,20 @@ function checkQualifier(value: string, context: definition.PlatformContext) {
     return -1;
 }
 
-var resolverInstance: FileNameResolver;
+let resolverInstance: FileNameResolver;
 
 export function resolveFileName(path: string, ext: string): string {
     if (!resolverInstance) {
         resolverInstance = new FileNameResolver({
-            width: platform.screen.mainScreen.widthDIPs,
-            height: platform.screen.mainScreen.heightDIPs,
-            os: platform.device.os,
-            deviceType: platform.device.deviceType
+            width: screen.mainScreen.widthDIPs,
+            height: screen.mainScreen.heightDIPs,
+            os: device.os,
+            deviceType: device.deviceType
         });
     }
 
     return resolverInstance.resolveFileName(path, ext);
 }
 
-export function clearCache(): void {
-    if (resolverInstance) {
-        resolverInstance.clearCache();
-    }
-}
-
-export function _invalidateResolverInstance(): void {
-    resolverInstance = undefined;
-}
\ No newline at end of file
+appModule.on("cssChanged", args => resolverInstance = undefined);
+appModule.on("livesync", args => resolverInstance && resolverInstance.clearCache());
\ No newline at end of file
diff --git a/tns-core-modules/file-system/file-system-access.android.ts b/tns-core-modules/file-system/file-system-access.android.ts
index 56332f303..b6861ac44 100644
--- a/tns-core-modules/file-system/file-system-access.android.ts
+++ b/tns-core-modules/file-system/file-system-access.android.ts
@@ -1,6 +1,14 @@
 import * as textModule from "text";
-import * as utils from "utils/utils";
-import * as typesModule from "utils/types";
+import { getNativeApplication } from "application";
+
+let applicationContext: android.content.Context;
+function getApplicationContext() {
+    if (!applicationContext) {
+        applicationContext = (<android.app.Application>getNativeApplication()).getApplicationContext();
+    }
+
+    return applicationContext;
+}
 
 export class FileSystemAccess {
     private _pathSeparator = "/";
@@ -179,17 +187,17 @@ export class FileSystemAccess {
     }
 
     public getDocumentsFolderPath(): string {
-        var dir = utils.ad.getApplicationContext().getFilesDir();
+        var dir = getApplicationContext().getFilesDir();
         return dir.getAbsolutePath();
     }
 
     public getLogicalRootPath(): string {
-        var dir = utils.ad.getApplicationContext().getFilesDir();
+        var dir = getApplicationContext().getFilesDir();
         return dir.getCanonicalPath();
     }
 
     public getTempFolderPath(): string {
-        var dir = utils.ad.getApplicationContext().getCacheDir();
+        var dir = getApplicationContext().getCacheDir();
         return dir.getAbsolutePath();
     }
 
@@ -227,8 +235,6 @@ export class FileSystemAccess {
 
     public readText(path: string, onError?: (error: any) => any, encoding?: any) {
         try {
-            var types: typeof typesModule = require("utils/types");
-
             var javaFile = new java.io.File(path);
             var stream = new java.io.FileInputStream(javaFile);
 
@@ -245,7 +251,7 @@ export class FileSystemAccess {
             var result = "";
             while (true) {
                 line = bufferedReader.readLine();
-                if (types.isNullOrUndefined(line)) {
+                if (line === null) {
                     break;
                 }
 
diff --git a/tns-core-modules/globals/globals.ts b/tns-core-modules/globals/globals.ts
index 71a8bdcc8..69e766317 100644
--- a/tns-core-modules/globals/globals.ts
+++ b/tns-core-modules/globals/globals.ts
@@ -121,15 +121,9 @@ if ((<any>global).__snapshot) {
     registerOnGlobalContext("fetch", "fetch");
 }
 
-import * as platform from "platform";
-
-let consoleModule = require("console");
-var c = new consoleModule.Console();
-
-if (platform.device.os === platform.platformNames.android) {
-    (<any>global).console = c;
-} else if (platform.device.os === platform.platformNames.ios) {
-    (<any>global).console.dump = function (args) { c.dump(args); };
+if (!(<any>global).console) {
+    const consoleModule = require("console");
+    (<any>global).console = new consoleModule.Console();
 }
 
 export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) {
diff --git a/tns-core-modules/http/http-request.android.ts b/tns-core-modules/http/http-request.android.ts
index 79a3b5914..7235ab1fa 100644
--- a/tns-core-modules/http/http-request.android.ts
+++ b/tns-core-modules/http/http-request.android.ts
@@ -1,8 +1,6 @@
 /**
  * Android specific http request implementation.
  */
-import * as types from "utils/types";
-import * as utilsModule from "utils/utils";
 import * as imageSourceModule from "image-source";
 import * as platformModule from "platform";
 import * as fsModule from "file-system";
@@ -10,16 +8,18 @@ import * as fsModule from "file-system";
 // this is imported for definition purposes only
 import * as http from "http";
 
+function parseJSON(source: string): any {
+    var src = source.trim();
+    if (src.lastIndexOf(")") === src.length - 1) {
+        return JSON.parse(src.substring(src.indexOf("(") + 1, src.lastIndexOf(")")));
+    }
+
+    return JSON.parse(src);
+}
+
 var requestIdCounter = 0;
 var pendingRequests = {};
 
-var utils: typeof utilsModule;
-function ensureUtils() {
-    if (!utils) {
-        utils = require("utils/utils");
-    }
-}
-
 var imageSource: typeof imageSourceModule;
 function ensureImageSource() {
     if (!imageSource) {
@@ -81,21 +81,20 @@ function onRequestComplete(requestId: number, result: org.nativescript.widgets.A
                 } else {
                     str = result.responseAsString;
                 }
-                if (types.isString(str)) {
+                if (typeof str === "string") {
                     return str;
                 } else {
                     throw new Error("Response content may not be converted to string");
                 }
             },
             toJSON: (encoding?: http.HttpResponseEncoding) => {
-                ensureUtils();
                 let str: string;
                 if (encoding) {
                     str = decodeResponse(result.raw, encoding);
                 } else {
                     str = result.responseAsString;
                 }
-                return utils.parseJSON(str);
+                return parseJSON(str);
             },
             toImage: () => {
                 ensureImageSource();
@@ -138,7 +137,7 @@ function onRequestComplete(requestId: number, result: org.nativescript.widgets.A
 }
 
 function buildJavaOptions(options: http.HttpRequestOptions) {
-    if (!types.isString(options.url)) {
+    if (typeof options.url !== "string") {
         throw new Error("Http request must provide a valid url.");
     }
 
@@ -146,16 +145,16 @@ function buildJavaOptions(options: http.HttpRequestOptions) {
 
     javaOptions.url = options.url;
 
-    if (types.isString(options.method)) {
+    if (typeof options.method === "string") {
         javaOptions.method = options.method;
     }
-    if (types.isString(options.content) || options.content instanceof FormData) {
+    if (typeof options.content === "string" || options.content instanceof FormData) {
         javaOptions.content = options.content.toString();
     }
-    if (types.isNumber(options.timeout)) {
+    if (typeof options.timeout === "number") {
         javaOptions.timeout = options.timeout;
     }
-    if (types.isBoolean(options.dontFollowRedirects)) {
+    if (typeof options.dontFollowRedirects === "boolean") {
         javaOptions.dontFollowRedirects = options.dontFollowRedirects;
     }
 
@@ -181,7 +180,7 @@ function buildJavaOptions(options: http.HttpRequestOptions) {
 }
 
 export function request(options: http.HttpRequestOptions): Promise<http.HttpResponse> {
-    if (!types.isDefined(options)) {
+    if (options === undefined || options === null) {
         // TODO: Shouldn't we throw an error here - defensive programming
         return;
     }
diff --git a/tns-core-modules/http/http-request.ios.ts b/tns-core-modules/http/http-request.ios.ts
index e4c47e91c..37e6ec227 100644
--- a/tns-core-modules/http/http-request.ios.ts
+++ b/tns-core-modules/http/http-request.ios.ts
@@ -21,6 +21,15 @@ var USER_AGENT = `Mozilla/5.0 (i${device}; CPU OS 6_0 like Mac OS X) AppleWebKit
 var sessionConfig = getter(NSURLSessionConfiguration, NSURLSessionConfiguration.defaultSessionConfiguration);
 var queue = getter(NSOperationQueue, NSOperationQueue.mainQueue);
 
+function parseJSON(source: string): any {
+    var src = source.trim();
+    if (src.lastIndexOf(")") === src.length - 1) {
+        return JSON.parse(src.substring(src.indexOf("(") + 1, src.lastIndexOf(")")));
+    }
+
+    return JSON.parse(src);
+}
+
 class NSURLSessionTaskDelegateImpl extends NSObject implements NSURLSessionTaskDelegate {
     public static ObjCProtocols = [NSURLSessionTaskDelegate];
     public URLSessionTaskWillPerformHTTPRedirectionNewRequestCompletionHandler(session: NSURLSession, task: NSURLSessionTask, response: NSHTTPURLResponse, request: NSURLRequest, completionHandler: (p1: NSURLRequest) => void): void {
@@ -121,7 +130,7 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
                                 raw: data,
                                 toString: (encoding?: http.HttpResponseEncoding) => { return NSDataToString(data, encoding); },
                                 toJSON: (encoding?: http.HttpResponseEncoding) => {
-                                    return utils.parseJSON(NSDataToString(data, encoding));
+                                    return parseJSON(NSDataToString(data, encoding));
                                 },
                                 toImage: () => {
                                     ensureImageSource();
diff --git a/tns-core-modules/image-source/image-source.android.ts b/tns-core-modules/image-source/image-source.android.ts
index 7cb1ca44b..6eaa0c7f4 100644
--- a/tns-core-modules/image-source/image-source.android.ts
+++ b/tns-core-modules/image-source/image-source.android.ts
@@ -1,40 +1,35 @@
-import * as types from "utils/types";
-import * as definition from "image-source";
-import * as common from "./image-source-common";
-import * as utilsModule from "utils/utils";
-import * as fileSystemModule from "file-system";
-import * as enumsModule from "ui/enums";
+import { ImageSource as ImageSourceDeifinition } from "image-source";
+
+export * from "./image-source-common";
+import * as fs from "file-system";
 import * as imageAssetModule from "image-asset";
 
-global.moduleMerge(common, exports);
+import { getNativeApplication } from "application";
 
-var utils: typeof utilsModule;
-function ensureUtils() {
-    if (!utils) {
-        utils = require("utils/utils");
+let application: android.app.Application;
+let resources: android.content.res.Resources;
+
+function getApplication() {
+    if (!application) {
+        application = (<android.app.Application>getNativeApplication());
     }
+
+    return application;
+}
+function getResources() {
+    if (!resources) {
+        resources = getApplication().getResources();
+    }
+
+    return resources;
 }
 
-var fs: typeof fileSystemModule;
-function ensureFS() {
-    if (!fs) {
-        fs = require("file-system");
-    }
-}
-
-var enums: typeof enumsModule;
-function ensureEnums() {
-    if (!enums) {
-        enums = require("ui/enums");
-    }
-}
-
-export class ImageSource implements definition.ImageSource {
+export class ImageSource implements ImageSourceDeifinition {
     public android: android.graphics.Bitmap;
     public ios: UIImage;
 
-    public fromAsset(asset: imageAssetModule.ImageAsset): Promise<definition.ImageSource> {
-        return new Promise<definition.ImageSource>((resolve, reject) => {
+    public fromAsset(asset: imageAssetModule.ImageAsset): Promise<ImageSource> {
+        return new Promise<ImageSource>((resolve, reject) => {
             asset.getImageAsync((image, err) => {
                 if (image) {
                     this.setRotationAngleFromFile(asset.android);
@@ -50,15 +45,12 @@ export class ImageSource implements definition.ImageSource {
 
     public loadFromResource(name: string): boolean {
         this.android = null;
-
-        ensureUtils();
-
-        var res = utils.ad.getApplicationContext().getResources();
+        const res = getResources();
         if (res) {
-            var identifier: number = res.getIdentifier(name, 'drawable', utils.ad.getApplication().getPackageName());
+            const identifier: number = res.getIdentifier(name, 'drawable', getApplication().getPackageName());
             if (0 < identifier) {
                 // Load BitmapDrawable with getDrawable to make use of Android internal caching
-                var bitmapDrawable = <android.graphics.drawable.BitmapDrawable>res.getDrawable(identifier);
+                const bitmapDrawable = <android.graphics.drawable.BitmapDrawable>res.getDrawable(identifier);
                 if (bitmapDrawable && bitmapDrawable.getBitmap) {
                     this.android = bitmapDrawable.getBitmap();
                 }
@@ -76,8 +68,8 @@ export class ImageSource implements definition.ImageSource {
 
     private setRotationAngleFromFile(filename: string) {
         this.rotationAngle = 0;
-        let ei = new android.media.ExifInterface(filename);
-        let orientation = ei.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, android.media.ExifInterface.ORIENTATION_NORMAL);
+        const ei = new android.media.ExifInterface(filename);
+        const orientation = ei.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, android.media.ExifInterface.ORIENTATION_NORMAL);
 
         switch (orientation) {
             case android.media.ExifInterface.ORIENTATION_ROTATE_90:
@@ -93,9 +85,7 @@ export class ImageSource implements definition.ImageSource {
     }
 
     public loadFromFile(path: string): boolean {
-        ensureFS();
-
-        var fileName = types.isString(path) ? path.trim() : "";
+        let fileName = typeof path === "string" ? path.trim() : "";
         if (fileName.indexOf("~/") === 0) {
             fileName = fs.path.join(fs.knownFolders.currentApp().path, fileName.replace("~/", ""));
         }
@@ -124,8 +114,8 @@ export class ImageSource implements definition.ImageSource {
     }
 
     public loadFromBase64(source: string): boolean {
-        if (types.isString(source)) {
-            var bytes = android.util.Base64.decode(source, android.util.Base64.DEFAULT);
+        if (typeof source === "string") {
+            const bytes = android.util.Base64.decode(source, android.util.Base64.DEFAULT);
             this.android = android.graphics.BitmapFactory.decodeByteArray(bytes, 0, bytes.length)
         }
         return this.android != null;
@@ -142,30 +132,30 @@ export class ImageSource implements definition.ImageSource {
         return source != null;
     }
 
-    public saveToFile(path: string, format: string, quality = 100): boolean {
+    public saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality = 100): boolean {
         if (!this.android) {
             return false;
         }
 
-        var targetFormat = getTargetFormat(format);
+        const targetFormat = getTargetFormat(format);
 
         // TODO add exception handling
-        var outputStream = new java.io.BufferedOutputStream(new java.io.FileOutputStream(path));
+        const outputStream = new java.io.BufferedOutputStream(new java.io.FileOutputStream(path));
 
-        var res = this.android.compress(targetFormat, quality, outputStream);
+        const res = this.android.compress(targetFormat, quality, outputStream);
         outputStream.close();
         return res;
     }
 
-    public toBase64String(format: string, quality = 100): string {
+    public toBase64String(format: "png" | "jpeg" | "jpg", quality = 100): string {
         if (!this.android) {
             return null;
         }
 
-        var targetFormat = getTargetFormat(format);
+        const targetFormat = getTargetFormat(format);
 
-        var outputStream = new java.io.ByteArrayOutputStream();
-        var base64Stream = new android.util.Base64OutputStream(outputStream, android.util.Base64.NO_WRAP);
+        const outputStream = new java.io.ByteArrayOutputStream();
+        const base64Stream = new android.util.Base64OutputStream(outputStream, android.util.Base64.NO_WRAP);
 
         this.android.compress(targetFormat, quality, base64Stream);
 
@@ -201,13 +191,11 @@ export class ImageSource implements definition.ImageSource {
     }
 }
 
-function getTargetFormat(format: string): android.graphics.Bitmap.CompressFormat {
-    ensureEnums();
-
+function getTargetFormat(format: "png" | "jpeg" | "jpg"): android.graphics.Bitmap.CompressFormat {
     switch (format) {
-        case enums.ImageFormat.jpeg || enums.ImageFormat.jpg:
+        case "jpeg" || "jpg":
             return android.graphics.Bitmap.CompressFormat.JPEG;
         default:
             return android.graphics.Bitmap.CompressFormat.PNG;
     }
-}
+}
\ No newline at end of file
diff --git a/tns-core-modules/image-source/image-source.d.ts b/tns-core-modules/image-source/image-source.d.ts
index 96f81f95d..df0b8ac53 100644
--- a/tns-core-modules/image-source/image-source.d.ts
+++ b/tns-core-modules/image-source/image-source.d.ts
@@ -99,14 +99,14 @@ declare module "image-source" {
         * @param format The format (encoding) of the image.
         * @param quality Optional parameter, specifying the quality of the encoding. Defaults to the maximum available quality.
         */
-        saveToFile(path: string, format: string, quality?: number): boolean;
+        saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality?: number): boolean;
 
         /**
          * Converts the image to base64 encoded string, using the provided image format and quality.
          * @param format The format (encoding) of the image.
          * @param quality Optional parameter, specifying the quality of the encoding. Defaults to the maximum available quality.
          */
-        toBase64String(format: string, quality?: number): string;
+        toBase64String(format: "png" | "jpeg" | "jpg", quality?: number): string;
     }
 
     export function fromAsset(asset: imageAssetModule.ImageAsset): Promise<ImageSource>;
diff --git a/tns-core-modules/location/Readme.md b/tns-core-modules/location/Readme.md
deleted file mode 100644
index 580755e65..000000000
--- a/tns-core-modules/location/Readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated. Please use same functionality from `nativescript-geolocation` npm module.
\ No newline at end of file
diff --git a/tns-core-modules/location/location-common.ts b/tns-core-modules/location/location-common.ts
deleted file mode 100644
index fda1d8363..000000000
--- a/tns-core-modules/location/location-common.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-//import * as locationManagerModule from "location/location-manager";
-import * as defModule from "location";
-import * as timerModule from "timer";
-
-var defaultGetLocationTimeout = 20000;
-
-@Deprecated
-export class Location implements defModule.Location {
-    public latitude: number;
-    public longitude: number;
-
-    public altitude: number;
-
-    public horizontalAccuracy: number;
-    public verticalAccuracy: number;
-
-    public speed: number; // in m/s ?
-
-    public direction: number; // in degrees
-
-    public timestamp: Date;
-
-    public android: any;  // android Location
-    public ios: any;      // iOS native location
-}
-
-export var getLocation = function (options?: defModule.Options): Promise<defModule.Location> {
-    var timerId;
-    var locationManager = new defModule.LocationManager();
-
-    if (options && (0 === options.timeout)) {
-        return new Promise<defModule.Location>((resolve, reject) => {
-            var location = locationManager.lastKnownLocation;
-            if (location) {
-                if (options && ("number" === typeof options.maximumAge)) {
-                    if (location.timestamp.valueOf() + options.maximumAge > new Date().valueOf()) {
-                        resolve(location);
-                    }
-                    else {
-                        reject(new Error("timeout is 0 and last known location is older than maximumAge"));
-                    }
-                }
-                else {
-                    resolve(location);
-                }
-            }
-            else {
-                reject(new Error("timeout is 0 and no known location found"));
-            }
-        });
-    }
-
-    return new Promise<defModule.Location>((resolve, reject) => {
-        if (!defModule.LocationManager.isEnabled()) {
-            return reject(new Error("Location service is disabled"));
-        }
-
-        var timer: typeof timerModule = require("timer");
-
-        locationManager.startLocationMonitoring(function (location: defModule.Location) {
-            if (options && ("number" === typeof options.maximumAge)) {
-                if (location.timestamp.valueOf() + options.maximumAge > new Date().valueOf()) {
-                    locationManager.stopLocationMonitoring();
-                    if ("undefined" !== typeof timerId) {
-                        timer.clearTimeout(timerId);
-                    }
-                    resolve(location);
-                }
-            }
-            else {
-                locationManager.stopLocationMonitoring();
-                if ("undefined" !== typeof timerId) {
-                    timer.clearTimeout(timerId);
-                }
-                resolve(location);
-            }
-        }, function (error: Error) {
-                console.error('Location error received: ' + error);
-                locationManager.stopLocationMonitoring();
-                if ("undefined" !== typeof timerId) {
-                    timer.clearTimeout(timerId);
-                }
-                reject(error);
-            },
-            options
-            );
-
-        if (options && ("number" === typeof options.timeout)) {
-            timerId = timer.setTimeout(function () {
-                locationManager.stopLocationMonitoring();
-                reject(new Error("timeout searching for location"));
-            }, options.timeout || defaultGetLocationTimeout);
-        }
-    });
-}
diff --git a/tns-core-modules/location/location.android.ts b/tns-core-modules/location/location.android.ts
deleted file mode 100644
index 1a128215c..000000000
--- a/tns-core-modules/location/location.android.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import * as enums from "ui/enums";
-import * as locationModule from "location";
-import * as common from "./location-common";
-import * as utils from "utils/utils";
-
-global.moduleMerge(common, exports);
-
-@Deprecated
-export class LocationManager implements locationModule.LocationManager {
-	get android(): locationModule.AndroidLocationManager {
-		return this.androidLocationManager;
-	}
-
-	get ios(): locationModule.iOSLocationManager {
-		return undefined;
-	}
-
-	public isStarted: boolean;
-    // in meters
-    public desiredAccuracy: number;
-
-    // The minimum distance (measured in meters) a device must move horizontally before an update event is generated.
-    public updateDistance: number;
-
-    private androidLocationManager: locationModule.AndroidLocationManager;
-
-    private _locationListener: any;
-
-    get locationListener(): any {
-        if (!this._locationListener) {
-            this._locationListener = <any>new android.location.LocationListener({
-                onLocationChanged: function (location1: android.location.Location) {
-                    if (this._onLocation) {
-                        var location = LocationManager.locationFromAndroidLocation(location1);
-                        if (this.maximumAge) {
-                            if (location.timestamp.valueOf() + this.maximumAge > new Date().valueOf()) {
-                                this._onLocation(location);
-                            }
-                        }
-                        else {
-                            this._onLocation(location);
-                        }
-                    }
-                },
-
-                onProviderDisabled: function (provider: string) {
-                    //
-                },
-
-                onProviderEnabled: function (provider: string) {
-                    //
-                },
-
-                onStatusChanged: function (arg1: string, arg2: number, arg3: android.os.Bundle): void {
-                    //
-                }
-            });
-        }
-        return this._locationListener;
-    }
-
-    private static locationFromAndroidLocation(androidLocation: android.location.Location): locationModule.Location {
-        var location = new common.Location();
-        location.latitude = androidLocation.getLatitude();
-        location.longitude = androidLocation.getLongitude();
-        location.altitude = androidLocation.getAltitude();
-        location.horizontalAccuracy = androidLocation.getAccuracy();
-        location.verticalAccuracy = androidLocation.getAccuracy();
-        location.speed = androidLocation.getSpeed();
-        location.direction = androidLocation.getBearing();
-        location.timestamp = new Date(androidLocation.getTime());
-        location.android = androidLocation;
-        return location;
-    }
-
-    private static androidLocationFromLocation(location: locationModule.Location): android.location.Location {
-        var androidLocation = new android.location.Location('custom');
-        androidLocation.setLatitude(location.latitude);
-        androidLocation.setLongitude(location.longitude);
-        if (location.altitude) {
-            androidLocation.setAltitude(location.altitude);
-        }
-        if (location.speed) {
-            androidLocation.setSpeed(float(location.speed));
-        }
-        if (location.direction) {
-            androidLocation.setBearing(float(location.direction));
-        }
-        if (location.timestamp) {
-            try {
-                androidLocation.setTime(long(location.timestamp.getTime()));
-            }
-            catch (e) {
-                console.error('invalid location timestamp');
-            }
-        }
-        return androidLocation;
-    }
-
-    public static isEnabled(): boolean {
-        var criteria = new android.location.Criteria();
-        criteria.setAccuracy(android.location.Criteria.ACCURACY_COARSE);
-        var lm = utils.ad.getApplicationContext().getSystemService(android.content.Context.LOCATION_SERVICE);
-        // due to bug in android API getProviders() with criteria parameter overload should be called (so most loose acuracy is used).
-        var enabledProviders = lm.getProviders(criteria, true);
-        return (enabledProviders.size() > 0) ? true : false;
-    }
-
-    public static distance(loc1: locationModule.Location, loc2: locationModule.Location): number {
-        if (!loc1.android) {
-            loc1.android = LocationManager.androidLocationFromLocation(loc1);
-        }
-        if (!loc2.android) {
-            loc2.android = LocationManager.androidLocationFromLocation(loc2);
-        }
-        return loc1.android.distanceTo(loc2.android);
-    }
-
-    constructor() {
-		//super();
-        this.desiredAccuracy = enums.Accuracy.any;
-        this.updateDistance = 0; 
-        
-		//this.androidLocationManager = utils.ad.getApplicationContext().getSystemService(android.content.Context.LOCATION_SERVICE);
-        var alm = utils.ad.getApplicationContext().getSystemService(android.content.Context.LOCATION_SERVICE);
-		this.androidLocationManager = new AndroidLocationManager(alm);
-		this.androidLocationManager.minimumUpdateTime = 200;
-    }
-
-    public startLocationMonitoring(onLocation: (location: locationModule.Location) => any, onError?: (error: Error) => any, options?: locationModule.Options) {
-        var criteria = new android.location.Criteria();
-        if (options) {
-            if (options.desiredAccuracy) {
-                this.desiredAccuracy = options.desiredAccuracy;
-            }
-            if (options.updateDistance) {
-                this.updateDistance = options.updateDistance;
-            }
-            if (options.minimumUpdateTime) {
-                this.androidLocationManager.minimumUpdateTime = options.minimumUpdateTime;
-            }
-        }
-		criteria.setAccuracy((this.desiredAccuracy === enums.Accuracy.high) ? android.location.Criteria.ACCURACY_FINE : android.location.Criteria.ACCURACY_COARSE);
-
-        this.locationListener._onLocation = onLocation;
-        this.locationListener._onError = onError;
-        this.locationListener.maximumAge = (options && ("number" === typeof options.maximumAge)) ? options.maximumAge : undefined;
-        try {
-            this.androidLocationManager.manager.requestLocationUpdates(this.androidLocationManager.minimumUpdateTime, this.updateDistance, criteria, this.locationListener, null);
-			this.isStarted = true;
-        }
-        catch (e) {
-            if (onError) {
-                onError(e);
-            }
-        }
-    }
-
-    public stopLocationMonitoring() {
-        this.androidLocationManager.manager.removeUpdates(this.locationListener);
-		this.isStarted = false;
-    }
-
-    get lastKnownLocation(): locationModule.Location {
-        var criteria = new android.location.Criteria();
-        criteria.setAccuracy((this.desiredAccuracy === enums.Accuracy.high) ? android.location.Criteria.ACCURACY_FINE : android.location.Criteria.ACCURACY_COARSE);
-        try {
-            var providers = this.androidLocationManager.manager.getProviders(criteria, false);
-            var it = providers.iterator();
-            var location: android.location.Location;
-            var tempLocation: android.location.Location;
-            while (it.hasNext()) {
-                var element = it.next();
-                //console.log('found provider: ' + element);
-                tempLocation = this.androidLocationManager.manager.getLastKnownLocation(element);
-                if (!location) {
-                    location = tempLocation;
-                }
-                else {
-                    if (tempLocation.getTime() < location.getTime()) {
-                        location = tempLocation;
-                    }
-                }
-            }
-            if (location) {
-                return LocationManager.locationFromAndroidLocation(location);
-            }
-        }
-        catch (e) {
-            console.error(e.message);
-        }
-
-        return null;
-    }
-}
-
-@Deprecated
-export class AndroidLocationManager implements locationModule.AndroidLocationManager {
-	private _manager: android.location.LocationManager;
-	private _minimumUpdateTime: number;
-
-	public set minimumUpdateTime(value: number) {
-		this._minimumUpdateTime = value;
-	}
-
-	public get minimumUpdateTime(): number {
-		return this._minimumUpdateTime;
-	}
-
-	public get manager(): android.location.LocationManager {
-		return this._manager;
-	}
-
-	constructor(manager: android.location.LocationManager) {
-		this._manager = manager;
-	}
-}
diff --git a/tns-core-modules/location/location.d.ts b/tns-core-modules/location/location.d.ts
deleted file mode 100644
index c61197f31..000000000
--- a/tns-core-modules/location/location.d.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Allows you to use the geolocation of the device.
- */
-declare module "location" {
-    // For future usage
-    //class LocationRegion {
-    //    public latitude: number;
-    //    public longitude: number;
-
-    //    public raduis: number; // radius in meters
-    //}
-
-   /**
-    * A data class that encapsulates common properties for a geolocation.
-    * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-    */
-    export class Location {
-       /**
-        * The latitude of the geolocation, in degrees.
-        */
-        latitude: number;
-
-       /**
-        * The longitude of the geolocation, in degrees.
-        */
-        longitude: number;
-
-       /**
-        * The altitude (if available), in meters above sea level.
-        */
-        altitude: number;
-
-       /**
-        * The horizontal accuracy, in meters.
-        */
-        horizontalAccuracy: number;
-
-       /**
-        * The vertical accuracy, in meters.
-        */
-        verticalAccuracy: number;
-
-       /**
-        * The speed, in meters/second over ground.
-        */
-        speed: number;
-
-       /**
-        * The direction (course), in degrees.
-        */
-        direction: number;
-
-       /**
-        * The time at which this location was determined.
-        */
-        timestamp: Date;
-
-       /**
-        * The android-specific [location](http://developer.android.com/reference/android/location/Location.html) object.
-        */
-        android: any /* android.location.Location */;
-
-       /**
-        * The ios-specific [CLLocation](https://developer.apple.com/library/ios/documentation/CoreLocation/Reference/CLLocation_Class/) object.
-        */
-        ios: any /* CLLocation */;
-    }
-
-   /**
-    * Provides options for location monitoring.
-    * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-    */
-    export interface Options {
-       /**
-        * Specifies desired accuracy in meters. Defaults to DesiredAccuracy.HIGH
-        */
-        desiredAccuracy?: number;
-
-       /**
-        * Update distance filter in meters. Specifies how often to update. Default on iOS is no filter, on Android it is 0 meters
-        */
-        updateDistance?: number;
-
-       /**
-        * Minimum time interval between location updates, in milliseconds (ignored on iOS)
-        */
-        minimumUpdateTime?: number;
-
-       /**
-        * how old locations to receive in ms.
-        */
-        maximumAge?: number;
-
-       /**
-        * how long to wait for a location in ms.
-        */
-        timeout?: number;
-    }
-
-   /**
-    * Provides methods for querying geolocation (in case available) on the target platform.
-    * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-    */
-    export class LocationManager {
-       /**
-        * Checks whether the location services are switched ON for this device (on Android) or application (iOS).
-        */
-        static isEnabled(): boolean;
-
-       /**
-        * Measures the distance in meters between two locations.
-        * @param loc1 The first location.
-        * @param loc2 The second location.
-        */
-        static distance(loc1: Location, loc2: Location): number;
-
-       /**
-        * The desired accuracy in meters. Defaults to DesiredAccuracy.HIGH
-        */
-        desiredAccuracy: number;
-
-       /**
-        * The update distance filter in meters. Specifies how often to update. Default on iOS is no filter, on Android it is 0 meters.
-        */
-        updateDistance: number;
-
-       /**
-        * True if the location listener is already started. In this case all other start requests will be ignored.
-        */
-        isStarted: boolean;
-
-       /**
-        * Starts location monitoring.
-        * @param onLocation A function that will be called upon every location update received.
-        * @param onError An optional error callback.
-        * @param options An optional object specifying location update settings.
-        */
-        startLocationMonitoring(onLocation: (location: Location) => any, onError?: (error: Error) => any, options?: Options);
-
-       /**
-        * Stops location monitoring.
-        */
-        stopLocationMonitoring();
-
-       /**
-        * Returns last known location from device's location services or null of no known last location.
-        */
-        lastKnownLocation: Location;
-
-		/**
-		 * An android-specific data for location.
-		 */
-		android: AndroidLocationManager;
-
-		/**
-		 * An ios-specific data for location.
-		 */
-		ios: iOSLocationManager;
-    }
-
-	/**
-	 * Provides Android specific data related to location.
-     * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-	 */
-	export interface AndroidLocationManager {
-		/**
-		 * The android-specific location manager [LocationManager](http://developer.android.com/reference/android/location/LocationManager.html)
-		 */
-		manager: any /* android.location.LocationManager */;
-
-		/**
-		 * The minimum time interval between subsequent location updates, in milliseconds.
-		 */
-        minimumUpdateTime: number;
-	}
-
-	/**
-	 * Fires a single shot location search. If you specify timeout in options (milliseconds), location search will stop on timeout.
-	 * If you specify timeout = 0 it just requests the last known location.
-	 * However if you specify maximumAge and the location received is older it won't be received.
-	 * @param options - An optional object specifying location update settings.
-     * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-	 */
-    export function getLocation(options?: Options): Promise<Location>;
-
-	/* tslint:disable */
-	/**
-	 * Provides iOS specific data related to location.
-     * [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
-	 */
-	export interface iOSLocationManager {
-		/**
-		 * The ios-specific location manager [CLLocationManager](https://developer.apple.com/library/ios/documentation/CoreLocation/Reference/CLLocationManager_Class/)
-		 */
-		manager: any /* CLLocationManager */;
-	}
-}
diff --git a/tns-core-modules/location/location.ios.ts b/tns-core-modules/location/location.ios.ts
deleted file mode 100644
index 9529f5c03..000000000
--- a/tns-core-modules/location/location.ios.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import * as locationModule from "location";
-import * as common from "./location-common";
-
-global.moduleMerge(common, exports);
-
-class LocationListenerImpl extends NSObject implements CLLocationManagerDelegate {
-    public static ObjCProtocols = [CLLocationManagerDelegate];
-
-    static new(): LocationListenerImpl {
-        return <LocationListenerImpl>super.new();
-    }
-
-    private _onLocation: (location: locationModule.Location) => any;
-    private _onError: (error: Error) => any
-    private _options: locationModule.Options;
-    private _maximumAge: number;
-
-    public initWithLocationErrorOptions(location: (location: locationModule.Location) => any, error?: (error: Error) => any, options?: locationModule.Options): LocationListenerImpl {
-        this._onLocation = location;
-        
-        if (error) {
-            this._onError = error;
-        }
-
-        if (options) {
-            this._options = options;
-        }
-
-        this._maximumAge = (this._options && ("number" === typeof this._options.maximumAge)) ? this._options.maximumAge : undefined;
-
-        return this;
-    }
-
-    public locationManagerDidUpdateLocations(manager, locations): void {
-        for (var i = 0; i < locations.count; i++) {
-            var location = LocationManager._locationFromCLLocation(locations.objectAtIndex(i));
-            if (this._maximumAge) {
-                if (location.timestamp.valueOf() + this._maximumAge > new Date().valueOf()) {
-                    this._onLocation(location);
-                }
-            }
-            else {
-                this._onLocation(location);
-            }
-        }
-    }
-
-    public locationManagerDidFailWithError(manager, error): void {
-        if (this._onError) {
-            this._onError(new Error(error.localizedDescription));
-        }
-    }
-}
-
-@Deprecated
-export class LocationManager implements locationModule.LocationManager {
-	get android(): locationModule.AndroidLocationManager {
-		return undefined;
-	}
-
-	get ios(): locationModule.iOSLocationManager {
-		return this.iosLocationManager;
-	}
-
-	public isStarted: boolean;
-    // in meters
-    // we might need some predefined values here like 'any' and 'high'
-    public desiredAccuracy: number;
-
-	// The minimum distance (measured in meters) a device must move horizontally before an update event is generated.
-    public updateDistance: number;
-
-    private iosLocationManager: locationModule.iOSLocationManager;
-    private listener: any;
-
-    public static _locationFromCLLocation(clLocation: CLLocation): locationModule.Location {
-        var location = new locationModule.Location();
-        location.latitude = clLocation.coordinate.latitude;
-        location.longitude = clLocation.coordinate.longitude;
-        location.altitude = clLocation.altitude;
-        location.horizontalAccuracy = clLocation.horizontalAccuracy;
-        location.verticalAccuracy = clLocation.verticalAccuracy;
-        location.speed = clLocation.speed;
-        location.direction = clLocation.course;
-		var timeIntervalSince1970 = NSDate.dateWithTimeIntervalSinceDate(0, clLocation.timestamp).timeIntervalSince1970;
-        location.timestamp = new Date(timeIntervalSince1970 * 1000);
-        location.ios = clLocation;
-        return location;
-    }
-
-    private static iosLocationFromLocation(location: locationModule.Location): CLLocation {
-        var hAccuracy = location.horizontalAccuracy ? location.horizontalAccuracy : -1;
-        var vAccuracy = location.verticalAccuracy ? location.verticalAccuracy : -1;
-        var speed = location.speed ? location.speed : -1;
-        var course = location.direction ? location.direction : -1;
-        var altitude = location.altitude ? location.altitude : -1;
-        var timestamp = location.timestamp ? NSDate.dateWithTimeIntervalSince1970(location.timestamp.getTime() / 1000) : null;
-        var iosLocation = CLLocation.alloc().initWithCoordinateAltitudeHorizontalAccuracyVerticalAccuracyCourseSpeedTimestamp(CLLocationCoordinate2DMake(location.latitude, location.longitude), altitude, hAccuracy, vAccuracy, course, speed, <any>timestamp);
-        return iosLocation;
-    }
-
-    public static isEnabled(): boolean {
-        if (CLLocationManager.locationServicesEnabled()) {
-            // CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse and CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways are options that are available in iOS 8.0+
-            // while CLAuthorizationStatus.kCLAuthorizationStatusAuthorized is here to support iOS 8.0-.
-            return (CLLocationManager.authorizationStatus() === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse 
-                || CLLocationManager.authorizationStatus() === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways
-                || CLLocationManager.authorizationStatus() === CLAuthorizationStatus.kCLAuthorizationStatusAuthorized);
-        }
-        return false;
-    }
-
-    public static distance(loc1: locationModule.Location, loc2: locationModule.Location): number {
-        if (!loc1.ios) {
-            loc1.ios = LocationManager.iosLocationFromLocation(loc1);
-        }
-        if (!loc2.ios) {
-            loc2.ios = LocationManager.iosLocationFromLocation(loc2);
-        }
-        return loc1.ios.distanceFromLocation(loc2.ios);
-    }
-
-    constructor() {
-		//super();
-        var enums = require("ui/enums");
-
-        this.desiredAccuracy = enums.Accuracy.any;
-        this.updateDistance = kCLDistanceFilterNone;
-		var iosLocManager = new CLLocationManager();
-        this.iosLocationManager = new iOSLocationManager(iosLocManager);
-    }
-
-    public startLocationMonitoring(onLocation: (location: locationModule.Location) => any, onError?: (error: Error) => any, options?: locationModule.Options) {
-        if (!this.listener) {
-            if (options) {
-                if (options.desiredAccuracy) {
-                    this.desiredAccuracy = options.desiredAccuracy;
-                }
-                if (options.updateDistance) {
-                    this.updateDistance = options.updateDistance;
-                }
-            }
-
-            this.listener = LocationListenerImpl.new().initWithLocationErrorOptions(onLocation, onError, options);
-            this.iosLocationManager.manager.delegate = this.listener;
-            this.iosLocationManager.manager.desiredAccuracy = this.desiredAccuracy;
-            this.iosLocationManager.manager.distanceFilter = this.updateDistance;
-            this.iosLocationManager.manager.startUpdatingLocation();
-			this.isStarted = true;
-        }
-    }
-
-    public stopLocationMonitoring() {
-        this.iosLocationManager.manager.stopUpdatingLocation();
-        this.iosLocationManager.manager.delegate = null;
-        this.listener = null;
-		this.isStarted = false;
-    }
-
-    get lastKnownLocation(): locationModule.Location {
-        var clLocation = this.iosLocationManager.manager.location;
-        if (clLocation) {
-            return LocationManager._locationFromCLLocation(clLocation);
-        }
-        return null;
-    }
-}
-
-/* tslint:disable */
-@Deprecated
-export class iOSLocationManager implements locationModule.iOSLocationManager {
-	private _manager: CLLocationManager;
-
-	public get manager(): CLLocationManager {
-		return this._manager;
-	}
-
-	constructor(manager: CLLocationManager) {
-		this._manager = manager;
-	}
-}
diff --git a/tns-core-modules/location/package.json b/tns-core-modules/location/package.json
deleted file mode 100644
index 90e08aaef..000000000
--- a/tns-core-modules/location/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name" : "location",
-  	"main" : "location",
-	"nativescript": {}
-}
-
diff --git a/tns-core-modules/platform/platform.android.ts b/tns-core-modules/platform/platform.android.ts
index e79ef3e6b..cf62f2aae 100644
--- a/tns-core-modules/platform/platform.android.ts
+++ b/tns-core-modules/platform/platform.android.ts
@@ -1,21 +1,15 @@
 /* tslint:disable:class-name */
-import * as definition from "platform";
-import * as utils from "utils/utils";
-
-declare module "platform" {
-    export interface ScreenMetrics {
-        _invalidate(): void;
-    }
-}
+import { Device as DeviceDefinition, ScreenMetrics as ScreenMetricsDefinition } from "platform";
+import * as appModule from "application";
 
 const MIN_TABLET_PIXELS = 600;
 
 export module platformNames {
-    export var android = "Android";
-    export var ios = "iOS";
+    export const android = "Android";
+    export const ios = "iOS";
 }
 
-class Device implements definition.Device {
+class Device implements DeviceDefinition {
     private _manufacturer: string;
     private _model: string;
     private _osVersion: string;
@@ -78,10 +72,11 @@ class Device implements definition.Device {
 
     get uuid(): string {
         if (!this._uuid) {
+            const nativeApp = <android.app.Application>appModule.android.nativeApp;
             this._uuid = android.provider.Settings.Secure.getString(
-                utils.ad.getApplicationContext().getContentResolver(),
+                nativeApp.getContentResolver(),
                 android.provider.Settings.Secure.ANDROID_ID
-                );
+            );
         }
 
         return this._uuid;
@@ -96,7 +91,7 @@ class Device implements definition.Device {
     }
 
     get region(): string {
-        if(!this._region) {
+        if (!this._region) {
             this._region = java.util.Locale.getDefault().getCountry();
         }
 
@@ -104,17 +99,30 @@ class Device implements definition.Device {
     }
 }
 
-class MainScreen implements definition.ScreenMetrics {
+class MainScreen implements ScreenMetricsDefinition {
     private _metrics: android.util.DisplayMetrics;
 
-    public _invalidate(): void {
-        this._metrics = null;
+    constructor() {
+        // NOTE: This will be memory leak but we MainScreen is singleton
+        appModule.on("cssChanged", this.cssChanged, this);
     }
-    
+
+    private cssChanged(args: appModule.CssChangedEventData): void {
+        if (!this._metrics) {
+            this._metrics = new android.util.DisplayMetrics();
+        }
+        this.initMetrics();
+    }
+
+    private initMetrics(): void {
+        const nativeApp = <android.app.Application>appModule.getNativeApplication();
+        nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
+    }
+
     private get metrics(): android.util.DisplayMetrics {
         if (!this._metrics) {
             this._metrics = new android.util.DisplayMetrics();
-            utils.ad.getApplicationContext().getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
+            this.initMetrics();
         }
         return this._metrics;
     }
@@ -137,10 +145,10 @@ class MainScreen implements definition.ScreenMetrics {
 
 }
 
-export var device: definition.Device = new Device();
+export const device = new Device();
 
 export module screen {
-    export var mainScreen = new MainScreen();
+    export const mainScreen = new MainScreen();
 }
 
-export var isAndroid = true;
\ No newline at end of file
+export const isAndroid = true;
\ No newline at end of file
diff --git a/tns-core-modules/platform/platform.ios.ts b/tns-core-modules/platform/platform.ios.ts
index 31e6c9a6b..b4f5f99a8 100644
--- a/tns-core-modules/platform/platform.ios.ts
+++ b/tns-core-modules/platform/platform.ios.ts
@@ -1,14 +1,14 @@
 /* tslint:disable:class-name */
-import * as definition from "platform";
+import { Device as DeviceDefinition, ScreenMetrics as ScreenMetricsDefinition } from "platform";
 
 import * as utils from "utils/utils";
 
 export module platformNames {
-    export var android = "Android";
-    export var ios = "iOS";
+    export const android = "Android";
+    export const ios = "iOS";
 }
 
-class Device implements definition.Device {
+class Device implements DeviceDefinition {
     private _model: string;
     private _osVersion: string;
     private _sdkVersion: string;
@@ -94,12 +94,8 @@ class Device implements definition.Device {
     }
 }
 
-class MainScreen implements definition.ScreenMetrics {
+class MainScreen implements ScreenMetricsDefinition {
     private _screen: UIScreen;
-
-    _invalidate(){
-        //
-    }
     
     private get screen(): UIScreen {
         if (!this._screen) {
@@ -126,10 +122,10 @@ class MainScreen implements definition.ScreenMetrics {
     }
 }
 
-export var device: definition.Device = new Device();
+export const device = new Device();
 
 export module screen {
-    export var mainScreen = new MainScreen();
+    export const mainScreen = new MainScreen();
 }
 
-export var isIOS = true;
\ No newline at end of file
+export const isIOS = true;
\ No newline at end of file
diff --git a/tns-core-modules/tns-core-modules.d.ts b/tns-core-modules/tns-core-modules.d.ts
index e83f2cd6c..13c79f3bb 100644
--- a/tns-core-modules/tns-core-modules.d.ts
+++ b/tns-core-modules/tns-core-modules.d.ts
@@ -1,7 +1,6 @@
 /// <reference path="module.d.ts" />
 /// <reference path="application-settings/application-settings.d.ts" />
 /// <reference path="application/application.d.ts" />
-/// <reference path="camera/camera.d.ts" />
 /// <reference path="color/color.d.ts" />
 /// <reference path="color/known-colors.d.ts" />
 /// <reference path="connectivity/connectivity.d.ts" />
@@ -23,7 +22,6 @@
 /// <reference path="js-libs/easysax/easysax.d.ts" />
 /// <reference path="js-libs/esprima/esprima.d.ts" />
 /// <reference path="js-libs/polymer-expressions/polymer-expressions.d.ts" />
-/// <reference path="location/location.d.ts" />
 /// <reference path="platform/platform.d.ts" />
 /// <reference path="text/formatted-string.d.ts" />
 /// <reference path="text/span.d.ts" />
diff --git a/tns-core-modules/trace/trace.ts b/tns-core-modules/trace/trace.ts
index 0c70b75eb..ac0b99f5c 100644
--- a/tns-core-modules/trace/trace.ts
+++ b/tns-core-modules/trace/trace.ts
@@ -1,10 +1,9 @@
 import * as definition from "trace";
-import * as types from "utils/types";
 
-var enabled = false;
-var _categories = {};
-var _writers: Array<definition.TraceWriter> = [];
-var _eventListeners: Array<definition.EventListener> = [];
+let enabled = false;
+let _categories = {};
+let _writers: Array<definition.TraceWriter> = [];
+let _eventListeners: Array<definition.EventListener> = [];
 
 export function enable() {
     enabled = true;
@@ -156,7 +155,7 @@ class ConsoleWriter implements definition.TraceWriter {
         }
 
         var msgType;
-        if (types.isUndefined(type)) {
+        if (type === undefined) {
             msgType = messageType.log;
         } else {
             msgType = type;
diff --git a/tns-core-modules/ui/action-bar/action-bar-common.ts b/tns-core-modules/ui/action-bar/action-bar-common.ts
index 379d41556..c5092ad73 100644
--- a/tns-core-modules/ui/action-bar/action-bar-common.ts
+++ b/tns-core-modules/ui/action-bar/action-bar-common.ts
@@ -5,11 +5,11 @@
     IOSActionItemSettings, AndroidActionItemSettings, AndroidActionBarSettings,
     NavigationButton
 } from "ui/action-bar";
-import { Page } from "ui/page";
-import { View, ViewBase, Property, unsetValue, horizontalAlignmentProperty, verticalAlignmentProperty, HorizontalAlignment, VerticalAlignment } from "ui/core/view";
 
 export * from "ui/core/view";
 
+import { View, ViewBase, Property, unsetValue, horizontalAlignmentProperty, verticalAlignmentProperty, HorizontalAlignment, VerticalAlignment } from "ui/core/view";
+
 export module knownCollections {
     export var actionItems = "actionItems";
 }
@@ -17,7 +17,6 @@ export module knownCollections {
 export class ActionBarBase extends View implements ActionBarDefinition {
     private _actionItems: ActionItems;
     private _navigationButton: NavigationButton;
-    private _page: Page;
     private _titleView: View;
 
     public title: string;
@@ -73,13 +72,6 @@ export class ActionBarBase extends View implements ActionBarDefinition {
         }
     }
 
-    get page(): Page {
-        return this._page;
-    }
-    set page(value: Page) {
-        this._page = value;
-    }
-
     get android(): AndroidActionBarSettings {
         return undefined;
     }
@@ -294,10 +286,6 @@ export class ActionItemBase extends ViewBase implements ActionItemDefinition {
         }
     }
 
-    get page(): Page {
-        return this.actionBar ? this.actionBar.page : undefined;
-    }
-
     public _raiseTap() {
         this._emit(ActionItemBase.tapEvent);
     }
diff --git a/tns-core-modules/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
index 9a651d884..8d6c0caa8 100644
--- a/tns-core-modules/ui/action-bar/action-bar.android.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.android.ts
@@ -131,7 +131,8 @@ export class ActionBar extends ActionBarBase {
             return;
         }
 
-        if (!this.page.frame || !this.page.frame._getNavBarVisible(this.page)) {
+        const page = this.page;
+        if (!page.frame || !page.frame._getNavBarVisible(page)) {
             this.nativeView.setVisibility(android.view.View.GONE);
 
             // If action bar is hidden - no need to fill it with items.
@@ -179,11 +180,12 @@ export class ActionBar extends ActionBarBase {
     }
 
     public _updateNavigationButton() {
-        let navButton = this.navigationButton;
+        const navButton = this.navigationButton;
         if (navButton && isVisible(navButton)) {
-            if (navButton.android.systemIcon) {
+            const systemIcon = navButton.android.systemIcon;
+            if (systemIcon !== undefined) {
                 // Try to look in the system resources.
-                let systemResourceId = getSystemResourceId(navButton.android.systemIcon);
+                const systemResourceId = getSystemResourceId(systemIcon);
                 if (systemResourceId) {
                     this.nativeView.setNavigationIcon(systemResourceId);
                 }
diff --git a/tns-core-modules/ui/action-bar/action-bar.d.ts b/tns-core-modules/ui/action-bar/action-bar.d.ts
index 7322243e3..ee09bbe3c 100644
--- a/tns-core-modules/ui/action-bar/action-bar.d.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.d.ts
@@ -3,8 +3,7 @@
  */
 declare module "ui/action-bar" {
     import { EventData, ViewBase, View, AddArrayFromBuilder, AddChildFromBuilder } from "ui/core/view";
-    import { Page } from "ui/page";
-
+    
     /**
      * Provides an abstraction over the ActionBar (android) and NavigationBar (iOS).
      */
@@ -35,11 +34,6 @@ declare module "ui/action-bar" {
          */
         android: AndroidActionBarSettings;
 
-        /**
-         * Gets the page that contains the action bar.
-         */
-        page: Page;
-
         /**
          * Updates the action bar.
          */
@@ -110,11 +104,6 @@ declare module "ui/action-bar" {
          */
         actionBar: ActionBar;
 
-        /**
-         * Gets the page that contains the action item.
-         */
-        page: Page;
-
         /**
          * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
          * @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change"). 
diff --git a/tns-core-modules/ui/action-bar/action-bar.ios.ts b/tns-core-modules/ui/action-bar/action-bar.ios.ts
index 85cdb11d4..3c7f6fb8b 100644
--- a/tns-core-modules/ui/action-bar/action-bar.ios.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.ios.ts
@@ -36,7 +36,7 @@ export class ActionItem extends ActionItemBase {
         return this._ios;
     }
     public set ios(value: IOSActionItemSettings) {
-        throw new Error("ActionItem.android is read-only");
+        throw new Error("ActionItem.ios is read-only");
     }
 }
 
@@ -61,13 +61,13 @@ export class ActionBar extends ActionBarBase {
     }
 
     public update() {
-        let page = this.page;
+        const page = this.page;
         // Page should be attached to frame to update the action bar.
         if (!page || !page.parent) {
             return;
         }
 
-        let viewController = (<UIViewController>this.page.ios);
+        let viewController = (<UIViewController>page.ios);
         let navigationItem: UINavigationItem = viewController.navigationItem;
         let navController = <UINavigationController>page.frame.ios.controller;
         let navigationBar = navController ? navController.navigationBar : null;
@@ -161,8 +161,12 @@ export class ActionBar extends ActionBarBase {
             item.actionView.ios.addGestureRecognizer(recognizer);
             barButtonItem = UIBarButtonItem.alloc().initWithCustomView(item.actionView.ios);
         }
-        else if (typeof item.ios.systemIcon === "number") {
-            barButtonItem = UIBarButtonItem.alloc().initWithBarButtonSystemItemTargetAction(item.ios.systemIcon, tapHandler, "tap");
+        else if (item.ios.systemIcon !== undefined) {
+            let id: number = item.ios.systemIcon;
+            if (typeof id === "string") {
+                id = parseInt(id);
+            }
+            barButtonItem = UIBarButtonItem.alloc().initWithBarButtonSystemItemTargetAction(id, tapHandler, "tap");
         }
         else if (item.icon) {
             let img = fromFileOrResource(item.icon);
@@ -202,7 +206,7 @@ export class ActionBar extends ActionBarBase {
     }
 
     public _onTitlePropertyChanged() {
-        let page = this.page;
+        const page = this.page;
         if (!page) {
             return;
         }
@@ -225,7 +229,7 @@ export class ActionBar extends ActionBarBase {
 
         let navBarWidth = 0;
         let navBarHeight = 0;
-
+        
         let frame = this.page.frame;
         if (frame) {
             let navBar: UIView = frame.ios.controller.navigationBar;
@@ -284,7 +288,7 @@ export class ActionBar extends ActionBarBase {
     // }
 
     private get navBar(): UINavigationBar {
-        let page = this.page;
+        const page = this.page;
         // Page should be attached to frame to update the action bar.
         if (!page || !page.frame) {
             return undefined;
diff --git a/tns-core-modules/ui/builder/builder.d.ts b/tns-core-modules/ui/builder/builder.d.ts
index 6f14cf667..452dae0c9 100644
--- a/tns-core-modules/ui/builder/builder.d.ts
+++ b/tns-core-modules/ui/builder/builder.d.ts
@@ -2,6 +2,7 @@
     import { View, Template, KeyedTemplate } from "ui/core/view";
     import { Page } from "ui/page";
 
+    export function loadPage(moduleNamePath: string, fileName: string, moduleExports?: any): Page;
     export function load(fileName: string, exports?: any): View;
     export function load(options: LoadOptions): View;
     export function parse(value: string | Template, exports?: any): View;
diff --git a/tns-core-modules/ui/builder/builder.ts b/tns-core-modules/ui/builder/builder.ts
index 4fecb6baa..50a185350 100644
--- a/tns-core-modules/ui/builder/builder.ts
+++ b/tns-core-modules/ui/builder/builder.ts
@@ -44,7 +44,7 @@ export function parseMultipleTemplates(value: string, context: any): Array<Keyed
     return parseInternal(dummyComponent, context).component["itemTemplates"];
 }
 
-function parseInternal(value: string, context: any, uri?: string): ComponentModule {
+function parseInternal(value: string, context: any, uri?: string, moduleNamePath?: string): ComponentModule {
     var start: xml2ui.XmlStringParser;
     var ui: xml2ui.ComponentParser;
 
@@ -55,7 +55,7 @@ function parseInternal(value: string, context: any, uri?: string): ComponentModu
 
     (start = new xml2ui.XmlStringParser(errorFormat))
         .pipe(new xml2ui.PlatformFilter())
-        .pipe(new xml2ui.XmlStateParser(ui = new xml2ui.ComponentParser(context, errorFormat, componentSourceTracker)));
+        .pipe(new xml2ui.XmlStateParser(ui = new xml2ui.ComponentParser(context, errorFormat, componentSourceTracker, moduleNamePath)));
 
     start.parse(value);
 
@@ -63,7 +63,7 @@ function parseInternal(value: string, context: any, uri?: string): ComponentModu
 }
 
 function loadCustomComponent(componentPath: string, componentName?: string, attributes?: Object, context?: Object, parentPage?: Page): ComponentModule {
-    if (!parentPage && context){
+    if (!parentPage && context) {
         // Read the parent page that was passed down below
         // https://github.com/NativeScript/NativeScript/issues/1639
         parentPage = context["_parentPage"];
@@ -95,20 +95,19 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
                 subExports = global.loadModule(jsFilePath)
             }
         }
-        
+
         // Pass the parent page down the chain in case of custom components nested on many levels. Use the context for piggybacking.
         // https://github.com/NativeScript/NativeScript/issues/1639
         if (!subExports) {
-            subExports = {};    
+            subExports = {};
         }
         subExports["_parentPage"] = parentPage;
-        
+
         result = loadInternal(xmlFilePath, subExports);
 
         // Attributes will be transfered to the custom component
         if (isDefined(result) && isDefined(result.component) && isDefined(attributes)) {
-            var attr: string;
-            for (attr in attributes) {
+            for (let attr in attributes) {
                 setPropertyValue(result.component, subExports, context, attr, attributes[attr]);
             }
         }
@@ -156,16 +155,37 @@ export function load(pathOrOptions: string | LoadOptions, context?: any): View {
     return viewToReturn;
 }
 
+export function loadPage(moduleNamePath: string, fileName: string, context?: any): Page {
+    var componentModule: ComponentModule;
+
+    // Check if the XML file exists.
+    if (File.exists(fileName)) {
+        const file = File.fromPath(fileName);
+        const onError = function (error) {
+            throw new Error("Error loading file " + fileName + " :" + error.message);
+        }
+        const text = file.readTextSync(onError);
+        componentModule = parseInternal(text, context, fileName, moduleNamePath);
+    }
+
+    if (componentModule && componentModule.component) {
+        // Save exports to root component (will be used for templates).
+        (<any>componentModule.component).exports = context;
+    }
+
+    return (<Page>componentModule.component);
+}
+
 function loadInternal(fileName: string, context?: any): ComponentModule {
     var componentModule: ComponentModule;
 
     // Check if the XML file exists.
     if (File.exists(fileName)) {
-        var file = File.fromPath(fileName);
-        var onError = function (error) {
+        const file = File.fromPath(fileName);
+        const onError = function (error) {
             throw new Error("Error loading file " + fileName + " :" + error.message);
         }
-        var text = file.readTextSync(onError);
+        const text = file.readTextSync(onError);
         componentModule = parseInternal(text, context, fileName);
     }
 
@@ -501,7 +521,7 @@ namespace xml2ui {
         private error: ErrorFormatter;
         private sourceTracker: SourceTracker;
 
-        constructor(context: any, errorFormat: ErrorFormatter, sourceTracker: SourceTracker) {
+        constructor(context: any, errorFormat: ErrorFormatter, sourceTracker: SourceTracker, private moduleNamePath?: string) {
             this.context = context;
             this.error = errorFormat;
             this.sourceTracker = sourceTracker;
@@ -563,7 +583,7 @@ namespace xml2ui {
                             //Ignore the default ...tns.xsd namespace URL
                             namespace = undefined;
                         }
-                        componentModule = getComponentModule(args.elementName, namespace, args.attributes, this.context);
+                        componentModule = getComponentModule(args.elementName, namespace, args.attributes, this.context, this.moduleNamePath);
                     }
 
                     if (componentModule) {
@@ -662,4 +682,4 @@ namespace xml2ui {
             items?: Array<any>;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tns-core-modules/ui/builder/component-builder.d.ts b/tns-core-modules/ui/builder/component-builder.d.ts
index bf40628ad..821d29ada 100644
--- a/tns-core-modules/ui/builder/component-builder.d.ts
+++ b/tns-core-modules/ui/builder/component-builder.d.ts
@@ -1,7 +1,7 @@
 declare module "ui/builder/component-builder" {
     import { View } from "ui/core/view";
 
-    export function getComponentModule(elementName: string, namespace: string, attributes: Object, exports: Object): ComponentModule;
+    export function getComponentModule(elementName: string, namespace: string, attributes: Object, exports: Object, moduleNamePath?: string): ComponentModule;
     export function setPropertyValue(instance: View, instanceModuleExports: Object, pageExports: Object, propertyName: string, propertyValue: any): void;
 
     export interface ComponentModule {
diff --git a/tns-core-modules/ui/builder/component-builder.ts b/tns-core-modules/ui/builder/component-builder.ts
index 7215af8c7..44516561a 100644
--- a/tns-core-modules/ui/builder/component-builder.ts
+++ b/tns-core-modules/ui/builder/component-builder.ts
@@ -4,18 +4,12 @@ import { View, isEventOrGesture } from "ui/core/view";
 import { ComponentModule } from "ui/builder/component-builder";
 import { File, path, knownFolders } from "file-system";
 import { getBindingOptions, bindingConstants } from "./binding-builder";
+import { resolveFileName } from "file-system/file-name-resolver";
 import * as debugModule from "utils/debug";
 import * as platformModule from "platform";
 
-//the imports below are needed for special property registration
-import "ui/layouts/dock-layout";
-import "ui/layouts/grid-layout";
-import "ui/layouts/absolute-layout";
-
-import { getSpecialPropertySetter } from "ui/builder/special-properties";
-
-var UI_PATH = "ui/";
-var MODULES = {
+const UI_PATH = "ui/";
+const MODULES = {
     "TabViewItem": "ui/tab-view",
     "FormattedString": "text/formatted-string",
     "Span": "text/span",
@@ -24,19 +18,18 @@ var MODULES = {
     "SegmentedBarItem": "ui/segmented-bar",
 };
 
-var CODEFILE = "codeFile";
-var CSSFILE = "cssFile";
+const CODEFILE = "codeFile";
+const CSSFILE = "cssFile";
+const IMPORT = "import";
 
-var IMPORT = "import";
-
-var platform: typeof platformModule;
+let platform: typeof platformModule;
 function ensurePlatform() {
     if (!platform) {
         platform = require("platform");
     }
 }
 
-export function getComponentModule(elementName: string, namespace: string, attributes: Object, exports: Object): ComponentModule {
+export function getComponentModule(elementName: string, namespace: string, attributes: Object, exports: Object, moduleNamePath?: string): ComponentModule {
     var instance: View;
     var instanceModule: Object;
     var componentModule: ComponentModule;
@@ -50,11 +43,11 @@ export function getComponentModule(elementName: string, namespace: string, attri
         elementName.split(/(?=[A-Z])/).join("-").toLowerCase();
 
     try {
-        if (isString(namespace)) {
+        if (typeof namespace === "string") {
             if (global.moduleExists(namespace)) {
                 moduleId = namespace;
             } else {
-                var pathInsideTNSModules = path.join(knownFolders.currentApp().path, "tns_modules", namespace);
+                const pathInsideTNSModules = path.join(knownFolders.currentApp().path, "tns_modules", namespace);
 
                 try {
                     // module inside tns_modules
@@ -73,18 +66,19 @@ export function getComponentModule(elementName: string, namespace: string, attri
         }
 
         // Get the component type from module.
-        var instanceType = instanceModule[elementName] || Object;
+        const instanceType = instanceModule[elementName] || Object;
 
         // Create instance of the component.
         instance = new instanceType();
     } catch (ex) {
-        var debug: typeof debugModule = require("utils/debug");
+        const debug: typeof debugModule = require("utils/debug");
         throw new debug.ScopeError(ex, "Module '" + moduleId + "' not found for element '" + (namespace ? namespace + ":" : "") + elementName + "'.");
     }
 
+    let cssApplied = false;
     if (attributes) {
         if (attributes[IMPORT]) {
-            var importPath = attributes[IMPORT].trim();
+            let importPath = attributes[IMPORT].trim();
 
             if (importPath.indexOf("~/") === 0) {
                 importPath = path.join(knownFolders.currentApp().path, importPath.replace("~/", ""));
@@ -94,45 +88,55 @@ export function getComponentModule(elementName: string, namespace: string, attri
             (<any>instance).exports = exports;
         }
 
-        if (attributes[CODEFILE]) {
-            if (instance instanceof Page) {
-                var codeFilePath = attributes[CODEFILE].trim();
+        if (instance instanceof Page) {
+            if (attributes[CODEFILE]) {
+                let codeFilePath = attributes[CODEFILE].trim();
                 if (codeFilePath.indexOf("~/") === 0) {
                     codeFilePath = path.join(knownFolders.currentApp().path, codeFilePath.replace("~/", ""));
                 }
 
-                let codeFilePathWithExt = codeFilePath.indexOf(".js") !== -1 ? codeFilePath : `${codeFilePath}.js`;
+                const codeFilePathWithExt = codeFilePath.indexOf(".js") !== -1 ? codeFilePath : `${codeFilePath}.js`;
                 if (File.exists(codeFilePathWithExt)) {
                     exports = global.loadModule(codeFilePath);
                     (<any>instance).exports = exports;
                 } else {
                     throw new Error(`Code file with path "${codeFilePathWithExt}" cannot be found!`);
                 }
-            } else {
-                throw new Error("Code file atribute is valid only for pages!");
             }
-        }
 
-        if (attributes[CSSFILE]) {
-            if (instance instanceof Page) {
-                var cssFilePath = attributes[CSSFILE].trim();
+            if (attributes[CSSFILE]) {
+                let cssFilePath = attributes[CSSFILE].trim();
                 if (cssFilePath.indexOf("~/") === 0) {
                     cssFilePath = path.join(knownFolders.currentApp().path, cssFilePath.replace("~/", ""));
                 }
                 if (File.exists(cssFilePath)) {
-                    (<Page>instance).addCssFile(cssFilePath);
-                    instance[CSSFILE] = true;
+                    instance.addCssFile(cssFilePath);
+                    cssApplied = true;
                 } else {
                     throw new Error(`Css file with path "${cssFilePath}" cannot be found!`);
                 }
-            } else {
-                throw new Error("Css file attribute is valid only for pages!");
             }
         }
     }
 
+    if (instance instanceof Page) {
+        if (moduleNamePath && !cssApplied) {
+            let cssFilePath = resolveFileName(moduleNamePath, "css");
+            if (cssFilePath) {
+                instance.addCssFile(cssFilePath);
+                cssApplied = true;
+            }
+        }
+
+        if (!cssApplied) {
+            // Called only to apply application css.
+            // If we have page css (through file or cssAttribute) we have appCss applied.
+            instance._refreshCss();
+        }
+    }
+
     if (instance && instanceModule) {
-        for (var attr in attributes) {
+        for (let attr in attributes) {
 
             var attrValue = <string>attributes[attr];
 
@@ -149,12 +153,11 @@ export function getComponentModule(elementName: string, namespace: string, attri
             }
 
             if (attr.indexOf(".") !== -1) {
-                var subObj = instance;
-                var properties = attr.split(".");
-                var subPropName = properties[properties.length - 1];
+                let subObj = instance;
+                const properties = attr.split(".");
+                const subPropName = properties[properties.length - 1];
 
-                var i: number;
-                for (i = 0; i < properties.length - 1; i++) {
+                for (let i = 0; i < properties.length - 1; i++) {
                     if (isDefined(subObj)) {
                         subObj = subObj[properties[i]];
                     }
@@ -199,13 +202,8 @@ export function setPropertyValue(instance: View, instanceModule: Object, exports
     }
     else {
         let attrHandled = false;
-        let specialSetter = getSpecialPropertySetter(propertyName);
-        if (!attrHandled && specialSetter) {
-            specialSetter(instance, propertyValue);
-            attrHandled = true;
-        }
-        if (!attrHandled && (<any>instance)._applyXmlAttribute) {
-            attrHandled = (<any>instance)._applyXmlAttribute(propertyName, propertyValue);
+        if (!attrHandled && instance._applyXmlAttribute) {
+            attrHandled = instance._applyXmlAttribute(propertyName, propertyValue);
         }
         if (!attrHandled) {
             instance[propertyName] = propertyValue;
diff --git a/tns-core-modules/ui/core/properties.ts b/tns-core-modules/ui/core/properties.ts
index 1d1d2d304..480dcff44 100644
--- a/tns-core-modules/ui/core/properties.ts
+++ b/tns-core-modules/ui/core/properties.ts
@@ -585,8 +585,9 @@ export class CssAnimationProperty<T extends Style, U> {
         const eventName = propertyName + "Change";
 
         function descriptor(symbol: symbol, propertySource: ValueSource, enumerable: boolean, configurable: boolean, getsComputed: boolean): PropertyDescriptor {
-            return { enumerable, configurable,
-                get: getsComputed ? function(this: T) { return this[computedValue]; } : function(this: T) { return this[symbol]; },
+            return {
+                enumerable, configurable,
+                get: getsComputed ? function (this: T) { return this[computedValue]; } : function (this: T) { return this[symbol]; },
                 set(this: T, value: U) {
                     let prev = this[computedValue];
                     if (value === unsetValue) {
@@ -999,10 +1000,9 @@ export function resetCSSProperties(style: Style): void {
     }
 }
 
-export function propagateInheritedProperties(view: ViewBase): void {
+export function propagateInheritableProperties(view: ViewBase): void {
     const inheritablePropertyValues = inheritablePropertyValuesOn(view);
-    const inheritableCssPropertyValues = inheritableCssPropertyValuesOn(view.style);
-    if (inheritablePropertyValues.length === 0 && inheritableCssPropertyValues.length === 0) {
+    if (inheritablePropertyValues.length === 0) {
         return;
     }
 
@@ -1016,6 +1016,18 @@ export function propagateInheritedProperties(view: ViewBase): void {
             }
         }
 
+        return true;
+    });
+}
+
+export function propagateInheritableCssProperties(style: Style): void {
+    const view = style.view;
+    const inheritableCssPropertyValues = inheritableCssPropertyValuesOn(style);
+    if (inheritableCssPropertyValues.length === 0) {
+        return;
+    }
+
+    view.eachChild((child) => {
         for (let pair of inheritableCssPropertyValues) {
             const prop = pair.property;
             const sourceKey = prop.sourceKey;
@@ -1025,6 +1037,7 @@ export function propagateInheritedProperties(view: ViewBase): void {
                 prop.setInheritedValue.call(style, pair.value, ValueSource.Inherited);
             }
         }
+
         return true;
     });
 }
diff --git a/tns-core-modules/ui/core/view-base.ts b/tns-core-modules/ui/core/view-base.ts
index 9d71382b0..fc20fd0eb 100644
--- a/tns-core-modules/ui/core/view-base.ts
+++ b/tns-core-modules/ui/core/view-base.ts
@@ -1,6 +1,6 @@
 import { ViewBase as ViewBaseDefinition } from "ui/core/view-base";
 import { Observable, EventData, PropertyChangeData } from "data/observable";
-import { Property, InheritedProperty, Style, clearInheritedProperties, propagateInheritedProperties, resetCSSProperties, initNativeView, resetNativeView } from "./properties";
+import { Property, InheritedProperty, Style, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, resetCSSProperties, initNativeView, resetNativeView } from "./properties";
 import { Binding, BindingOptions } from "ui/core/bindable";
 import { isIOS, isAndroid } from "platform";
 import { fromString as gestureFromString } from "ui/gestures";
@@ -9,6 +9,8 @@ import { KeyframeAnimation } from "ui/animation/keyframe-animation";
 
 import { isEnabled as traceEnabled, write as traceWrite, categories as traceCategories, notifyEvent as traceNotifyEvent, isCategorySet } from "trace";
 
+import { Page } from "ui/page";
+
 // TODO: Remove this import!
 import * as types from "utils/types";
 
@@ -126,8 +128,8 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     public _domId: number;
     public _context: any;
     public _isAddedToNativeVisualTree: boolean;
-    public _isCssApplied: boolean;
     public _cssState: ssm.CssState;
+    public _styleScope: ssm.StyleScope;
 
     constructor() {
         super();
@@ -135,6 +137,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
         this._style = new Style(this);
     }
 
+    // TODO: Use Type.prototype.typeName instead.
     get typeName(): string {
         return types.getClass(this);
     }
@@ -177,7 +180,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
         return <T>getViewById(this, id);
     }
 
-    get page(): ViewBaseDefinition {
+    get page(): Page {
         if (this.parent) {
             return this.parent.page;
         }
@@ -199,6 +202,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     }
 
     public onUnloaded() {
+        this._styleScope = null;
         this._setCssState(null);
         this._unloadEachChild();
         this._isLoaded = false;
@@ -216,14 +220,10 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     }
 
     public _applyStyleFromScope() {
-        let rootPage = this.page;
-        if (!rootPage || this._isCssApplied) {
-            return;
+        const scope = this._styleScope;
+        if (scope) {
+            scope.applySelectors(this);
         }
-
-        let scope: ssm.StyleScope = (<any>rootPage)._getStyleScope();
-        scope.applySelectors(this);
-        this._isCssApplied = true;
     }
 
     // TODO: Make sure the state is set to null and this is called on unloaded to clean up change listeners...
@@ -422,7 +422,10 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     }
 
     public requestLayout(): void {
-        //
+        let parent = this.parent;
+        if (parent) {
+            parent.requestLayout();
+        }
     }
 
     public eachChild(callback: (child: ViewBase) => boolean) {
@@ -449,17 +452,29 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
         view._parentChanged(null);
     }
 
-    protected _addViewCore(view: ViewBase, atIndex?: number) {
+    private _setStyleScope(scope: ssm.StyleScope): void {
+        this._styleScope = scope;
         this._applyStyleFromScope();
+        this.eachChild((v) => {
+            v._setStyleScope(scope);
+            return true;
+        });
+    }
 
-        // TODO: Split this method - we want binding context before loaded.
-        propagateInheritedProperties(this);
+    public _addViewCore(view: ViewBase, atIndex?: number) {
+        propagateInheritableProperties(this);
+
+        const styleScope = this._styleScope;
+        if (styleScope) {
+            view._setStyleScope(styleScope);
+        }
+
+        propagateInheritableCssProperties(this.style);
 
         if (this._context) {
             view._setupUI(this._context, atIndex);
         }
-
-        // TODO: Discuss this.
+        
         if (this._isLoaded) {
             view.onLoaded();
         }
@@ -516,9 +531,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
         }
     }
 
-    public _setupUI(context: android.content.Context, atIndex?: number) {
-        this._applyStyleFromScope();
-
+    public _setupUI(context: android.content.Context, atIndex?: number, parentIsLoaded?: boolean) {
         traceNotifyEvent(this, "_setupUI");
         if (traceEnabled()) {
             traceWrite(`${this}._setupUI(${context})`, traceCategories.VisualTreeEvents);
@@ -686,7 +699,6 @@ export const classNameProperty = new Property<ViewBase, string>({
 classNameProperty.register(ViewBase);
 
 function resetStyles(view: ViewBase): void {
-    view._isCssApplied = false;
     view._cancelAllAnimations();
     resetCSSProperties(view.style);
     view._applyStyleFromScope();
@@ -697,4 +709,4 @@ function resetStyles(view: ViewBase): void {
 }
 
 export const idProperty = new Property<ViewBase, string>({ name: "id", valueChanged: (view, oldValue, newValue) => resetStyles(view) });
-idProperty.register(ViewBase);
+idProperty.register(ViewBase);
\ No newline at end of file
diff --git a/tns-core-modules/ui/core/view.d.ts b/tns-core-modules/ui/core/view.d.ts
index 00ace7c4f..791d670ca 100644
--- a/tns-core-modules/ui/core/view.d.ts
+++ b/tns-core-modules/ui/core/view.d.ts
@@ -28,15 +28,6 @@ declare module "ui/core/view" {
      */
     export function lengthComparer(x: Length, y: Length): boolean;
 
-    /**
-     * Iterates through all child views (via visual tree) and executes a function.
-     * @param view - Starting view (parent container).
-     * @param callback - A function to execute on every child. If function returns false it breaks the iteration.
-     */
-    export function eachDescendant(view: View, callback: (child: View) => boolean);
-
-    export function isEventOrGesture(name: string, view: View): boolean;
-
     export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator;
 
     /**
diff --git a/tns-core-modules/ui/definitions.d.ts b/tns-core-modules/ui/definitions.d.ts
index a13458024..6feac5584 100644
--- a/tns-core-modules/ui/definitions.d.ts
+++ b/tns-core-modules/ui/definitions.d.ts
@@ -1,10 +1,6 @@
 declare module "ui/core/view-base" {
     import { Observable, EventData } from "data/observable";
-    import {
-        Property, PropertyOptions, CoercibleProperty, CoerciblePropertyOptions,
-        InheritedProperty, CssProperty, CssPropertyOptions, InheritedCssProperty,
-        ShorthandProperty, ShorthandPropertyOptions, unsetValue
-    } from "ui/core/properties";
+    import { Property, InheritedProperty } from "ui/core/properties";
     import { Binding, BindingOptions } from "ui/core/bindable";
     import { Style } from "ui/styling/style";
     import { SelectorCore } from "ui/styling/css-selector";
@@ -12,6 +8,7 @@ declare module "ui/core/view-base" {
     import { fromString as gestureFromString } from "ui/gestures";
     import { KeyframeAnimation } from "ui/animation/keyframe-animation";
     import { isEnabled as traceEnabled, write as traceWrite, categories as traceCategories, notifyEvent as traceNotifyEvent, isCategorySet } from "trace";
+    import { Page } from "ui/page";
 
     export {
         Observable, EventData, KeyframeAnimation,
@@ -21,6 +18,13 @@ declare module "ui/core/view-base" {
 
     export * from "ui/core/properties";
 
+    /**
+     * Iterates through all child views (via visual tree) and executes a function.
+     * @param view - Starting view (parent container).
+     * @param callback - A function to execute on every child. If function returns false it breaks the iteration.
+     */
+    export function eachDescendant(view: ViewBase, callback: (child: ViewBase) => boolean);
+
     /**
      * Gets an ancestor from a given type.
      * @param view - Starting view (child view).
@@ -84,7 +88,7 @@ declare module "ui/core/view-base" {
         /**
          * Gets owner page. This is a read-only property.
          */
-        public readonly page: ViewBase;
+        public readonly page: Page;
 
         /**
          * Gets the style object associated to this view.
@@ -180,6 +184,10 @@ declare module "ui/core/view-base" {
          * A widget can call this method to discard mathing css pseudo class.
          */
         public deletePseudoClass(name: string): void;
+
+        //@private
+        public _styleScope: any;
+        //@endprivate
     }
 
     export const idProperty: Property<ViewBase, string>;
@@ -293,6 +301,8 @@ declare module "ui/core/properties" {
     export function initNativeView(view: ViewBase): void;
     export function resetNativeView(view: ViewBase): void;
     export function resetCSSProperties(style: Style): void;
+    export function propagateInheritableProperties(view: ViewBase): void;
+    export function propagateInheritableCssProperties(style: Style): void;
 
     export function makeValidator<T>(...values: T[]): (value: any) => value is T;
     export function makeParser<T>(isValid: (value: any) => boolean): (value: any) => T;
diff --git a/tns-core-modules/ui/dialogs/dialogs.android.ts b/tns-core-modules/ui/dialogs/dialogs.android.ts
index 48e920a4f..261234ab3 100644
--- a/tns-core-modules/ui/dialogs/dialogs.android.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.android.ts
@@ -3,11 +3,14 @@
  */
 import { DialogOptions, ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions } from "ui/dialogs";
 import { getLabelColor, getButtonColor, getButtonBackgroundColor, isDialogOptions, inputType, ALERT, OK, CONFIRM, CANCEL, PROMPT, LOGIN } from "./dialogs-common";
-import { isString, isDefined } from "utils/types";
 import { android as androidApp } from "application";
 
 export * from "./dialogs-common";
 
+function isString(value): value is string {
+    return typeof value === "string";
+}
+
 function createAlertDialog(options?: DialogOptions): android.app.AlertDialog.Builder {
     const alert = new android.app.AlertDialog.Builder(androidApp.foregroundActivity);
     alert.setTitle(options && isString(options.title) ? options.title : "");
@@ -279,7 +282,7 @@ export function action(arg: any): Promise<string> {
             options.cancelButtonText = arguments[1];
         }
     } else if (arguments.length === 3) {
-        if (isString(arguments[0]) && isString(arguments[1]) && isDefined(arguments[2])) {
+        if (isString(arguments[0]) && isString(arguments[1]) && typeof arguments[2] !== "undefined") {
             options = defaultOptions;
             options.message = arguments[0];
             options.cancelButtonText = arguments[1];
diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index b857e0378..5d8b38570 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -1,12 +1,34 @@
 import { Frame as FrameDefinition, NavigationEntry, BackstackEntry, NavigationTransition } from "ui/frame";
-import { Page, View, CustomLayoutView, isIOS, isAndroid, traceEnabled, traceWrite, traceCategories } from "ui/page";
+import { Page, View, CustomLayoutView, isIOS, isAndroid, traceEnabled, traceWrite, traceCategories, EventData } from "ui/page";
 import { isString, isFunction, isDefined } from "utils/types";
 import { resolveFileName } from "file-system/file-name-resolver";
 import * as fs from "file-system";
 import * as builder from "ui/builder";
+import * as application from "application";
 
 export * from "ui/page";
 
+function onLivesync(args: EventData): void {
+    // give time to allow fileNameResolver & css to reload.
+    setTimeout(() => {
+        let g = <any>global;
+        // Close the error page if available and remove the reference from global context.
+        if (g.errorPage) {
+            g.errorPage.closeModal();
+            g.errorPage = undefined;
+        }
+
+        try {
+            reloadPage();
+        } catch (ex) {
+            // Show the error as modal page, save reference to the page in global context.
+            g.errorPage = builder.parse(`<Page><ScrollView><Label text="${ex}" textWrap="true" style="color: red;" /></ScrollView></Page>`);
+            g.errorPage.showModal();
+        }
+    });
+}
+application.on("livesync", args => onLivesync);
+
 let frameStack: Array<FrameBase> = [];
 
 function buildEntryFromArgs(arg: any): NavigationEntry {
@@ -29,14 +51,14 @@ function buildEntryFromArgs(arg: any): NavigationEntry {
 }
 
 export function reloadPage(): void {
-    let frame = topmost();
+    const frame = topmost();
     if (frame) {
         if (frame.currentPage && frame.currentPage.modal) {
             frame.currentPage.modal.closeModal();
         }
 
-        let currentEntry = frame._currentEntry.entry;
-        let newEntry: NavigationEntry = {
+        const currentEntry = frame._currentEntry.entry;
+        const newEntry: NavigationEntry = {
             animated: false,
             clearHistory: true,
             context: currentEntry.context,
@@ -66,6 +88,7 @@ export function resolvePageFromEntry(entry: NavigationEntry): Page {
         let moduleNamePath = fs.path.join(currentAppPath, entry.moduleName);
 
         let moduleExports;
+        // web-pack case where developers register their page JS file manually.
         if (global.moduleExists(entry.moduleName)) {
             if (traceEnabled()) {
                 traceWrite("Loading pre-registered JS module: " + entry.moduleName, traceCategories.Navigation);
@@ -89,20 +112,20 @@ export function resolvePageFromEntry(entry: NavigationEntry): Page {
                 traceWrite("Calling createPage()", traceCategories.Navigation);
             }
             page = moduleExports.createPage();
-        }
-        else {
+
+            let cssFileName = resolveFileName(moduleNamePath, "css");
+            // If there is no cssFile only appCss will be applied at loaded.
+            if (cssFileName) {
+                page.addCssFile(cssFileName);
+            }
+        } else {
+            // cssFileName is loaded inside pageFromBuilder->loadPage
             page = pageFromBuilder(moduleNamePath, moduleExports);
         }
 
         if (!(page && page instanceof Page)) {
             throw new Error("Failed to load Page from entry.moduleName: " + entry.moduleName);
         }
-
-        // Possible CSS file path. Add it only if CSS not already specified and loaded from cssFile Page attribute in XML.
-        let cssFileName = resolveFileName(moduleNamePath, "css");
-        if (cssFileName && !page["cssFile"]) {
-            page.addCssFile(cssFileName);
-        }
     }
 
     return page;
@@ -120,10 +143,7 @@ function pageFromBuilder(moduleNamePath: string, moduleExports: any): Page {
         }
 
         // Or check if the file exists in the app modules and load the page from XML.
-        element = builder.load(fileName, moduleExports);
-        if (element instanceof Page) {
-            page = <Page>element;
-        }
+        page = builder.loadPage(moduleNamePath, fileName, moduleExports);
     }
 
     // Attempts to implement https://github.com/NativeScript/NativeScript/issues/1311
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index 4edc8842e..d3179474d 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -755,18 +755,14 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
             traceWrite(`Activity.onCreate(${savedInstanceState})`, traceCategories.NativeLifecycle);
         }
 
-        let app = application.android;
-        let intent = activity.getIntent();
-        if (application.onLaunch) {
-            application.onLaunch(intent);
-        }
-
-        let launchArgs: application.LaunchEventData = { eventName: application.launchEvent, object: app, android: intent };
+        const app = application.android;
+        const intent = activity.getIntent();
+        const launchArgs: application.LaunchEventData = { eventName: application.launchEvent, object: app, android: intent };
         application.notify(launchArgs);
 
         let frameId = -1;
         let rootView = launchArgs.root;
-        let extras = intent.getExtras();
+        const extras = intent.getExtras();
 
         // We have extras when we call - new Frame().navigate();
         // savedInstanceState is used when activity is recreated.
@@ -872,9 +868,6 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
 
         const exitArgs = { eventName: application.exitEvent, object: application.android, android: activity };
         application.notify(exitArgs);
-        if (application.onExit) {
-            application.onExit();
-        }
     }
 
     public onBackPressed(activity: any, superFunc: Function): void {
@@ -920,11 +913,6 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
             traceWrite(`NativeScriptActivity.onActivityResult(${requestCode}, ${resultCode}, ${data})`, traceCategories.NativeLifecycle);
         }
 
-        const result = application.android.onActivityResult;
-        if (result) {
-            result(requestCode, resultCode, data);
-        }
-
         application.android.notify(<application.AndroidActivityResultEventData>{
             eventName: "activityResult",
             object: application.android,
diff --git a/tns-core-modules/ui/page/page-common.ts b/tns-core-modules/ui/page/page-common.ts
index 23b0b8103..df680f475 100644
--- a/tns-core-modules/ui/page/page-common.ts
+++ b/tns-core-modules/ui/page/page-common.ts
@@ -5,7 +5,7 @@ import {
 import { Frame, topmost as topmostFrame, resolvePageFromEntry } from "ui/frame";
 import { ActionBar } from "ui/action-bar";
 import { KeyframeAnimationInfo } from "ui/animation/keyframe-animation";
-import { StyleScope } from "../styling/style-scope";
+import { StyleScope } from "ui/styling/style-scope";
 import { File, path, knownFolders } from "file-system";
 
 export * from "ui/content-view";
@@ -24,8 +24,6 @@ export class PageBase extends ContentView implements PageDefinition {
 
     private _navigationContext: any;
 
-    private _cssApplied: boolean;
-    private _styleScope = new StyleScope();
     private _actionBar: ActionBar;
 
     public _modal: PageBase;
@@ -39,7 +37,7 @@ export class PageBase extends ContentView implements PageDefinition {
 
     constructor() {
         super();
-        this.actionBar = new ActionBar();
+        this._styleScope = new StyleScope();
     }
 
     get navigationContext(): any {
@@ -47,17 +45,19 @@ export class PageBase extends ContentView implements PageDefinition {
     }
 
     get css(): string {
-        if (this._styleScope) {
-            return this._styleScope.css;
-        }
-        return undefined;
+        return this._styleScope.css;
     }
     set css(value: string) {
         this._styleScope.css = value;
+        this._cssFiles = {};
         this._refreshCss();
     }
 
     get actionBar(): ActionBar {
+        if (!this._actionBar) {
+            this._actionBar = new ActionBar();
+            this._addView(this._actionBar);
+        }
         return this._actionBar;
     }
     set actionBar(value: ActionBar) {
@@ -67,35 +67,41 @@ export class PageBase extends ContentView implements PageDefinition {
 
         if (this._actionBar !== value) {
             if (this._actionBar) {
-                this._actionBar.page = undefined;
                 this._removeView(this._actionBar);
             }
             this._actionBar = value;
-            this._actionBar.page = this;
             this._addView(this._actionBar);
         }
     }
 
-    get page(): View {
+    get page(): PageDefinition {
         return this;
     }
 
-    private _refreshCss(): void {
-        if (this._cssApplied) {
-            this._resetCssValues();
+    public refreshCssIfAppCssChanged(): void {
+        // If app css changed ensureSelectors will return true.
+        // Need when app css change and page is in the backstack.
+        if (this._styleScope.ensureSelectors()) {
+            this._refreshCss();
         }
+    }
 
-        this._cssApplied = false;
-        if (this.isLoaded) {
-            this._applyCss();
-        }
+    public onLoaded(): void {
+        this.refreshCssIfAppCssChanged();
+        super.onLoaded();
+    }
+
+    public onUnloaded() {
+        const styleScope = this._styleScope;
+        super.onUnloaded();
+        this._styleScope = styleScope;
     }
 
     public addCss(cssString: string): void {
-        this._addCssInternal(cssString, undefined);
+        this._addCssInternal(cssString);
     }
 
-    private _addCssInternal(cssString: string, cssFileName: string): void {
+    private _addCssInternal(cssString: string, cssFileName?: string): void {
         this._styleScope.addCss(cssString, cssFileName);
         this._refreshCss();
     }
@@ -117,6 +123,18 @@ export class PageBase extends ContentView implements PageDefinition {
         }
     }
 
+    public _refreshCss(): void {
+        const styleScope = this._styleScope;
+        this._resetCssValues();
+        const checkSelectors = (view: View): boolean => {
+            styleScope.applySelectors(view);
+            return true;
+        };
+
+        checkSelectors(this);
+        eachDescendant(this, checkSelectors);
+    }
+
     public getKeyframeAnimationWithName(animationName: string): KeyframeAnimationInfo {
         return this._styleScope.getKeyframeAnimationWithName(animationName);
     }
@@ -251,25 +269,6 @@ export class PageBase extends ContentView implements PageDefinition {
         return (this.content ? 1 : 0) + (this.actionBar ? 1 : 0);
     }
 
-    private _applyCss() {
-        if (this._cssApplied) {
-            return;
-        }
-
-        this._styleScope.ensureSelectors();
-
-        const scope = this._styleScope;
-        const checkSelectors = (view: View): boolean => {
-            scope.applySelectors(view);
-            return true;
-        };
-
-        checkSelectors(this);
-        eachDescendant(this, checkSelectors);
-
-        this._cssApplied = true;
-    }
-
     private _resetCssValues() {
         const resetCssValuesFunc = (view: View): boolean => {
             view._cancelAllAnimations();
diff --git a/tns-core-modules/ui/page/page.d.ts b/tns-core-modules/ui/page/page.d.ts
index f318d2739..3f2244adb 100644
--- a/tns-core-modules/ui/page/page.d.ts
+++ b/tns-core-modules/ui/page/page.d.ts
@@ -248,6 +248,7 @@ declare module "ui/page" {
          */
         onNavigatedFrom(isBackNavigation: boolean): void;
 
+        _refreshCss(): void;
         _getStyleScope(): styleScope.StyleScope;
         //@endprivate
     }
diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
index 3e79875d9..e178867e6 100644
--- a/tns-core-modules/ui/styling/style-scope.ts
+++ b/tns-core-modules/ui/styling/style-scope.ts
@@ -21,8 +21,56 @@ function ensureCssAnimationParserModule() {
     }
 }
 
+export function mergeCssSelectors(): void {
+    applicationCssSelectors = applicationSelectors.slice();
+    applicationCssSelectors.push.apply(applicationCssSelectors, applicationAdditionalSelectors);
+    applicationCssSelectorVersion++;
+}
+
+let applicationCssSelectors: RuleSet[] = [];
+let applicationCssSelectorVersion: number = 0;
+let applicationSelectors: RuleSet[] = [];
+const applicationAdditionalSelectors: RuleSet[] = [];
+const applicationKeyframes: any = {};
+
 const animationsSymbol: symbol = Symbol("animations");
 
+function onCssChanged(args: application.CssChangedEventData): void {
+    if (args.cssText) {
+        const parsed = createSelectorsFromCss(args.cssText, args.cssFile, applicationKeyframes);
+        if (parsed) {
+            applicationAdditionalSelectors.push.apply(applicationAdditionalSelectors, parsed);
+            mergeCssSelectors();
+        }
+    }
+}
+
+function onLiveSync(args: application.CssChangedEventData): void {
+    loadCss(args.cssFile)
+}
+
+function loadCss(cssFile?: string): RuleSet[] {
+    if (!cssFile) {
+        return undefined;
+    }
+
+    let result: RuleSet[];
+
+    const cssFileName = path.join(knownFolders.currentApp().path, cssFile);
+    if (File.exists(cssFileName)) {
+        const file = File.fromPath(cssFileName);
+        const applicationCss = file.readTextSync();
+        if (applicationCss) {
+            result = createSelectorsFromCss(applicationCss, cssFileName, applicationKeyframes);
+            applicationSelectors = result;
+            mergeCssSelectors();
+        }
+    }
+}
+
+application.on("cssChanged", onCssChanged);
+application.on("livesync", onLiveSync);
+
 let pattern: RegExp = /('|")(.*?)\1/;
 
 export class CssState {
@@ -115,7 +163,7 @@ export class StyleScope {
 
         this._reset();
 
-        const parsedSelectors = StyleScope.createSelectorsFromCss(this._css, cssFileName, this._keyframes);
+        const parsedSelectors = createSelectorsFromCss(this._css, cssFileName, this._keyframes);
 
         if (append) {
             this._localCssSelectors.push.apply(this._localCssSelectors, parsedSelectors);
@@ -139,66 +187,22 @@ export class StyleScope {
         return undefined;
     }
 
-    public static createSelectorsFromCss(css: string, cssFileName: string, keyframes: Object): RuleSet[] {
-        try {
-            let pageCssSyntaxTree = css ? parseCss(css, { source: cssFileName }) : null;
-            let pageCssSelectors: RuleSet[] = [];
-            if (pageCssSyntaxTree) {
-                pageCssSelectors = pageCssSelectors.concat(StyleScope.createSelectorsFromImports(pageCssSyntaxTree, keyframes));
-                pageCssSelectors = pageCssSelectors.concat(StyleScope.createSelectorsFromSyntaxTree(pageCssSyntaxTree, keyframes));
-            }
-            return pageCssSelectors;
-        } catch (e) {
-            traceWrite("Css styling failed: " + e, traceCategories.Error, traceMessageType.error);
-        }
-    }
-
-    public static createSelectorsFromImports(tree: SyntaxTree, keyframes: Object): RuleSet[] {
-        let selectors: RuleSet[] = [];
-
-        if (tree !== null && tree !== undefined) {
-            let imports = tree["stylesheet"]["rules"].filter(r => r.type === "import");
-
-            for (let i = 0; i < imports.length; i++) {
-                let importItem = imports[i]["import"];
-
-                let match = importItem && (<string>importItem).match(pattern);
-                let url = match && match[2];
-
-                if (url !== null && url !== undefined) {
-                    let appDirectory = knownFolders.currentApp().path;
-                    let fileName = resolveFileNameFromUrl(url, appDirectory, File.exists);
-
-                    if (fileName !== null) {
-                        let file = File.fromPath(fileName);
-                        let text = file.readTextSync();
-                        if (text) {
-                            selectors = selectors.concat(StyleScope.createSelectorsFromCss(text, fileName, keyframes));
-                        }
-                    }
-                }
-            }
-        }
-
-        return selectors;
-    }
-
     public ensureSelectors(): boolean {
-        let toMerge = [];
-        if ((this._applicationCssSelectorsAppliedVersion !== application.cssSelectorVersion) ||
-            (this._localCssSelectorVersion !== this._localCssSelectorsAppliedVersion) ||
-            (!this._mergedCssSelectors)) {
-
-            toMerge.push(application.cssSelectors);
-            this._applicationCssSelectorsAppliedVersion = application.cssSelectorVersion;
+        let toMerge: RuleSet[][];
+        if (this._applicationCssSelectorsAppliedVersion !== applicationCssSelectorVersion ||
+            this._localCssSelectorVersion !== this._localCssSelectorsAppliedVersion ||
+            !this._mergedCssSelectors) {
+            toMerge = [];
+            toMerge.push(applicationCssSelectors);
+            this._applicationCssSelectorsAppliedVersion = applicationCssSelectorVersion;
             toMerge.push(this._localCssSelectors);
             this._localCssSelectorsAppliedVersion = this._localCssSelectorVersion;
-            for (let keyframe in application.keyframes) {
-                this._keyframes[keyframe] = application.keyframes[keyframe];
+            for (let keyframe in applicationKeyframes) {
+                this._keyframes[keyframe] = applicationKeyframes[keyframe];
             }
         }
 
-        if (toMerge.length > 0) {
+        if (toMerge && toMerge.length > 0) {
             this._mergedCssSelectors = toMerge.filter(m => !!m).reduce((merged, next) => merged.concat(next), []);
             this._applyKeyframesOnSelectors();
         } else {
@@ -206,7 +210,6 @@ export class StyleScope {
         }
 
         this._selectors = new SelectorsMap(this._mergedCssSelectors);
-
         return true;
     }
 
@@ -224,19 +227,6 @@ export class StyleScope {
         return this._selectors.query(node).selectors;
     }
 
-    private static createSelectorsFromSyntaxTree(ast: SyntaxTree, keyframes: Object): RuleSet[] {
-        let nodes = ast.stylesheet.rules;
-        (<Keyframes[]>nodes.filter(isKeyframe)).forEach(node => keyframes[node.name] = node);
-
-        let rulesets = fromAstNodes(nodes);
-        if (rulesets && rulesets.length) {
-            ensureCssAnimationParserModule();
-            rulesets.forEach(rule => rule[animationsSymbol] = cssAnimationParserModule.CssAnimationParser.keyframeAnimationsFromCSSDeclarations(rule.declarations));
-        }
-
-        return rulesets;
-    }
-
     private _reset() {
         this._statesByKey = {};
         this._viewIdToKey = {};
@@ -263,6 +253,63 @@ export class StyleScope {
     }
 }
 
+function createSelectorsFromCss(css: string, cssFileName: string, keyframes: Object): RuleSet[] {
+    try {
+        const pageCssSyntaxTree = css ? parseCss(css, { source: cssFileName }) : null;
+        let pageCssSelectors: RuleSet[] = [];
+        if (pageCssSyntaxTree) {
+            pageCssSelectors = pageCssSelectors.concat(createSelectorsFromImports(pageCssSyntaxTree, keyframes));
+            pageCssSelectors = pageCssSelectors.concat(createSelectorsFromSyntaxTree(pageCssSyntaxTree, keyframes));
+        }
+        return pageCssSelectors;
+    } catch (e) {
+        traceWrite("Css styling failed: " + e, traceCategories.Error, traceMessageType.error);
+    }
+}
+
+function createSelectorsFromImports(tree: SyntaxTree, keyframes: Object): RuleSet[] {
+    let selectors: RuleSet[] = [];
+
+    if (tree !== null && tree !== undefined) {
+        const imports = tree["stylesheet"]["rules"].filter(r => r.type === "import");
+
+        for (let i = 0; i < imports.length; i++) {
+            const importItem = imports[i]["import"];
+
+            const match = importItem && (<string>importItem).match(pattern);
+            const url = match && match[2];
+
+            if (url !== null && url !== undefined) {
+                const appDirectory = knownFolders.currentApp().path;
+                const fileName = resolveFileNameFromUrl(url, appDirectory, File.exists);
+
+                if (fileName !== null) {
+                    const file = File.fromPath(fileName);
+                    const text = file.readTextSync();
+                    if (text) {
+                        selectors = selectors.concat(createSelectorsFromCss(text, fileName, keyframes));
+                    }
+                }
+            }
+        }
+    }
+
+    return selectors;
+}
+
+function createSelectorsFromSyntaxTree(ast: SyntaxTree, keyframes: Object): RuleSet[] {
+    const nodes = ast.stylesheet.rules;
+    (<Keyframes[]>nodes.filter(isKeyframe)).forEach(node => keyframes[node.name] = node);
+
+    const rulesets = fromAstNodes(nodes);
+    if (rulesets && rulesets.length) {
+        ensureCssAnimationParserModule();
+        rulesets.forEach(rule => rule[animationsSymbol] = cssAnimationParserModule.CssAnimationParser.keyframeAnimationsFromCSSDeclarations(rule.declarations));
+    }
+
+    return rulesets;
+}
+
 export function resolveFileNameFromUrl(url: string, appDirectory: string, fileExists: (name: string) => boolean): string {
     let fileName: string = typeof url === "string" ? url.trim() : "";
 
@@ -285,7 +332,7 @@ export function resolveFileNameFromUrl(url: string, appDirectory: string, fileEx
 
 export function applyInlineStyle(view: ViewBase, styleStr: string) {
     let localStyle = `local { ${styleStr} }`;
-    let inlineRuleSet = StyleScope.createSelectorsFromCss(localStyle, null, {});
+    let inlineRuleSet = createSelectorsFromCss(localStyle, null, {});
     const style = view.style;
 
     inlineRuleSet[0].declarations.forEach(d => {
@@ -319,3 +366,5 @@ class InlineSelector extends SelectorCore {
     public ruleset: RuleSet;
     public match(node: Node): boolean { return true; }
 }
+
+loadCss(application.cssFile);
\ No newline at end of file
diff --git a/tns-core-modules/utils/utils-common.ts b/tns-core-modules/utils/utils-common.ts
index f32515f5a..e1e268273 100644
--- a/tns-core-modules/utils/utils-common.ts
+++ b/tns-core-modules/utils/utils-common.ts
@@ -2,33 +2,6 @@
 
 export var RESOURCE_PREFIX = "res://";
 
-export function copyFrom(source: any, target: any) {
-    if (types.isDefined(source) && types.isDefined(target)) {
-        var i: number;
-        var key: string;
-        var value: any;
-        var keys = Object.keys(source);
-
-        for (i = 0; i < keys.length; i++) {
-            key = keys[i];
-            value = source[key];
-
-            if (types.isDefined(value)) {
-                target[key] = value;
-            }
-        }
-    }
-}
-
-export function parseJSON(source: string): any {
-    var src = source.trim();
-    if (src.lastIndexOf(")") === src.length - 1) {
-        return JSON.parse(src.substring(src.indexOf("(") + 1, src.lastIndexOf(")")));
-    }
-
-    return JSON.parse(src);
-}
-
 export function escapeRegexSymbols(source: string): string {
     let escapeRegex = /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g;
     return source.replace(escapeRegex, "\\$&");
diff --git a/tns-core-modules/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
index 0ae72b166..5852e0f87 100644
--- a/tns-core-modules/utils/utils.android.ts
+++ b/tns-core-modules/utils/utils.android.ts
@@ -4,19 +4,20 @@
 
 export * from "./utils-common";
 
+import { getNativeApplication } from "application";
+
 export module layout {
-    let density = -1;
-    let metrics: android.util.DisplayMetrics;
+    let density: number;
 
     // cache the MeasureSpec constants here, to prevent extensive marshaling calls to and from Java
     // TODO: While this boosts the performance it is error-prone in case Google changes these constants
     const MODE_SHIFT = 30;
     const MODE_MASK = 0x3 << MODE_SHIFT;
-    let sdkVersion = -1;
+    let sdkVersion: number;
     let useOldMeasureSpec = false;
 
     export function makeMeasureSpec(size: number, mode: number): number {
-        if (sdkVersion === -1) {
+        if (sdkVersion === undefined) {
             // check whether the old layout is needed
             sdkVersion = ad.getApplicationContext().getApplicationInfo().targetSdkVersion;
             useOldMeasureSpec = sdkVersion <= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
@@ -29,17 +30,9 @@ export module layout {
         return (size & ~MODE_MASK) | (mode & MODE_MASK);
     }
 
-    export function getDisplayMetrics(): android.util.DisplayMetrics {
-        if (!metrics) {
-            metrics = ad.getApplicationContext().getResources().getDisplayMetrics();
-        }
-
-        return metrics;
-    }
-
     export function getDisplayDensity(): number {
-        if (density === -1) {
-            density = getDisplayMetrics().density;
+        if (density === undefined) {
+            density = ad.getResources().getDisplayMetrics().density;
         }
 
         return density;
@@ -56,44 +49,38 @@ export module layout {
 
 // We are using "ad" here to avoid namespace collision with the global android object
 export module ad {
-    let nativeApp: android.app.Application;
-    declare var com;
-    export function getApplication() {
-        if (!nativeApp) {
-            // check whether the com.tns.NativeScriptApplication type exists
-            if (com.tns.NativeScriptApplication) {
-                nativeApp = com.tns.NativeScriptApplication.getInstance();
-            }
 
-            // the getInstance might return null if com.tns.NativeScriptApplication exists but is  not the starting app type
-            if (!nativeApp) {
-                // check whether application.android.init has been explicitly called
-                let application = require("application");
-                nativeApp = application.android.nativeApp;
-
-                if (!nativeApp) {
-                    // TODO: Should we handle the case when a custom application type is provided and the user has not explicitly initialized the application module? 
-                    let clazz = java.lang.Class.forName("android.app.ActivityThread");
-                    if (clazz) {
-                        let method = clazz.getMethod("currentApplication", null);
-                        if (method) {
-                            nativeApp = method.invoke(null, null);
-                        }
-                    }
-                }
-            }
-
-            // we cannot work without having the app instance
-            if (!nativeApp) {
-                throw new Error("Failed to retrieve native Android Application object. If you have a custom android.app.Application type implemented make sure that you've called the '<application-module>.android.init' method.")
-            }
+    let application: android.app.Application;
+    let applicationContext: android.content.Context;
+    let contextResources: android.content.res.Resources;
+    let packageName: string;
+    export function getApplicationContext() {
+        if (!applicationContext) {
+            applicationContext = getApplication().getApplicationContext();
         }
 
-        return nativeApp;
+        return applicationContext;
     }
-    export function getApplicationContext() {
-        let app = getApplication();
-        return app.getApplicationContext();
+    export function getApplication() {
+        if (!application) {
+            application = (<android.app.Application>getNativeApplication());
+        }
+
+        return application;
+    }
+    export function getResources() {
+        if (!contextResources) {
+            contextResources = getApplication().getResources();
+        }
+
+        return contextResources;
+    }
+    function getPackageName() {
+        if (!packageName) {
+            packageName = getApplicationContext().getPackageName();
+        }
+
+        return packageName;
     }
 
     let inputMethodManager: android.view.inputmethod.InputMethodManager;
@@ -156,8 +143,8 @@ export module ad {
         }
 
         export function getId(name: string): number {
-            var resources = getApplicationContext().getResources();
-            var packageName = getApplicationContext().getPackageName();
+            var resources = getResources();
+            var packageName = getPackageName();
             var uri = packageName + name;
             return resources.getIdentifier(uri, null, null);
         }
@@ -200,7 +187,7 @@ export function GC() {
 }
 
 export function openUrl(location: string): boolean {
-    var context = ad.getApplicationContext();
+    const context = ad.getApplicationContext();
     try {
         var intent = new android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(location.trim()));
         intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/tns-core-modules/utils/utils.d.ts b/tns-core-modules/utils/utils.d.ts
index ca04a9661..455b8b750 100644
--- a/tns-core-modules/utils/utils.d.ts
+++ b/tns-core-modules/utils/utils.d.ts
@@ -206,12 +206,7 @@
          */
         export function openFile(filePath: string): boolean
     }
-    /**
-     * An utility function that copies properties from source object to target object.
-     * @param source - The source object.
-     * @param target - The target object.
-     */
-    export function copyFrom(source: any, target: any);
+
     /**
      * An utility function that invokes garbage collection on the JavaScript side.
      */
@@ -229,12 +224,6 @@
      */
     export function isDataURI(uri: string): boolean
 
-    /**
-     * Returns object from JSON or JSONP string.
-     * @param source The JSON or JSONP string.
-     */
-    export function parseJSON(source: string): any
-
     /**
      * Opens url.
      * @param url The url.