diff --git a/.make-packages.js b/.make-packages.js
index 3692719cb3..577f895a75 100644
--- a/.make-packages.js
+++ b/.make-packages.js
@@ -53,14 +53,14 @@ let rootPackageJson = Object.assign({}, pkg, {
 // functionality requires that the most broad mapping (rxjs/operators) be at
 // the end of the alias mapping object. Created Webpack issue:
 // https://github.com/webpack/webpack/issues/5870
-const fileNames = klawSync(CJS_ROOT, {
+const fileNames = klawSync(LEGACY_REEXPORT_ROOT, {
   nodir: true,
   filter: function(item) {
     return item.path.endsWith('.js');
   }
 })
 .map(item => item.path)
-.map(path => path.slice((`${__dirname}/${CJS_ROOT}`).length))
+.map(path => path.slice((`${__dirname}/${LEGACY_REEXPORT_ROOT}`).length))
 .sort().reverse();
 
 // Execute build optimizer transforms on ESM5 files
@@ -149,7 +149,7 @@ function copySources(rootDir, packageDir, ignoreMissing) {
 function createImportTargets(importTargets, targetName, targetDirectory) {
   const importMap = {};
   for (const x in importTargets) {
-    importMap['rxjs/' + x] = 'rxjs/' + targetName + importTargets[x];
+    importMap['rxjs/' + x] = ('rxjs-compat/' + targetName + importTargets[x]).replace(/\.js$/, '');
   }
 
   const outputData =
@@ -160,7 +160,7 @@ var path = require('path');
 var dir = path.resolve(__dirname);
 
 module.exports = function() {
-  return ${JSON.stringify(importMap, null, 4).replace(/(: )"rxjs\/_esm(5|2015)\/(.+")(,?)/g, "$1path.join(dir, \"$3)$4")};
+  return ${JSON.stringify(importMap, null, 4)};
 }
 `
 
diff --git a/compat/add/observable/defer.ts b/compat/add/observable/defer.ts
index 9733c19c56..eb5378ae6f 100644
--- a/compat/add/observable/defer.ts
+++ b/compat/add/observable/defer.ts
@@ -1,5 +1,4 @@
-import { Observable } from 'rxjs';
-import { defer as staticDefer } from 'rxjs/observable/defer';
+import { Observable, defer as staticDefer } from 'rxjs';
 
 Observable.defer = staticDefer;
 
diff --git a/compat/operators/combineLatest.ts b/compat/operators/combineLatest.ts
index c8839cc956..198fcf09f2 100644
--- a/compat/operators/combineLatest.ts
+++ b/compat/operators/combineLatest.ts
@@ -1,6 +1,6 @@
 
-import { isArray } from 'rxjs/util/isArray';
-import { subscribeToResult } from 'rxjs/util/subscribeToResult';
+import { isArray } from 'rxjs/internal/util/isArray';
+import { subscribeToResult } from 'rxjs/internal/util/subscribeToResult';
 import { Observable, ObservableInput, Operator, OperatorFunction, from } from 'rxjs';
 import { CombineLatestOperator } from 'rxjs/internal/observable/combineLatest';
 
diff --git a/compat/package.json b/compat/package.json
index cdc832bdf1..b88e3968a1 100644
--- a/compat/package.json
+++ b/compat/package.json
@@ -2,8 +2,5 @@
   "name": "rxjs-compat",
   "version": "6.0.0-alpha.3",
   "main": "./Rx.js",
-  "typings": "./Rx.d.ts",
-  "dependencies": {
-    "rxjs": "^6.0.0-alpha.3"
-  }
+  "typings": "./Rx.d.ts"
 }
diff --git a/compat/symbol/iterator.ts b/compat/symbol/iterator.ts
index 092db344a6..d13717b3ea 100644
--- a/compat/symbol/iterator.ts
+++ b/compat/symbol/iterator.ts
@@ -1 +1 @@
-export * from 'rxjs/symbol/iterator';
+export * from 'rxjs/internal/symbol/iterator';
diff --git a/compat/symbol/observable.ts b/compat/symbol/observable.ts
index 073a7ce679..1797979dc1 100644
--- a/compat/symbol/observable.ts
+++ b/compat/symbol/observable.ts
@@ -1 +1 @@
-export * from 'rxjs/symbol/observable';
+export * from 'rxjs/internal/symbol/observable';
diff --git a/compat/symbol/rxSubscriber.ts b/compat/symbol/rxSubscriber.ts
index bae8fa9095..98a66a01dd 100644
--- a/compat/symbol/rxSubscriber.ts
+++ b/compat/symbol/rxSubscriber.ts
@@ -1 +1 @@
-export * from 'rxjs/symbol/rxSubscriber';
+export * from 'rxjs/internal/symbol/rxSubscriber';
diff --git a/package.json b/package.json
index 10ebdc28ae..fe7b734d57 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "precommit": "lint-staged",
     "commitmsg": "validate-commit-msg",
     "info": "npm-scripts-info",
-    "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_legacy_reexport generate_packages",
+    "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport 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_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup",
diff --git a/src/internal/Rx.ts b/src/internal/Rx.ts
index c634234d34..beae5d66d0 100644
--- a/src/internal/Rx.ts
+++ b/src/internal/Rx.ts
@@ -10,139 +10,139 @@ export { config } from './config';
 
 // statics
 /* tslint:disable:no-use-before-declare */
-import '../add/observable/bindCallback';
-import '../add/observable/bindNodeCallback';
-import '../add/observable/combineLatest';
-import '../add/observable/concat';
-import '../add/observable/defer';
-import '../add/observable/empty';
-import '../add/observable/forkJoin';
-import '../add/observable/from';
-import '../add/observable/fromEvent';
-import '../add/observable/fromEventPattern';
-import '../add/observable/fromPromise';
-import '../add/observable/generate';
-import '../add/observable/if';
-import '../add/observable/interval';
-import '../add/observable/merge';
-import '../add/observable/race';
-import '../add/observable/never';
-import '../add/observable/of';
-import '../add/observable/onErrorResumeNext';
-import '../add/observable/pairs';
-import '../add/observable/range';
-import '../add/observable/using';
-import '../add/observable/throw';
-import '../add/observable/timer';
-import '../add/observable/zip';
+import 'rxjs-compat/add/observable/bindCallback';
+import 'rxjs-compat/add/observable/bindNodeCallback';
+import 'rxjs-compat/add/observable/combineLatest';
+import 'rxjs-compat/add/observable/concat';
+import 'rxjs-compat/add/observable/defer';
+import 'rxjs-compat/add/observable/empty';
+import 'rxjs-compat/add/observable/forkJoin';
+import 'rxjs-compat/add/observable/from';
+import 'rxjs-compat/add/observable/fromEvent';
+import 'rxjs-compat/add/observable/fromEventPattern';
+import 'rxjs-compat/add/observable/fromPromise';
+import 'rxjs-compat/add/observable/generate';
+import 'rxjs-compat/add/observable/if';
+import 'rxjs-compat/add/observable/interval';
+import 'rxjs-compat/add/observable/merge';
+import 'rxjs-compat/add/observable/race';
+import 'rxjs-compat/add/observable/never';
+import 'rxjs-compat/add/observable/of';
+import 'rxjs-compat/add/observable/onErrorResumeNext';
+import 'rxjs-compat/add/observable/pairs';
+import 'rxjs-compat/add/observable/range';
+import 'rxjs-compat/add/observable/using';
+import 'rxjs-compat/add/observable/throw';
+import 'rxjs-compat/add/observable/timer';
+import 'rxjs-compat/add/observable/zip';
 
 //dom
-import '../add/observable/dom/ajax';
-import '../add/observable/dom/webSocket';
+import 'rxjs-compat/add/observable/dom/ajax';
+import 'rxjs-compat/add/observable/dom/webSocket';
 
 //internal/operators
-import '../add/operator/buffer';
-import '../add/operator/bufferCount';
-import '../add/operator/bufferTime';
-import '../add/operator/bufferToggle';
-import '../add/operator/bufferWhen';
-import '../add/operator/catch';
-import '../add/operator/combineAll';
-import '../add/operator/combineLatest';
-import '../add/operator/concat';
-import '../add/operator/concatAll';
-import '../add/operator/concatMap';
-import '../add/operator/concatMapTo';
-import '../add/operator/count';
-import '../add/operator/dematerialize';
-import '../add/operator/debounce';
-import '../add/operator/debounceTime';
-import '../add/operator/defaultIfEmpty';
-import '../add/operator/delay';
-import '../add/operator/delayWhen';
-import '../add/operator/distinct';
-import '../add/operator/distinctUntilChanged';
-import '../add/operator/distinctUntilKeyChanged';
-import '../add/operator/do';
-import '../add/operator/exhaust';
-import '../add/operator/exhaustMap';
-import '../add/operator/expand';
-import '../add/operator/elementAt';
-import '../add/operator/filter';
-import '../add/operator/finally';
-import '../add/operator/find';
-import '../add/operator/findIndex';
-import '../add/operator/first';
-import '../add/operator/groupBy';
-import '../add/operator/ignoreElements';
-import '../add/operator/isEmpty';
-import '../add/operator/audit';
-import '../add/operator/auditTime';
-import '../add/operator/last';
-import '../add/operator/let';
-import '../add/operator/every';
-import '../add/operator/map';
-import '../add/operator/mapTo';
-import '../add/operator/materialize';
-import '../add/operator/max';
-import '../add/operator/merge';
-import '../add/operator/mergeAll';
-import '../add/operator/mergeMap';
-import '../add/operator/mergeMapTo';
-import '../add/operator/mergeScan';
-import '../add/operator/min';
-import '../add/operator/multicast';
-import '../add/operator/observeOn';
-import '../add/operator/onErrorResumeNext';
-import '../add/operator/pairwise';
-import '../add/operator/partition';
-import '../add/operator/pluck';
-import '../add/operator/publish';
-import '../add/operator/publishBehavior';
-import '../add/operator/publishReplay';
-import '../add/operator/publishLast';
-import '../add/operator/race';
-import '../add/operator/reduce';
-import '../add/operator/repeat';
-import '../add/operator/repeatWhen';
-import '../add/operator/retry';
-import '../add/operator/retryWhen';
-import '../add/operator/sample';
-import '../add/operator/sampleTime';
-import '../add/operator/scan';
-import '../add/operator/sequenceEqual';
-import '../add/operator/share';
-import '../add/operator/shareReplay';
-import '../add/operator/single';
-import '../add/operator/skip';
-import '../add/operator/skipLast';
-import '../add/operator/skipUntil';
-import '../add/operator/skipWhile';
-import '../add/operator/startWith';
-import '../add/operator/subscribeOn';
-import '../add/operator/switch';
-import '../add/operator/switchMap';
-import '../add/operator/switchMapTo';
-import '../add/operator/take';
-import '../add/operator/takeLast';
-import '../add/operator/takeUntil';
-import '../add/operator/takeWhile';
-import '../add/operator/throttle';
-import '../add/operator/throttleTime';
-import '../add/operator/timeInterval';
-import '../add/operator/timeout';
-import '../add/operator/timeoutWith';
-import '../add/operator/timestamp';
-import '../add/operator/toArray';
-import '../add/operator/toPromise';
-import '../add/operator/window';
-import '../add/operator/windowCount';
-import '../add/operator/windowTime';
-import '../add/operator/windowToggle';
-import '../add/operator/windowWhen';
-import '../add/operator/withLatestFrom';
-import '../add/operator/zip';
-import '../add/operator/zipAll';
+import 'rxjs-compat/add/operator/buffer';
+import 'rxjs-compat/add/operator/bufferCount';
+import 'rxjs-compat/add/operator/bufferTime';
+import 'rxjs-compat/add/operator/bufferToggle';
+import 'rxjs-compat/add/operator/bufferWhen';
+import 'rxjs-compat/add/operator/catch';
+import 'rxjs-compat/add/operator/combineAll';
+import 'rxjs-compat/add/operator/combineLatest';
+import 'rxjs-compat/add/operator/concat';
+import 'rxjs-compat/add/operator/concatAll';
+import 'rxjs-compat/add/operator/concatMap';
+import 'rxjs-compat/add/operator/concatMapTo';
+import 'rxjs-compat/add/operator/count';
+import 'rxjs-compat/add/operator/dematerialize';
+import 'rxjs-compat/add/operator/debounce';
+import 'rxjs-compat/add/operator/debounceTime';
+import 'rxjs-compat/add/operator/defaultIfEmpty';
+import 'rxjs-compat/add/operator/delay';
+import 'rxjs-compat/add/operator/delayWhen';
+import 'rxjs-compat/add/operator/distinct';
+import 'rxjs-compat/add/operator/distinctUntilChanged';
+import 'rxjs-compat/add/operator/distinctUntilKeyChanged';
+import 'rxjs-compat/add/operator/do';
+import 'rxjs-compat/add/operator/exhaust';
+import 'rxjs-compat/add/operator/exhaustMap';
+import 'rxjs-compat/add/operator/expand';
+import 'rxjs-compat/add/operator/elementAt';
+import 'rxjs-compat/add/operator/filter';
+import 'rxjs-compat/add/operator/finally';
+import 'rxjs-compat/add/operator/find';
+import 'rxjs-compat/add/operator/findIndex';
+import 'rxjs-compat/add/operator/first';
+import 'rxjs-compat/add/operator/groupBy';
+import 'rxjs-compat/add/operator/ignoreElements';
+import 'rxjs-compat/add/operator/isEmpty';
+import 'rxjs-compat/add/operator/audit';
+import 'rxjs-compat/add/operator/auditTime';
+import 'rxjs-compat/add/operator/last';
+import 'rxjs-compat/add/operator/let';
+import 'rxjs-compat/add/operator/every';
+import 'rxjs-compat/add/operator/map';
+import 'rxjs-compat/add/operator/mapTo';
+import 'rxjs-compat/add/operator/materialize';
+import 'rxjs-compat/add/operator/max';
+import 'rxjs-compat/add/operator/merge';
+import 'rxjs-compat/add/operator/mergeAll';
+import 'rxjs-compat/add/operator/mergeMap';
+import 'rxjs-compat/add/operator/mergeMapTo';
+import 'rxjs-compat/add/operator/mergeScan';
+import 'rxjs-compat/add/operator/min';
+import 'rxjs-compat/add/operator/multicast';
+import 'rxjs-compat/add/operator/observeOn';
+import 'rxjs-compat/add/operator/onErrorResumeNext';
+import 'rxjs-compat/add/operator/pairwise';
+import 'rxjs-compat/add/operator/partition';
+import 'rxjs-compat/add/operator/pluck';
+import 'rxjs-compat/add/operator/publish';
+import 'rxjs-compat/add/operator/publishBehavior';
+import 'rxjs-compat/add/operator/publishReplay';
+import 'rxjs-compat/add/operator/publishLast';
+import 'rxjs-compat/add/operator/race';
+import 'rxjs-compat/add/operator/reduce';
+import 'rxjs-compat/add/operator/repeat';
+import 'rxjs-compat/add/operator/repeatWhen';
+import 'rxjs-compat/add/operator/retry';
+import 'rxjs-compat/add/operator/retryWhen';
+import 'rxjs-compat/add/operator/sample';
+import 'rxjs-compat/add/operator/sampleTime';
+import 'rxjs-compat/add/operator/scan';
+import 'rxjs-compat/add/operator/sequenceEqual';
+import 'rxjs-compat/add/operator/share';
+import 'rxjs-compat/add/operator/shareReplay';
+import 'rxjs-compat/add/operator/single';
+import 'rxjs-compat/add/operator/skip';
+import 'rxjs-compat/add/operator/skipLast';
+import 'rxjs-compat/add/operator/skipUntil';
+import 'rxjs-compat/add/operator/skipWhile';
+import 'rxjs-compat/add/operator/startWith';
+import 'rxjs-compat/add/operator/subscribeOn';
+import 'rxjs-compat/add/operator/switch';
+import 'rxjs-compat/add/operator/switchMap';
+import 'rxjs-compat/add/operator/switchMapTo';
+import 'rxjs-compat/add/operator/take';
+import 'rxjs-compat/add/operator/takeLast';
+import 'rxjs-compat/add/operator/takeUntil';
+import 'rxjs-compat/add/operator/takeWhile';
+import 'rxjs-compat/add/operator/throttle';
+import 'rxjs-compat/add/operator/throttleTime';
+import 'rxjs-compat/add/operator/timeInterval';
+import 'rxjs-compat/add/operator/timeout';
+import 'rxjs-compat/add/operator/timeoutWith';
+import 'rxjs-compat/add/operator/timestamp';
+import 'rxjs-compat/add/operator/toArray';
+import 'rxjs-compat/add/operator/toPromise';
+import 'rxjs-compat/add/operator/window';
+import 'rxjs-compat/add/operator/windowCount';
+import 'rxjs-compat/add/operator/windowTime';
+import 'rxjs-compat/add/operator/windowToggle';
+import 'rxjs-compat/add/operator/windowWhen';
+import 'rxjs-compat/add/operator/withLatestFrom';
+import 'rxjs-compat/add/operator/zip';
+import 'rxjs-compat/add/operator/zipAll';
 
 /* tslint:disable:no-unused-variable */
 export {Operator} from './Operator';
diff --git a/tsconfig.json b/tsconfig.json
index 2a919c001d..955087bddc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,12 +21,11 @@
       "es2015.symbol.wellknown",
       "dom"
     ],
-    "rootDir": ".",
     "baseUrl": ".",
     "paths": {
-      "rxjs": ["./src"],
+      "rxjs": ["./src/index"],
       "rxjs/*": ["./src/*"],
-      "rxjs-compat": ["./compat"],
+      "rxjs-compat": ["./compat/index"],
       "rxjs-compat/*": ["./compat/*"]
     }
   },