diff --git a/.gitignore b/.gitignore
index 54f9e418ba..4362878661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 # Don’t commit the following directories created by pub.
-build/
-benchpress-build/
+/dist/
 packages/
 .buildlog
 node_modules
-packages
 .pub
 .DS_STORE
 
@@ -21,4 +19,4 @@ pubspec.lock
 .idea/
 
 
-docs/bower_components/
\ No newline at end of file
+/docs/bower_components/
\ No newline at end of file
diff --git a/README.md b/README.md
index 327fe843b3..ea8fa53181 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,13 @@
 
 ### Build:
 
-1. `gulp build` -> result is in `build` folder
+1. `gulp build` -> result is in `dist` folder
 
   * will also run `pub get` for the subfolders in `modules`
     and run `dartanalyzer` for every file that matches
     `<module>/src/<module>.dart`, e.g. `di/src/di.dart`
 
-2. `gulp clean` -> cleans the `build` folder
+2. `gulp clean` -> cleans the `dist` folder
 
 ### Tests:
 
@@ -45,13 +45,6 @@ the transpiler is reloaded. With that it is possible to make changes
 to the preprocessor and run the tests without exiting karma
 (just touch a test file that you would like to run).
 
-Restriction for Dart tests (for now):
-
-  * Due to a bug `karma-dart` plugin,
-    this will use the files in the `build` folder for resolving
-    `package:` dependencies (created e.g. for `import ... from 'di:di'`).
-    So you need to execute `gulp build` before this.
-
 ### Examples:
 
 To see the examples, first build the project as described above.
@@ -59,11 +52,11 @@ To see the examples, first build the project as described above.
 #### Hello World Example
 This example consists of three basic pieces - a component, a decorator and a service.
 They are all constructed via injection. For more information see the comments in the
-source `modules/examples/src/hello_world/app.js`.
+source `modules/examples/src/hello_world/index.js`.
 
 You can build this example as either JS or Dart app:
-* (JS) `gulp serve` and open `localhost:8000/js/examples/lib/hello_world/` in Chrome.
-* (Dart) `gulp examples/pub.serve` and open `localhost:8080` in Chrome(for dart2js) or dartium(for dart vm).
+* (JS) `gulp serve.js.dev` and open `localhost:8000/examples/web/hello_world/` in Chrome.
+* (Dart) `gulp serve/examples.dart` and open `localhost:8080` in Chrome(for dart2js) or dartium(for dart vm).
 
 ## Debug the transpiler
 
diff --git a/docs/dgeni-package/index.js b/docs/dgeni-package/index.js
index c3afc48861..b509f5232f 100644
--- a/docs/dgeni-package/index.js
+++ b/docs/dgeni-package/index.js
@@ -45,7 +45,7 @@ module.exports = new Package('angular', [jsdocPackage, nunjucksPackage])
 
 // Configure file writing
 .config(function(writeFilesProcessor) {
-  writeFilesProcessor.outputFolder  = 'build/docs';
+  writeFilesProcessor.outputFolder  = 'dist/docs';
 })
 
 
diff --git a/docs/dgeni-package/services/atParser.js b/docs/dgeni-package/services/atParser.js
index 31ece78ee6..58366aef9b 100644
--- a/docs/dgeni-package/services/atParser.js
+++ b/docs/dgeni-package/services/atParser.js
@@ -1,6 +1,6 @@
 var traceur = require('traceur/src/node/traceur.js');
 var ParseTreeVisitor = System.get(System.map.traceur + '/src/syntax/ParseTreeVisitor').ParseTreeVisitor;
-var file2modulename = require('../../../file2modulename');
+var file2modulename = require('../../../tools/build/file2modulename');
 /**
  * Wrapper around traceur that can parse the contents of a file
  */
diff --git a/gulpfile.js b/gulpfile.js
index 24de5e2e11..04b532c24d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,22 +1,23 @@
-var benchpress = require('angular-benchpress/lib/cli');
-var del = require('del');
-var es = require('event-stream');
-var file2moduleName = require('./file2modulename');
-var fs = require('fs');
-var glob = require('glob');
 var gulp = require('gulp');
-var $ = require('gulp-load-plugins')();
-var merge = require('merge');
-var mergeStreams = require('event-stream').merge;
-var path = require('path');
-var Q = require('q');
-var readline = require('readline');
+var gulpPlugins = require('gulp-load-plugins')();
 var runSequence = require('run-sequence');
-var spawn = require('child_process').spawn;
-var through2 = require('through2');
-var which = require('which');
+var merge = require('merge');
+var gulpTraceur = require('./tools/transpiler/gulp-traceur');
 
