diff --git a/.gitignore b/.gitignore
index a4c0557..c0293f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ polymer.min*
 polymer.sandbox*
 polymer.native*
 polymer.concat*
+build
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
index ed2dd2f..66d8e8e 100644
--- a/conf/karma.conf.js
+++ b/conf/karma.conf.js
@@ -7,10 +7,10 @@ module.exports = function(karma) {
     // list of files / patterns to load in the browser
     files: [
       'tools/test/mocha-htmltest.js',
-      'polymer/conf/mocha.conf.js',
-      'polymer/node_modules/chai/chai.js',
-      'polymer/polymer.js',
-      'polymer/test/js/*.js',
+      'polymer-dev/conf/mocha.conf.js',
+      'polymer-dev/node_modules/chai/chai.js',
+      'polymer-dev/polymer.js',
+      'polymer-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,18 +29,18 @@ 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/*.js', 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/tools/**/*.js', included: false},
+      {pattern: 'platform-dev/*.js', 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: 'platform-dev/tools/**/*.js', included: false},
       {pattern: 'polymer-expressions/src/*.js', included: false},
       {pattern: 'polymer-expressions/third_party/**/*.js', included: false},
-      {pattern: 'polymer/src/**/*.js', included: false},
-      {pattern: 'polymer/test/**/*.css', included: false},
-      {pattern: 'polymer/test/**/*.html', included: false},
-      {pattern: 'polymer/test/**/*.js', included: false},
+      {pattern: 'polymer-dev/src/**/*.js', included: false},
+      {pattern: 'polymer-dev/test/**/*.css', included: false},
+      {pattern: 'polymer-dev/test/**/*.html', included: false},
+      {pattern: 'polymer-dev/test/**/*.js', included: false},
       {pattern: 'tools/**/*.js', included: false}
     ]
   }));
diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
index 5b523ae..037455a 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/polymer/test/'
+  ignoreLeaks: true,
+  htmlbase: '/base/polymer-devll/test/'
 });
diff --git a/gruntfile.js b/gruntfile.js
index 3b7ccc0..7d4671b 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
           nonull: true
         },
         files: {
-          'polymer.concat.js': Polymer
+          'build/polymer.concat.js': Polymer
         }
       }
     },
@@ -37,13 +37,14 @@ module.exports = function(grunt) {
       },
       Polymer: {
         options: {
-          sourceMap: 'polymer.min.js.map',
-          sourceMapIn: 'polymer.concat.js.map',
+          sourceMap: 'build/polymer.js.map',
+          sourceMapIn: 'build/polymer.concat.js.map',
+          sourceMappingURL: 'polymer.js.map',
           banner: grunt.file.read('LICENSE') + '// @version: <%= pkg.version %>'
           //mangle: false, beautify: true, compress: false
         },
         files: {
-          'polymer.min.js': 'polymer.concat.js'
+          'build/polymer.js': 'build/polymer.concat.js'
         }
       }
     },
@@ -71,9 +72,9 @@ module.exports = function(grunt) {
             '.'
           ]
         },
-        dest: 'build.log',
+        dest: 'build/build.log',
         src: [
-          'polymer.min.js',
+          'build/polymer.min.js',
         ]
       }
     },
@@ -91,10 +92,10 @@ module.exports = function(grunt) {
   grunt.registerTask('stash', 'prepare for testing build', function() {
     grunt.option('force', true);
     grunt.task.run('move:polymer.js:polymer.js.bak');
-    grunt.task.run('move:polymer.min.js:polymer.js');
+    grunt.task.run('move:build/polymer.js:polymer.js');
   });
   grunt.registerTask('restore', function() {
-    grunt.task.run('move:polymer.js:polymer.min.js');
+    grunt.task.run('move:polymer.js:build/polymer.js');
     grunt.task.run('move:polymer.js.bak:polymer.js');
     grunt.option('force', false);
   });
@@ -102,7 +103,7 @@ module.exports = function(grunt) {
   grunt.registerTask('test-build', ['minify', 'stash', 'test', 'restore']);
 
   grunt.registerTask('default', ['minify', 'audit']);
-  grunt.registerTask('minify', ['concat_sourcemap', 'uglify', 'sourcemap_copy:polymer.concat.js.map:polymer.min.js.map']);
+  grunt.registerTask('minify', ['concat_sourcemap', 'uglify', 'sourcemap_copy:build/polymer.concat.js.map:build/polymer.js.map']);
   grunt.registerTask('docs', ['yuidoc']);
   grunt.registerTask('test', ['override-chrome-launcher', 'karma:polymer']);
   grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot', 'minify', 'stash', 'karma:buildbot', 'restore']);