diff --git a/.make-packages.js b/.make-packages.js
index 55ae76de2f..e666ba3ebd 100644
--- a/.make-packages.js
+++ b/.make-packages.js
@@ -1,36 +1,113 @@
-var pkg = require('./package.json');
-var fs = require('fs');
-var mkdirp = require('mkdirp');
-var path = require('path');
-var licenseTool = require('./tools/add-license-to-file');
-var addLicenseToFile = licenseTool.addLicenseToFile;
-var addLicenseTextToFile = licenseTool.addLicenseTextToFile;
+"use strict";
+
+let pkg = require('./package.json');
+let fs = require('fs-extra');
+let mkdirp = require('mkdirp');
+let path = require('path');
+let klawSync = require('klaw-sync');
+let licenseTool = require('./tools/add-license-to-file');
+let addLicenseToFile = licenseTool.addLicenseToFile;
+let addLicenseTextToFile = licenseTool.addLicenseTextToFile;
+
+const ROOT = 'dist/';
+const CJS_ROOT = ROOT + 'cjs/';
+const ESM5_ROOT = ROOT + 'esm5/';
+const ESM2015_ROOT = ROOT + 'esm2015/';
+const UMD_ROOT = ROOT + 'global/';
+const TYPE_ROOT = ROOT + 'typings/';
+const PKG_ROOT = ROOT + 'package/';
+const CJS_PKG = PKG_ROOT + '_cjs/';
+const ESM5_PKG = PKG_ROOT + '_esm5/';
+const ESM2015_PKG = PKG_ROOT + '_esm2015/';
+const UMD_PKG = PKG_ROOT + 'bundles/';
+const TYPE_PKG = PKG_ROOT + '_typings/';
+
 
 // License info for minified files
-var licenseUrl = 'https://github.com/ReactiveX/RxJS/blob/master/LICENSE.txt';
-var license = 'Apache License 2.0 ' + licenseUrl;
+let licenseUrl = 'https://github.com/ReactiveX/RxJS/blob/master/LICENSE.txt';
+let license = 'Apache License 2.0 ' + licenseUrl;
 
 delete pkg.scripts;
+fs.removeSync(PKG_ROOT);
 