-var js2es5Options = {
+var clean = require('./tools/build/clean');
+var deps = require('./tools/build/deps');
+var transpile = require('./tools/build/transpile');
+var html = require('./tools/build/html');
+var benchpress = require('./tools/build/benchpress');
+var pubspec = require('./tools/build/pubspec');
+var dartanalyzer = require('./tools/build/dartanalyzer');
+var jsserve = require('./tools/build/jsserve');
+var pubserve = require('./tools/build/pubserve');
+var DART_SDK = require('./tools/build/dartdetect')(gulp);
+// -----------------------
+// configuration
+
+var _COMPILER_CONFIG_JS_DEFAULT = {
   sourceMaps: true,
   annotations: true, // parse annotations
   types: true, // parse types
@@ -25,388 +26,256 @@ var js2es5Options = {
   modules: 'instantiate'
 };
 
-var js2es5OptionsProd = merge(true, js2es5Options, {
-  typeAssertions: false
-});
-
-var js2es5OptionsDev = merge(true, js2es5Options, {
-  typeAssertionModule: 'rtts_assert/rtts_assert',
-  typeAssertions: true
-});
-
-var js2dartOptions = {
-  sourceMaps: true,
-  annotations: true, // parse annotations
-  types: true, // parse types
-  script: false, // parse as a module
-  memberVariables: true, // parse class fields
-  outputLanguage: 'dart'
-};
-
-var DART_SDK = false;
-
-try {
-  which.sync('dart');
-  console.log('Dart SDK detected');
-  if (process.platform === 'win32') {
-    DART_SDK = {
-      PUB: 'pub.bat',
-      ANALYZER: 'dartanalyzer.bat'
-    };
-  } else {
-    DART_SDK = {
-      PUB: 'pub',
-      ANALYZER: 'dartanalyzer'
-    };
+var _HTLM_DEFAULT_SCRIPTS_JS = [
+  {src: '/deps/traceur-runtime.js', mimeType: 'text/javascript'},
+  {src: '/rtts_assert/lib/rtts_assert.js', mimeType: 'text/javascript'},
+  {src: '/deps/es6-module-loader-sans-promises.src.js', mimeType: 'text/javascript'},
+  {src: '/deps/system.src.js', mimeType: 'text/javascript'},
+  {src: '/deps/extension-register.js', mimeType: 'text/javascript'},
+  {src: '/deps/runtime_paths.js', mimeType: 'text/javascript'},
+  {
+    inline: 'System.import(\'$MODULENAME$\').then(function(m) { m.main(); }, console.log.bind(console))',
+    mimeType: 'text/javascript'
   }
-} catch (e) {
-  console.log('Dart SDK is not available, Dart tasks will be skipped.');
-  var gulpTaskFn = gulp.task.bind(gulp);
-  gulp.task = function (name, deps, fn) {
-    if (name.indexOf('.dart') === -1) {
-      return gulpTaskFn(name, deps, fn);
-    } else {
-      return gulpTaskFn(name, function() {
-        console.log('Dart SDK is not available. Skipping task: ' + name);
-      });
-    }
-  };
-}
+];
 
-var gulpTraceur = require('./tools/transpiler/gulp-traceur');
 
-// ---------
-// traceur runtime
-
-gulp.task('jsRuntime/build', function() {
-  var traceurRuntime = gulp.src([
-    gulpTraceur.RUNTIME_PATH,
-    "node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js",
-    "node_modules/systemjs/dist/system.src.js",
-    "node_modules/systemjs/lib/extension-register.js"
-  ]).pipe(gulp.dest('build/js'));
-  return traceurRuntime;
-});
-
-// -----------------------
-// modules
-var sourceTypeConfigs = {
-  dart: {
-    transpileSrc: ['modules/**/*.js'],
-    // pub serve uses project_root/web for static serving.
-    htmlSrc: ['modules/*/src/**/*.html', 'modules/*/web/*.html'],
-    copySrc: ['modules/**/*.dart'],
-    outputDir: 'build/dart',
-    outputExt: 'dart',
-    mimeType: 'application/dart'
+var CONFIG = {
+  commands: {
+    pub: process.platform === 'win32' ? 'pub.bat' : 'pub',
+    dartanalyzer: process.platform === "win32" ? "dartanalyzer.bat" : "dartanalyzer"
   },
-  js: {
-    transpileSrc: ['modules/**/*.js', 'modules/**/*.es6'],
-    htmlSrc: ['modules/*/src/**/*.html'],
-    copySrc: ['modules/**/*.es5'],
-    outputDir: 'build/js',
-    outputExt: 'js'
+  dest: {
+    js: {
+      all: 'dist/js',
+      dev: 'dist/js/dev',
+      prod: 'dist/js/prod'
+    },
+    dart: 'dist/dart'
+  },
+  srcFolderMapping: {
+    'default': 'lib',
+    // need a tmp folder as benchpress does not support
+    // inplace generation of the benchmarks...
+    'benchmark*/**': 'perf_tmp',
+    'example*/**': 'web'
+  },
+  deps: {
+    js: [
+      gulpTraceur.RUNTIME_PATH,
+      "node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js",
+      "node_modules/systemjs/dist/system.src.js",
+      "node_modules/systemjs/lib/extension-register.js",
+      "tools/build/runtime_paths.js",
+      "node_modules/angular/angular.js"
+    ]
+  },
+  transpile: {
+    src: {
+      js: ['modules/**/*.js', 'modules/**/*.es6'],
+      dart: ['modules/**/*.js']
+    },
+    copy: {
+      js: ['modules/**/*.es5'],
+      dart: ['modules/**/*.dart']
+    },
+    options: {
+      js: {
+        dev: merge(true, _COMPILER_CONFIG_JS_DEFAULT, {
+          typeAssertionModule: 'rtts_assert/rtts_assert',
+          typeAssertions: true
+        }),
+        prod: merge(true, _COMPILER_CONFIG_JS_DEFAULT, {
+          typeAssertions: false
+        })
+      },
+      dart: {
+        sourceMaps: true,
+        annotations: true, // parse annotations
+        types: true, // parse types
+        script: false, // parse as a module
+        memberVariables: true, // parse class fields
+        outputLanguage: 'dart'
+      }
+    }
+  },
+  html: {
+    src: {
+      js: ['modules/*/src/**/*.html'],
+      dart: ['modules/*/src/**/*.html']
+    },
+    scriptsPerFolder: {
+      js: {
+        default: _HTLM_DEFAULT_SCRIPTS_JS,
+        'benchmarks_external/**':
+          [{ src: '/deps/angular.js', mimeType: 'text/javascript' }].concat(_HTLM_DEFAULT_SCRIPTS_JS)
+      },
+      dart: {
+        default: [
+          {src: '$MODULENAME_WITHOUT_PATH$.dart', mimeType: 'application/dart'},
+          {src: 'packages/browser/dart.js', mimeType: 'text/javascript'}
+        ]
+      }
+    }
+  },
+  benchpress: {
+    configFile: {
+      content: 'module.exports=function(){};\n',
+      name: 'bp.conf.js'
+    },
+    mainHtmls: '*/perf_tmp/**/main.html',
+    outputFolderName: 'web'
+  },
+  pubspec: {
+    src: 'modules/*/pubspec.yaml'
   }
 };
 
+// ------------
+// clean
 
-gulp.task('modules/clean', function(cb) {
-  del('build', cb);
-});
+gulp.task('build/clean.js', clean(gulp, gulpPlugins, {
+  path: CONFIG.dest.js.all
+}));
 
-gulp.task('modules/build.dart/src', function() {
-  return createModuleTask(merge(sourceTypeConfigs.dart, {compilerOptions: js2dartOptions}));
-});
+gulp.task('build/clean.dart', clean(gulp, gulpPlugins, {
+  path: CONFIG.dest.dart
+}));
 
-gulp.task('modules/build.dart/pubspec', function() {
-  var outputDir = sourceTypeConfigs.dart.outputDir;
-  var files = [];
-  var changedStream = gulp.src('modules/*/pubspec.yaml')
-    .pipe($.changed(outputDir)) // Only forward files that changed.
-    .pipe(through2.obj(function(file, enc, done) {
-      files.push(path.resolve(process.cwd(), outputDir, file.relative));
-      this.push(file);
-      done();
-    }))
-    .pipe(gulp.dest(outputDir));
-  // 1. We need to wait for all pubspecs to be present before executing
-  // `pub get` as it checks the folders of the dependencies!
-  // 2. We execute `pub get` commands sequentially to avoid race condition with pub cache
-  var promise = streamToPromise(changedStream).then(function() {
-    for (var i = 0; i < files.length; i++) {
-      (function (file) {
-        promise = promise.then(function() {
-          return processToPromise(spawn(DART_SDK.PUB, ['get'], {
-                    stdio: 'inherit',
-                    cwd: path.dirname(file)
-                  }));
-        });
-      })(files[i]);
-    }
-  });
+// ------------
+// deps
 
-  return promise;
+gulp.task('build/deps.js.dev', deps(gulp, gulpPlugins, {
+  src: CONFIG.deps.js,
+  dest: CONFIG.dest.js.dev
+}));
 
-});
+gulp.task('build/deps.js.prod', deps(gulp, gulpPlugins, {
+  src: CONFIG.deps.js,
+  dest: CONFIG.dest.js.prod
+}));
 
-function processToPromise(process) {
-  var defer = Q.defer();
-  process.on('close', function(code) {
-    if (code) {
-      defer.reject(code);
-    } else {
-      defer.resolve();
-    }
-  });
-  return defer.promise;
-}
+// ------------
+// transpile
 
-function streamToPromise(stream) {
-  var defer = Q.defer();
-  stream.on('end', defer.resolve);
-  stream.on('error', defer.reject);
-  return defer.promise;
-}
+gulp.task('build/transpile.js.dev', transpile(gulp, gulpPlugins, {
+  src: CONFIG.transpile.src.js,
+  copy: CONFIG.transpile.copy.js,
+  dest: CONFIG.dest.js.dev,
+  outputExt: 'js',
+  options: CONFIG.transpile.options.js.dev,
+  srcFolderMapping: CONFIG.srcFolderMapping
+}));
 
-gulp.task('modules/build.dart', ['modules/build.dart/src', 'modules/build.dart/pubspec']);
+gulp.task('build/transpile.js.prod', transpile(gulp, gulpPlugins, {
+  src: CONFIG.transpile.src.js,
+  copy: CONFIG.transpile.copy.js,
+  dest: CONFIG.dest.js.prod,
+  outputExt: 'js',
+  options: CONFIG.transpile.options.js.prod,
+  srcFolderMapping: CONFIG.srcFolderMapping
+}));
 
-gulp.task('modules/build.dev.js', function() {
-  return createModuleTask(merge(true, sourceTypeConfigs.js, {compilerOptions: js2es5OptionsDev}));
-});
+gulp.task('build/transpile.dart', transpile(gulp, gulpPlugins, {
+  src: CONFIG.transpile.src.dart,
+  copy: CONFIG.transpile.copy.dart,
+  dest: CONFIG.dest.dart,
+  outputExt: 'dart',
+  options: CONFIG.transpile.options.dart,
+  srcFolderMapping: CONFIG.srcFolderMapping
+}));
 
-gulp.task('modules/build.prod.js', function() {
-  return createModuleTask(merge(true, sourceTypeConfigs.js, {compilerOptions: js2es5OptionsProd}));
-});
+// ------------
+// html
 
-function renameSrcToLib(file) {
-  file.dirname = file.dirname.replace(/\bsrc\b/, 'lib');
-}
+gulp.task('build/html.js.dev', html(gulp, gulpPlugins, {
+  src: CONFIG.html.src.js,
+  dest: CONFIG.dest.js.dev,
+  srcFolderMapping: CONFIG.srcFolderMapping,
+  scriptsPerFolder: CONFIG.html.scriptsPerFolder.js
+}));
 
-function renameEs5ToJs(file) {
-  if (file.extname == '.es5') {
-    file.extname = '.js';
-  }
-}
+gulp.task('build/html.js.prod', html(gulp, gulpPlugins, {
+  src: CONFIG.html.src.js,
+  dest: CONFIG.dest.js.prod,
+  srcFolderMapping: CONFIG.srcFolderMapping,
+  scriptsPerFolder: CONFIG.html.scriptsPerFolder.js
+}));
 
-function createModuleTask(sourceTypeConfig) {
-  var transpile = gulp.src(sourceTypeConfig.transpileSrc)
-    .pipe($.rename({extname: '.'+sourceTypeConfig.outputExt}))
-    .pipe($.rename(renameSrcToLib))
-    .pipe(gulpTraceur(sourceTypeConfig.compilerOptions, file2moduleName))
-    .pipe(gulp.dest(sourceTypeConfig.outputDir));
-  var copy = gulp.src(sourceTypeConfig.copySrc)
-    .pipe($.rename(renameSrcToLib))
-    .pipe($.rename(renameEs5ToJs))
-    .pipe(gulp.dest(sourceTypeConfig.outputDir));
-  // TODO: provide the list of files to the template
-  // automatically!
-  var html = gulp.src(sourceTypeConfig.htmlSrc)
-    .pipe($.rename(renameSrcToLib))
-    .pipe($.ejs({
-      type: sourceTypeConfig.outputExt
-    }))
-    .pipe(gulp.dest(sourceTypeConfig.outputDir));
+gulp.task('build/html.dart', html(gulp, gulpPlugins, {
+  src: CONFIG.html.src.dart,
+  dest: CONFIG.dest.dart,
+  srcFolderMapping: CONFIG.srcFolderMapping,
+  scriptsPerFolder: CONFIG.html.scriptsPerFolder.dart
+}));
 
-  return mergeStreams(transpile, copy, html);
-}
+// ------------
+// benchpress
 
+gulp.task('build/benchpress.js.dev', benchpress(gulp, gulpPlugins, {
+  mainHtmls: CONFIG.benchpress.mainHtmls,
+  configFile: CONFIG.benchpress.configFile,
+  buildDir: CONFIG.dest.js.dev,
+  outputFolderName: CONFIG.benchpress.outputFolderName
+}));
+
+gulp.task('build/benchpress.js.prod', benchpress(gulp, gulpPlugins, {
+  mainHtmls: CONFIG.benchpress.mainHtmls,
+  configFile: CONFIG.benchpress.configFile,
+  buildDir: CONFIG.dest.js.prod,
+  outputFolderName: CONFIG.benchpress.outputFolderName
+}));
+
+gulp.task('build/benchpress.dart', benchpress(gulp, gulpPlugins, {
+  mainHtmls: CONFIG.benchpress.mainHtmls,
+  configFile: CONFIG.benchpress.configFile,
+  buildDir: CONFIG.dest.dart,
+  outputFolderName: CONFIG.benchpress.outputFolderName
+}));
+
+
+// ------------
+// pubspec
+
+gulp.task('build/pubspec.dart', pubspec(gulp, gulpPlugins, {
+  src: CONFIG.pubspec.src,
+  dest: CONFIG.dest.dart,
+  command: DART_SDK.PUB
+}));
+
+// ------------
+// pubspec
+
+gulp.task('build/analyze.dart', dartanalyzer(gulp, gulpPlugins, {
+  dest: CONFIG.dest.dart,
+  command: DART_SDK.ANALYZER,
+  srcFolderMapping: CONFIG.srcFolderMapping
+}));
 
 // ------------------
-// ANALYZE
+// web servers
+gulp.task('serve.js.dev', jsserve(gulp, gulpPlugins, {
+  path: CONFIG.dest.js.dev
+}));
 
-gulp.task('analyze/analyzer.dart', function(done) {
-  var pubSpecs = [].slice.call(glob.sync('build/dart/*/pubspec.yaml', {
-    cwd: __dirname
-  }));
-  var tempFile = '_analyzer.dart';
-  // analyze in parallel!
-  return Q.all(pubSpecs.map(function(pubSpecFile) {
-    var dir = path.dirname(pubSpecFile);
-    var srcFiles = [].slice.call(glob.sync('lib/**/*.dart', {
-      cwd: dir
-    }));
-    var testFiles = [].slice.call(glob.sync('test/**/*_spec.dart', {
-      cwd: dir
-    }));
-    var analyzeFile = ['library _analyzer;'];
-    srcFiles.concat(testFiles).forEach(function(fileName, index) {
-      if (fileName !== tempFile) {
-        analyzeFile.push('import "./'+fileName+'" as mod'+index+';');
-      }
-    });
-    fs.writeFileSync(path.join(dir, tempFile), analyzeFile.join('\n'));
-    var defer = Q.defer();
-    analyze(dir, defer.makeNodeResolver());
-    return defer.promise;
-  }));
+gulp.task('serve.js.prod', jsserve(gulp, gulpPlugins, {
+  path: CONFIG.dest.js.prod
+}));
 
-  function analyze(dirName, done) {
-    var stream = spawn(DART_SDK.ANALYZER, ['--fatal-warnings', tempFile], {
-      // inherit stdin and stderr, but filter stdout
-      stdio: [process.stdin, 'pipe', process.stderr],
-      cwd: dirName
-    });
-    // Filter out unused imports from our generated file.
-    // We don't reexports from the generated file
-    // as this could lead to name clashes when two files
-    // export the same thing.
-    var rl = readline.createInterface({
-      input: stream.stdout,
-      output: process.stdout,
-      terminal: false
-    });
-    var hintCount = 0;
-    rl.on('line', function(line) {
-      if (line.match(/Unused import/)) {
-        return;
-      }
-      if (line.match(/\[hint\]/)) {
-        hintCount++;
-      }
-      console.log(dirName + ':' + line);
-    });
-    stream.on('close', function(code) {
-      var error;
-      if (code !== 0) {
-        error = new Error('Dartanalyzer failed with exit code ' + code);
-      }
-      if (hintCount > 0) {
-        error = new Error('Dartanalyzer showed hints');
-      }
-      done(error);
-    });
-  }
-});
+gulp.task('serve/examples.dart', pubserve(gulp, gulpPlugins, {
+  command: DART_SDK.PUB,
+  path: CONFIG.dest.dart + '/examples'
+}));
 
+gulp.task('serve/benchmarks.dart', pubserve(gulp, gulpPlugins, {
+  command: DART_SDK.PUB,
+  path: CONFIG.dest.dart + '/benchmarks'
+}));
 
-
-// ------------------
-// BENCHMARKS JS
-
-gulp.task('benchmarks/internal.benchpress.js', function () {
-  benchpress.build({
-    benchmarksPath: 'build/js/benchmarks/lib',
-    buildPath: 'build/benchpress/js'
-  })
-});
-
-gulp.task('benchmarks/external.benchpress.js', function () {
-  benchpress.build({
-    benchmarksPath: 'build/js/benchmarks_external/lib',
-    buildPath: 'build/benchpress/js'
-  })
-});
-
-gulp.task('benchmarks/internal.js', function() {
-  runSequence(
-    ['jsRuntime/build', 'modules/build.prod.js'],
-    'benchmarks/internal.benchpress.js'
-  );
-});
-
-gulp.task('benchmarks/external.js', function() {
-  runSequence(
-    ['jsRuntime/build', 'modules/build.prod.js'],
-    'benchmarks/external.benchpress.js'
-  );
-});
-
-
-// ------------------
-// BENCHMARKS DART
-
-function benchmarkDart2Js(buildPath, done) {
-
-  mergeStreams(dart2jsStream(), bpConfStream())
-    .on('end', function() {
-      runBenchpress();
-      done();
-    });
-
-  function dart2jsStream() {
-    return gulp.src([
-      buildPath+"/lib/**/benchmark.dart"
-    ]).pipe($.shell(['dart2js --package-root="'+buildPath+'/packages" -o "<%= file.path %>.js" <%= file.path %>']));
-  }
-
-  function bpConfStream() {
-    var bpConfContent = "module.exports = function(c) {c.set({scripts: [{src: 'benchmark.dart.js'}]});}";
-    var createBpConfJs = es.map(function(file, cb) {
-      var dir = path.dirname(file.path);
-      fs.writeFileSync(path.join(dir, "bp.conf.js"), bpConfContent);
-      cb();
-    });
-
-    return gulp.src([
-      buildPath+"/lib/**/benchmark.dart"
-    ]).pipe(createBpConfJs);
-  }
-
-  function runBenchpress() {
-    benchpress.build({
-        benchmarksPath: buildPath+'/lib',
-        buildPath: 'build/benchpress/dart'
-    });
-  }
-}
-
-gulp.task('benchmarks/internal.dart', ['modules/build.dart'], function(done) {
-  benchmarkDart2Js('build/dart/benchmarks', done);
-});
-
-gulp.task('benchmarks/external.dart', ['modules/build.dart'], function(done) {
-  benchmarkDart2Js('build/dart/benchmarks_external', done);
-});
-
-gulp.task('benchmarks/build.dart', ['benchmarks/internal.dart', 'benchmarks/external.dart']);
-
-
-
-// ------------------
-// WEB SERVERS
-
-gulp.task('serve', function() {
-  $.connect.server({
-    root: [__dirname+'/build'],
-    port: 8000,
-    livereload: false,
-    open: false,
-    middleware: function() {
-      return [function(req, resp, next){
-        if (req.url.match(/\.dart$/)) {
-          resp.setHeader("Content-Type", "application/dart");
-        }
-        next();
-      }];
-    }
-  })();
-});
-
-gulp.task('examples/pub.serve', function(done) {
-  spawn(DART_SDK.PUB, ['serve'], {cwd: 'build/dart/examples', stdio: 'inherit'})
-    .on('done', done);
-});
-
-
-
-// --------------
-// general targets
-
-gulp.task('clean', ['modules/clean']);
-
-gulp.task('build', function(done) {
-  runSequence(
-    // parallel
-    ['jsRuntime/build', 'modules/build.dart', 'modules/build.dev.js'],
-    // sequential
-    'analyze/analyzer.dart'
-  );
-});
-
-gulp.task('analyze', function(done) {
-  runSequence('analyze/analyzer.dart');
-});
-
+gulp.task('serve/benchmarks_external.dart', pubserve(gulp, gulpPlugins, {
+  command: DART_SDK.PUB,
+  path: CONFIG.dest.dart + '/benchmarks_external'
+}));
 
 // --------------
 // doc generation
@@ -435,12 +304,12 @@ gulp.task('docs/bower', function() {
 
 gulp.task('docs/assets', ['docs/bower'], function() {
   return gulp.src('docs/bower_components/**/*')
-    .pipe(gulp.dest('build/docs/lib'));
+    .pipe(gulp.dest('dist/docs/lib'));
 });
 
 gulp.task('docs/app', function() {
   return gulp.src('docs/app/**/*')
-    .pipe(gulp.dest('build/docs'));
+    .pipe(gulp.dest('dist/docs'));
 });
 
 gulp.task('docs', ['docs/assets', 'docs/app', 'docs/dgeni']);
@@ -456,8 +325,38 @@ gulp.task('docs/test', function () {
 
 var webserver = require('gulp-webserver');
 gulp.task('docs/serve', function() {
-  gulp.src('build/docs/')
+  gulp.src('dist/docs/')
     .pipe(webserver({
       fallback: 'index.html'
     }));
 });
+
+// -----------------
+// orchestrated targets
+gulp.task('build.dart', function() {
+  return runSequence(
+    ['build/transpile.dart', 'build/html.dart', 'build/pubspec.dart'],
+    'build/benchpress.dart',
+    'build/analyze.dart'
+  );
+});
+
+gulp.task('build.js.dev', function() {
+  return runSequence(
+    ['build/deps.js.dev', 'build/transpile.js.dev', 'build/html.js.dev'],
+    'build/benchpress.js.dev'
+  );
+});
+
+gulp.task('build.js.prod', function() {
+  return runSequence(
+    ['build/deps.js.prod', 'build/transpile.js.prod', 'build/html.js.prod'],
+    'build/benchpress.js.dev'
+  );
+});
+
+gulp.task('build.js', ['build.js.dev', 'build.js.prod']);
+
+gulp.task('clean', ['build/clean.js', 'build/clean.dart']);
+
+gulp.task('build', ['build.js', 'build.dart']);
diff --git a/karma-dart.conf.js b/karma-dart.conf.js
index d8896537b2..faa3bd13d5 100644
--- a/karma-dart.conf.js
+++ b/karma-dart.conf.js
@@ -1,6 +1,6 @@
 // Karma configuration
 // Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
-var file2moduleName = require('./file2modulename');
+var file2moduleName = require('./tools/build/file2modulename');
 
 module.exports = function(config) {
   config.set({
diff --git a/karma-js.conf.js b/karma-js.conf.js
index 96a2d23628..672bc13265 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -1,6 +1,6 @@
 // Karma configuration
 // Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
-var file2moduleName = require('./file2modulename');
+var file2moduleName = require('./tools/build/file2modulename');
 
 module.exports = function(config) {
   config.set({
@@ -20,7 +20,7 @@ module.exports = function(config) {
       'node_modules/systemjs/dist/system.src.js',
       'node_modules/systemjs/lib/extension-register.js',
 
-      'file2modulename.js',
+      'tools/build/file2modulename.js',
       'test-main.js'
     ],
 
diff --git a/modules/benchmarks/pubspec.yaml b/modules/benchmarks/pubspec.yaml
index 0e16a3ee09..67371437d7 100644
--- a/modules/benchmarks/pubspec.yaml
+++ b/modules/benchmarks/pubspec.yaml
@@ -12,3 +12,6 @@ dependencies:
     path: ../core
   change_detection:
     path: ../change_detection
+  benchpress:
+    path: ../benchpress
+  browser: '>=0.10.0 <0.11.0'
diff --git a/modules/benchmarks/src/change_detection/benchmark.dart b/modules/benchmarks/src/change_detection/benchmark.dart
deleted file mode 100644
index 91aa3a44ab..0000000000
--- a/modules/benchmarks/src/change_detection/benchmark.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-library benchmark;
-
-import './change_detection_benchmark.dart' as cdb;
-import 'dart:js' as js;
-
-main () {
-  cdb.run();
-}
\ No newline at end of file
diff --git a/modules/benchmarks/src/change_detection/benchmark.es5 b/modules/benchmarks/src/change_detection/benchmark.es5
deleted file mode 100644
index 43f732be56..0000000000
--- a/modules/benchmarks/src/change_detection/benchmark.es5
+++ /dev/null
@@ -1,3 +0,0 @@
-System.import('benchmarks/change_detection/change_detection_benchmark').then(function (bm) {
-  bm.run();
-}, console.log.bind(console));
\ No newline at end of file
diff --git a/modules/benchmarks/src/change_detection/bp.conf.es5 b/modules/benchmarks/src/change_detection/bp.conf.es5
deleted file mode 100644
index b9ff8a4015..0000000000
--- a/modules/benchmarks/src/change_detection/bp.conf.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-      {src: '/js/traceur-runtime.js'},
-      {src: '/js/es6-module-loader-sans-promises.src.js'},
-      {src: '/js/extension-register.js'},
-      {src: 'register_system.js'},
-      {src: 'benchmark.js'}
-    ]
-  });
-};
diff --git a/modules/benchmarks/src/change_detection/change_detection_benchmark.js b/modules/benchmarks/src/change_detection/change_detection_benchmark.js
index eed9bacc6d..a9f56b8b1c 100644
--- a/modules/benchmarks/src/change_detection/change_detection_benchmark.js
+++ b/modules/benchmarks/src/change_detection/change_detection_benchmark.js
@@ -3,7 +3,7 @@ import {Parser} from 'change_detection/parser/parser';
 import {Lexer} from 'change_detection/parser/lexer';
 import {reflector} from 'reflection/reflection';
 import {isPresent} from 'facade/lang';
-import {benchmark, benchmarkStep} from '../benchpress';
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
 
 import {
   ChangeDetector,
@@ -153,7 +153,7 @@ function setUpChangeDetection() {
   return new ChangeDetector(parentRange);
 }
 
-export function run () {
+export function main () {
   setUpReflector();
 
   benchmark(`Baseline`, function () {
diff --git a/modules/benchmarks/src/change_detection/main.html b/modules/benchmarks/src/change_detection/main.html
index e69de29bb2..3995f8ae30 100644
--- a/modules/benchmarks/src/change_detection/main.html
+++ b/modules/benchmarks/src/change_detection/main.html
@@ -0,0 +1 @@
+$SCRIPTS$
\ No newline at end of file
diff --git a/modules/benchmarks/src/change_detection/main.js b/modules/benchmarks/src/change_detection/main.js
new file mode 100644
index 0000000000..6f8ba2a482
--- /dev/null
+++ b/modules/benchmarks/src/change_detection/main.js
@@ -0,0 +1 @@
+export {main} from './change_detection_benchmark';
diff --git a/modules/benchmarks/src/change_detection/register_system.es5 b/modules/benchmarks/src/change_detection/register_system.es5
deleted file mode 100644
index 2e26a8b495..0000000000
--- a/modules/benchmarks/src/change_detection/register_system.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.paths = {
-  'core/*': '/js/core/lib/*.js',
-  'change_detection/*': '/js/change_detection/lib/*.js',
-  'facade/*': '/js/facade/lib/*.js',
-  'di/*': '/js/di/lib/*.js',
-  'rtts_assert/*': '/js/rtts_assert/lib/*.js',
-  'test_lib/*': '/js/test_lib/lib/*.js',
-  'benchmarks/*': '/js/benchmarks/lib/*.js',
-  'reflection/*': '/js/reflection/lib/*.js'
-};
-register(System);
diff --git a/modules/benchmarks/src/compiler/benchmark.dart b/modules/benchmarks/src/compiler/benchmark.dart
deleted file mode 100644
index c8aa1fc047..0000000000
--- a/modules/benchmarks/src/compiler/benchmark.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-library compiler_benchmark;
-
-import './selector_benchmark.dart' as sbm;
-import './compiler_benchmark.dart' as cbm;
-
-main () {
-  sbm.main();
-  cbm.main();
-}
\ No newline at end of file
diff --git a/modules/benchmarks/src/compiler/benchmark.es5 b/modules/benchmarks/src/compiler/benchmark.es5
deleted file mode 100644
index debc6af297..0000000000
--- a/modules/benchmarks/src/compiler/benchmark.es5
+++ /dev/null
@@ -1,8 +0,0 @@
-Promise.all([
-  System.import('benchmarks/compiler/selector_benchmark'),
-  System.import('benchmarks/compiler/compiler_benchmark')
-]).then(function (benchmarks) {
-  benchmarks.forEach(function(bm) {
-    bm.main();
-  });
-}, console.log.bind(console));
diff --git a/modules/benchmarks/src/compiler/bp.conf.es5 b/modules/benchmarks/src/compiler/bp.conf.es5
deleted file mode 100644
index b9ff8a4015..0000000000
--- a/modules/benchmarks/src/compiler/bp.conf.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-      {src: '/js/traceur-runtime.js'},
-      {src: '/js/es6-module-loader-sans-promises.src.js'},
-      {src: '/js/extension-register.js'},
-      {src: 'register_system.js'},
-      {src: 'benchmark.js'}
-    ]
-  });
-};
diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.js b/modules/benchmarks/src/compiler/compiler_benchmark.js
index 4b1d401476..6c2d2c5eac 100644
--- a/modules/benchmarks/src/compiler/compiler_benchmark.js
+++ b/modules/benchmarks/src/compiler/compiler_benchmark.js
@@ -1,7 +1,7 @@
-import {benchmark, benchmarkStep} from '../benchpress';
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
 
 import {DOM, document} from 'facade/dom';
-import {isBlank} from 'facade/lang';
+import {isBlank, Type} from 'facade/lang';
 import {MapWrapper} from 'facade/collection';
 import {AnnotatedType} from 'core/compiler/annotated_type';
 
@@ -61,7 +61,7 @@ function setup() {
   });
 
   reflector.registerGetters({
-    "inter0": (a) => a.inter0, "inter1": (a) => a.inter1, 
+    "inter0": (a) => a.inter0, "inter1": (a) => a.inter1,
     "inter2": (a) => a.inter2, "inter3": (a) => a.inter3, "inter4": (a) => a.inter4,
 
     "value0": (a) => a.value0, "value1": (a) => a.value1,
@@ -111,7 +111,7 @@ export function main() {
   benchmark(`instantiate 5*${COUNT} element with bindings`, function() {
     var template = loadTemplate('templateWithBindings', COUNT);
     var protoView = compiler.compileWithCache(null, annotatedComponent, template);
-    var rootRecordRange = new ProtoRecordRange().instantiate(null, new Object());
+    var rootRecordRange = new ProtoRecordRange().instantiate(null, null);
 
     benchmarkStep('run', function() {
       var view = protoView.instantiate(null, null, null);
diff --git a/modules/benchmarks/src/compiler/main.html b/modules/benchmarks/src/compiler/main.html
index d16b04e8fa..178588bd7d 100644
--- a/modules/benchmarks/src/compiler/main.html
+++ b/modules/benchmarks/src/compiler/main.html
@@ -1,3 +1,5 @@
+$SCRIPTS$
+
 <template id="templateNoBindings">
   <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
     <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
diff --git a/modules/benchmarks/src/compiler/main.js b/modules/benchmarks/src/compiler/main.js
new file mode 100644
index 0000000000..3a3a19252c
--- /dev/null
+++ b/modules/benchmarks/src/compiler/main.js
@@ -0,0 +1,7 @@
+import * as sbm from './selector_benchmark';
+import * as cbm from './compiler_benchmark';
+
+export function main() {
+  sbm.main();
+  cbm.main();
+}
diff --git a/modules/benchmarks/src/compiler/register_system.es5 b/modules/benchmarks/src/compiler/register_system.es5
deleted file mode 100644
index 2e26a8b495..0000000000
--- a/modules/benchmarks/src/compiler/register_system.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.paths = {
-  'core/*': '/js/core/lib/*.js',
-  'change_detection/*': '/js/change_detection/lib/*.js',
-  'facade/*': '/js/facade/lib/*.js',
-  'di/*': '/js/di/lib/*.js',
-  'rtts_assert/*': '/js/rtts_assert/lib/*.js',
-  'test_lib/*': '/js/test_lib/lib/*.js',
-  'benchmarks/*': '/js/benchmarks/lib/*.js',
-  'reflection/*': '/js/reflection/lib/*.js'
-};
-register(System);
diff --git a/modules/benchmarks/src/compiler/selector_benchmark.js b/modules/benchmarks/src/compiler/selector_benchmark.js
index 7873c43686..509d710902 100644
--- a/modules/benchmarks/src/compiler/selector_benchmark.js
+++ b/modules/benchmarks/src/compiler/selector_benchmark.js
@@ -1,4 +1,4 @@
-import {benchmark, benchmarkStep} from '../benchpress';
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
 
 import {SelectorMatcher} from "core/compiler/selector";
 import {CssSelector} from "core/compiler/selector";
diff --git a/modules/benchmarks/src/di/benchmark.dart b/modules/benchmarks/src/di/benchmark.dart
deleted file mode 100644
index 61c19f5371..0000000000
--- a/modules/benchmarks/src/di/benchmark.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-library injector_get_benchmark;
-
-import './injector_instantiate_benchmark.dart' as b;
-import 'dart:js' as js;
-
-main () {
-  js.context['benchmarkSteps'].add(new js.JsObject.jsify({
-      "name": "Injector.instantiate",
-      "fn": new js.JsFunction.withThis((_) => b.run())
-  }));
-}
\ No newline at end of file
diff --git a/modules/benchmarks/src/di/benchmark.es5 b/modules/benchmarks/src/di/benchmark.es5
deleted file mode 100644
index ed55f58711..0000000000
--- a/modules/benchmarks/src/di/benchmark.es5
+++ /dev/null
@@ -1,15 +0,0 @@
-System.import('benchmarks/di/injector_get_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'Injector.get (token)', fn: bm.run});
-}, console.log.bind(console));
-
-System.import('benchmarks/di/injector_get_by_key_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'Injector.get (key)', fn: bm.run});
-}, console.log.bind(console));
-
-System.import('benchmarks/di/injector_get_child_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'Injector.get (grand x 5 child)', fn: bm.run});
-}, console.log.bind(console));
-
-System.import('benchmarks/di/injector_instantiate_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'Injector.instantiate', fn: bm.run});
-}, console.log.bind(console));
\ No newline at end of file
diff --git a/modules/benchmarks/src/di/bp.conf.es5 b/modules/benchmarks/src/di/bp.conf.es5
deleted file mode 100644
index b9ff8a4015..0000000000
--- a/modules/benchmarks/src/di/bp.conf.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-      {src: '/js/traceur-runtime.js'},
-      {src: '/js/es6-module-loader-sans-promises.src.js'},
-      {src: '/js/extension-register.js'},
-      {src: 'register_system.js'},
-      {src: 'benchmark.js'}
-    ]
-  });
-};
diff --git a/modules/benchmarks/src/di/main.html b/modules/benchmarks/src/di/main.html
index e69de29bb2..3995f8ae30 100644
--- a/modules/benchmarks/src/di/main.html
+++ b/modules/benchmarks/src/di/main.html
@@ -0,0 +1 @@
+$SCRIPTS$
\ No newline at end of file
diff --git a/modules/benchmarks/src/di/main.js b/modules/benchmarks/src/di/main.js
new file mode 100644
index 0000000000..dac1fc9a9f
--- /dev/null
+++ b/modules/benchmarks/src/di/main.js
@@ -0,0 +1,24 @@
+import * as injector_get_benchmark from './injector_get_benchmark';
+import * as injector_get_by_key_benchmark from './injector_get_by_key_benchmark';
+import * as injector_get_child_benchmark from './injector_get_child_benchmark';
+import * as injector_instantiate_benchmark from './injector_instantiate_benchmark';
+
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
+
+export function main() {
+  benchmark(`Injector.get (token)`, function() {
+    benchmarkStep('run', injector_get_benchmark.run);
+  });
+
+  benchmark(`Injector.get (key)`, function() {
+    benchmarkStep('run', injector_get_by_key_benchmark.run);
+  });
+
+  benchmark(`Injector.get (grand x 5 child)`, function() {
+    benchmarkStep('run', injector_get_child_benchmark.run);
+  });
+
+  benchmark(`Injector.instantiate`, function() {
+    benchmarkStep('run', injector_instantiate_benchmark.run);
+  });
+}
diff --git a/modules/benchmarks/src/di/register_system.es5 b/modules/benchmarks/src/di/register_system.es5
deleted file mode 100644
index 2e26a8b495..0000000000
--- a/modules/benchmarks/src/di/register_system.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.paths = {
-  'core/*': '/js/core/lib/*.js',
-  'change_detection/*': '/js/change_detection/lib/*.js',
-  'facade/*': '/js/facade/lib/*.js',
-  'di/*': '/js/di/lib/*.js',
-  'rtts_assert/*': '/js/rtts_assert/lib/*.js',
-  'test_lib/*': '/js/test_lib/lib/*.js',
-  'benchmarks/*': '/js/benchmarks/lib/*.js',
-  'reflection/*': '/js/reflection/lib/*.js'
-};
-register(System);
diff --git a/modules/benchmarks/src/element_injector/benchmark.dart b/modules/benchmarks/src/element_injector/benchmark.dart
deleted file mode 100644
index 2b7adff902..0000000000
--- a/modules/benchmarks/src/element_injector/benchmark.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-library element_injector_benchmark;
-
-import './instantiate_benchmark.dart' as ib;
-import './instantiate_benchmark_codegen.dart' as ibc;
-import './instantiate_directive_benchmark.dart' as idb;
-import 'dart:js' as js;
-
-main () {
-  js.context['benchmarkSteps'].add(new js.JsObject.jsify({
-      "name": "ElementInjector.instantiate + instantiateDirectives",
-      "fn": new js.JsFunction.withThis((_) => ib.run())
-  }));
-
-  js.context['benchmarkSteps'].add(new js.JsObject.jsify({
-      "name": "ElementInjector.instantiateDirectives",
-      "fn": new js.JsFunction.withThis((_) => idb.run())
-  }));
-
-  js.context['benchmarkSteps'].add(new js.JsObject.jsify({
-      "name": "ElementInjector.instantiate + instantiateDirectives (codegen)",
-      "fn": new js.JsFunction.withThis((_) => ibc.run())
-  }));
-}
\ No newline at end of file
diff --git a/modules/benchmarks/src/element_injector/benchmark.es5 b/modules/benchmarks/src/element_injector/benchmark.es5
deleted file mode 100644
index 222a86db68..0000000000
--- a/modules/benchmarks/src/element_injector/benchmark.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.import('benchmarks/element_injector/instantiate_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'ElementInjector.instantiate + instantiateDirectives', fn: bm.run});
-}, console.log.bind(console));
-
-System.import('benchmarks/element_injector/instantiate_directive_benchmark').then(function (bm) {
-  window.benchmarkSteps.push({name: 'ElementInjector.instantiateDirectives', fn: bm.run});
-}, console.log.bind(console));
-
-System.import('benchmarks/element_injector/instantiate_benchmark_codegen').then(function (bm) {
-  window.benchmarkSteps.push({name: 'ElementInjector.instantiate + instantiateDirectives (codegen)', fn: bm.run});
-}, console.log.bind(console));
\ No newline at end of file
diff --git a/modules/benchmarks/src/element_injector/bp.conf.es5 b/modules/benchmarks/src/element_injector/bp.conf.es5
deleted file mode 100644
index b9ff8a4015..0000000000
--- a/modules/benchmarks/src/element_injector/bp.conf.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-      {src: '/js/traceur-runtime.js'},
-      {src: '/js/es6-module-loader-sans-promises.src.js'},
-      {src: '/js/extension-register.js'},
-      {src: 'register_system.js'},
-      {src: 'benchmark.js'}
-    ]
-  });
-};
diff --git a/modules/benchmarks/src/element_injector/main.html b/modules/benchmarks/src/element_injector/main.html
index e69de29bb2..3995f8ae30 100644
--- a/modules/benchmarks/src/element_injector/main.html
+++ b/modules/benchmarks/src/element_injector/main.html
@@ -0,0 +1 @@
+$SCRIPTS$
\ No newline at end of file
diff --git a/modules/benchmarks/src/element_injector/main.js b/modules/benchmarks/src/element_injector/main.js
new file mode 100644
index 0000000000..ebfe18b11d
--- /dev/null
+++ b/modules/benchmarks/src/element_injector/main.js
@@ -0,0 +1,19 @@
+import * as instantiate_benchmark from './instantiate_benchmark';
+import * as instantiate_directive_benchmark from './instantiate_directive_benchmark';
+import * as instantiate_benchmark_codegen from './instantiate_benchmark_codegen';
+
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
+
+export function main() {
+  benchmark(`ElementInjector.instantiate + instantiateDirectives`, function() {
+    benchmarkStep('run', instantiate_benchmark.run);
+  });
+
+  benchmark(`ElementInjector.instantiateDirectives`, function() {
+    benchmarkStep('run', instantiate_directive_benchmark.run);
+  });
+
+  benchmark(`ElementInjector.instantiate + instantiateDirectives (codegen)`, function() {
+    benchmarkStep('run', instantiate_benchmark_codegen.run);
+  });
+}
diff --git a/modules/benchmarks/src/element_injector/register_system.es5 b/modules/benchmarks/src/element_injector/register_system.es5
deleted file mode 100644
index 2e26a8b495..0000000000
--- a/modules/benchmarks/src/element_injector/register_system.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.paths = {
-  'core/*': '/js/core/lib/*.js',
-  'change_detection/*': '/js/change_detection/lib/*.js',
-  'facade/*': '/js/facade/lib/*.js',
-  'di/*': '/js/di/lib/*.js',
-  'rtts_assert/*': '/js/rtts_assert/lib/*.js',
-  'test_lib/*': '/js/test_lib/lib/*.js',
-  'benchmarks/*': '/js/benchmarks/lib/*.js',
-  'reflection/*': '/js/reflection/lib/*.js'
-};
-register(System);
diff --git a/modules/benchmarks_external/pubspec.yaml b/modules/benchmarks_external/pubspec.yaml
index 0678203497..425c33fae4 100644
--- a/modules/benchmarks_external/pubspec.yaml
+++ b/modules/benchmarks_external/pubspec.yaml
@@ -3,3 +3,5 @@ environment:
   sdk: '>=1.4.0'
 dependencies:
   angular: ">=1.0.0 <2.0.0"
+  benchpress:
+    path: ../benchpress
diff --git a/modules/benchmarks_external/src/benchpress.dart b/modules/benchmarks_external/src/benchpress.dart
deleted file mode 100644
index 81542709bd..0000000000
--- a/modules/benchmarks_external/src/benchpress.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-library benchmarks.benchpress;
-
-import 'dart:js' as js;
-import 'dart:html';
-import 'dart:async';
-
-// TODO: move the functionality of this module into benchpress and replace this
-// file with a Dart wrapper!
-
-var _benchmarkNames = [];
-
-_benchmarkId(index) {
-  return "benchmark${index}";
-}
-
-_useBenchmark(index) {
-  var search = window.location.search;
-  if (search.length > 0) {
-    search = search.substring(1);
-  }
-  if (search.length > 0) {
-    return search == _benchmarkId(index);
-  } else {
-    return true;
-  }
-}
-
-_onLoad(callback) {
-  var isReady = document.readyState == 'complete';
-  if (isReady) {
-    Timer.run(callback);
-  } else {
-    window.addEventListener('load', (event) => callback(), false);
-  }
-}
-
-_createBenchmarkMenu() {
-  var div = document.createElement('div');
-  div.innerHtml += '<h1>Benchmarks:</h1><a class="btn btn-default" href="?">All</a>';
-  for (var i=0; i<_benchmarkNames.length; i++) {
-    var activeClass = _useBenchmark(i) ? 'active' : '';
-    div.innerHtml += '<a class="btn btn-default ${activeClass}" href="?${_benchmarkId(i)}">${_benchmarkNames[i]}</a>';
-  }
-  document.body.insertBefore(div, document.body.childNodes[0]);
-}
-
-benchmark(name, stepsCreationCallback) {
-  _benchmarkNames.add(name);
-  if (_benchmarkNames.length == 2) {
-    _onLoad(_createBenchmarkMenu);
-  }
-  if (_useBenchmark(_benchmarkNames.length-1)) {
-    stepsCreationCallback();
-  }
-}
-
-benchmarkStep(name, callback) {
-  var benchmarkName = _benchmarkNames[_benchmarkNames.length-1];
-  js.context['benchmarkSteps'].add(new js.JsObject.jsify({
-      "name": benchmarkName + '#' + name,
-      "fn": new js.JsFunction.withThis((_) => callback())
-  }));
-}
diff --git a/modules/benchmarks_external/src/benchpress.es6 b/modules/benchmarks_external/src/benchpress.es6
deleted file mode 100644
index d5e5d5e0df..0000000000
--- a/modules/benchmarks_external/src/benchpress.es6
+++ /dev/null
@@ -1,55 +0,0 @@
-// TODO: move the functionality of this module into benchpress itself!
-
-var benchmarkNames = [];
-
-function benchmarkId(index) {
-  return 'benchmark' + index;
-}
-
-function useBenchmark(index) {
-  var search = window.location.search;
-  if (search.length > 0) {
-    search = search.substring(1);
-  }
-  if (search.length > 0) {
-    return search == benchmarkId(index);
-  } else {
-    return true;
-  }
-}
-
-function onLoad(callback) {
-  var isReady = document.readyState === 'complete';
-  if (isReady) {
-    window.setTimeout(callback);
-  } else {
-    window.addEventListener('load', callback, false);
-  }
-}
-
-function createBenchmarkMenu() {
-  var div = document.createElement('div');
-  div.innerHTML += '<h1>Benchmarks:</h1><a class="btn btn-default" href="?">All</a>';
-  for (var i=0; i<benchmarkNames.length; i++) {
-    var activeClass = useBenchmark(i) ? 'active' : '';
-    div.innerHTML += ('<a class="btn btn-default '+activeClass+'" href="?'+benchmarkId(i)+'">'+benchmarkNames[i]+'</a>');
-  }
-  document.body.insertBefore(div, document.body.childNodes[0]);
-}
-
-export function benchmark(name, stepsCreationCallback) {
-  benchmarkNames.push(name);
-  if (benchmarkNames.length === 2) {
-    onLoad(createBenchmarkMenu);
-  }
-  if (useBenchmark(benchmarkNames.length-1)) {
-    stepsCreationCallback();
-  }
-}
-
-export function benchmarkStep(name, callback) {
-  var benchmarkName = benchmarkNames[benchmarkNames.length-1];
-  window.benchmarkSteps.push({
-    name: benchmarkName + '#' + name, fn: callback
-  });
-}
diff --git a/modules/benchmarks_external/src/compiler/benchmark.es5 b/modules/benchmarks_external/src/compiler/benchmark.es5
deleted file mode 100644
index ff4715023c..0000000000
--- a/modules/benchmarks_external/src/compiler/benchmark.es5
+++ /dev/null
@@ -1,7 +0,0 @@
-Promise.all([
-  System.import('benchmarks_external/compiler/compiler_benchmark_ng13')
-]).then(function (benchmarks) {
-  benchmarks.forEach(function(bm) {
-    bm.main();
-  });
-}, console.log.bind(console));
diff --git a/modules/benchmarks_external/src/compiler/bp.conf.es5 b/modules/benchmarks_external/src/compiler/bp.conf.es5
deleted file mode 100644
index 235bb40d80..0000000000
--- a/modules/benchmarks_external/src/compiler/bp.conf.es5
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-      {src: '/js/traceur-runtime.js'},
-      {src: '/js/es6-module-loader-sans-promises.src.js'},
-      {src: '/js/extension-register.js'},
-      {src: 'register_system.js'},
-      {src: 'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.2/angular.js'},
-      {src: 'benchmark.js'}
-    ]
-  });
-};
diff --git a/modules/benchmarks_external/src/compiler/compiler_benchmark_ng10.dart b/modules/benchmarks_external/src/compiler/compiler_benchmark_ng10.dart
index 8aee93e026..c4fd9bfd9f 100644
--- a/modules/benchmarks_external/src/compiler/compiler_benchmark_ng10.dart
+++ b/modules/benchmarks_external/src/compiler/compiler_benchmark_ng10.dart
@@ -1,6 +1,6 @@
 import 'package:angular/angular.dart';
 import 'package:angular/application_factory_static.dart';
-import '../benchpress.dart';
+import 'package:benchpress/benchpress.dart';
 import 'dart:html';
 
 var COUNT = 30;
diff --git a/modules/benchmarks_external/src/compiler/compiler_benchmark_ng13.es6 b/modules/benchmarks_external/src/compiler/compiler_benchmark_ng13.es6
index 1de20ff6e9..895d0b5399 100644
--- a/modules/benchmarks_external/src/compiler/compiler_benchmark_ng13.es6
+++ b/modules/benchmarks_external/src/compiler/compiler_benchmark_ng13.es6
@@ -1,4 +1,4 @@
-import {benchmark, benchmarkStep} from '../benchpress';
+import {benchmark, benchmarkStep} from 'benchpress/benchpress';
 
 var COUNT = 30;
 var $compile;
diff --git a/modules/benchmarks_external/src/compiler/benchmark.dart b/modules/benchmarks_external/src/compiler/main.dart
similarity index 100%
rename from modules/benchmarks_external/src/compiler/benchmark.dart
rename to modules/benchmarks_external/src/compiler/main.dart
diff --git a/modules/benchmarks_external/src/compiler/main.es6 b/modules/benchmarks_external/src/compiler/main.es6
new file mode 100644
index 0000000000..a127b6e36b
--- /dev/null
+++ b/modules/benchmarks_external/src/compiler/main.es6
@@ -0,0 +1 @@
+export {main} from './compiler_benchmark_ng13';
diff --git a/modules/benchmarks_external/src/compiler/main.html b/modules/benchmarks_external/src/compiler/main.html
index d16b04e8fa..178588bd7d 100644
--- a/modules/benchmarks_external/src/compiler/main.html
+++ b/modules/benchmarks_external/src/compiler/main.html
@@ -1,3 +1,5 @@
+$SCRIPTS$
+
 <template id="templateNoBindings">
   <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
     <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
diff --git a/modules/benchmarks_external/src/compiler/register_system.es5 b/modules/benchmarks_external/src/compiler/register_system.es5
deleted file mode 100644
index 34499cfd2b..0000000000
--- a/modules/benchmarks_external/src/compiler/register_system.es5
+++ /dev/null
@@ -1,11 +0,0 @@
-System.paths = {
-  'core/*': '/js/core/lib/*.js',
-  'change_detection/*': '/js/change_detection/lib/*.js',
-  'facade/*': '/js/facade/lib/*.js',
-  'di/*': '/js/di/lib/*.js',
-  'rtts_assert/*': '/js/rtts_assert/lib/*.js',
-  'test_lib/*': '/js/test_lib/lib/*.js',
-  'benchmarks_external/*': '/js/benchmarks_external/lib/*.js',
-  'reflection/*': '/js/reflection/lib/*.js'
-};
-register(System);
diff --git a/modules/benchpress/pubspec.yaml b/modules/benchpress/pubspec.yaml
new file mode 100644
index 0000000000..b83af2da19
--- /dev/null
+++ b/modules/benchpress/pubspec.yaml
@@ -0,0 +1,4 @@
+name: benchpress
+environment:
+  sdk: '>=1.4.0'
+dependencies:
diff --git a/modules/benchmarks/src/benchpress.dart b/modules/benchpress/src/benchpress.dart
similarity index 100%
rename from modules/benchmarks/src/benchpress.dart
rename to modules/benchpress/src/benchpress.dart
diff --git a/modules/benchmarks/src/benchpress.es6 b/modules/benchpress/src/benchpress.es6
similarity index 100%
rename from modules/benchmarks/src/benchpress.es6
rename to modules/benchpress/src/benchpress.es6
diff --git a/modules/examples/src/hello_world/index.html b/modules/examples/src/hello_world/index.html
index a86ced24ea..16b869170d 100644
--- a/modules/examples/src/hello_world/index.html
+++ b/modules/examples/src/hello_world/index.html
@@ -1,23 +1,11 @@
 <!doctype html>
 <html>
-  <title>Hello Angular 2.0 (JS)</title>
+  <title>Hello Angular 2.0 (Reflection)</title>
 <body>
   <hello-app>
     Loading...
   </hello-app>
 
-  <script src="../../../traceur-runtime.js"></script>
-  <script src="../../../rtts_assert/lib/rtts_assert.js"></script>
-  <script src="../../../es6-module-loader-sans-promises.src.js"></script>
-  <script src="../../../system.src.js"></script>
-  <script src="../../../extension-register.js"></script>
-
-  <script src="main.js"></script>
+  $SCRIPTS$
 </body>
 </html>
-<!-- to run do:
-  1) gulp build
-  2) gulp serve
-  3) open localhost:8000/js/examples/lib/hello_world/ in chrome.
-  TODO(rado): merge with Darts's index.html in ../../web/
--->
diff --git a/modules/examples/src/hello_world/app.js b/modules/examples/src/hello_world/index.js
similarity index 100%
rename from modules/examples/src/hello_world/app.js
rename to modules/examples/src/hello_world/index.js
diff --git a/modules/examples/src/hello_world/index_static.html b/modules/examples/src/hello_world/index_static.html
new file mode 100644
index 0000000000..f6f1b5bb40
--- /dev/null
+++ b/modules/examples/src/hello_world/index_static.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <title>Hello Angular 2.0 (Static)</title>
+<body>
+  <hello-app>
+    Loading...
+  </hello-app>
+
+  $SCRIPTS$
+</body>
+</html>
diff --git a/modules/examples/src/hello_world/static_app.js b/modules/examples/src/hello_world/index_static.js
similarity index 98%
rename from modules/examples/src/hello_world/static_app.js
rename to modules/examples/src/hello_world/index_static.js
index 58323a6e3e..70b6f06ffc 100644
--- a/modules/examples/src/hello_world/static_app.js
+++ b/modules/examples/src/hello_world/index_static.js
@@ -1,4 +1,4 @@
-import *  as app from './app';
+import *  as app from './index';
 
 import {Component, Decorator, TemplateConfig, NgElement} from 'core/core';
 import {Parser} from 'change_detection/parser/parser';
