diff --git a/modules/examples/src/message_broker/loader.js b/modules/examples/src/message_broker/loader.js
index aa449f2b4e..f8f15ec8d7 100644
--- a/modules/examples/src/message_broker/loader.js
+++ b/modules/examples/src/message_broker/loader.js
@@ -1,4 +1,5 @@
 $SCRIPTS$
+
 //importScripts("math_worker.js").execute();
 //System.import("examples/src/web_workers/math_worker").then(function(m){console.log("got", m)});
 //importScripts("rx.js");
@@ -13,10 +14,12 @@ window = {
   RegExp: RegExp,
   Promise: Promise,
   Date: Date
-}
-assert = function(){}
+};
+assert = function(){};
 
 
+System.config({baseURL: '/', defaultJSExtensions: true});
+
 System.import("examples/src/message_broker/background_index").then(function(m){
   console.log("running main");
   try{
diff --git a/modules/examples/src/web_workers/images/loader.js b/modules/examples/src/web_workers/images/loader.js
index 444cec555a..17ac00fb41 100644
--- a/modules/examples/src/web_workers/images/loader.js
+++ b/modules/examples/src/web_workers/images/loader.js
@@ -1,4 +1,6 @@
-$SCRIPTS$ window = {
+$SCRIPTS$
+
+window = {
   setTimeout: setTimeout,
   Map: Map,
   Set: Set,
@@ -12,6 +14,9 @@ $SCRIPTS$ window = {
 assert = function() {};
 importScripts("b64.js");
 
+
+System.config({baseURL: '/', defaultJSExtensions: true});
+
 System.import("examples/src/web_workers/images/background_index")
     .then(
         function(m) {
diff --git a/modules/examples/src/web_workers/kitchen_sink/loader.js b/modules/examples/src/web_workers/kitchen_sink/loader.js
index 09eabf9538..245bcf66ac 100644
--- a/modules/examples/src/web_workers/kitchen_sink/loader.js
+++ b/modules/examples/src/web_workers/kitchen_sink/loader.js
@@ -1,4 +1,6 @@
-$SCRIPTS$ window = {
+$SCRIPTS$
+
+window = {
   setTimeout: setTimeout,
   Map: Map,
   Set: Set,
@@ -11,6 +13,9 @@ $SCRIPTS$ window = {
 };
 assert = function() {};
 
+
+System.config({baseURL: '/', defaultJSExtensions: true});
+
 System.import("examples/src/web_workers/kitchen_sink/background_index")
     .then(
         function(m) {
diff --git a/modules/examples/src/web_workers/todo/loader.js b/modules/examples/src/web_workers/todo/loader.js
index 47bc93fe4a..b531e6e63a 100644
--- a/modules/examples/src/web_workers/todo/loader.js
+++ b/modules/examples/src/web_workers/todo/loader.js
@@ -1,4 +1,6 @@
-$SCRIPTS$ window = {
+$SCRIPTS$
+
+window = {
   setTimeout: setTimeout,
   Map: Map,
   Set: Set,
@@ -11,6 +13,9 @@ $SCRIPTS$ window = {
 };
 assert = function() {};
 
+
+System.config({baseURL: '/', defaultJSExtensions: true});
+
 System.import("examples/src/web_workers/todo/background_index")
     .then(
         function(m) {
diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html
index 5f356d8314..816acf781b 100644
--- a/tools/broccoli/html-replace/SCRIPTS.html
+++ b/tools/broccoli/html-replace/SCRIPTS.html
@@ -3,8 +3,17 @@
 <script src="traceur-runtime.js" type="text/javascript"></script>
 <script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
-<script src="extension-register.js" type="text/javascript"></script>
-<script src="extension-cjs.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
-<script src="runtime_paths.js" type="text/javascript"></script>
-<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
+<script type="text/javascript">
+  var filename = '@@FILENAME_NO_EXT';
+  var parent = filename.split('/');
+  parent = parent.splice(0, parent.length-1).join('/');
+  System.config({
+    baseURL: '/',
+    defaultJSExtensions: true,
+    paths: {
+      'rx': parent + '/rx.js'
+    }
+  });
+  System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
+</script>
diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
index 3e2813b704..321e3063bb 100644
--- a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
+++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
@@ -4,8 +4,17 @@
 <script src="traceur-runtime.js" type="text/javascript"></script>
 <script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
-<script src="extension-register.js" type="text/javascript"></script>
-<script src="extension-cjs.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
-<script src="runtime_paths.js" type="text/javascript"></script>
-<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
+<script type="text/javascript">
+  var filename = '@@FILENAME_NO_EXT';
+  var parent = filename.split('/');
+  parent = parent.splice(0, parent.length-1).join('/');
+  System.config({
+    baseURL: '/',
+    defaultJSExtensions: true,
+    paths: {
+      'rx': parent + '/rx.js'
+    }
+  });
+  System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
+</script>
diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
index 4005350e4d..d29db40bad 100644
--- a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
+++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
@@ -5,8 +5,17 @@
 <script src="traceur-runtime.js" type="text/javascript"></script>
 <script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
-<script src="extension-register.js" type="text/javascript"></script>
-<script src="extension-cjs.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
-<script src="runtime_paths.js" type="text/javascript"></script>
-<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
+<script type="text/javascript">
+  var filename = '@@FILENAME_NO_EXT';
+  var parent = filename.split('/');
+  parent = parent.splice(0, parent.length-1).join('/');
+  System.config({
+    baseURL: '/',
+    defaultJSExtensions: true,
+    paths: {
+      'rx': parent + '/rx.js'
+    }
+  });
+  System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
+</script>
diff --git a/tools/broccoli/js-replace/.SCRIPTS.js.swp b/tools/broccoli/js-replace/.SCRIPTS.js.swp
deleted file mode 100644
index e31b22634a..0000000000
Binary files a/tools/broccoli/js-replace/.SCRIPTS.js.swp and /dev/null differ
diff --git a/tools/broccoli/js-replace/SCRIPTS.js b/tools/broccoli/js-replace/SCRIPTS.js
index 13ccb2b98c..04a75f799c 100644
--- a/tools/broccoli/js-replace/SCRIPTS.js
+++ b/tools/broccoli/js-replace/SCRIPTS.js
@@ -1,3 +1,2 @@
 importScripts("/examples/src/assets/zone-microtask-web-workers.js", "long-stack-trace-zone.js",
-              "traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js",
-              "extension-register.js", "extension-cjs.js", "Reflect.js", "runtime_paths.js");
+              "traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js", "Reflect.js");
diff --git a/tools/build/snippets/runtime_paths.js b/tools/build/snippets/runtime_paths.js
deleted file mode 100644
index a1ff444772..0000000000
--- a/tools/build/snippets/runtime_paths.js
+++ /dev/null
@@ -1,7 +0,0 @@
-System.paths = {
-  '*': '/*.js',
-  'rx': 'rx.js'
-};
-register(System);
-cjs(System);
-