diff --git a/.gitignore b/.gitignore
index a3732ec..dce4a1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 
 /test.bat
 
-/build/shadowdom.conditional.js
+/build/platform*
 *.min.js*
 *.concat.js*
 build.bat
diff --git a/bower.json b/bower.json
index 09e7494..865d957 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,8 @@
     "HTMLImports": "Polymer/HTMLImports#master",
     "PointerGestures":"Polymer/PointerGestures#master",
     "ShadowDOM": "Polymer/ShadowDOM#master",
-    "polymer-expressions": "Polymer/polymer-expressions#master"
+    "polymer-expressions": "Polymer/polymer-expressions#master",
+    "tools": "Polymer/tools#master"
   },
   "license": "BSD",
   "private": true,
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
index 3fe3cd4..804a1f9 100644
--- a/conf/karma.conf.js
+++ b/conf/karma.conf.js
@@ -7,9 +7,9 @@ module.exports = function(karma) {
     // list of files / patterns to load in the browser
     files: [
       'tools/test/mocha-htmltest.js',
-      'platform/conf/mocha.conf.js',
-      'platform/../tools/test/chai/chai.js',
-      'platform/test/js/*.js',
+      'platform-dev/conf/mocha.conf.js',
+      'tools/test/chai/chai.js',
+      'platform-dev/test/js/*.js',
       {pattern: 'CustomElements/custom-elements.js', included: false},
       {pattern: 'CustomElements/src/*.js', included: false},
       {pattern: 'HTMLImports/html-imports.js', included: false},
@@ -29,11 +29,11 @@ module.exports = function(karma) {
       {pattern: 'WeakMap/weakmap.js', included: false},
       {pattern: 'observe-js/src/*.js', included: false},
       {pattern: 'observe-js/util/*.js', included: false},
-      {pattern: 'platform/../tools/test/mocha/mocha.*', included: false},
-      {pattern: 'platform/platform.*', included: false},
-      {pattern: 'platform/src/*.js', included: false},
-      {pattern: 'platform/test/**/*.html', included: false},
-      {pattern: 'platform/test/**/*.js', included: false},
+      {pattern: 'platform-dev/../tools/test/mocha/mocha.*', included: false},
+      {pattern: 'platform-dev/platform.*', included: false},
+      {pattern: 'platform-dev/src/*.js', included: false},
+      {pattern: 'platform-dev/test/**/*.html', included: false},
+      {pattern: 'platform-dev/test/**/*.js', included: false},
       {pattern: 'polymer-expressions/src/*.js', included: false},
       {pattern: 'polymer-expressions/tests/*.js', included: false},
       {pattern: 'polymer-expressions/third_party/**/*.js', included: false},
diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
index 995828a..5813dcd 100644
--- a/conf/mocha.conf.js
+++ b/conf/mocha.conf.js
@@ -2,6 +2,6 @@ mocha.setup({
   ui: 'tdd',
   slow: 1000,
   timeout: 30000,
-	ignoreLeaks: true,
-  htmlbase: '/base/platform/test/'
+  ignoreLeaks: true,
+  htmlbase: '/base/platform-dev/test/'
 });
diff --git a/gruntfile.js b/gruntfile.js
index d9b1b95..a43ddcb 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -26,14 +26,14 @@ module.exports = function(grunt) {
           nonull: true
         },
         files: {
-          'platform.concat.js': readManifest('build.json')
+          'build/platform.concat.js': readManifest('build.json')
         }
       }
     },
     concat: {
       lite: {
         files: {
-          'platform-lite.concat.js': readManifest('build-lite.json')
+          'build/platform-lite.concat.js': readManifest('build-lite.json')
         }
       }
     },
@@ -46,12 +46,13 @@ module.exports = function(grunt) {
       },
       Platform: {
         options: {
-          sourceMap: 'platform.min.js.map',
-          sourceMapIn: 'platform.concat.js.map',
+          sourceMap: 'build/platform.js.map',
+          sourceMapIn: 'build/platform.concat.js.map',
+          sourceMappingURL: "platform.js.map",
           banner: grunt.file.read('LICENSE')
         },
         files: {
-          'platform.min.js': 'platform.concat.js'
+          'build/platform.js': 'build/platform.concat.js'
         }
       }
     },
@@ -86,17 +87,17 @@ module.exports = function(grunt) {
   grunt.registerTask('stash', 'prepare for testing build', function() {
     grunt.option('force', true);
     grunt.task.run('move:platform.js:platform.js.bak');
-    grunt.task.run('move:platform.min.js:platform.js');
+    grunt.task.run('move:build/platform.js:platform.js');
   });
   grunt.registerTask('restore', function() {
-    grunt.task.run('move:platform.js:platform.min.js');
+    grunt.task.run('move:platform.js:build/platform.js');
     grunt.task.run('move:platform.js.bak:platform.js');
     grunt.option('force', false);
   });
 
   grunt.registerTask('test-build', ['default', 'stash', 'test', 'restore']);
 
-  grunt.registerTask('default', ['concat_sourcemap', 'uglify', 'sourcemap_copy:platform.concat.js.map:platform.min.js.map']);
+  grunt.registerTask('default', ['concat_sourcemap', 'uglify', 'sourcemap_copy:build/platform.concat.js.map:build/platform.js.map']);
   grunt.registerTask('docs', ['yuidoc']);
   grunt.registerTask('test', ['override-chrome-launcher', 'karma:platform']);
   grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot', 'test-build']);