diff --git a/public/docs/_examples/rxjs/ts/plnkr.json b/public/docs/_examples/rxjs/ts/plnkr.json
index d85bc59fe3..63de2208e6 100644
--- a/public/docs/_examples/rxjs/ts/plnkr.json
+++ b/public/docs/_examples/rxjs/ts/plnkr.json
@@ -1,5 +1,6 @@
 {
   "description": "RxJS",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
diff --git a/public/docs/_examples/rxjs/ts/app/add-hero.component.html b/public/docs/_examples/rxjs/ts/src/app/add-hero.component.html
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/add-hero.component.html
rename to public/docs/_examples/rxjs/ts/src/app/add-hero.component.html
diff --git a/public/docs/_examples/rxjs/ts/app/add-hero.component.ts b/public/docs/_examples/rxjs/ts/src/app/add-hero.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/add-hero.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/add-hero.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/api-error-handler.service.ts b/public/docs/_examples/rxjs/ts/src/app/api-error-handler.service.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/api-error-handler.service.ts
rename to public/docs/_examples/rxjs/ts/src/app/api-error-handler.service.ts
diff --git a/public/docs/_examples/rxjs/ts/app/app-routing.module.ts b/public/docs/_examples/rxjs/ts/src/app/app-routing.module.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/app-routing.module.ts
rename to public/docs/_examples/rxjs/ts/src/app/app-routing.module.ts
diff --git a/public/docs/_examples/rxjs/ts/app/app.component.ts b/public/docs/_examples/rxjs/ts/src/app/app.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/app.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/app.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/app.module.ts b/public/docs/_examples/rxjs/ts/src/app/app.module.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/app.module.ts
rename to public/docs/_examples/rxjs/ts/src/app/app.module.ts
diff --git a/public/docs/_examples/rxjs/ts/app/event-aggregator.service.ts b/public/docs/_examples/rxjs/ts/src/app/event-aggregator.service.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/event-aggregator.service.ts
rename to public/docs/_examples/rxjs/ts/src/app/event-aggregator.service.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-counter.component.1.ts b/public/docs/_examples/rxjs/ts/src/app/hero-counter.component.1.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-counter.component.1.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-counter.component.1.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-counter.component.ts b/public/docs/_examples/rxjs/ts/src/app/hero-counter.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-counter.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-counter.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-detail.component.1.ts b/public/docs/_examples/rxjs/ts/src/app/hero-detail.component.1.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-detail.component.1.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-detail.component.1.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-detail.component.ts b/public/docs/_examples/rxjs/ts/src/app/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-detail.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-detail.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-list.component.1.ts b/public/docs/_examples/rxjs/ts/src/app/hero-list.component.1.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-list.component.1.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-list.component.1.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-list.component.ts b/public/docs/_examples/rxjs/ts/src/app/hero-list.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-list.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-list.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero-search.component.css b/public/docs/_examples/rxjs/ts/src/app/hero-search.component.css
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-search.component.css
rename to public/docs/_examples/rxjs/ts/src/app/hero-search.component.css
diff --git a/public/docs/_examples/rxjs/ts/app/hero-search.component.html b/public/docs/_examples/rxjs/ts/src/app/hero-search.component.html
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-search.component.html
rename to public/docs/_examples/rxjs/ts/src/app/hero-search.component.html
diff --git a/public/docs/_examples/rxjs/ts/app/hero-search.component.ts b/public/docs/_examples/rxjs/ts/src/app/hero-search.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero-search.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero-search.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero.service.ts b/public/docs/_examples/rxjs/ts/src/app/hero.service.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero.service.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero.service.ts
diff --git a/public/docs/_examples/rxjs/ts/app/hero.ts b/public/docs/_examples/rxjs/ts/src/app/hero.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/hero.ts
rename to public/docs/_examples/rxjs/ts/src/app/hero.ts
diff --git a/public/docs/_examples/rxjs/ts/app/heroes-filtered.component.1.ts b/public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.1.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/heroes-filtered.component.1.ts
rename to public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.1.ts
diff --git a/public/docs/_examples/rxjs/ts/app/heroes-filtered.component.2.ts b/public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.2.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/heroes-filtered.component.2.ts
rename to public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.2.ts
diff --git a/public/docs/_examples/rxjs/ts/app/heroes-filtered.component.ts b/public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/heroes-filtered.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/heroes-filtered.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/in-memory-data.service.ts b/public/docs/_examples/rxjs/ts/src/app/in-memory-data.service.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/in-memory-data.service.ts
rename to public/docs/_examples/rxjs/ts/src/app/in-memory-data.service.ts
diff --git a/public/docs/_examples/rxjs/ts/app/loading.component.css b/public/docs/_examples/rxjs/ts/src/app/loading.component.css
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/loading.component.css
rename to public/docs/_examples/rxjs/ts/src/app/loading.component.css
diff --git a/public/docs/_examples/rxjs/ts/app/loading.component.ts b/public/docs/_examples/rxjs/ts/src/app/loading.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/loading.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/loading.component.ts
diff --git a/public/docs/_examples/rxjs/ts/app/loading.service.ts b/public/docs/_examples/rxjs/ts/src/app/loading.service.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/loading.service.ts
rename to public/docs/_examples/rxjs/ts/src/app/loading.service.ts
diff --git a/public/docs/_examples/rxjs/ts/app/message-log.component.ts b/public/docs/_examples/rxjs/ts/src/app/message-log.component.ts
similarity index 100%
rename from public/docs/_examples/rxjs/ts/app/message-log.component.ts
rename to public/docs/_examples/rxjs/ts/src/app/message-log.component.ts
diff --git a/public/docs/_examples/rxjs/ts/index.html b/public/docs/_examples/rxjs/ts/src/index.html
similarity index 88%
rename from public/docs/_examples/rxjs/ts/index.html
rename to public/docs/_examples/rxjs/ts/src/index.html
index ee23e5f6a4..94f44300e2 100644
--- a/public/docs/_examples/rxjs/ts/index.html
+++ b/public/docs/_examples/rxjs/ts/src/index.html
@@ -2,8 +2,10 @@
 <!-- #docregion -->
 <html>
   <head>
+
     <!-- Set the base href -->
     <base href="/">
+
     <title>RxJS in Angular</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -13,12 +15,11 @@
     <script src="node_modules/core-js/client/shim.min.js"></script>
 
     <script src="node_modules/zone.js/dist/zone.js"></script>
-    <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app')
+      System.import('main.js')
             .catch(function(err){ console.error(err); });
     </script>
   </head>
diff --git a/public/docs/_examples/rxjs/ts/app/main.ts b/public/docs/_examples/rxjs/ts/src/main.ts
similarity index 75%
rename from public/docs/_examples/rxjs/ts/app/main.ts
rename to public/docs/_examples/rxjs/ts/src/main.ts
index 961a226688..f332d1d245 100644
--- a/public/docs/_examples/rxjs/ts/app/main.ts
+++ b/public/docs/_examples/rxjs/ts/src/main.ts
@@ -1,6 +1,6 @@
 // #docregion
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app.module';
+import { AppModule } from './app/app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule);