7/11 master -> stable

polymer.js

@@ -8,25 +8,33 @@
 
 var thisFile = 'polymer.js';
 var scopeName = 'Polymer';
+
 var modules = [
-  '../platform/platform.js',
-  'src/lang.js',
-  'src/oop.js',
-  'src/register.js',
-  'src/base.js',
-  'src/trackObservers.js',
-  'src/bindProperties.js',
-  'src/bindMDV.js',
-  'src/attrs.js',
-  'src/marshal.js',
-  'src/events.js',
-  'src/observeProperties.js',
-  'src/styling.js',
-  'src/shimStyling.js',
-  'src/path.js',
-  'src/job.js',
-  'src/boot.js'
-];
+  "../platform/platform.js"
+].concat([
+  "boot.js",
+  "shimStyling.js",
+  "lib/lang.js",
+  "lib/dom.js",
+  "lib/deserialize.js",
+  "lib/job.js",
+  "lib/super.js",
+  "api.js",
+  "instance/utils.js",
+  "instance/events.js",
+  "instance/attributes.js",
+  "instance/properties.js",
+  "instance/mdv.js",
+  "instance/base.js",
+  "instance/styles.js",
+  "declaration/path.js",
+  "declaration/events.js",
+  "declaration/attributes.js",
+  "declaration/styles.js",
+  "declaration/polymer-element.js"
+].map(function(n) {
+  return "src/" + n;
+}));
 
 // export