diff --git a/README.md b/README.md
index c726c6f2f..cbbe36f7b 100644
--- a/README.md
+++ b/README.md
@@ -49,15 +49,23 @@ nx run core:build.npm
 There are additional targets you can test changes against:
 
 ```
-// livesync develop changes (used in CI automated tests)
+// variety of manual ui testing
+nx run core-e2e-ui:ios
+nx run core-e2e-ui:android
+nx run core-e2e-ui:clean
+
+// used in CI automated tests but you can run these manually as well to check if you caused any regressions
 nx run core-e2e-automated:ios
 nx run core-e2e-automated:android
 nx run core-e2e-automated:clean
 
-// various ui testing
-nx run core-e2e-ui:ios
-nx run core-e2e-ui:android
-nx run core-e2e-ui:clean
+
+```
+
+#### Compatibility package for old style tns-core-modules
+
+```
+nx run tns-core-modules-compat:build
 ```
 
 ## @nativescript/ui-mobile-base
diff --git a/nx.json b/nx.json
index e689f4a01..19a4ccc00 100644
--- a/nx.json
+++ b/nx.json
@@ -36,6 +36,9 @@
     "core": {
       "tags": []
     },
+    "tns-core-modules-compat": {
+      "tags": []
+    },
     "types-ios": {
       "tags": []
     },