-var cjsPkg = Object.assign({}, pkg, {
+let rootPackageJson = Object.assign({}, pkg, {
   name: 'rxjs',
-  main: 'Rx.js',
-  typings: 'Rx.d.ts'
+  main: './_cjs/Rx.js',
+  module: './_esm5/Rx.js',
+  es2015: './_esm2015/Rx.js',
+  typings: './_typings/Rx.d.ts'
+});
+
+// Read the files and create package.json files for each. This allows Node,
+// Webpack, and any other tool to resolve using the "main", "module", or
+// other keys we add to package.json.
+klawSync(CJS_ROOT, {
+  nodir: true,
+  filter: function(item) {
+    return item.path.endsWith('.js');
+  }
+})
+.map(item => item.path)
+.map(path => path.slice((`${__dirname}/${CJS_ROOT}`).length))
+.forEach(fileName => {
+  // Get the name of the directory to create
+  let parentDirectory = path.dirname(fileName);
+  // Get the name of the file to be the new directory
+  let directory = fileName.slice(0, fileName.length - 3);
+  let targetFileName = path.basename(directory);
+
+  fs.ensureDirSync(PKG_ROOT + parentDirectory);
+
+  // For "index.js" files, these are re-exports and need a package.json
+  // in-place rather than in a directory
+  if (targetFileName !== "index") {
+    fs.ensureDirSync(PKG_ROOT + directory);
+    fs.writeJsonSync(PKG_ROOT + directory + '/package.json', {
+      main: path.relative(PKG_ROOT + directory, CJS_PKG + directory) + '.js',
+      module: path.relative(PKG_ROOT + directory, ESM5_PKG + directory) + '.js',
+      es2015: path.relative(PKG_ROOT + directory, ESM2015_PKG + directory) + '.js',
+      typings: path.relative(PKG_ROOT + directory, TYPE_PKG + directory) + '.d.ts'
+    });
+  } else {
+    // If targeting an "index", there is no directory
+    directory = directory.split('/').slice(0, -1).join('/');
+    fs.writeJsonSync(PKG_ROOT + directory + '/package.json', {
+      main: path.relative(PKG_ROOT + directory, CJS_PKG + directory + '/index.js'),
+      module: path.relative(PKG_ROOT + directory, ESM5_PKG + directory + '/index.js'),
+      es2015: path.relative(PKG_ROOT + directory, ESM2015_PKG + directory + '/index.js'),
+      typings: path.relative(PKG_ROOT + directory, TYPE_PKG + directory + '/index.d.ts')
+    });
+  }
 });
 
-fs.writeFileSync('dist/cjs/package.json', JSON.stringify(cjsPkg, null, 2));
-fs.writeFileSync('dist/cjs/LICENSE.txt', fs.readFileSync('./LICENSE.txt').toString());
-fs.writeFileSync('dist/cjs/README.md', fs.readFileSync('./README.md').toString());
+// Make the distribution folder
+mkdirp.sync(PKG_ROOT);
+
+// Copy over the sources
+copySources('src/', PKG_ROOT + 'src/');
+copySources(CJS_ROOT, CJS_PKG);
+copySources(ESM5_ROOT, ESM5_PKG);
+copySources(ESM2015_ROOT, ESM2015_PKG);
+fs.copySync(TYPE_ROOT, TYPE_PKG);
 
-// Bundles for CJS only
-mkdirp.sync('dist/cjs/bundles');
-// UMD bundles
-fs.writeFileSync('dist/cjs/bundles/Rx.js', fs.readFileSync('dist/global/Rx.js').toString());
-fs.writeFileSync('dist/cjs/bundles/Rx.min.js', fs.readFileSync('dist/global/Rx.min.js').toString());
-fs.writeFileSync('dist/cjs/bundles/Rx.min.js.map', fs.readFileSync('dist/global/Rx.min.js.map').toString());
+fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson);
 
+fs.copySync(UMD_ROOT, UMD_PKG);
 // Add licenses to tops of bundles
-addLicenseToFile('LICENSE.txt', 'dist/cjs/bundles/Rx.js');
-addLicenseTextToFile(license, 'dist/cjs/bundles/Rx.min.js');
-addLicenseToFile('LICENSE.txt', 'dist/global/Rx.js');
-addLicenseTextToFile(license, 'dist/global/Rx.min.js');
\ No newline at end of file
+addLicenseToFile('LICENSE.txt', UMD_PKG + 'Rx.js');
+addLicenseTextToFile(license, UMD_PKG + 'Rx.min.js');
+addLicenseToFile('LICENSE.txt', UMD_PKG + 'Rx.js');
+addLicenseTextToFile(license, UMD_PKG + 'Rx.min.js');
+
+// Copy over the ESM5 files
+fs.copySync(ESM5_ROOT, ESM5_PKG);
+
+function copySources(rootDir, packageDir, packageJson) {
+  // Copy over the CommonJS files
+  fs.copySync(rootDir, packageDir);
+  fs.copySync('./LICENSE.txt', packageDir + 'LICENSE.txt');
+  fs.copySync('./README.md', packageDir + 'README.md');
+  if (packageJson) {
+    fs.writeJsonSync(packageDir + 'package.json', packageJson);
+  }
+}
diff --git a/.markdown-doctest-setup.js b/.markdown-doctest-setup.js
index d532c05291..6afba751e5 100644
--- a/.markdown-doctest-setup.js
+++ b/.markdown-doctest-setup.js
@@ -45,7 +45,7 @@ module.exports = {
 
   regexRequire: {
     'rxjs/(.*)': function (_, moduleName) {
-      return require(__dirname + '/dist/cjs/' + moduleName);
+      return require(__dirname + '/dist/package/' + moduleName);
     }
   },
 
diff --git a/index.js b/index.js
index ddeed3a1ab..6c3b0dc179 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/Rx');
+module.exports = require('./dist/package/Rx');
diff --git a/package.json b/package.json
index 5423a41a52..80d9a2a591 100644
--- a/package.json
+++ b/package.json
@@ -21,23 +21,26 @@
   "scripts-info": {
     "info": "List available script",
     "build_all": "Build all packages (ES6, CJS, UMD) and generate packages",
-    "build_cjs": "Build CJS package with clean up existing build, copy source into dist",
-    "build_es6": "Build ES6 package with clean up existing build, copy source into dist",
+    "build_cjs": "Build CJS package with clean up existing build",
+    "build_esm5": "Build ESM/ES5 package with clean up existing build",
+    "build_esm2015": "Build ESM/ES2015 package with clean up existing build",
     "build_closure_core": "Minify Global core build using closure compiler",
     "build_global": "Build Global package, then minify build",
     "build_perf": "Build CJS & Global build, run macro performance test",
     "build_test": "Build CJS package & test spec, execute mocha test runner",
     "build_cover": "Run lint to current code, build CJS & test spec, execute test coverage",
-    "build_docs": "Build ES6 & global package, create documentation using it",
+    "build_docs": "Build ESM2015 & global package, create documentation using it",
     "build_spec": "Build test specs",
     "check_circular_dependencies": "Check codebase has circular dependencies",
     "clean_spec": "Clean up existing test spec build output",
     "clean_dist_cjs": "Clean up existing CJS package output",
-    "clean_dist_es6": "Clean up existing ES6 package output",
+    "clean_dist_esm5": "Clean up existing ESM/ES5 package output",
+    "clean_dist_esm2015": "Clean up existing ESM/ES2015 package output",
     "clean_dist_global": "Clean up existing Global package output",
     "commit": "Run git commit wizard",
     "compile_dist_cjs": "Compile codebase into CJS module",
-    "compile_module_es6": "Compile codebase into ES6",
+    "compile_module_esm5": "Compile codebase into ESM/ES5",
+    "compile_module_esm2015": "Compile codebase into ESM/ES2015",
     "cover": "Execute test coverage",
     "lint_perf": "Run lint against performance test suite",
     "lint_spec": "Run lint against test spec",
@@ -55,29 +58,32 @@
     "precommit": "lint-staged",
     "commitmsg": "validate-commit-msg",
     "info": "npm-scripts-info",
-    "build_all": "npm-run-all build_cjs build_global generate_packages",
-    "build_cjs": "npm-run-all clean_dist_cjs copy_src_cjs compile_dist_cjs",
-    "build_es6": "npm-run-all clean_dist_es6 copy_src_es6 compile_module_es6",
-    "build_es6_for_docs": "npm-run-all clean_dist_es6 copy_src_es6 compile_dist_es6_for_docs",
+    "build_all": "npm-run-all clean_dist build_cjs build_esm5 build_esm2015 build_umd generate_packages",
+    "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs",
+    "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5",
+    "build_esm2015": "npm-run-all clean_dist_esm2015 compile_module_esm2015",
+    "build_esm2015_for_docs": "npm-run-all clean_dist_esm2015 compile_dist_esm2015_for_docs",
     "build_closure_core": "node ./tools/make-closure-core.js",
-    "build_global": "npm-run-all clean_dist_global build_es6 && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core clean_dist_es6",
+    "build_global": "npm-run-all clean_dist_global build_esm5 && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core clean_dist_esm5",
+    "build_umd": "npm-run-all clean_dist_global && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core",
     "build_perf": "webdriver-manager update && npm-run-all build_cjs build_global perf",
-    "build_test": "shx rm -rf ./dist/ && npm-run-all build_cjs clean_spec build_spec test_mocha",
-    "build_cover": "shx rm -rf ./dist/ && npm-run-all build_cjs build_spec cover",
-    "build_docs": "npm-run-all build_global build_es6_for_docs build_cjs clean_spec build_spec tests2png decision_tree_widget && esdoc -c esdoc.json && npm-run-all clean_dist_es6",
+    "build_test": "shx rm -rf ./dist/ && npm-run-all build_all clean_spec build_spec test_mocha",
+    "build_cover": "shx rm -rf ./dist/ && npm-run-all build_all build_spec cover",
+    "build_docs": "npm-run-all build_global build_esm2015_for_docs build_cjs clean_spec build_spec tests2png decision_tree_widget && esdoc -c esdoc.json && npm-run-all clean_dist_esm2015",
     "build_spec": "tsc --project ./spec --pretty",
     "build_spec_browser": "webpack --config spec/support/webpack.mocha.config.js",
     "check_circular_dependencies": "madge ./dist/cjs --circular",
     "clean_spec": "shx rm -rf spec-js",
+    "clean_dist": "shx rm -rf ./dist",
     "clean_dist_cjs": "shx rm -rf ./dist/cjs",
-    "clean_dist_es6": "shx rm -rf ./dist/es6",
+    "clean_dist_esm5": "shx rm -rf ./dist/esm5",
+    "clean_dist_esm2015": "shx rm -rf ./dist/esm2015",
     "clean_dist_global": "shx rm -rf ./dist/global",
-    "copy_src_cjs": "mkdirp ./dist/cjs/src && shx cp -r ./src/* ./dist/cjs/src",
-    "copy_src_es6": "mkdirp ./dist/es6/src && shx cp -r ./src/* ./dist/es6/src",
     "commit": "git-cz",
-    "compile_dist_cjs": "tsc ./dist/cjs/src/Rx.ts ./dist/cjs/src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
-    "compile_module_es6": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts -m es2015   --sourceMap --outDir ./dist/es6 --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom ",
-    "compile_dist_es6_for_docs": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts ./dist/es6/src/MiscJSDoc.ts -m es2015   --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
+    "compile_dist_cjs": "tsc   ./src/Rx.ts ./src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/cjs   --target ES5    --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node -d --declarationDir ./dist/typings",
+    "compile_dist_esm5": "tsc  ./src/Rx.ts ./src/add/observable/of.ts -m es2015   --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/esm5  --target ES5    --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
+    "compile_module_esm2015": "tsc ./src/Rx.ts ./src/add/observable/of.ts -m es2015   --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/esm2015 --target es2015 --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
+    "compile_dist_esm2015_for_docs": "tsc ./src/Rx.ts ./src/add/observable/of.ts ./src/MiscJSDoc.ts -m es2015   --sourceMap --outDir ./dist/es6 --target es2015 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
     "cover": "shx rm -rf dist/cjs && tsc src/Rx.ts src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --outDir dist/cjs --sourceMap --target ES5 -d && nyc --reporter=lcov --reporter=html --exclude=spec/support/**/* --exclude=spec-js/**/* --exclude=node_modules mocha --opts spec/support/default.opts spec-js",
     "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..",
     "doctoc": "doctoc CONTRIBUTING.md",
@@ -168,6 +174,7 @@
     "gzip-size": "^3.0.0",
     "http-server": "^0.9.0",
     "husky": "^0.13.3",
+    "klaw-sync": "^3.0.0",
     "lint-staged": "3.2.5",
     "lodash": "^4.15.0",
     "madge": "^1.4.3",
@@ -204,7 +211,7 @@
   "engines": {
     "npm": ">=2.0.0"
   },
-  "typings": "./dist/cjs/Rx.d.ts",
+  "typings": "./dist/package/typings/Rx.d.ts",
   "dependencies": {
     "symbol-observable": "^1.0.1"
   }
diff --git a/perf/micro/immediate-scheduler/operators/distinct-keyselector.js b/perf/micro/immediate-scheduler/operators/distinct-keyselector.js
index 86afd4aeb8..d6cff1f14d 100644
--- a/perf/micro/immediate-scheduler/operators/distinct-keyselector.js
+++ b/perf/micro/immediate-scheduler/operators/distinct-keyselector.js
@@ -1,5 +1,5 @@
 var RxOld = require('rx');
-var RxNew = require('../../../../dist/cjs/Rx');
+var RxNew = require('../../../../dist/package/Rx');
 
 module.exports = function (suite) {
   var source = Array.from({ length: 25 }, function (_, i) { return { value: i % 3 }; });
diff --git a/perf/micro/immediate-scheduler/operators/distinct.js b/perf/micro/immediate-scheduler/operators/distinct.js
index fee8a7eb84..aad4f9fc0d 100644
--- a/perf/micro/immediate-scheduler/operators/distinct.js
+++ b/perf/micro/immediate-scheduler/operators/distinct.js
@@ -1,5 +1,5 @@
 var RxOld = require('rx');
-var RxNew = require('../../../../dist/cjs/Rx');
+var RxNew = require('../../../../dist/package/Rx');
 
 module.exports = function (suite) {
   var source = Array.from({ length: 25 }, function (_, i) { return i % 3; });
diff --git a/spec/Notification-spec.ts b/spec/Notification-spec.ts
index 8bc3d4a41e..76bb760011 100644
--- a/spec/Notification-spec.ts
+++ b/spec/Notification-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 declare const expectObservable;
 const Notification = Rx.Notification;
diff --git a/spec/Observable-spec.ts b/spec/Observable-spec.ts
index 41a8dcddbc..f6a11d2e1a 100644
--- a/spec/Observable-spec.ts
+++ b/spec/Observable-spec.ts
@@ -1,9 +1,9 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../dist/cjs/Rx';
-import {TeardownLogic} from '../dist/cjs/Subscription';
+import * as Rx from '../dist/package/Rx';
+import {TeardownLogic} from '../dist/package/Subscription';
 import marbleTestingSignature = require('./helpers/marble-testing'); // tslint:disable-line:no-require-imports
-import { map } from '../dist/cjs/operators';
+import { map } from '../dist/package/operators';
 
 declare const { asDiagram, rxTestScheduler };
 declare const cold: typeof marbleTestingSignature.cold;
diff --git a/spec/Scheduler-spec.ts b/spec/Scheduler-spec.ts
index eca500960e..0d9cfb084d 100644
--- a/spec/Scheduler-spec.ts
+++ b/spec/Scheduler-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Scheduler = Rx.Scheduler;
 
diff --git a/spec/Subject-spec.ts b/spec/Subject-spec.ts
index 0a4b57776d..0588be41f5 100644
--- a/spec/Subject-spec.ts
+++ b/spec/Subject-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 import marbleTestingSignature = require('./helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { time };
diff --git a/spec/Subscriber-spec.ts b/spec/Subscriber-spec.ts
index 02c4afbc2d..8fd878e616 100644
--- a/spec/Subscriber-spec.ts
+++ b/spec/Subscriber-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Subscriber = Rx.Subscriber;
 
diff --git a/spec/Subscription-spec.ts b/spec/Subscription-spec.ts
index c92a3d4aa8..b4d5a077b7 100644
--- a/spec/Subscription-spec.ts
+++ b/spec/Subscription-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Observable = Rx.Observable;
 const Subscription = Rx.Subscription;
diff --git a/spec/exports-spec.ts b/spec/exports-spec.ts
index 878c42da5f..d8276328cf 100644
--- a/spec/exports-spec.ts
+++ b/spec/exports-spec.ts
@@ -1,29 +1,29 @@
 import { expect } from 'chai';
-import { bindCallback } from '../dist/cjs/observable/bindCallback';
-import { bindNodeCallback } from '../dist/cjs/observable/bindNodeCallback';
-import { combineLatest } from '../dist/cjs/observable/combineLatest';
-import { concat } from '../dist/cjs/observable/concat';
-import { defer } from '../dist/cjs/observable/defer';
-import { empty } from '../dist/cjs/observable/empty';
-import { forkJoin } from '../dist/cjs/observable/forkJoin';
-import { from } from '../dist/cjs/observable/from';
-import { fromEvent } from '../dist/cjs/observable/fromEvent';
-import { fromEventPattern } from '../dist/cjs/observable/fromEventPattern';
-import { fromPromise } from '../dist/cjs/observable/fromPromise';
-import { _if } from '../dist/cjs/observable/if';
-import { interval } from '../dist/cjs/observable/interval';
-import { merge } from '../dist/cjs/observable/merge';
-import { never } from '../dist/cjs/observable/never';
-import { of } from '../dist/cjs/observable/of';
-import { onErrorResumeNext } from '../dist/cjs/observable/onErrorResumeNext';
-import { pairs } from '../dist/cjs/observable/pairs';
-import { race } from '../dist/cjs/observable/race';
-import { range } from '../dist/cjs/observable/range';
-import { _throw } from '../dist/cjs/observable/throw';
-import { timer } from '../dist/cjs/observable/timer';
-import { using } from '../dist/cjs/observable/using';
-import { zip } from '../dist/cjs/observable/zip';
-import * as Rx from '../dist/cjs/Rx';
+import { bindCallback } from '../dist/package/observable/bindCallback';
+import { bindNodeCallback } from '../dist/package/observable/bindNodeCallback';
+import { combineLatest } from '../dist/package/observable/combineLatest';
+import { concat } from '../dist/package/observable/concat';
+import { defer } from '../dist/package/observable/defer';
+import { empty } from '../dist/package/observable/empty';
+import { forkJoin } from '../dist/package/observable/forkJoin';
+import { from } from '../dist/package/observable/from';
+import { fromEvent } from '../dist/package/observable/fromEvent';
+import { fromEventPattern } from '../dist/package/observable/fromEventPattern';
+import { fromPromise } from '../dist/package/observable/fromPromise';
+import { _if } from '../dist/package/observable/if';
+import { interval } from '../dist/package/observable/interval';
+import { merge } from '../dist/package/observable/merge';
+import { never } from '../dist/package/observable/never';
+import { of } from '../dist/package/observable/of';
+import { onErrorResumeNext } from '../dist/package/observable/onErrorResumeNext';
+import { pairs } from '../dist/package/observable/pairs';
+import { race } from '../dist/package/observable/race';
+import { range } from '../dist/package/observable/range';
+import { _throw } from '../dist/package/observable/throw';
+import { timer } from '../dist/package/observable/timer';
+import { using } from '../dist/package/observable/using';
+import { zip } from '../dist/package/observable/zip';
+import * as Rx from '../dist/package/Rx';
 
 describe('exports', () => {
   it('should have rxjs/observable/bindCallback', () => {
diff --git a/spec/helpers/marble-testing.ts b/spec/helpers/marble-testing.ts
index 2fb9bcdf72..87507cefd5 100644
--- a/spec/helpers/marble-testing.ts
+++ b/spec/helpers/marble-testing.ts
@@ -1,9 +1,9 @@
 ///<reference path='../../typings/index.d.ts'/>
-import {Observable} from '../../dist/cjs/Observable';
-import {SubscriptionLog} from '../../dist/cjs/testing/SubscriptionLog';
-import {ColdObservable} from '../../dist/cjs/testing/ColdObservable';
-import {HotObservable} from '../../dist/cjs/testing/HotObservable';
-import {TestScheduler, observableToBeFn, subscriptionLogsToBeFn} from '../../dist/cjs/testing/TestScheduler';
+import {Observable} from '../../dist/package/Observable';
+import {SubscriptionLog} from '../../dist/package/testing/SubscriptionLog';
+import {ColdObservable} from '../../dist/package/testing/ColdObservable';
+import {HotObservable} from '../../dist/package/testing/HotObservable';
+import {TestScheduler, observableToBeFn, subscriptionLogsToBeFn} from '../../dist/package/testing/TestScheduler';
 
 declare const global: any;
 
diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts
index 2acd0f40d9..65ac08aeb7 100644
--- a/spec/helpers/test-helper.ts
+++ b/spec/helpers/test-helper.ts
@@ -1,10 +1,10 @@
 ///<reference path='../../typings/index.d.ts'/>
 declare const global: any;
 
-import * as Rx from '../../dist/cjs/Rx';
-import {ObservableInput} from '../../dist/cjs/Observable';
-import {root} from '../../dist/cjs/util/root';
-import {$$iterator} from '../../dist/cjs/symbol/iterator';
+import * as Rx from '../../dist/package/Rx';
+import {ObservableInput} from '../../dist/package/Observable';
+import {root} from '../../dist/package/util/root';
+import {$$iterator} from '../../dist/package/symbol/iterator';
 import $$symbolObservable from 'symbol-observable';
 
 export function lowerCaseO<T>(...args): Rx.Observable<T> {
diff --git a/spec/helpers/testScheduler-ui.ts b/spec/helpers/testScheduler-ui.ts
index 0e522e6d60..7b425222d7 100644
--- a/spec/helpers/testScheduler-ui.ts
+++ b/spec/helpers/testScheduler-ui.ts
@@ -7,7 +7,7 @@ import * as escapeRe from 'escape-string-regexp';
 import * as chai from 'chai';
 import * as sinonChai from 'sinon-chai';
 
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import * as marble from './marble-testing';
 
 //setup sinon-chai
diff --git a/spec/helpers/tests2png/diagram-test-runner.js b/spec/helpers/tests2png/diagram-test-runner.js
index 1517567760..31806e5252 100644
--- a/spec/helpers/tests2png/diagram-test-runner.js
+++ b/spec/helpers/tests2png/diagram-test-runner.js
@@ -1,5 +1,5 @@
-var root = require('../../../dist/cjs/util/root').root;
-var Rx = require('../../../dist/cjs/Rx');
+var root = require('../../../dist/package/util/root').root;
+var Rx = require('../../../dist/package/Rx');
 var painter = require('./painter');
 
 function getInputStreams(rxTestScheduler) {
diff --git a/spec/observables/IteratorObservable-spec.ts b/spec/observables/IteratorObservable-spec.ts
index 63b1d73761..530f8a1c38 100644
--- a/spec/observables/IteratorObservable-spec.ts
+++ b/spec/observables/IteratorObservable-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {queue} from '../../dist/cjs/scheduler/queue';
-import {IteratorObservable} from '../../dist/cjs/observable/IteratorObservable';
+import * as Rx from '../../dist/package/Rx';
+import {queue} from '../../dist/package/scheduler/queue';
+import {IteratorObservable} from '../../dist/package/observable/IteratorObservable';
 
 declare const expectObservable;
 declare const rxTestScheduler: Rx.TestScheduler;
diff --git a/spec/observables/ScalarObservable-spec.ts b/spec/observables/ScalarObservable-spec.ts
index 208cffbde2..2bfcaee973 100644
--- a/spec/observables/ScalarObservable-spec.ts
+++ b/spec/observables/ScalarObservable-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {ScalarObservable} from '../../dist/cjs/observable/ScalarObservable';
+import * as Rx from '../../dist/package/Rx';
+import {ScalarObservable} from '../../dist/package/observable/ScalarObservable';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 
diff --git a/spec/observables/SubscribeOnObservable-spec.ts b/spec/observables/SubscribeOnObservable-spec.ts
index 353912a78b..c70b2e29d5 100644
--- a/spec/observables/SubscribeOnObservable-spec.ts
+++ b/spec/observables/SubscribeOnObservable-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {SubscribeOnObservable} from '../../dist/cjs/observable/SubscribeOnObservable';
+import * as Rx from '../../dist/package/Rx';
+import {SubscribeOnObservable} from '../../dist/package/observable/SubscribeOnObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/observables/bindCallback-spec.ts b/spec/observables/bindCallback-spec.ts
index 59c92ab1e0..cb698435fa 100644
--- a/spec/observables/bindCallback-spec.ts
+++ b/spec/observables/bindCallback-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 const Observable = Rx.Observable;
diff --git a/spec/observables/bindNodeCallback-spec.ts b/spec/observables/bindNodeCallback-spec.ts
index e6e50de25a..615d641711 100644
--- a/spec/observables/bindNodeCallback-spec.ts
+++ b/spec/observables/bindNodeCallback-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 const Observable = Rx.Observable;
diff --git a/spec/observables/combineLatest-spec.ts b/spec/observables/combineLatest-spec.ts
index 65bfa08228..f354aa3231 100644
--- a/spec/observables/combineLatest-spec.ts
+++ b/spec/observables/combineLatest-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { type };
diff --git a/spec/observables/concat-spec.ts b/spec/observables/concat-spec.ts
index 4810df6328..98401b8a95 100644
--- a/spec/observables/concat-spec.ts
+++ b/spec/observables/concat-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/observables/defer-spec.ts b/spec/observables/defer-spec.ts
index df6e391e35..f4238ae59f 100644
--- a/spec/observables/defer-spec.ts
+++ b/spec/observables/defer-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts
index d80dc79ec0..4ad5e8cef7 100644
--- a/spec/observables/dom/ajax-spec.ts
+++ b/spec/observables/dom/ajax-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../../dist/cjs/Rx';
-import {root} from '../../../dist/cjs/util/root';
+import * as Rx from '../../../dist/package/Rx';
+import {root} from '../../../dist/package/util/root';
 
 declare const global: any;
 
diff --git a/spec/observables/dom/webSocket-spec.ts b/spec/observables/dom/webSocket-spec.ts
index 548f2cc961..9db4181281 100644
--- a/spec/observables/dom/webSocket-spec.ts
+++ b/spec/observables/dom/webSocket-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../../dist/cjs/Rx';
+import * as Rx from '../../../dist/package/Rx';
 
 declare const __root__: any;
 
diff --git a/spec/observables/empty-spec.ts b/spec/observables/empty-spec.ts
index 2bf0e8f91d..df11f0f386 100644
--- a/spec/observables/empty-spec.ts
+++ b/spec/observables/empty-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/forkJoin-spec.ts b/spec/observables/forkJoin-spec.ts
index 677bf4651d..8182987939 100644
--- a/spec/observables/forkJoin-spec.ts
+++ b/spec/observables/forkJoin-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/observables/from-promise-spec.ts b/spec/observables/from-promise-spec.ts
index 3fca23353c..cbb1ecc58d 100644
--- a/spec/observables/from-promise-spec.ts
+++ b/spec/observables/from-promise-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const process: any;
 const Observable = Rx.Observable;
diff --git a/spec/observables/from-spec.ts b/spec/observables/from-spec.ts
index bf0a02e428..fe0d256a3b 100644
--- a/spec/observables/from-spec.ts
+++ b/spec/observables/from-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const {asDiagram, expectObservable, Symbol, type};
 declare const rxTestScheduler: Rx.TestScheduler;
diff --git a/spec/observables/fromEvent-spec.ts b/spec/observables/fromEvent-spec.ts
index 635c977808..6b30d72ddf 100644
--- a/spec/observables/fromEvent-spec.ts
+++ b/spec/observables/fromEvent-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/fromEventPattern-spec.ts b/spec/observables/fromEventPattern-spec.ts
index 86f3b4bada..be7b69fa3d 100644
--- a/spec/observables/fromEventPattern-spec.ts
+++ b/spec/observables/fromEventPattern-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {noop} from '../../dist/cjs/util/noop';
+import * as Rx from '../../dist/package/Rx';
+import {noop} from '../../dist/package/util/noop';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/generate-spec.ts b/spec/observables/generate-spec.ts
index b30857fb8e..2a8365c884 100644
--- a/spec/observables/generate-spec.ts
+++ b/spec/observables/generate-spec.ts
@@ -1,6 +1,6 @@
-import * as Rx from '../../dist/cjs/Rx';
-import '../../dist/cjs/add/observable/generate';
-import {TestScheduler} from '../../dist/cjs/testing/TestScheduler';
+import * as Rx from '../../dist/package/Rx';
+import '../../dist/package/add/observable/generate';
+import {TestScheduler} from '../../dist/package/testing/TestScheduler';
 import {expect} from 'chai';
 declare const {asDiagram, expectObservable};
 declare const rxTestScheduler: TestScheduler;
diff --git a/spec/observables/if-spec.ts b/spec/observables/if-spec.ts
index 0b7ee01dd6..c0fe01797e 100644
--- a/spec/observables/if-spec.ts
+++ b/spec/observables/if-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const expectObservable: typeof marbleTestingSignature.expectObservable;
diff --git a/spec/observables/interval-spec.ts b/spec/observables/interval-spec.ts
index 03fb7bf7c7..c88c8e3a76 100644
--- a/spec/observables/interval-spec.ts
+++ b/spec/observables/interval-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/merge-spec.ts b/spec/observables/merge-spec.ts
index c49e61f811..bac73de11c 100644
--- a/spec/observables/merge-spec.ts
+++ b/spec/observables/merge-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/observables/never-spec.ts b/spec/observables/never-spec.ts
index 8835792c13..093181d97c 100644
--- a/spec/observables/never-spec.ts
+++ b/spec/observables/never-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/of-spec.ts b/spec/observables/of-spec.ts
index 1e3cd0bbd5..90e19ea6e2 100644
--- a/spec/observables/of-spec.ts
+++ b/spec/observables/of-spec.ts
@@ -1,8 +1,8 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {ArrayObservable} from '../../dist/cjs/observable/ArrayObservable';
-import {ScalarObservable} from '../../dist/cjs/observable/ScalarObservable';
-import {EmptyObservable} from '../../dist/cjs/observable/EmptyObservable';
+import * as Rx from '../../dist/package/Rx';
+import {ArrayObservable} from '../../dist/package/observable/ArrayObservable';
+import {ScalarObservable} from '../../dist/package/observable/ScalarObservable';
+import {EmptyObservable} from '../../dist/package/observable/EmptyObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/onErrorResumeNext-spec.ts b/spec/observables/onErrorResumeNext-spec.ts
index ddff470acf..b7ee3a8757 100644
--- a/spec/observables/onErrorResumeNext-spec.ts
+++ b/spec/observables/onErrorResumeNext-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/observables/pairs-spec.ts b/spec/observables/pairs-spec.ts
index d5cf8b0615..442a0e45ba 100644
--- a/spec/observables/pairs-spec.ts
+++ b/spec/observables/pairs-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/race-spec.ts b/spec/observables/race-spec.ts
index 263ded380d..30865b5ada 100644
--- a/spec/observables/race-spec.ts
+++ b/spec/observables/race-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/observables/range-spec.ts b/spec/observables/range-spec.ts
index 62442aa24f..c77c3c24d8 100644
--- a/spec/observables/range-spec.ts
+++ b/spec/observables/range-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {RangeObservable} from '../../dist/cjs/observable/RangeObservable';
+import * as Rx from '../../dist/package/Rx';
+import {RangeObservable} from '../../dist/package/observable/RangeObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/throw-spec.ts b/spec/observables/throw-spec.ts
index c2b456067a..3af8afbc88 100644
--- a/spec/observables/throw-spec.ts
+++ b/spec/observables/throw-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {ErrorObservable} from '../../dist/cjs/observable/ErrorObservable';
+import * as Rx from '../../dist/package/Rx';
+import {ErrorObservable} from '../../dist/package/observable/ErrorObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/observables/timer-spec.ts b/spec/observables/timer-spec.ts
index d8f9eb333f..3e813c6bfd 100644
--- a/spec/observables/timer-spec.ts
+++ b/spec/observables/timer-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/observables/using-spec.ts b/spec/observables/using-spec.ts
index b8e8755210..eb137505ed 100644
--- a/spec/observables/using-spec.ts
+++ b/spec/observables/using-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const Observable = Rx.Observable;
 const Subscription = Rx.Subscription;
diff --git a/spec/observables/zip-spec.ts b/spec/observables/zip-spec.ts
index cc800448c6..73415dc0f5 100644
--- a/spec/observables/zip-spec.ts
+++ b/spec/observables/zip-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { type };
diff --git a/spec/operators/audit-spec.ts b/spec/operators/audit-spec.ts
index b151dfef9d..443328fdf2 100644
--- a/spec/operators/audit-spec.ts
+++ b/spec/operators/audit-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/auditTime-spec.ts b/spec/operators/auditTime-spec.ts
index 8c1491a989..2e024dcb12 100644
--- a/spec/operators/auditTime-spec.ts
+++ b/spec/operators/auditTime-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/buffer-spec.ts b/spec/operators/buffer-spec.ts
index dc17061c5a..6b1bc22a48 100644
--- a/spec/operators/buffer-spec.ts
+++ b/spec/operators/buffer-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/bufferCount-spec.ts b/spec/operators/bufferCount-spec.ts
index a3f79a89a0..579fc0f9be 100644
--- a/spec/operators/bufferCount-spec.ts
+++ b/spec/operators/bufferCount-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import { expect } from 'chai';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/operators/bufferTime-spec.ts b/spec/operators/bufferTime-spec.ts
index 29b0b5642b..bb86409c87 100644
--- a/spec/operators/bufferTime-spec.ts
+++ b/spec/operators/bufferTime-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/bufferToggle-spec.ts b/spec/operators/bufferToggle-spec.ts
index 18f49ebc78..a1f109989d 100644
--- a/spec/operators/bufferToggle-spec.ts
+++ b/spec/operators/bufferToggle-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/bufferWhen-spec.ts b/spec/operators/bufferWhen-spec.ts
index 566f530c33..9e35678651 100644
--- a/spec/operators/bufferWhen-spec.ts
+++ b/spec/operators/bufferWhen-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/catch-spec.ts b/spec/operators/catch-spec.ts
index 1a933d0cb0..98b34e60b4 100644
--- a/spec/operators/catch-spec.ts
+++ b/spec/operators/catch-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import * as sinon from 'sinon';
 import {createObservableInputs} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
diff --git a/spec/operators/combineAll-spec.ts b/spec/operators/combineAll-spec.ts
index cd6dd3edcd..9d903c742c 100644
--- a/spec/operators/combineAll-spec.ts
+++ b/spec/operators/combineAll-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/combineLatest-spec.ts b/spec/operators/combineLatest-spec.ts
index 5d551e5fd4..7510fee2f0 100644
--- a/spec/operators/combineLatest-spec.ts
+++ b/spec/operators/combineLatest-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/concat-spec.ts b/spec/operators/concat-spec.ts
index f669c1ddae..3084f5f557 100644
--- a/spec/operators/concat-spec.ts
+++ b/spec/operators/concat-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/concatAll-spec.ts b/spec/operators/concatAll-spec.ts
index b217460e43..08f6a9b2f2 100644
--- a/spec/operators/concatAll-spec.ts
+++ b/spec/operators/concatAll-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/concatMap-spec.ts b/spec/operators/concatMap-spec.ts
index 3f989487df..d355a2ff76 100644
--- a/spec/operators/concatMap-spec.ts
+++ b/spec/operators/concatMap-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/concatMapTo-spec.ts b/spec/operators/concatMapTo-spec.ts
index 05c9f55b02..02beda6e12 100644
--- a/spec/operators/concatMapTo-spec.ts
+++ b/spec/operators/concatMapTo-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/count-spec.ts b/spec/operators/count-spec.ts
index 08d12310a7..dedf1f6da0 100644
--- a/spec/operators/count-spec.ts
+++ b/spec/operators/count-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/debounce-spec.ts b/spec/operators/debounce-spec.ts
index b2ff1f6da7..37440a5e41 100644
--- a/spec/operators/debounce-spec.ts
+++ b/spec/operators/debounce-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/debounceTime-spec.ts b/spec/operators/debounceTime-spec.ts
index 324c24832e..02ed83d5d1 100644
--- a/spec/operators/debounceTime-spec.ts
+++ b/spec/operators/debounceTime-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/defaultIfEmpty-spec.ts b/spec/operators/defaultIfEmpty-spec.ts
index 9677157f7c..39a623ee06 100644
--- a/spec/operators/defaultIfEmpty-spec.ts
+++ b/spec/operators/defaultIfEmpty-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/delay-spec.ts b/spec/operators/delay-spec.ts
index 60331bbf50..499a24d846 100644
--- a/spec/operators/delay-spec.ts
+++ b/spec/operators/delay-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/delayWhen-spec.ts b/spec/operators/delayWhen-spec.ts
index 50375bcf21..0e5388bf34 100644
--- a/spec/operators/delayWhen-spec.ts
+++ b/spec/operators/delayWhen-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 import { expect } from 'chai';
 
diff --git a/spec/operators/dematerialize-spec.ts b/spec/operators/dematerialize-spec.ts
index 5123138c73..88974ef063 100644
--- a/spec/operators/dematerialize-spec.ts
+++ b/spec/operators/dematerialize-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/distinct-spec.ts b/spec/operators/distinct-spec.ts
index dccbaf52b4..a8996944a0 100644
--- a/spec/operators/distinct-spec.ts
+++ b/spec/operators/distinct-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/operators/distinctUntilChanged-spec.ts b/spec/operators/distinctUntilChanged-spec.ts
index 8c96e6e73e..2337f5cf87 100644
--- a/spec/operators/distinctUntilChanged-spec.ts
+++ b/spec/operators/distinctUntilChanged-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/distinctUntilKeyChanged-spec.ts b/spec/operators/distinctUntilKeyChanged-spec.ts
index aa40e1d3b9..1adb93a2ce 100644
--- a/spec/operators/distinctUntilKeyChanged-spec.ts
+++ b/spec/operators/distinctUntilKeyChanged-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/do-spec.ts b/spec/operators/do-spec.ts
index f2bc1a640a..f549332d5e 100644
--- a/spec/operators/do-spec.ts
+++ b/spec/operators/do-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/elementAt-spec.ts b/spec/operators/elementAt-spec.ts
index ac27b5cc85..b20f1a9723 100644
--- a/spec/operators/elementAt-spec.ts
+++ b/spec/operators/elementAt-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/every-spec.ts b/spec/operators/every-spec.ts
index 403fd559d8..e782bdd74a 100644
--- a/spec/operators/every-spec.ts
+++ b/spec/operators/every-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/exhaust-spec.ts b/spec/operators/exhaust-spec.ts
index fe6a3793ed..068c6bb854 100644
--- a/spec/operators/exhaust-spec.ts
+++ b/spec/operators/exhaust-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/exhaustMap-spec.ts b/spec/operators/exhaustMap-spec.ts
index c99c2a977b..696b4854df 100644
--- a/spec/operators/exhaustMap-spec.ts
+++ b/spec/operators/exhaustMap-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/expand-spec.ts b/spec/operators/expand-spec.ts
index bbb9ea25d1..4822980ee7 100644
--- a/spec/operators/expand-spec.ts
+++ b/spec/operators/expand-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/filter-spec.ts b/spec/operators/filter-spec.ts
index 4c95609d7f..55c896585e 100644
--- a/spec/operators/filter-spec.ts
+++ b/spec/operators/filter-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/finally-spec.ts b/spec/operators/finally-spec.ts
index 74a8e9bd54..d49c01f633 100644
--- a/spec/operators/finally-spec.ts
+++ b/spec/operators/finally-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, Symbol, type };
diff --git a/spec/operators/find-spec.ts b/spec/operators/find-spec.ts
index b9094cef02..67807afa1c 100644
--- a/spec/operators/find-spec.ts
+++ b/spec/operators/find-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/findIndex-spec.ts b/spec/operators/findIndex-spec.ts
index b3a8934426..656314f312 100644
--- a/spec/operators/findIndex-spec.ts
+++ b/spec/operators/findIndex-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/first-spec.ts b/spec/operators/first-spec.ts
index 91f031dfbb..e29746b853 100644
--- a/spec/operators/first-spec.ts
+++ b/spec/operators/first-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/groupBy-spec.ts b/spec/operators/groupBy-spec.ts
index 6f1eb8bdae..a24ce44ca5 100644
--- a/spec/operators/groupBy-spec.ts
+++ b/spec/operators/groupBy-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {GroupedObservable} from '../../dist/cjs/operators/groupBy';
+import * as Rx from '../../dist/package/Rx';
+import {GroupedObservable} from '../../dist/package/operators/groupBy';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/ignoreElements-spec.ts b/spec/operators/ignoreElements-spec.ts
index d96fe121cb..71a9e052cc 100644
--- a/spec/operators/ignoreElements-spec.ts
+++ b/spec/operators/ignoreElements-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/isEmpty-spec.ts b/spec/operators/isEmpty-spec.ts
index d393afb825..5a38d5fecc 100644
--- a/spec/operators/isEmpty-spec.ts
+++ b/spec/operators/isEmpty-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/last-spec.ts b/spec/operators/last-spec.ts
index 61726aecc8..32b49b90bd 100644
--- a/spec/operators/last-spec.ts
+++ b/spec/operators/last-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/let-spec.ts b/spec/operators/let-spec.ts
index 81f3342cef..a835070bcc 100644
--- a/spec/operators/let-spec.ts
+++ b/spec/operators/let-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 /** @test {let} */
 describe('Observable.prototype.let', () => {
diff --git a/spec/operators/map-spec.ts b/spec/operators/map-spec.ts
index ac24af38d5..fc9d666819 100644
--- a/spec/operators/map-spec.ts
+++ b/spec/operators/map-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/mapTo-spec.ts b/spec/operators/mapTo-spec.ts
index 185dd01a23..b2562b1a8a 100644
--- a/spec/operators/mapTo-spec.ts
+++ b/spec/operators/mapTo-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/materialize-spec.ts b/spec/operators/materialize-spec.ts
index faa8440d15..2dd0211f5f 100644
--- a/spec/operators/materialize-spec.ts
+++ b/spec/operators/materialize-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/max-spec.ts b/spec/operators/max-spec.ts
index c6b47aace4..6a0bf19e72 100644
--- a/spec/operators/max-spec.ts
+++ b/spec/operators/max-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/merge-spec.ts b/spec/operators/merge-spec.ts
index 84c3757ff9..ed32e346ba 100644
--- a/spec/operators/merge-spec.ts
+++ b/spec/operators/merge-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/mergeAll-spec.ts b/spec/operators/mergeAll-spec.ts
index 0aa533d8ce..fc750622e1 100644
--- a/spec/operators/mergeAll-spec.ts
+++ b/spec/operators/mergeAll-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/mergeMap-spec.ts b/spec/operators/mergeMap-spec.ts
index 5df1f1af8f..d51afa1170 100644
--- a/spec/operators/mergeMap-spec.ts
+++ b/spec/operators/mergeMap-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, type };
diff --git a/spec/operators/mergeMapTo-spec.ts b/spec/operators/mergeMapTo-spec.ts
index d12296d796..305fb1ec49 100644
--- a/spec/operators/mergeMapTo-spec.ts
+++ b/spec/operators/mergeMapTo-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, type };
diff --git a/spec/operators/mergeScan-spec.ts b/spec/operators/mergeScan-spec.ts
index 5edceebe3b..9c1cbf336d 100644
--- a/spec/operators/mergeScan-spec.ts
+++ b/spec/operators/mergeScan-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/operators/min-spec.ts b/spec/operators/min-spec.ts
index 0c8d248275..818e72816b 100644
--- a/spec/operators/min-spec.ts
+++ b/spec/operators/min-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/multicast-spec.ts b/spec/operators/multicast-spec.ts
index 17654ab8f6..794b08fc0d 100644
--- a/spec/operators/multicast-spec.ts
+++ b/spec/operators/multicast-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time, rxTestScheduler };
diff --git a/spec/operators/observeOn-spec.ts b/spec/operators/observeOn-spec.ts
index 22e295c7b8..862b4c5d14 100644
--- a/spec/operators/observeOn-spec.ts
+++ b/spec/operators/observeOn-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import { expect } from 'chai';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/operators/onErrorResumeNext-spec.ts b/spec/operators/onErrorResumeNext-spec.ts
index 8359917b88..dd7cf635f0 100644
--- a/spec/operators/onErrorResumeNext-spec.ts
+++ b/spec/operators/onErrorResumeNext-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/partition-spec.ts b/spec/operators/partition-spec.ts
index 2c9736d7be..f33f1f64fe 100644
--- a/spec/operators/partition-spec.ts
+++ b/spec/operators/partition-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/pluck-spec.ts b/spec/operators/pluck-spec.ts
index 584cd227dd..889b5b8d69 100644
--- a/spec/operators/pluck-spec.ts
+++ b/spec/operators/pluck-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/publish-spec.ts b/spec/operators/publish-spec.ts
index 4b85f7740d..cc5361d9d9 100644
--- a/spec/operators/publish-spec.ts
+++ b/spec/operators/publish-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/publishBehavior-spec.ts b/spec/operators/publishBehavior-spec.ts
index e1d52a16b6..9de6485e00 100644
--- a/spec/operators/publishBehavior-spec.ts
+++ b/spec/operators/publishBehavior-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/publishLast-spec.ts b/spec/operators/publishLast-spec.ts
index 032b2d8950..8f6daba61b 100644
--- a/spec/operators/publishLast-spec.ts
+++ b/spec/operators/publishLast-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/publishReplay-spec.ts b/spec/operators/publishReplay-spec.ts
index 592a15c64e..45c82fecad 100644
--- a/spec/operators/publishReplay-spec.ts
+++ b/spec/operators/publishReplay-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/race-spec.ts b/spec/operators/race-spec.ts
index 89ac62aa48..ba31304f81 100644
--- a/spec/operators/race-spec.ts
+++ b/spec/operators/race-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/operators/reduce-spec.ts b/spec/operators/reduce-spec.ts
index 603dda87ef..563349d83b 100644
--- a/spec/operators/reduce-spec.ts
+++ b/spec/operators/reduce-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, type };
diff --git a/spec/operators/refCount-spec.ts b/spec/operators/refCount-spec.ts
index ff30f13ed1..06085db7a5 100644
--- a/spec/operators/refCount-spec.ts
+++ b/spec/operators/refCount-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/repeat-spec.ts b/spec/operators/repeat-spec.ts
index fc0e417184..dc77b61fdb 100644
--- a/spec/operators/repeat-spec.ts
+++ b/spec/operators/repeat-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/repeatWhen-spec.ts b/spec/operators/repeatWhen-spec.ts
index ad8e6f47c9..54c5d3ab4c 100644
--- a/spec/operators/repeatWhen-spec.ts
+++ b/spec/operators/repeatWhen-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/retry-spec.ts b/spec/operators/retry-spec.ts
index 3aea5c51c9..b7bc81ec6e 100644
--- a/spec/operators/retry-spec.ts
+++ b/spec/operators/retry-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/retryWhen-spec.ts b/spec/operators/retryWhen-spec.ts
index eaac675b29..a39758529c 100644
--- a/spec/operators/retryWhen-spec.ts
+++ b/spec/operators/retryWhen-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/sample-spec.ts b/spec/operators/sample-spec.ts
index 013889f538..32b225bfdf 100644
--- a/spec/operators/sample-spec.ts
+++ b/spec/operators/sample-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import { expect } from 'chai';
 
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
diff --git a/spec/operators/sampleTime-spec.ts b/spec/operators/sampleTime-spec.ts
index 85ff41209c..627214cd90 100644
--- a/spec/operators/sampleTime-spec.ts
+++ b/spec/operators/sampleTime-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/scan-spec.ts b/spec/operators/scan-spec.ts
index c0122615d9..cce2fe9b7e 100644
--- a/spec/operators/scan-spec.ts
+++ b/spec/operators/scan-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, type };
diff --git a/spec/operators/share-spec.ts b/spec/operators/share-spec.ts
index 0d682fb65a..06b2c218e3 100644
--- a/spec/operators/share-spec.ts
+++ b/spec/operators/share-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/shareReplay-spec.ts b/spec/operators/shareReplay-spec.ts
index 4a61e00ca6..281454dbd1 100644
--- a/spec/operators/shareReplay-spec.ts
+++ b/spec/operators/shareReplay-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/single-spec.ts b/spec/operators/single-spec.ts
index 8b9cb57700..32772d1c5b 100644
--- a/spec/operators/single-spec.ts
+++ b/spec/operators/single-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/skip-spec.ts b/spec/operators/skip-spec.ts
index ec9e5710aa..48043e88ae 100644
--- a/spec/operators/skip-spec.ts
+++ b/spec/operators/skip-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/skipLast-spec.ts b/spec/operators/skipLast-spec.ts
index e3688b71ec..5f71be6f48 100644
--- a/spec/operators/skipLast-spec.ts
+++ b/spec/operators/skipLast-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 declare const {hot, cold, asDiagram, expectObservable, expectSubscriptions};
 
 const Observable = Rx.Observable;
diff --git a/spec/operators/skipUntil-spec.ts b/spec/operators/skipUntil-spec.ts
index 6111639156..2f2ba0d8e2 100644
--- a/spec/operators/skipUntil-spec.ts
+++ b/spec/operators/skipUntil-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/skipWhile-spec.ts b/spec/operators/skipWhile-spec.ts
index 83db88d5ef..584a4846f8 100644
--- a/spec/operators/skipWhile-spec.ts
+++ b/spec/operators/skipWhile-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/startWith-spec.ts b/spec/operators/startWith-spec.ts
index e95f1d587c..7428fe82df 100644
--- a/spec/operators/startWith-spec.ts
+++ b/spec/operators/startWith-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/subscribeOn-spec.ts b/spec/operators/subscribeOn-spec.ts
index 4248a9370f..dfee14f8ad 100644
--- a/spec/operators/subscribeOn-spec.ts
+++ b/spec/operators/subscribeOn-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/switch-spec.ts b/spec/operators/switch-spec.ts
index 1f0703ab6f..42d6912094 100644
--- a/spec/operators/switch-spec.ts
+++ b/spec/operators/switch-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/switchMap-spec.ts b/spec/operators/switchMap-spec.ts
index 6fd4236847..15c66c333e 100644
--- a/spec/operators/switchMap-spec.ts
+++ b/spec/operators/switchMap-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/switchMapTo-spec.ts b/spec/operators/switchMapTo-spec.ts
index 666c7d7ad0..3e36fd82b7 100644
--- a/spec/operators/switchMapTo-spec.ts
+++ b/spec/operators/switchMapTo-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/take-spec.ts b/spec/operators/take-spec.ts
index 79a532ddd8..bb76a903b3 100644
--- a/spec/operators/take-spec.ts
+++ b/spec/operators/take-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/takeLast-spec.ts b/spec/operators/takeLast-spec.ts
index 572e22acb6..d0e6fd84dc 100644
--- a/spec/operators/takeLast-spec.ts
+++ b/spec/operators/takeLast-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/takeUntil-spec.ts b/spec/operators/takeUntil-spec.ts
index b2a2288409..00ad8d7649 100644
--- a/spec/operators/takeUntil-spec.ts
+++ b/spec/operators/takeUntil-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/takeWhile-spec.ts b/spec/operators/takeWhile-spec.ts
index 067187df46..d5f62199b6 100644
--- a/spec/operators/takeWhile-spec.ts
+++ b/spec/operators/takeWhile-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/throttle-spec.ts b/spec/operators/throttle-spec.ts
index bf2226adbe..35a29469eb 100644
--- a/spec/operators/throttle-spec.ts
+++ b/spec/operators/throttle-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/throttleTime-spec.ts b/spec/operators/throttleTime-spec.ts
index df33d664d5..dc8f73618a 100644
--- a/spec/operators/throttleTime-spec.ts
+++ b/spec/operators/throttleTime-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/timeInterval-spec.ts b/spec/operators/timeInterval-spec.ts
index 0157fac3df..4bc663d613 100644
--- a/spec/operators/timeInterval-spec.ts
+++ b/spec/operators/timeInterval-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/timeout-spec.ts b/spec/operators/timeout-spec.ts
index 8b616ec719..6b1c2469a8 100644
--- a/spec/operators/timeout-spec.ts
+++ b/spec/operators/timeout-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/timeoutWith-spec.ts b/spec/operators/timeoutWith-spec.ts
index 5697a81017..89518fa6bf 100644
--- a/spec/operators/timeoutWith-spec.ts
+++ b/spec/operators/timeoutWith-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/timestamp-spec.ts b/spec/operators/timestamp-spec.ts
index 12494d0a43..f94a46f9dd 100644
--- a/spec/operators/timestamp-spec.ts
+++ b/spec/operators/timestamp-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/operators/toArray-spec.ts b/spec/operators/toArray-spec.ts
index f9b0833bc3..1338970a36 100644
--- a/spec/operators/toArray-spec.ts
+++ b/spec/operators/toArray-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, type };
diff --git a/spec/operators/toPromise-spec.ts b/spec/operators/toPromise-spec.ts
index dbd5017c76..c155c2fb4c 100644
--- a/spec/operators/toPromise-spec.ts
+++ b/spec/operators/toPromise-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const __root__: any;
 const Observable = Rx.Observable;
diff --git a/spec/operators/window-spec.ts b/spec/operators/window-spec.ts
index 453f25227d..a131f6490f 100644
--- a/spec/operators/window-spec.ts
+++ b/spec/operators/window-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/windowCount-spec.ts b/spec/operators/windowCount-spec.ts
index b054f9da53..1801f27d32 100644
--- a/spec/operators/windowCount-spec.ts
+++ b/spec/operators/windowCount-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/windowTime-spec.ts b/spec/operators/windowTime-spec.ts
index b8dd9a41df..6f2e6362f2 100644
--- a/spec/operators/windowTime-spec.ts
+++ b/spec/operators/windowTime-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/windowToggle-spec.ts b/spec/operators/windowToggle-spec.ts
index 4d81c52b13..c774ac576f 100644
--- a/spec/operators/windowToggle-spec.ts
+++ b/spec/operators/windowToggle-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/windowWhen-spec.ts b/spec/operators/windowWhen-spec.ts
index 8cd36947ae..0fdd7882d1 100644
--- a/spec/operators/windowWhen-spec.ts
+++ b/spec/operators/windowWhen-spec.ts
@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram, time };
diff --git a/spec/operators/withLatestFrom-spec.ts b/spec/operators/withLatestFrom-spec.ts
index 07bb5f5f6d..4daf1f4ad7 100644
--- a/spec/operators/withLatestFrom-spec.ts
+++ b/spec/operators/withLatestFrom-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
diff --git a/spec/operators/zip-spec.ts b/spec/operators/zip-spec.ts
index 74b12a9e17..15fb7c4e25 100644
--- a/spec/operators/zip-spec.ts
+++ b/spec/operators/zip-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const type;
diff --git a/spec/operators/zipAll-spec.ts b/spec/operators/zipAll-spec.ts
index 58e52e28f1..d129292fd0 100644
--- a/spec/operators/zipAll-spec.ts
+++ b/spec/operators/zipAll-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
diff --git a/spec/root-module-spec.ts b/spec/root-module-spec.ts
index e59b013d7f..9b326a48be 100644
--- a/spec/root-module-spec.ts
+++ b/spec/root-module-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 describe('Root Module', () => {
   it('should contain exports from commonjs modules', () => {
diff --git a/spec/schedulers/AnimationFrameScheduler-spec.ts b/spec/schedulers/AnimationFrameScheduler-spec.ts
index 2f4219d03c..178e23c9c5 100644
--- a/spec/schedulers/AnimationFrameScheduler-spec.ts
+++ b/spec/schedulers/AnimationFrameScheduler-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const animationFrame = Rx.Scheduler.animationFrame;
 
diff --git a/spec/schedulers/AsapScheduler-spec.ts b/spec/schedulers/AsapScheduler-spec.ts
index 66c6ff5df9..5035673c8c 100644
--- a/spec/schedulers/AsapScheduler-spec.ts
+++ b/spec/schedulers/AsapScheduler-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const asap = Rx.Scheduler.asap;
 
diff --git a/spec/schedulers/QueueScheduler-spec.ts b/spec/schedulers/QueueScheduler-spec.ts
index 0a120f3421..adbe5aaa4a 100644
--- a/spec/schedulers/QueueScheduler-spec.ts
+++ b/spec/schedulers/QueueScheduler-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const Scheduler = Rx.Scheduler;
 const queue = Scheduler.queue;
diff --git a/spec/schedulers/TestScheduler-spec.ts b/spec/schedulers/TestScheduler-spec.ts
index fe316e8913..a383d409e5 100644
--- a/spec/schedulers/TestScheduler-spec.ts
+++ b/spec/schedulers/TestScheduler-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { time };
diff --git a/spec/schedulers/VirtualTimeScheduler-spec.ts b/spec/schedulers/VirtualTimeScheduler-spec.ts
index e0e113d6cf..4296687eed 100644
--- a/spec/schedulers/VirtualTimeScheduler-spec.ts
+++ b/spec/schedulers/VirtualTimeScheduler-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import { VirtualAction } from '../../dist/cjs/scheduler/VirtualTimeScheduler';
+import * as Rx from '../../dist/package/Rx';
+import { VirtualAction } from '../../dist/package/scheduler/VirtualTimeScheduler';
 
 const VirtualTimeScheduler = Rx.VirtualTimeScheduler;
 
diff --git a/spec/subjects/AsyncSubject-spec.ts b/spec/subjects/AsyncSubject-spec.ts
index 69e0e02ddc..f1aae7b28a 100644
--- a/spec/subjects/AsyncSubject-spec.ts
+++ b/spec/subjects/AsyncSubject-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const AsyncSubject = Rx.AsyncSubject;
 
diff --git a/spec/subjects/BehaviorSubject-spec.ts b/spec/subjects/BehaviorSubject-spec.ts
index c5c801383c..717bced614 100644
--- a/spec/subjects/BehaviorSubject-spec.ts
+++ b/spec/subjects/BehaviorSubject-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { time };
diff --git a/spec/subjects/ReplaySubject-spec.ts b/spec/subjects/ReplaySubject-spec.ts
index 08a8945b2a..a1d576135c 100644
--- a/spec/subjects/ReplaySubject-spec.ts
+++ b/spec/subjects/ReplaySubject-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {TestScheduler} from '../../dist/cjs/testing/TestScheduler';
+import * as Rx from '../../dist/package/Rx';
+import {TestScheduler} from '../../dist/package/testing/TestScheduler';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;
diff --git a/spec/symbol/iterator-spec.ts b/spec/symbol/iterator-spec.ts
index 7a8eb2b2ee..9fa1e4ea5e 100644
--- a/spec/symbol/iterator-spec.ts
+++ b/spec/symbol/iterator-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { $$iterator, symbolIteratorPonyfill } from '../../dist/cjs/symbol/iterator';
+import { $$iterator, symbolIteratorPonyfill } from '../../dist/package/symbol/iterator';
 
 describe('iterator symbol', () => {
   it('should exist', () => {
diff --git a/spec/symbol/observable-polyfilled-spec.ts b/spec/symbol/observable-polyfilled-spec.ts
index cbed008705..28d7f09491 100644
--- a/spec/symbol/observable-polyfilled-spec.ts
+++ b/spec/symbol/observable-polyfilled-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 
-import {getSymbolObservable} from '../../dist/cjs/symbol/observable';
+import {getSymbolObservable} from '../../dist/package/symbol/observable';
 
 describe('observable symbol', () => {
   it('should exist in the proper form when Symbol does not exist', () => {
diff --git a/spec/symbol/observable-spec.ts b/spec/symbol/observable-spec.ts
index aea794daef..0a2226c311 100644
--- a/spec/symbol/observable-spec.ts
+++ b/spec/symbol/observable-spec.ts
@@ -1,8 +1,8 @@
 import {expect} from 'chai';
 import $$symbolObservable from 'symbol-observable';
 
-import {root} from '../../dist/cjs/util/root';
-import {getSymbolObservable} from '../../dist/cjs/symbol/observable';
+import {root} from '../../dist/package/util/root';
+import {getSymbolObservable} from '../../dist/package/symbol/observable';
 
 describe('observable symbol', () => {
   it('should exist in the proper form', () => {
diff --git a/spec/symbol/rxSubscriber-spec.ts b/spec/symbol/rxSubscriber-spec.ts
index 556bb61763..da58548392 100644
--- a/spec/symbol/rxSubscriber-spec.ts
+++ b/spec/symbol/rxSubscriber-spec.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {root} from '../../dist/cjs/util/root';
-import {$$rxSubscriber} from '../../dist/cjs/symbol/rxSubscriber';
+import {root} from '../../dist/package/util/root';
+import {$$rxSubscriber} from '../../dist/package/symbol/rxSubscriber';
 
 describe('rxSubscriber symbol', () => {
   it('should exist in the proper form', () => {
diff --git a/spec/util/FastMap-spec.ts b/spec/util/FastMap-spec.ts
index 2ae9b2c505..98d00f5903 100644
--- a/spec/util/FastMap-spec.ts
+++ b/spec/util/FastMap-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {FastMap} from '../../dist/cjs/util/FastMap';
+import {FastMap} from '../../dist/package/util/FastMap';
 
 /** @test {FastMap} */
 describe('FastMap', () => {
diff --git a/spec/util/Immediate-spec.ts b/spec/util/Immediate-spec.ts
index 6cc3e7af94..6da10a9a13 100644
--- a/spec/util/Immediate-spec.ts
+++ b/spec/util/Immediate-spec.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import {ImmediateDefinition} from '../../dist/cjs/util/Immediate';
-import * as Rx from '../../dist/cjs/Rx';
+import {ImmediateDefinition} from '../../dist/package/util/Immediate';
+import * as Rx from '../../dist/package/Rx';
 
 declare const __root__: any;
 
diff --git a/spec/util/MapPolyfill-spec.ts b/spec/util/MapPolyfill-spec.ts
index bbf960bb88..4a2c46cdbb 100644
--- a/spec/util/MapPolyfill-spec.ts
+++ b/spec/util/MapPolyfill-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {MapPolyfill} from '../../dist/cjs/util/MapPolyfill';
+import {MapPolyfill} from '../../dist/package/util/MapPolyfill';
 
 /** @test {MapPolyfill} */
 describe('MapPolyfill', () => {
diff --git a/spec/util/Set-spec.ts b/spec/util/Set-spec.ts
index 814342db86..c935693f8b 100644
--- a/spec/util/Set-spec.ts
+++ b/spec/util/Set-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import { Set as TestSet, minimalSetImpl } from '../../dist/cjs/util/Set';
+import { Set as TestSet, minimalSetImpl } from '../../dist/package/util/Set';
 
 describe('Set', () => {
   if (typeof Set === 'function') {
diff --git a/spec/util/UnsubscriptionError-spec.ts b/spec/util/UnsubscriptionError-spec.ts
index 7933f296db..b6b7d4e299 100644
--- a/spec/util/UnsubscriptionError-spec.ts
+++ b/spec/util/UnsubscriptionError-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 const { Observable, UnsubscriptionError } = Rx;
 
diff --git a/spec/util/assign-spec.ts b/spec/util/assign-spec.ts
index 720338fea0..537f2dff09 100644
--- a/spec/util/assign-spec.ts
+++ b/spec/util/assign-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { assign, getAssign, assignImpl } from '../../dist/cjs/util/assign';
+import { assign, getAssign, assignImpl } from '../../dist/package/util/assign';
 
 describe('assign', () => {
   it('should exist', () => {
diff --git a/spec/util/pipe-spec.ts b/spec/util/pipe-spec.ts
index 63288c7fc5..37c6c083b4 100644
--- a/spec/util/pipe-spec.ts
+++ b/spec/util/pipe-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { pipe } from '../../dist/cjs/util/pipe';
+import { pipe } from '../../dist/package/util/pipe';
 
 describe('pipe', () => {
   it('should exist', () => {
diff --git a/spec/util/root-spec.ts b/spec/util/root-spec.ts
index 70f83c6905..9891483a90 100644
--- a/spec/util/root-spec.ts
+++ b/spec/util/root-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { root } from '../../dist/cjs/util/root';
+import { root } from '../../dist/package/util/root';
 
 /** @test {root} */
 describe('root', () => {
diff --git a/spec/util/subscribeToResult-spec.ts b/spec/util/subscribeToResult-spec.ts
index cfba7dea0b..6972dbceba 100644
--- a/spec/util/subscribeToResult-spec.ts
+++ b/spec/util/subscribeToResult-spec.ts
@@ -1,11 +1,11 @@
 import { expect } from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import { subscribeToResult } from '../../dist/cjs/util/subscribeToResult';
-import { OuterSubscriber } from '../../dist/cjs/OuterSubscriber';
-import { $$iterator } from '../../dist/cjs/symbol/iterator';
+import * as Rx from '../../dist/package/Rx';
+import { subscribeToResult } from '../../dist/package/util/subscribeToResult';
+import { OuterSubscriber } from '../../dist/package/OuterSubscriber';
+import { $$iterator } from '../../dist/package/symbol/iterator';
 import $$symbolObservable from 'symbol-observable';
-import { Observable } from '../../dist/cjs/Observable';
-import { Subject } from '../../dist/cjs/Subject';
+import { Observable } from '../../dist/package/Observable';
+import { Subject } from '../../dist/package/Subject';
 
 describe('subscribeToResult', () => {
   it('should synchronously complete when subscribe to scalarObservable', () => {
diff --git a/spec/util/toSubscriber-spec.ts b/spec/util/toSubscriber-spec.ts
index d17581fbd4..cb861a7d63 100644
--- a/spec/util/toSubscriber-spec.ts
+++ b/spec/util/toSubscriber-spec.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {toSubscriber} from '../../dist/cjs/util/toSubscriber';
+import {toSubscriber} from '../../dist/package/util/toSubscriber';
 
 describe('toSubscriber', () => {
   it('should not be closed when other subscriber created with no arguments completes', () => {
diff --git a/src/Rx.global.js b/src/Rx.global.js
index 732ae74e97..d75682b210 100644
--- a/src/Rx.global.js
+++ b/src/Rx.global.js
@@ -1,5 +1,5 @@
-(function(root, factory) {
-    root.Rx = factory();
-} (window || global || this, function() {
-    return require('../dist/cjs/Rx');
-}));
\ No newline at end of file
+(function (root, factory) {
+  root.Rx = factory();
+})(window || global || this, function () {
+  return require('../dist/package/Rx');
+});
\ No newline at end of file
diff --git a/tools/make-closure-core.js b/tools/make-closure-core.js
index 847d937544..f507a0bf1e 100644
--- a/tools/make-closure-core.js
+++ b/tools/make-closure-core.js
@@ -5,7 +5,7 @@ var source = fs.readFileSync('dist/global/Rx.js', 'utf8');
 
 var compilerFlags = {
   jsCode: [{src: source}],
-  languageIn: 'ES5',
+  languageIn: 'ES2015',
   createSourceMap: true,
 };
 
diff --git a/tools/make-umd-bundle.js b/tools/make-umd-bundle.js
index 488ecbf7a0..99b400a838 100644
--- a/tools/make-umd-bundle.js
+++ b/tools/make-umd-bundle.js
@@ -10,7 +10,7 @@ var path = require('path');
 var tslib = require('tslib');
 
 rollup.rollup({
-  entry: 'dist/es6/Rx.js',
+  entry: 'dist/esm5/Rx.js',
   plugins: [
     rollupNodeResolve({
       jsnext: true,