diff --git a/cjs/package.json b/cjs/package.json
index 5ea40f9c..da159af8 100644
--- a/cjs/package.json
+++ b/cjs/package.json
@@ -2,7 +2,6 @@
     "name": "applicationinsights-core-js",
     "version": "0.0.1",
     "description": "Microsoft Application Insights Core Javascript SDK",
-    "main": "bundle/aicore.js",
     "devDependencies": {
         "grunt": "1.0.1",
         "grunt-contrib-qunit": "2.0.0",
@@ -11,13 +10,13 @@
         "typescript": "2.5.3"
     },
     "files":[
-        "coreSDK/applicationinsights-core.*",
+        "coreSDK/applicationinsights-core-js.*",
         "coreSDK/JavaScriptSDK/AppInsightsCore.*",
         "coreSDK/JavaScriptSDK.Interfaces/IAppInsightsCore.*",
         "coreSDK/JavaScriptSDK.Interfaces/IChannelControls.*",
         "coreSDK/JavaScriptSDK.Interfaces/ITelemetryPlugin.*",
         "coreSDK/JavaScriptSDK.Interfaces/IConfiguration.*"
    ],
-   "main": "coreSDK/applicationinsights-core.js",
-   "types": "coreSDK/applicationinsights-core.d.ts"
+   "main": "coreSDK/applicationinsights-core-js.js",
+   "types": "coreSDK/applicationinsights-core-js.d.ts"
 }
\ No newline at end of file
diff --git a/coreSDK/applicationinsights-core.ts b/coreSDK/applicationinsights-core.ts
deleted file mode 100644
index f4bd2126..00000000
--- a/coreSDK/applicationinsights-core.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export import IConfiguration  = require("./JavaScriptSDK.Interfaces/IConfiguration");
-export import IChannelControls  = require("./JavaScriptSDK.Interfaces/IChannelControls");
-export import ITelemetryPlugin  = require("./JavaScriptSDK.Interfaces/ITelemetryPlugin");
-export import IAppInsightsCore  = require("./JavaScriptSDK.Interfaces/IAppInsightsCore");
-export import ITelemetryItem  = require("./JavaScriptSDK.Interfaces/ITelemetryItem");
-export import AppInsightsCore  = require("./JavaScriptSDK/AppInsightsCore");
diff --git a/coreSDK/package.json b/coreSDK/package.json
index d9dc4643..6fd981bd 100644
--- a/coreSDK/package.json
+++ b/coreSDK/package.json
@@ -13,7 +13,7 @@
     },
     "files":[
         "./applicationinsights-core.ts",
-        "./JavaScriptSDK/AppInsightsCore.ts",
+        "./JavaScriptSDK/AppInsightsCore-js.ts",
         "./JavaScriptSDK.Interfaces/IAppInsightsCore.ts",
         "./JavaScriptSDK.Interfaces/IChannelControls.ts",
         "./JavaScriptSDK.Interfaces/ITelemetryPlugin.ts",
diff --git a/gruntfile.js b/gruntfile.js
index cb6a7876..64f17b6a 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -15,15 +15,9 @@ module.exports = function (grunt) {
 	    core: {
                 tsconfig: './tsconfig.json',
                 src: [
-                    'coreSDK/JavaScriptSDK/Telemetry/Common/*.ts',
-                    'coreSDK/JavaScriptSDK/Telemetry/*.ts',
-                    'coreSDK/JavaScriptSDK/ajax/*.ts',
-                    'coreSDK/JavaScriptSDK/Context/*.ts',
-                    'coreSDK/JavaScriptSDK/Context/Common/*.ts',
-                    'coreSDK/JavaScriptSDK.Interfaces/Contracts/Generated/*.ts',
-                    'coreSDK/JavaScriptSDK.Interfaces/Telemetry/*.ts',
-                    'coreSDK/JavaScriptSDK.Interfaces/Context/*.ts',
+                    'coreSDK/JavaScriptSDK.Interfaces/*.ts',
                     'coreSDK/JavaScriptSDK/*.ts',
+                    'coreSDK/applicationinsights-core-js.ts'
                 ],
                 out: 'coreSDK/bundle/aicore.js',
             },
@@ -47,7 +41,7 @@ module.exports = function (grunt) {
                 src: [
                     'coreSDK/JavaScriptSDK.Interfaces/*.ts',
                     'coreSDK/JavaScriptSDK/*.ts',
-                    'coreSDK/applicationinsights-core.ts'
+                    'coreSDK/applicationinsights-core-js.ts'
                 ]
             },
             module: {