diff --git a/modules/examples/src/hello_world/main.es5 b/modules/examples/src/hello_world/main.es5
deleted file mode 100644
index fa129dac44..0000000000
--- a/modules/examples/src/hello_world/main.es5
+++ /dev/null
@@ -1,23 +0,0 @@
-register(System);
-
-System.baseURL = '../../../';
-
-// So that we can import packages like `core/foo`, instead of `core/lib/foo`.
-System.paths = {
-  'core/*': './core/lib/*.js',
-  'change_detection/*': './change_detection/lib/*.js',
-  'facade/*': './facade/lib/*.js',
-  'di/*': './di/lib/*.js',
-  'reflection/*': './reflection/lib/*.js',
-  'rtts_assert/*': './rtts_assert/lib/*.js',
-  'examples/*': './examples/lib/*.js'
-};
-
-
-
-// TODO(rado): templatize and make reusable for all examples
-System.import('examples/hello_world/app').then(function(m) {
-  m.main();
-}, function(e) {
-  console.error(e.stack || e);
-});
diff --git a/modules/examples/web/index.html b/modules/examples/web/index.html
deleted file mode 100644
index 900b2c7a4b..0000000000
--- a/modules/examples/web/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Hello Angular 2.0 (Dart)</title>
-    <script type="application/dart" src="main.dart"></script>
-    <script src="packages/browser/dart.js"></script>
-  </head>
-  <body>
-    <hello-app>
-      Loading...
-    </hello-app>
-  </body>
-</html>
-
-<!-- to run do:
-  1) gulp build
-  2) gulp examples/pub.serve
-  3) open localhost:8080 in dartium or chrome.
-  TODO(rado): merge with JS's index.html in ../src/hello_world/
--->
diff --git a/modules/examples/web/index_static.html b/modules/examples/web/index_static.html
deleted file mode 100644
index 7c27acdc32..0000000000
--- a/modules/examples/web/index_static.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Hello Angular 2.0 (Dart Static)</title>
-    <script type="application/dart" src="main_static.dart"></script>
-    <script src="packages/browser/dart.js"></script>
-  </head>
-  <body>
-    <hello-app>
-      Loading...
-    </hello-app>
-  </body>
-</html>
-
-<!-- to run do:
-  1) gulp build
-  2) gulp examples/pub.serve
-  3) open localhost:8080/index_static.html in dartium or chrome.
-  TODO(rado): merge with JS's index.html in ../src/hello_world/
--->
diff --git a/modules/examples/web/main.dart b/modules/examples/web/main.dart
deleted file mode 100644
index 0c52222623..0000000000
--- a/modules/examples/web/main.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:examples/hello_world/app.dart' as HelloWorldApp;
-import 'package:reflection/reflection_capabilities.dart';
-import 'package:reflection/reflection.dart';
-
-// TODO(rado): templatize and make reusable for all examples.
-main() {
-  // enable mirrors and reflection.
-  // see static_app.js for an example of a static app.
-  reflector.reflectionCapabilities = new ReflectionCapabilities();
-  HelloWorldApp.main();
-}
diff --git a/modules/examples/web/main_static.dart b/modules/examples/web/main_static.dart
deleted file mode 100644
index d2909919cd..0000000000
--- a/modules/examples/web/main_static.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-import 'packages/examples/hello_world/static_app.dart' as HelloWorldApp;
-
-// TODO(rado): templatize and make reusable for all examples.
-main() => HelloWorldApp.main();
diff --git a/modules/facade/bootstrap.es5 b/modules/facade/bootstrap.es5
deleted file mode 100644
index 7ba8e2a189..0000000000
--- a/modules/facade/bootstrap.es5
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * This is a special facade used to bootstrap JS automatically. 
- * (In contrast to door wheere the user needs to explicitly call into angular.)
- * This file is appened to AngularJS and needs to be written in ES5.
- */
-(function(window, document) {
-  document.addEventListener('DOMContentLoaded', bootstrap, false);
-  function bootstrap() {
-    // TODO(misko): load application factory from the module system.
-    applicationFactory().run();  
-  }
-})(window, document);
\ No newline at end of file
diff --git a/package.json b/package.json
index 73bbcbfa43..994c240eae 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,8 @@
     "gulp-rename": "^1.2.0",
     "gulp-shell": "^0.2.10",
     "gulp-webserver": "^0.8.7",
