diff --git a/integration/systemjs/systemjs-compatibility-spec.js b/integration/systemjs/systemjs-compatibility-spec.js
index 3cfac872ff..e915c67905 100644
--- a/integration/systemjs/systemjs-compatibility-spec.js
+++ b/integration/systemjs/systemjs-compatibility-spec.js
@@ -2,8 +2,14 @@ var System = require('systemjs');
 var path = require('path');
 
 System.config({
-  map: { 'rxjs': path.join(__dirname, '..', '..', 'dist', 'cjs', '/') },
-  packages: { 'rxjs': {main: 'index.js', defaultExtension: 'js' }}
+  map: { 'rxjs': path.join(__dirname, '..', '..', 'dist', 'package', '/') },
+  packages: {
+    'rxjs': {main: 'index.js', defaultExtension: 'js' },
+    'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' },
+    'rxjs/operators': {main: 'index.js', defaultExtension: 'js' },
+    'rxjs/testing': {main: 'index.js', defaultExtension: 'js' },
+    'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }
+  }
 });
 
 Promise.all([
@@ -14,7 +20,7 @@ Promise.all([
   System.import('rxjs/websocket'),
 ]).then(
   function () { console.log('Successfully tested all entry-points with SystemJS!'); },
-  function () {
+  function (error) {
     console.error('\n\nFailed to load an entry-points via SystemJS: \n\n', error.message);
     process.exit(-1);
   }
diff --git a/src/ajax.ts b/src/ajax.ts
deleted file mode 100644
index 3e8295ad1c..0000000000
--- a/src/ajax.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ajax/index';
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index db52f5310f..4175ed2a90 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,6 +2,7 @@
 export { Observable } from './internal/Observable';
 export { ConnectableObservable } from './internal/observable/ConnectableObservable';
 export { Operator } from './internal/Operator';
+export { observable } from './internal/symbol/observable';
 
 /* Subjects */
 export { Subject } from './internal/Subject';
diff --git a/src/operators.ts b/src/operators.ts
deleted file mode 100644
index 1065b7f29e..0000000000
--- a/src/operators.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './operators/index';
\ No newline at end of file
diff --git a/src/testing.ts b/src/testing.ts
deleted file mode 100644
index 83ed436d50..0000000000
--- a/src/testing.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './testing/index';
\ No newline at end of file
diff --git a/src/websocket.ts b/src/websocket.ts
deleted file mode 100644
index a7f9ecd9f6..0000000000
--- a/src/websocket.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './websocket/index';
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index a8f687b579..992c41c3eb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "noImplicitThis": true,
     "suppressImplicitAnyIndexErrors": true,
     "moduleResolution": "classic", // we intentionally use "classic" module resolution to be SystemJS-compatible after transpilation
-    "stripInternal": true,
+    "stripInternal": false,
     "target": "es5",
     "outDir": "./.out",
     "lib": [
diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json
index 4ff8f680c1..ba995654ee 100644
--- a/tsconfig/tsconfig.base.json
+++ b/tsconfig/tsconfig.base.json
@@ -4,12 +4,15 @@
     "noEmit": false
   },
   "files": [
-    "../dist/src/internal/Rx.ts",
-    "../dist/src/add/observable/of.ts",
+    // entry-points
     "../dist/src/index.ts",
-    "../dist/src/operators.ts",
-    "../dist/src/ajax.ts",
-    "../dist/src/websocket.ts",
-    "../dist/src/testing.ts"
+    "../dist/src/ajax/index.ts",
+    "../dist/src/operators/index.ts",
+    "../dist/src/testing/index.ts",
+    "../dist/src/websocket/index.ts",
+
+    // legacy entry-points
+    "../dist/src/internal/Rx.ts",
+    "../dist/src/add/observable/of.ts"
   ]
 }