diff --git a/package.json b/package.json
index 733fb1fdc..eb3dd4574 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript",
-  "version": "7.0.0-rc.12",
+  "version": "7.0.0-rc.19",
   "license": "MIT",
   "scripts": {
     "nx": "nx",
diff --git a/packages/core/__tests__/e2e/automated/app/trace/trace-tests.ts b/packages/core/__tests__/e2e/automated/app/trace/trace-tests.ts
index af9f37817..a79430541 100644
--- a/packages/core/__tests__/e2e/automated/app/trace/trace-tests.ts
+++ b/packages/core/__tests__/e2e/automated/app/trace/trace-tests.ts
@@ -4,14 +4,14 @@ import { Trace } from "@nativescript/core";
 
 export var test_DummyTestForSnippetOnly0 = function () {
     // >> trace-all-categories
-    Trace.setCategories(Trace.categories.All.join(','));
+    Trace.setCategories(Trace.categories.All);
     Trace.enable();
     // << trace-all-categories
 };
 
 export var test_DummyTestForSnippetOnly1 = function () {
     // >> trace-specific-categories
-    Trace.setCategories(Trace.categories.All.concat(
+    Trace.setCategories(Trace.categories.All.split(',').concat(
         Trace.categories.Binding
         , Trace.categories.Debug
         , Trace.categories.Layout
diff --git a/packages/core/__tests__/e2e/ui/app/list-view/listview-binding-page.ts b/packages/core/__tests__/e2e/ui/app/list-view/listview-binding-page.ts
index 54936c5d6..1c46f7a2d 100644
--- a/packages/core/__tests__/e2e/ui/app/list-view/listview-binding-page.ts
+++ b/packages/core/__tests__/e2e/ui/app/list-view/listview-binding-page.ts
@@ -1,19 +1,15 @@
-import * as pageModule from "@nativescript/core/ui/page";
-import * as gridLayoutModule from "@nativescript/core/ui/layouts/grid-layout";
-import * as listViewModule from "@nativescript/core/ui/list-view";
-import * as observable from "@nativescript/core/data/observable";
-import * as observableArr from "@nativescript/core/data/observable-array";
+import { Page, GridLayout, ListView, Observable, ObservableArray, EventData } from "@nativescript/core";
 
-var arr = new observableArr.ObservableArray();
+var arr = new ObservableArray();
 for (var i = 0; i < 100; i++) {
     arr.push("item " + i);
 }
 
 export function createPage() {
-    var page: pageModule.Page = new pageModule.Page();
-    var grid: gridLayoutModule.GridLayout = new gridLayoutModule.GridLayout();
-    var listView: listViewModule.ListView = new listViewModule.ListView();
-    listView.on(listViewModule.ListView.loadedEvent, function (args: observable.EventData) {
+    var page: Page = new Page();
+    var grid: GridLayout = new GridLayout();
+    var listView: ListView = new ListView();
+    listView.on(ListView.loadedEvent, function (args: EventData) {
         (<any>args.object).items = arr;
     });
     grid.addChild(listView);
diff --git a/packages/core/application/index.ios.ts b/packages/core/application/index.ios.ts
index dff386ac8..2b7c86d4f 100644
--- a/packages/core/application/index.ios.ts
+++ b/packages/core/application/index.ios.ts
@@ -111,9 +111,9 @@ export class iOSApplication implements iOSApplicationDefinition {
 	}
 
 	get rootController(): UIViewController {
-    if (NativeScriptEmbedder.sharedInstance().delegate && !this._window) {
-      this._window = UIApplication.sharedApplication.delegate.window;
-    }
+		if (NativeScriptEmbedder.sharedInstance().delegate && !this._window) {
+			this._window = UIApplication.sharedApplication.delegate.window;
+		}
 		return this._window.rootViewController;
 	}
 
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
index 842f870c2..80cdd5c43 100644
--- a/packages/core/index.d.ts
+++ b/packages/core/index.d.ts
@@ -92,6 +92,8 @@ export declare const Utils: {
 	isRealDevice: typeof isRealDevice;
 	layout: typeof layout;
 	android: typeof androidUtils;
+	// legacy (a lot of plugins use the shorthand "ad" Utils.ad instead of Utils.android)
+	ad: typeof androidUtils;
 	ios: typeof iosUtils;
 	Source: typeof Source;
 	ClassInfo: typeof ClassInfo;
diff --git a/packages/core/index.ts b/packages/core/index.ts
index f0d64e7a5..a89f29152 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -119,6 +119,8 @@ export const Utils = {
 
 	layout,
 	android: androidUtils,
+	// legacy (a lot of plugins use the shorthand "ad" Utils.ad instead of Utils.android)
+	ad: androidUtils,
 	ios: iosUtils,
 	Source,
 	ClassInfo,
diff --git a/packages/core/package.json b/packages/core/package.json
index e4b3da788..93868a285 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "NativeScript Core Modules",
-  "version": "7.0.0-rc.12",
+  "version": "7.0.0-rc.19",
   "homepage": "https://nativescript.org",
   "repository": {
       "type": "git",
@@ -25,7 +25,8 @@
   "dependencies": {
     "css-tree": "^1.0.0-alpha.39",
     "@nativescript/hook": "~1.0.0",
-    "reduce-css-calc": "^2.1.7"
+    "reduce-css-calc": "^2.1.7",
+    "tns-core-modules": "rc"
   },
   "nativescript": {
       "platforms": {
diff --git a/packages/core/ui/animation/keyframe-animation.d.ts b/packages/core/ui/animation/keyframe-animation.d.ts
index 1c1d7bb0d..2e2fc3aed 100644
--- a/packages/core/ui/animation/keyframe-animation.d.ts
+++ b/packages/core/ui/animation/keyframe-animation.d.ts
@@ -1,4 +1,6 @@
 import { View } from '../core/view';
+import { Color } from '../../color';
+import { PercentLength } from '../styling/style-properties';
 
 export declare const ANIMATION_PROPERTIES;
 
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index 715b451d0..e2222decf 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -50,6 +50,8 @@ import { Device } from '../../../platform';
 import lazy from '../../../utils/lazy';
 
 export * from './view-common';
+// This one can eventually be cleaned up but causes issues with a lot of ui-suite plugins in particular if not exported here
+export * from '../properties';
 
 const DOMID = '_domId';
 const androidBackPressedEvent = 'androidBackPressed';
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
index d936ea885..7e2d727dc 100644
--- a/packages/core/ui/core/view/index.d.ts
+++ b/packages/core/ui/core/view/index.d.ts
@@ -10,6 +10,9 @@ import { LinearGradient } from '../../styling/gradient';
 // helpers (these are okay re-exported here)
 export * from './view-helper';
 
+// This one can eventually be cleaned up but causes issues with a lot of ui-suite plugins in particular if not exported here
+export * from '../properties';
+
 export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator;
 
 /**
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
index 63374fc15..5cf93f3b2 100644
--- a/packages/core/ui/core/view/index.ios.ts
+++ b/packages/core/ui/core/view/index.ios.ts
@@ -12,6 +12,8 @@ import { perspectiveProperty, Visibility, visibilityProperty, opacityProperty, r
 import { profile } from '../../../profiling';
 
 export * from './view-common';
+// This one can eventually be cleaned up but causes issues with a lot of ui-suite plugins in particular if not exported here
+export * from '../properties';
 
 const PFLAG_FORCE_LAYOUT = 1;
 const PFLAG_MEASURED_DIMENSION_SET = 1 << 1;
diff --git a/packages/core/ui/index.d.ts b/packages/core/ui/index.d.ts
index 6eb99dcd2..04c00cce7 100644
--- a/packages/core/ui/index.d.ts
+++ b/packages/core/ui/index.d.ts
@@ -7,8 +7,8 @@ export { sanitizeModuleName } from './builder/module-name-sanitizer';
 export { Button } from './button';
 export { ContentView } from './content-view';
 export { Binding, BindingOptions } from './core/bindable';
-export { ViewBase, ShowModalOptions, eachDescendant, getAncestor, getViewById } from './core/view-base';
-export { View, Template, KeyedTemplate, ShownModallyData } from './core/view';
+export { ViewBase, ShowModalOptions, eachDescendant, getAncestor, getViewById, booleanConverter } from './core/view-base';
+export { View, Template, KeyedTemplate, ShownModallyData, CSSType, ContainerView } from './core/view';
 export { Property, CoercibleProperty, InheritedProperty, CssProperty, InheritedCssProperty, ShorthandProperty, CssAnimationProperty, unsetValue } from './core/properties';
 export { DatePicker } from './date-picker';
 
@@ -17,7 +17,7 @@ export { action, alert, confirm, login, prompt, getCurrentPage, Dialogs, DialogS
 
 export * from './editable-text-base';
 export { Enums } from './enums';
-export { Frame, NavigationEntry, NavigationContext, NavigationTransition, BackstackEntry, ViewEntry } from './frame';
+export { Frame, NavigationEntry, NavigationContext, NavigationTransition, BackstackEntry, ViewEntry, AndroidActivityCallbacks, setActivityCallbacks } from './frame';
 
 export { GestureEventData, GestureEventDataWithState, GestureStateTypes, GestureTypes, GesturesObserver, TapGestureEventData, PanGestureEventData, PinchGestureEventData, RotationGestureEventData, SwipeDirection, SwipeGestureEventData, TouchGestureEventData } from './gestures';
 
diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts
index a84ddcfed..04c00cce7 100644
--- a/packages/core/ui/index.ts
+++ b/packages/core/ui/index.ts
@@ -7,8 +7,8 @@ export { sanitizeModuleName } from './builder/module-name-sanitizer';
 export { Button } from './button';
 export { ContentView } from './content-view';
 export { Binding, BindingOptions } from './core/bindable';
-export { ViewBase, ShowModalOptions, eachDescendant, getAncestor, getViewById } from './core/view-base';
-export { View, Template, KeyedTemplate, ShownModallyData } from './core/view';
+export { ViewBase, ShowModalOptions, eachDescendant, getAncestor, getViewById, booleanConverter } from './core/view-base';
+export { View, Template, KeyedTemplate, ShownModallyData, CSSType, ContainerView } from './core/view';
 export { Property, CoercibleProperty, InheritedProperty, CssProperty, InheritedCssProperty, ShorthandProperty, CssAnimationProperty, unsetValue } from './core/properties';
 export { DatePicker } from './date-picker';
 
diff --git a/packages/core/ui/page/page-common.d.ts b/packages/core/ui/page/page-common.d.ts
index e1d52aec5..5c0ef919c 100644
--- a/packages/core/ui/page/page-common.d.ts
+++ b/packages/core/ui/page/page-common.d.ts
@@ -31,14 +31,7 @@ export declare class PageBase extends ContentView {
 
 	readonly frame: Frame;
 
-	createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData {
-		return {
-			eventName: eventName,
-			object: this,
-			context: this.navigationContext,
-			isBackNavigation: isBackNavigation,
-		};
-	}
+	createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData;
 
 	onNavigatingTo(context: any, isBackNavigation: boolean, bindingContext?: any): void;
 
diff --git a/packages/core/ui/styling/style-scope.d.ts b/packages/core/ui/styling/style-scope.d.ts
index 90e4d4322..7b9bffc5c 100644
--- a/packages/core/ui/styling/style-scope.d.ts
+++ b/packages/core/ui/styling/style-scope.d.ts
@@ -45,5 +45,7 @@ export class StyleScope {
 	public getAnimations(ruleset: RuleSet): KeyframeAnimationInfo[];
 }
 
-export function resolveFileNameFromUrl(url: string, appDirectory: string, fileExists: (string) => boolean, importSource?: string): string;
+export function resolveFileNameFromUrl(url: string, appDirectory: string, fileExists: (filepath: string) => boolean, importSource?: string): string;
 export function applyInlineStyle(view: ViewBase, style: string): void;
+export function addTaggedAdditionalCSS(cssText: string, tag?: string | Number): boolean;
+export function removeTaggedAdditionalCSS(tag: String | Number): boolean;
diff --git a/packages/tns-core-modules-compat/.npmignore b/packages/tns-core-modules-compat/.npmignore
new file mode 100644
index 000000000..c32fafcdf
--- /dev/null
+++ b/packages/tns-core-modules-compat/.npmignore
@@ -0,0 +1,4 @@
+*.tgz
+**/*.ts
+!**/*.d.ts
+npm-debug.log
\ No newline at end of file
diff --git a/packages/tns-core-modules-compat/README.md b/packages/tns-core-modules-compat/README.md
new file mode 100644
index 000000000..71596b20e
--- /dev/null
+++ b/packages/tns-core-modules-compat/README.md
@@ -0,0 +1,3 @@
+**NOTE**: Do not use this package directly.
+
+The `tns-core-modules` package exists only for compatibility with older versions of NativeScript. It's recommended to use `@nativescript/core` now. 
\ No newline at end of file
diff --git a/packages/tns-core-modules-compat/application-settings/application-settings.d.ts b/packages/tns-core-modules-compat/application-settings/application-settings.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/application-settings.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application-settings/application-settings.js b/packages/tns-core-modules-compat/application-settings/application-settings.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/application-settings.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/application-settings/application-settings.ts b/packages/tns-core-modules-compat/application-settings/application-settings.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/application-settings.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application-settings/index.d.ts b/packages/tns-core-modules-compat/application-settings/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application-settings/index.js b/packages/tns-core-modules-compat/application-settings/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/application-settings/index.ts b/packages/tns-core-modules-compat/application-settings/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application-settings/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application/application.d.ts b/packages/tns-core-modules-compat/application/application.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/application.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application/application.js b/packages/tns-core-modules-compat/application/application.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/application.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/application/application.ts b/packages/tns-core-modules-compat/application/application.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/application.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application/index.d.ts b/packages/tns-core-modules-compat/application/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/application/index.js b/packages/tns-core-modules-compat/application/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/application/index.ts b/packages/tns-core-modules-compat/application/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/application/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/bundle-entry-points.d.ts b/packages/tns-core-modules-compat/bundle-entry-points.d.ts
new file mode 100644
index 000000000..e51f287b0
--- /dev/null
+++ b/packages/tns-core-modules-compat/bundle-entry-points.d.ts
@@ -0,0 +1 @@
+import '@nativescript/core/bundle-entry-points';
diff --git a/packages/tns-core-modules-compat/bundle-entry-points.js b/packages/tns-core-modules-compat/bundle-entry-points.js
new file mode 100644
index 000000000..2c24e8de4
--- /dev/null
+++ b/packages/tns-core-modules-compat/bundle-entry-points.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+require("@nativescript/core/bundle-entry-points");
diff --git a/packages/tns-core-modules-compat/bundle-entry-points.ts b/packages/tns-core-modules-compat/bundle-entry-points.ts
new file mode 100644
index 000000000..849ee1ceb
--- /dev/null
+++ b/packages/tns-core-modules-compat/bundle-entry-points.ts
@@ -0,0 +1,2 @@
+// Execute the bundle-entry-points from core. Nothing is exported.
+import '@nativescript/core/bundle-entry-points';
diff --git a/packages/tns-core-modules-compat/color/color.d.ts b/packages/tns-core-modules-compat/color/color.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/color.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/color/color.js b/packages/tns-core-modules-compat/color/color.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/color.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/color/color.ts b/packages/tns-core-modules-compat/color/color.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/color.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/color/index.d.ts b/packages/tns-core-modules-compat/color/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/color/index.js b/packages/tns-core-modules-compat/color/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/color/index.ts b/packages/tns-core-modules-compat/color/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/color/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/data/observable/index.d.ts b/packages/tns-core-modules-compat/data/observable/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/data/observable/index.js b/packages/tns-core-modules-compat/data/observable/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/data/observable/index.ts b/packages/tns-core-modules-compat/data/observable/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/data/observable/observable.d.ts b/packages/tns-core-modules-compat/data/observable/observable.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/observable.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/data/observable/observable.js b/packages/tns-core-modules-compat/data/observable/observable.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/observable.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/data/observable/observable.ts b/packages/tns-core-modules-compat/data/observable/observable.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/data/observable/observable.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/file-system/file-system.d.ts b/packages/tns-core-modules-compat/file-system/file-system.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/file-system.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/file-system/file-system.js b/packages/tns-core-modules-compat/file-system/file-system.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/file-system.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/file-system/file-system.ts b/packages/tns-core-modules-compat/file-system/file-system.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/file-system.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/file-system/index.d.ts b/packages/tns-core-modules-compat/file-system/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/file-system/index.js b/packages/tns-core-modules-compat/file-system/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/file-system/index.ts b/packages/tns-core-modules-compat/file-system/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/file-system/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/http/http.d.ts b/packages/tns-core-modules-compat/http/http.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/http.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/http/http.js b/packages/tns-core-modules-compat/http/http.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/http.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/http/http.ts b/packages/tns-core-modules-compat/http/http.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/http.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/http/index.d.ts b/packages/tns-core-modules-compat/http/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/http/index.js b/packages/tns-core-modules-compat/http/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/http/index.ts b/packages/tns-core-modules-compat/http/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/http/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-asset/image-asset.d.ts b/packages/tns-core-modules-compat/image-asset/image-asset.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/image-asset.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-asset/image-asset.js b/packages/tns-core-modules-compat/image-asset/image-asset.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/image-asset.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/image-asset/image-asset.ts b/packages/tns-core-modules-compat/image-asset/image-asset.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/image-asset.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-asset/index.d.ts b/packages/tns-core-modules-compat/image-asset/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-asset/index.js b/packages/tns-core-modules-compat/image-asset/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/image-asset/index.ts b/packages/tns-core-modules-compat/image-asset/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-asset/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-source/image-source.d.ts b/packages/tns-core-modules-compat/image-source/image-source.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/image-source.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-source/image-source.js b/packages/tns-core-modules-compat/image-source/image-source.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/image-source.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/image-source/image-source.ts b/packages/tns-core-modules-compat/image-source/image-source.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/image-source.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-source/index.d.ts b/packages/tns-core-modules-compat/image-source/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/image-source/index.js b/packages/tns-core-modules-compat/image-source/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/image-source/index.ts b/packages/tns-core-modules-compat/image-source/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/image-source/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/inspector_modules.js b/packages/tns-core-modules-compat/inspector_modules.js
new file mode 100644
index 000000000..1c334b4de
--- /dev/null
+++ b/packages/tns-core-modules-compat/inspector_modules.js
@@ -0,0 +1,7 @@
+// The "inspector_modules" module is not public, but is refered in legacy versons of webpack.config
+// So add the re-export manually
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("@nativescript/core/inspector_modules"));
diff --git a/packages/tns-core-modules-compat/package.json b/packages/tns-core-modules-compat/package.json
new file mode 100644
index 000000000..76f467234
--- /dev/null
+++ b/packages/tns-core-modules-compat/package.json
@@ -0,0 +1,25 @@
+{
+    "name": "tns-core-modules",
+    "main": "index",
+    "types": "index.d.ts",
+    "description": "Compatibility with old style tns-core-modules imports for NativeScript.",
+    "version": "7.0.0-rc.19",
+    "homepage": "https://nativescript.org",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/NativeScript/NativeScript"
+    },
+    "license": "Apache-2.0",
+    "scripts": {
+        "setup": "npm i"
+    },
+    "devDependencies": {
+        "@nativescript/core": "rc"
+    },
+    "nativescript": {
+        "platforms": {
+            "ios": "5.0.0",
+            "android": "5.0.0"
+        }
+    }
+}
diff --git a/packages/tns-core-modules-compat/platform/index.d.ts b/packages/tns-core-modules-compat/platform/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/platform/index.js b/packages/tns-core-modules-compat/platform/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/platform/index.ts b/packages/tns-core-modules-compat/platform/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/platform/platform.d.ts b/packages/tns-core-modules-compat/platform/platform.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/platform.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/platform/platform.js b/packages/tns-core-modules-compat/platform/platform.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/platform.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/platform/platform.ts b/packages/tns-core-modules-compat/platform/platform.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/platform/platform.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/profiling/index.d.ts b/packages/tns-core-modules-compat/profiling/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/profiling/index.js b/packages/tns-core-modules-compat/profiling/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/profiling/index.ts b/packages/tns-core-modules-compat/profiling/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/profiling/profiling.d.ts b/packages/tns-core-modules-compat/profiling/profiling.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/profiling.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/profiling/profiling.js b/packages/tns-core-modules-compat/profiling/profiling.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/profiling.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/profiling/profiling.ts b/packages/tns-core-modules-compat/profiling/profiling.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/profiling/profiling.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/tns-core-modules.d.ts b/packages/tns-core-modules-compat/tns-core-modules.d.ts
new file mode 100644
index 000000000..e2eb1206c
--- /dev/null
+++ b/packages/tns-core-modules-compat/tns-core-modules.d.ts
@@ -0,0 +1 @@
+// Not needed. Only added for back-compatibility as some apps refer to this file.
diff --git a/packages/tns-core-modules-compat/trace/index.d.ts b/packages/tns-core-modules-compat/trace/index.d.ts
new file mode 100644
index 000000000..de705c20a
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/index.d.ts
@@ -0,0 +1 @@
+export * from './trace';
diff --git a/packages/tns-core-modules-compat/trace/index.js b/packages/tns-core-modules-compat/trace/index.js
new file mode 100644
index 000000000..716cccb41
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./trace"), exports);
diff --git a/packages/tns-core-modules-compat/trace/index.ts b/packages/tns-core-modules-compat/trace/index.ts
new file mode 100644
index 000000000..de705c20a
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/index.ts
@@ -0,0 +1 @@
+export * from './trace';
diff --git a/packages/tns-core-modules-compat/trace/trace.d.ts b/packages/tns-core-modules-compat/trace/trace.d.ts
new file mode 100644
index 000000000..69fed71f4
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/trace.d.ts
@@ -0,0 +1,21 @@
+import { Trace } from '@nativescript/core';
+export declare const enable: typeof Trace.enable;
+export declare const error: typeof Trace.error;
+export declare const getErrorHandler: typeof Trace.getErrorHandler;
+export declare const isCategorySet: typeof Trace.isCategorySet;
+export declare const isEnabled: typeof Trace.isEnabled;
+export declare const notifyEvent: typeof Trace.notifyEvent;
+export declare const setCategories: typeof Trace.setCategories;
+export declare const setErrorHandler: typeof Trace.setErrorHandler;
+export declare const write: typeof Trace.write;
+export declare const removeWriter: typeof Trace.removeWriter;
+export declare const messageType: typeof Trace.messageType;
+export declare const removeEventListener: typeof Trace.removeEventListener;
+export declare const addCategories: typeof Trace.addCategories;
+export declare const addEventListener: typeof Trace.addEventListener;
+export declare const DefaultErrorHandler: typeof Trace.DefaultErrorHandler;
+export declare const ConsoleWriter: typeof Trace.ConsoleWriter;
+export declare const addWriter: typeof Trace.addWriter;
+export declare const categories: typeof Trace.categories;
+export declare const clearWriters: typeof Trace.clearWriters;
+export declare const disable: typeof Trace.disable;
diff --git a/packages/tns-core-modules-compat/trace/trace.js b/packages/tns-core-modules-compat/trace/trace.js
new file mode 100644
index 000000000..cbd32e03d
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/trace.js
@@ -0,0 +1,23 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.disable = exports.clearWriters = exports.categories = exports.addWriter = exports.ConsoleWriter = exports.DefaultErrorHandler = exports.addEventListener = exports.addCategories = exports.removeEventListener = exports.messageType = exports.removeWriter = exports.write = exports.setErrorHandler = exports.setCategories = exports.notifyEvent = exports.isEnabled = exports.isCategorySet = exports.getErrorHandler = exports.error = exports.enable = void 0;
+var core_1 = require("@nativescript/core");
+exports.enable = core_1.Trace.enable;
+exports.error = core_1.Trace.error;
+exports.getErrorHandler = core_1.Trace.getErrorHandler;
+exports.isCategorySet = core_1.Trace.isCategorySet;
+exports.isEnabled = core_1.Trace.isEnabled;
+exports.notifyEvent = core_1.Trace.notifyEvent;
+exports.setCategories = core_1.Trace.setCategories;
+exports.setErrorHandler = core_1.Trace.setErrorHandler;
+exports.write = core_1.Trace.write;
+exports.removeWriter = core_1.Trace.removeWriter;
+exports.messageType = core_1.Trace.messageType;
+exports.removeEventListener = core_1.Trace.removeEventListener;
+exports.addCategories = core_1.Trace.addCategories;
+exports.addEventListener = core_1.Trace.addEventListener;
+exports.DefaultErrorHandler = core_1.Trace.DefaultErrorHandler;
+exports.ConsoleWriter = core_1.Trace.ConsoleWriter;
+exports.addWriter = core_1.Trace.addWriter;
+exports.categories = core_1.Trace.categories;
+exports.clearWriters = core_1.Trace.clearWriters;
+exports.disable = core_1.Trace.disable;
diff --git a/packages/tns-core-modules-compat/trace/trace.ts b/packages/tns-core-modules-compat/trace/trace.ts
new file mode 100644
index 000000000..52afde9ad
--- /dev/null
+++ b/packages/tns-core-modules-compat/trace/trace.ts
@@ -0,0 +1,22 @@
+import { Trace } from '@nativescript/core';
+
+export const enable = Trace.enable;
+export const error = Trace.error;
+export const getErrorHandler = Trace.getErrorHandler;
+export const isCategorySet = Trace.isCategorySet;
+export const isEnabled = Trace.isEnabled;
+export const notifyEvent = Trace.notifyEvent;
+export const setCategories = Trace.setCategories;
+export const setErrorHandler = Trace.setErrorHandler;
+export const write = Trace.write;
+export const removeWriter = Trace.removeWriter;
+export const messageType = Trace.messageType;
+export const removeEventListener = Trace.removeEventListener;
+export const addCategories = Trace.addCategories;
+export const addEventListener = Trace.addEventListener;
+export const DefaultErrorHandler = Trace.DefaultErrorHandler;
+export const ConsoleWriter = Trace.ConsoleWriter;
+export const addWriter = Trace.addWriter;
+export const categories = Trace.categories;
+export const clearWriters = Trace.clearWriters;
+export const disable = Trace.disable;
diff --git a/packages/tns-core-modules-compat/tsconfig.json b/packages/tns-core-modules-compat/tsconfig.json
new file mode 100644
index 000000000..9aa096cc8
--- /dev/null
+++ b/packages/tns-core-modules-compat/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "noEmitOnError": true,
+        "noEmitHelpers": true,
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": true,
+        "noImplicitAny": false,
+        "noImplicitUseStrict": true,
+        "removeComments": true,
+        "experimentalDecorators": true,
+        "diagnostics": true,
+        "sourceMap": false,
+        "types" : [
+          "node"
+        ],
+        "lib": [
+            "es6", "dom"
+        ],
+        "baseUrl": "."
+    },
+    "include": [
+        "**/*.ts"
+    ],
+    "exclude": [
+        "node_modules",
+        "dist", 
+        "__tests__"
+    ]
+}
diff --git a/packages/tns-core-modules-compat/ui/core/index.d.ts b/packages/tns-core-modules-compat/ui/core/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/core/index.js b/packages/tns-core-modules-compat/ui/core/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/core/index.ts b/packages/tns-core-modules-compat/ui/core/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/core/view/index.d.ts b/packages/tns-core-modules-compat/ui/core/view/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/core/view/index.js b/packages/tns-core-modules-compat/ui/core/view/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/core/view/index.ts b/packages/tns-core-modules-compat/ui/core/view/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/core/view/view.d.ts b/packages/tns-core-modules-compat/ui/core/view/view.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/view.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/core/view/view.js b/packages/tns-core-modules-compat/ui/core/view/view.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/view.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/core/view/view.ts b/packages/tns-core-modules-compat/ui/core/view/view.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/core/view/view.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/frame/activity.android.js b/packages/tns-core-modules-compat/ui/frame/activity.android.js
new file mode 100644
index 000000000..3fc99d0f8
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/activity.android.js
@@ -0,0 +1,7 @@
+// The "ui/frame/activity" module is not public, but is refered in legacy versons of webpack.config
+// So add the re-export manually
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("@nativescript/core/ui/frame/activity"));
diff --git a/packages/tns-core-modules-compat/ui/frame/frame.d.ts b/packages/tns-core-modules-compat/ui/frame/frame.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/frame.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/frame/frame.js b/packages/tns-core-modules-compat/ui/frame/frame.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/frame.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/frame/frame.ts b/packages/tns-core-modules-compat/ui/frame/frame.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/frame.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/frame/index.d.ts b/packages/tns-core-modules-compat/ui/frame/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/frame/index.js b/packages/tns-core-modules-compat/ui/frame/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/frame/index.ts b/packages/tns-core-modules-compat/ui/frame/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/frame/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.js b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.ts b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/absolute-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/absolute-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.js b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.ts b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/dock-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/dock-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.js b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.ts b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/flexbox-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/flexbox-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.js b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.ts b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/grid-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/grid-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/index.js b/packages/tns-core-modules-compat/ui/layouts/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/index.ts b/packages/tns-core-modules-compat/ui/layouts/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.js b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.ts b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/stack-layout/stack-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.d.ts b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.js b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.ts b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.d.ts b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.js b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.ts b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/layouts/wrap-layout/wrap-layout.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/page/index.d.ts b/packages/tns-core-modules-compat/ui/page/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/page/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/ui/page/index.js b/packages/tns-core-modules-compat/ui/page/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/page/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/ui/page/index.ts b/packages/tns-core-modules-compat/ui/page/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/ui/page/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/utils/index.d.ts b/packages/tns-core-modules-compat/utils/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/utils/index.js b/packages/tns-core-modules-compat/utils/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/utils/index.ts b/packages/tns-core-modules-compat/utils/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/utils/types.d.ts b/packages/tns-core-modules-compat/utils/types.d.ts
new file mode 100644
index 000000000..373f25969
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/types.d.ts
@@ -0,0 +1,14 @@
+export declare const ClassInfo: typeof import('@nativescript/core/utils/types').ClassInfo;
+export declare const getClass: typeof import('@nativescript/core/utils/types').getClass;
+export declare const getBaseClasses: typeof import('@nativescript/core/utils/types').getBaseClasses;
+export declare const getClassInfo: typeof import('@nativescript/core/utils/types').getClassInfo;
+export declare const isBoolean: typeof import('@nativescript/core/utils/types').isBoolean;
+export declare const isDefined: typeof import('@nativescript/core/utils/types').isDefined;
+export declare const isFunction: typeof import('@nativescript/core/utils/types').isFunction;
+export declare const isNullOrUndefined: typeof import('@nativescript/core/utils/types').isNullOrUndefined;
+export declare const isNumber: typeof import('@nativescript/core/utils/types').isNumber;
+export declare const isObject: typeof import('@nativescript/core/utils/types').isObject;
+export declare const isString: typeof import('@nativescript/core/utils/types').isString;
+export declare const isUndefined: typeof import('@nativescript/core/utils/types').isUndefined;
+export declare const toUIString: typeof import('@nativescript/core/utils/types').toUIString;
+export declare const verifyCallback: typeof import('@nativescript/core/utils/types').verifyCallback;
diff --git a/packages/tns-core-modules-compat/utils/types.js b/packages/tns-core-modules-compat/utils/types.js
new file mode 100644
index 000000000..ca93d7ed6
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/types.js
@@ -0,0 +1,17 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyCallback = exports.toUIString = exports.isUndefined = exports.isString = exports.isObject = exports.isNumber = exports.isNullOrUndefined = exports.isFunction = exports.isDefined = exports.isBoolean = exports.getClassInfo = exports.getBaseClasses = exports.getClass = exports.ClassInfo = void 0;
+var core_1 = require("@nativescript/core");
+exports.ClassInfo = core_1.Utils.ClassInfo;
+exports.getClass = core_1.Utils.getClass;
+exports.getBaseClasses = core_1.Utils.getBaseClasses;
+exports.getClassInfo = core_1.Utils.getClassInfo;
+exports.isBoolean = core_1.Utils.isBoolean;
+exports.isDefined = core_1.Utils.isDefined;
+exports.isFunction = core_1.Utils.isFunction;
+exports.isNullOrUndefined = core_1.Utils.isNullOrUndefined;
+exports.isNumber = core_1.Utils.isNumber;
+exports.isObject = core_1.Utils.isObject;
+exports.isString = core_1.Utils.isString;
+exports.isUndefined = core_1.Utils.isUndefined;
+exports.toUIString = core_1.Utils.toUIString;
+exports.verifyCallback = core_1.Utils.verifyCallback;
diff --git a/packages/tns-core-modules-compat/utils/types.ts b/packages/tns-core-modules-compat/utils/types.ts
new file mode 100644
index 000000000..41e298460
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/types.ts
@@ -0,0 +1,16 @@
+import { Utils } from '@nativescript/core';
+
+export const ClassInfo = Utils.ClassInfo;
+export const getClass = Utils.getClass;
+export const getBaseClasses = Utils.getBaseClasses;
+export const getClassInfo = Utils.getClassInfo;
+export const isBoolean = Utils.isBoolean;
+export const isDefined = Utils.isDefined;
+export const isFunction = Utils.isFunction;
+export const isNullOrUndefined = Utils.isNullOrUndefined;
+export const isNumber = Utils.isNumber;
+export const isObject = Utils.isObject;
+export const isString = Utils.isString;
+export const isUndefined = Utils.isUndefined;
+export const toUIString = Utils.toUIString;
+export const verifyCallback = Utils.verifyCallback;
diff --git a/packages/tns-core-modules-compat/utils/utils.d.ts b/packages/tns-core-modules-compat/utils/utils.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/utils.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/utils/utils.js b/packages/tns-core-modules-compat/utils/utils.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/utils.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/utils/utils.ts b/packages/tns-core-modules-compat/utils/utils.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/utils/utils.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/xml/index.d.ts b/packages/tns-core-modules-compat/xml/index.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/index.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/xml/index.js b/packages/tns-core-modules-compat/xml/index.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/index.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/xml/index.ts b/packages/tns-core-modules-compat/xml/index.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/index.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/xml/xml.d.ts b/packages/tns-core-modules-compat/xml/xml.d.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/xml.d.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/packages/tns-core-modules-compat/xml/xml.js b/packages/tns-core-modules-compat/xml/xml.js
new file mode 100644
index 000000000..4ae4e4d5b
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/xml.js
@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/tns-core-modules-compat/xml/xml.ts b/packages/tns-core-modules-compat/xml/xml.ts
new file mode 100644
index 000000000..5dff1da93
--- /dev/null
+++ b/packages/tns-core-modules-compat/xml/xml.ts
@@ -0,0 +1 @@
+export * from '@nativescript/core';
diff --git a/tools/scripts/generate-tns-compat.ts b/tools/scripts/generate-tns-compat.ts
index 8bec0058f..a508f76a7 100644
--- a/tools/scripts/generate-tns-compat.ts
+++ b/tools/scripts/generate-tns-compat.ts
@@ -2,12 +2,12 @@ import * as path from 'path';
 import * as fs from 'fs';
 import readdirp, { EntryInfo } from 'readdirp';
 
-const inputFolder = path.resolve('dist/nativescript-core');
-const outputFolder = path.resolve('dist/tns-core-modules');
+const inputFolder = path.resolve('dist/packages/core');
+const outputFolder = path.resolve('dist/packages/tns-core-modules');
 const testImports: string[] = [];
 
 // List of definition files that don't need to be exported.
-const dtsBlacklist = ['module.d.ts', 'nativescript-error.d.ts', 'references.d.ts', 'tns-core-modules.d.ts'];
+const dtsBlacklist = ['global-types.d.ts', 'references.d.ts'];
 
 // List of modules that should be re-exported despite they are private
 const privateModulesWhitelist = [
diff --git a/workspace.json b/workspace.json
index d64c4d107..75b2b99dd 100644
--- a/workspace.json
+++ b/workspace.json
@@ -238,6 +238,36 @@
         }
       }
     },
+    "tns-core-modules-compat": {
+      "root": "packages/tns-core-modules-compat",
+      "sourceRoot": "packages/tns-core-modules-compat",
+      "projectType": "library",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@nrwl/workspace:run-commands",
+          "outputs": ["dist/packages"],
+          "options": {
+            "commands": [
+              {
+                "command": "npx rimraf -- node_modules package-lock.json"
+              },
+              {
+                "command": "npm i"
+              },
+              {
+                "command": "../../node_modules/.bin/tsc -p tsconfig.json"
+              },
+              {
+                "command": "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz"
+              }
+            ],
+            "cwd": "packages/tns-core-modules-compat",
+            "parallel": false
+          }
+        }
+      }
+    },
     "types-ios": {
       "root": "packages/types-ios",
       "sourceRoot": "packages/types-ios/src",