+    "angular": "1.3.5",
+    "minimatch": "^2.0.1",
     "lodash": "^2.4.1"
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 5f9c07471f..97fee4a75f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,18 +2,6 @@ name: angular
 environment:
   sdk: '>=1.4.0'
 dependencies:
-  examples:
-    path: build/dart/examples
-  test_lib:
-    path: build/dart/test_lib
-  facade:
-    path: build/dart/facade
-  core:
-    path: build/dart/core
-  di:
-    path: build/dart/di
-  change_detection:
-    path: build/dart/change_detection
 
 dev_dependencies:
   guinness: ">=0.1.16 <0.2.0"
\ No newline at end of file
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index f4c884e73c..95e817aed3 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -8,10 +8,6 @@ SCRIPT_DIR=$(dirname $0)
 cd $SCRIPT_DIR/../..
 source ./scripts/env.sh
 
-# For some reason, this task fails on Travis when run as a part of the `gulp build`.
-# It runs `pub get` which fails to read the `pubspec.yml` (created earlier by the task).
-./node_modules/.bin/gulp modules/build.dart/pubspec
-
 ./node_modules/.bin/gulp build
 
 pub install
diff --git a/tools/build/benchpress.js b/tools/build/benchpress.js
new file mode 100644
index 0000000000..e0d7a9c84c
--- /dev/null
+++ b/tools/build/benchpress.js
@@ -0,0 +1,39 @@
+var util = require('./util');
+var path = require('path');
+var benchpress = require('angular-benchpress/lib/cli');
+var through2 = require('through2');
+var Q = require('q');
+var path = require('path');
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    var benchmarkParentFolders = {};
+    var createBpConfStream = util.streamToPromise(
+      gulp.src(path.join(config.buildDir, config.mainHtmls))
+      .pipe(through2.obj(function(file, enc, done) {
+        file.path = path.join(path.dirname(file.path), config.configFile.name);
+        file.contents = new Buffer(config.configFile.content);
+        this.push(file);
+        benchmarkParentFolders[getParentFolder(file.path)] = true;
+        done();
+      }))
+      .pipe(gulp.dest(config.buildDir)));
+
+    return createBpConfStream.then(function() {
+      return Promise.all(Object.keys(benchmarkParentFolders).map(function(benchmarkParentPath) {
+        var defer = Q.defer();
+        benchpress.build({
+          benchmarksPath: benchmarkParentPath,
+          buildPath: path.join(benchmarkParentPath, path.join('../', config.outputFolderName))
+        }, defer.makeNodeResolver());
+        return defer.promise;
+      }));
+    });
+  };
+};
+
+function getParentFolder(file) {
+  var parts = path.dirname(file).split(path.sep);
+  parts.pop();
+  return parts.join(path.sep);
+}
\ No newline at end of file
diff --git a/tools/build/clean.js b/tools/build/clean.js
new file mode 100644
index 0000000000..1451f17ea4
--- /dev/null
+++ b/tools/build/clean.js
@@ -0,0 +1,8 @@
+var del = require('del');
+
+module.exports = function(gulp, plugins, config) {
+  return function(done) {
+    del(config.path, done);
+  };
+};
+
diff --git a/tools/build/dartanalyzer.js b/tools/build/dartanalyzer.js
new file mode 100644
index 0000000000..4ba2130037
--- /dev/null
+++ b/tools/build/dartanalyzer.js
@@ -0,0 +1,70 @@
+var Q = require('q');
+var readline = require('readline');
+var spawn = require('child_process').spawn;
+var path = require('path');
+var glob = require('glob');
+var fs = require('fs');
+var util = require('./util');
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    var dartModuleFolders = [].slice.call(glob.sync(config.dest + '/*'));
+    var tempFile = '_analyzer.dart';
+    // analyze in parallel!
+    return Q.all(dartModuleFolders.map(function(dir) {
+      var srcFiles = [].slice.call(glob.sync(util.filterByFile(config.srcFolderMapping, dir) + '/**/*.dart', {
+        cwd: dir
+      }));
+      var testFiles = [].slice.call(glob.sync('test/**/*_spec.dart', {
+        cwd: dir
+      }));
+      var analyzeFile = ['library _analyzer;'];
+      srcFiles.concat(testFiles).forEach(function(fileName, index) {
+        if (fileName !== tempFile) {
+          analyzeFile.push('import "./'+fileName+'" as mod'+index+';');
+        }
+      });
+      fs.writeFileSync(path.join(dir, tempFile), analyzeFile.join('\n'));
+      var defer = Q.defer();
+      analyze(dir, defer.makeNodeResolver());
+      return defer.promise;
+    }));
+
+    function analyze(dirName, done) {
+      var stream = spawn(config.command, ['--fatal-warnings', tempFile], {
+        // inherit stdin and stderr, but filter stdout
+        stdio: [process.stdin, 'pipe', process.stderr],
+        cwd: dirName
+      });
+      // Filter out unused imports from our generated file.
+      // We don't reexports from the generated file
+      // as this could lead to name clashes when two files
+      // export the same thing.
+      var rl = readline.createInterface({
+        input: stream.stdout,
+        output: process.stdout,
+        terminal: false
+      });
+      var hintCount = 0;
+      rl.on('line', function(line) {
+        if (line.match(/Unused import/)) {
+          return;
+        }
+        if (line.match(/\[hint\]/)) {
+          hintCount++;
+        }
+        console.log(dirName + ':' + line);
+      });
+      stream.on('close', function(code) {
+        var error;
+        if (code !== 0) {
+          error = new Error('Dartanalyzer failed with exit code ' + code);
+        }
+        if (hintCount > 0) {
+          error = new Error('Dartanalyzer showed hints');
+        }
+        done(error);
+      });
+    }
+  };
+};
diff --git a/tools/build/dartdetect.js b/tools/build/dartdetect.js
new file mode 100644
index 0000000000..1c2c8e50a8
--- /dev/null
+++ b/tools/build/dartdetect.js
@@ -0,0 +1,33 @@
+var which = require('which');
+
+module.exports = function(gulp) {
+  var DART_SDK = false;
+  try {
+    which.sync('dart');
+    console.log('Dart SDK detected');
+    if (process.platform === 'win32') {
+      DART_SDK = {
+        PUB: 'pub.bat',
+        ANALYZER: 'dartanalyzer.bat'
+      };
+    } else {
+      DART_SDK = {
+        PUB: 'pub',
+        ANALYZER: 'dartanalyzer'
+      };
+    }
+  } catch (e) {
+    console.log('Dart SDK is not available, Dart tasks will be skipped.');
+    var gulpTaskFn = gulp.task.bind(gulp);
+    gulp.task = function (name, deps, fn) {
+      if (name.indexOf('.dart') === -1) {
+        return gulpTaskFn(name, deps, fn);
+      } else {
+        return gulpTaskFn(name, function() {
+          console.log('Dart SDK is not available. Skipping task: ' + name);
+        });
+      }
+    };
+  }
+  return DART_SDK;
+}
diff --git a/tools/build/deps.js b/tools/build/deps.js
new file mode 100644
index 0000000000..f7c534dcab
--- /dev/null
+++ b/tools/build/deps.js
@@ -0,0 +1,8 @@
+var path = require('path');
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    return gulp.src(config.src)
+      .pipe(gulp.dest(path.join(config.dest, 'deps')));
+  };
+};
diff --git a/file2modulename.js b/tools/build/file2modulename.js
similarity index 88%
rename from file2modulename.js
rename to tools/build/file2modulename.js
index 6f8dbd2aa2..d670db6260 100644
--- a/file2modulename.js
+++ b/tools/build/file2modulename.js
@@ -5,6 +5,8 @@ function file2moduleName(filePath) {
     .replace(/.*\/tools\//, '')
     // module name should not include `src`, `test`, `lib`
     .replace(/\/src\//, '/')
+    .replace(/\/web\//, '/')
+    .replace(/\/perf_tmp\//, '/')
     .replace(/\/lib\//, '/')
     // module name should not have a suffix
     .replace(/\.\w*$/, '');
diff --git a/tools/build/html.js b/tools/build/html.js
new file mode 100644
index 0000000000..140bc86cff
--- /dev/null
+++ b/tools/build/html.js
@@ -0,0 +1,32 @@
+var util = require('./util');
+var file2moduleName = require('./file2modulename');
+var through2 = require('through2');
+var path = require('path');
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    return gulp.src(config.src)
+      .pipe(util.renameSrcFolder(plugins, config.srcFolderMapping))
+      .pipe(through2.obj(function(file, enc, done) {
+        var fileName = file.relative;
+        var moduleName = file2moduleName(fileName);
+        var moduleNameWithoutPath = path.basename(moduleName);
+        var scripts = util.filterByFile(config.scriptsPerFolder, fileName).map(function(script) {
+          var scriptTag;
+          if (script.src) {
+            scriptTag = '<script src="'+script.src+'" type="'+script.mimeType+'"></script>';
+          } else {
+            scriptTag = '<script type="'+script.mimeType+'">'+script.inline+'</script>';
+          }
+          return scriptTag
+            .replace('$MODULENAME_WITHOUT_PATH$', moduleNameWithoutPath)
+            .replace('$MODULENAME$', moduleName)
+        }).join('\n');
+        file.contents = new Buffer(file.contents.toString().replace('$SCRIPTS$', scripts));
+        this.push(file);
+        done();
+      }))
+      .pipe(gulp.dest(config.dest));
+    };
+};
+
diff --git a/tools/build/jsserve.js b/tools/build/jsserve.js
new file mode 100644
index 0000000000..ab263b9a6a
--- /dev/null
+++ b/tools/build/jsserve.js
@@ -0,0 +1,10 @@
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    plugins.connect.server({
+      root: [__dirname+'/../../'+config.path],
+      port: 8000,
+      livereload: false,
+      open: false
+    })();
+  };
+};
diff --git a/tools/build/pubserve.js b/tools/build/pubserve.js
new file mode 100644
index 0000000000..8080f91ce2
--- /dev/null
+++ b/tools/build/pubserve.js
@@ -0,0 +1,11 @@
+var util = require('./util');
+var spawn = require('child_process').spawn;
+
+module.exports = function(gulp, plugins, config, module) {
+  return function() {
+    return util.streamToPromise(spawn(config.command, ['serve'], {
+      cwd: config.path, stdio: 'inherit'
+    }));
+  };
+};
+
diff --git a/tools/build/pubspec.js b/tools/build/pubspec.js
new file mode 100644
index 0000000000..b96b4f9802
--- /dev/null
+++ b/tools/build/pubspec.js
@@ -0,0 +1,37 @@
+var util = require('./util');
+var Q = require('q');
+var spawn = require('child_process').spawn;
+var through2 = require('through2');
+var path = require('path');
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    var files = [];
+    var pubSpecCopy = util.streamToPromise(gulp.src(config.src)
+      .pipe(plugins.changed(config.dest)) // Only forward files that changed.
+      .pipe(through2.obj(function(file, enc, done) {
+        files.push(path.resolve(process.cwd(), config.dest, file.relative));
+        this.push(file);
+        done();
+      }))
+      .pipe(gulp.dest(config.dest)));
+
+    // We need to wait for all pubspecs to be present before executing
+    // `pub get` as it checks the folders of the dependencies!
+    // We need to execute pubspec serially as otherwise we can get into trouble
+    // with the pub cache...
+    return pubSpecCopy.then(nextFile);
+
+    function nextFile() {
+      if (!files.length) {
+        return;
+      }
+      var file = files.shift();
+      return util.processToPromise(spawn(config.command, ['get'], {
+        stdio: 'inherit',
+        cwd: path.dirname(file)
+      })).then(nextFile);
+    }
+  };
+};
+
diff --git a/tools/build/runtime_paths.js b/tools/build/runtime_paths.js
new file mode 100644
index 0000000000..72a57fcd1b
--- /dev/null
+++ b/tools/build/runtime_paths.js
@@ -0,0 +1,14 @@
+System.paths = {
+  'core/*': '/core/lib/*.js',
+  'change_detection/*': '/change_detection/lib/*.js',
+  'facade/*': '/facade/lib/*.js',
+  'di/*': '/di/lib/*.js',
+  'rtts_assert/*': '/rtts_assert/lib/*.js',
+  'test_lib/*': '/test_lib/lib/*.js',
+  'reflection/*': '/reflection/lib/*.js',
+  'benchpress/*': '/benchpress/lib/*.js',
+  'examples/*': '/examples/web/*.js',
+  'benchmarks/*': '/benchmarks/web/*.js',
+  'benchmarks_external/*': '/benchmarks_external/web/*.js',
+};
+register(System);
\ No newline at end of file
diff --git a/tools/build/transpile.js b/tools/build/transpile.js
new file mode 100644
index 0000000000..df2c4bd3c1
--- /dev/null
+++ b/tools/build/transpile.js
@@ -0,0 +1,24 @@
+var util = require('./util');
+var gulpTraceur = require('../transpiler/gulp-traceur');
+var file2moduleName = require('./file2modulename');
+var mergeStreams = require('event-stream').merge;
+
+module.exports = function(gulp, plugins, config) {
+  return function() {
+    var transpile = gulp.src(config.src)
+      .pipe(plugins.rename({extname: '.'+config.outputExt}))
+      .pipe(util.renameSrcFolder(plugins, config.srcFolderMapping))
+      .pipe(gulpTraceur(
+        config.options,
+        file2moduleName)
+      )
+      .pipe(gulp.dest(config.dest));
+
+    var copy = gulp.src(config.copy)
+      .pipe(plugins.rename({extname: '.'+config.outputExt}))
+        .pipe(util.renameSrcFolder(plugins, config.srcFolderMapping))
+      .pipe(gulp.dest(config.dest));
+
+    return mergeStreams(transpile, copy);
+  };
+};
diff --git a/tools/build/util.js b/tools/build/util.js
new file mode 100644
index 0000000000..f715e26412
--- /dev/null
+++ b/tools/build/util.js
@@ -0,0 +1,45 @@
+var Q = require('q');
+var minimatch = require('minimatch');
+
+module.exports = {
+  processToPromise: processToPromise,
+  streamToPromise: streamToPromise,
+  renameSrcFolder: renameSrcFolder,
+  filterByFile: filterByFile
+};
+
+function filterByFile(valuesWithPatterns, fileName) {
+  var match = null;
+  for (var pattern in valuesWithPatterns) {
+    if (pattern !== 'default' && minimatch(fileName, pattern)) {
+      match = valuesWithPatterns[pattern];
+    }
+  }
+  return match || valuesWithPatterns['default'];
+}
+
+function processToPromise(process) {
+  var defer = Q.defer();
+  process.on('close', function(code) {
+    if (code) {
+      defer.reject(code);
+    } else {
+      defer.resolve();
+    }
+  });
+  return defer.promise;
+}
+
+function streamToPromise(stream) {
+  var defer = Q.defer();
+  stream.on('end', defer.resolve);
+  stream.on('error', defer.reject);
+  return defer.promise;
+}
+
+function renameSrcFolder(plugins, srcFolderMapping) {
+  return plugins.rename(function(file) {
+    var srcOutputFolder = filterByFile(srcFolderMapping, file.dirname);
+    file.dirname = file.dirname.replace(/\bsrc\b/, srcOutputFolder);
+  });
+}