From dece82791f43b5e8d278aba89cf8d6119af1478f Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Apr 2012 13:11:40 -0700
Subject: - Decouple code editor from stage document switching logic - cleaning
 up

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/layout/document-bar.reel/document-bar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/components')

diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 4dc39fd6..27402dff 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -100,7 +100,7 @@ exports.DocumentBar = Montage.create(Component, {
             if(event._event.target.id === this.currentView) return;
 
             this.currentView = event._event.target.id;
-            this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view
+            this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
         }
     },
 
-- 
cgit v1.2.3


From bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 26 Apr 2012 16:23:59 -0700
Subject: Removing all "module" declarations and replaced with "prototype" in
 preparation for montage converting to the new "prototype" format fully

---
 js/components/about-box.reel/about-box.html        |  5 +-
 js/components/checkbox.reel/checkbox.html          |  3 +-
 js/components/colorbar.reel/colorbar.html          |  5 +-
 js/components/colorwheel.reel/colorwheel.html      |  5 +-
 js/components/combobox.reel/combobox.html          |  3 +-
 .../gradientpicker.reel/gradientpicker.html        |  5 +-
 js/components/hottext.reel/hottext.html            |  5 +-
 js/components/hottextunit.reel/hottextunit.html    |  5 +-
 .../layout/bread-crumb.reel/bread-crumb.html       | 11 ++--
 .../layout/document-bar.reel/document-bar.html     |  8 +--
 .../layout/document-entry.reel/document-entry.html |  5 +-
 .../layout/documents-tab.reel/documents-tab.html   | 11 ++--
 .../layout/stage-mode.reel/stage-mode.html         |  5 +-
 .../layout/subtool-button.reel/subtool-button.html |  5 +-
 .../layout/tool-button.reel/tool-button.html       |  5 +-
 .../layout/tools-list.reel/tools-list.html         | 77 ++++++++--------------
 .../tools-properties.reel/tools-properties.html    | 56 ++++++----------
 js/components/menu/menu-entry.reel/menu-entry.html | 14 ++--
 js/components/menu/menu-item.reel/menu-item.html   | 14 ++--
 js/components/menu/menu.reel/menu.html             | 17 ++---
 .../popup-manager.reel/popup-manager.html          |  5 +-
 js/components/popup-manager.reel/popup-manager.js  |  4 +-
 js/components/popup.reel/popup.html                |  5 +-
 js/components/radio.reel/radio.html                |  3 +-
 js/components/slider.reel/slider.html              |  5 +-
 js/components/textfield.reel/textfield.html        |  3 +-
 .../brush-properties.reel/brush-properties.html    | 17 ++---
 .../eraser-properties.reel/eraser-properties.html  |  5 +-
 .../eyedropper-properties.html                     |  5 +-
 .../fill-properties.reel/fill-properties.html      |  8 +--
 .../ink-bottle-properties.html                     | 14 ++--
 .../line-properties.reel/line-properties.html      |  5 +-
 .../object3d-properties.html                       |  5 +-
 .../oval-properties.reel/oval-properties.html      |  8 +--
 .../pan-properties.reel/pan-properties.html        |  5 +-
 .../pen-properties.reel/pen-properties.html        |  8 +--
 .../pencil-properties.reel/pencil-properties.html  |  5 +-
 .../rect-properties.reel/rect-properties.html      | 17 ++---
 .../rotate-stage-properties.html                   |  5 +-
 .../selection-properties.html                      |  3 +-
 .../shape-properties.reel/shape-properties.html    | 27 +++-----
 .../subselection-properties.html                   |  5 +-
 .../tag-properties.reel/tag-properties.html        |  3 +-
 .../text-properties.reel/text-properties.html      | 56 ++++++----------
 .../zoom-properties.reel/zoom-properties.html      |  5 +-
 js/components/treeview/branch.reel/branch.html     | 23 +++----
 js/components/treeview/leaf.reel/leaf.html         |  8 +--
 .../treeview/ninja-branch.reel/ninja-branch.html   | 23 +++----
 .../treeview/ninja-leaf.reel/ninja-leaf.html       |  8 +--
 js/components/treeview/treeview.reel/treeview.html | 17 ++---
 js/components/ui/color-chip.reel/color-chip.html   |  5 +-
 js/components/ui/file-input.reel/file-input.html   |  5 +-
 .../ui/icon-list-basic/icon.reel/icon.html         |  5 +-
 .../icon-list-basic/iconsList.reel/iconsList.html  | 11 ++--
 js/components/ui/input-group.reel/input-group.html | 14 ++--
 .../ui/property-control.reel/property-control.html |  8 +--
 js/components/ui/tree-basic/tree.reel/tree.html    | 11 ++--
 .../ui/tree-basic/treeItem.reel/treeItem.html      |  5 +-
 58 files changed, 230 insertions(+), 408 deletions(-)

(limited to 'js/components')

diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 7142d605..1f41699e 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
          {
              "owner": {
-                 "module": "js/components/about-box.reel",
-                 "name": "AboutBox",
+                 "prototype": "js/components/about-box.reel",
                  "properties": {
                      "element": {"#": "mainAboutBoxContainer"}
                  }
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index 3d523a98..a03d72fb 100755
--- a/js/components/checkbox.reel/checkbox.html
+++ b/js/components/checkbox.reel/checkbox.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/checkbox.reel",
-            "name": "Checkbox",
+            "prototype": "js/components/checkbox.reel",
             "properties": {
                 "element": {"#": "ch_comp"}
             }
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index f74f1437..c5bc186a 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!--
 <copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
    		<script type="text/montage-serialization">
    			{
             	"owner": {
-                	"module": "js/components/colorbar.reel",
-                	"name": "ColorBar",
+                	"prototype": "js/components/colorbar.reel[ColorBar]",
                 	"properties": {
                     	"element": {"#": "colorbar"}
 
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index a9fbfbd9..ef955c2d 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- 
 <copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
 		<script type="text/montage-serialization">
    			{
             	"owner": {
-                	"module": "js/components/colorwheel.reel",
-                	"name": "ColorWheel",
+                	"prototype": "js/components/colorwheel.reel[ColorWheel]",
                 	"properties": {
                     	"element": {"#": "colorwheel"}
 
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index d78cc9c1..a68dd37f 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/combobox.reel",
-            "name": "Combobox",
+            "prototype": "js/components/combobox.reel",
             "properties": {
                 "element": {"#": "cb_comp"}
             }
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index f71c6705..afd42925 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- 
  <copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
 		<script type="text/montage-serialization">
    			{
             	"owner": {
-                	"module": "js/components/gradientpicker.reel",
-                	"name": "GradientPicker",
+                	"prototype": "js/components/gradientpicker.reel[GradientPicker]",
                 	"properties": {
                     	"element": {"#": "gradientpicker"}
 
diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html
index 3531999c..314d4ca3 100755
--- a/js/components/hottext.reel/hottext.html
+++ b/js/components/hottext.reel/hottext.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/hottext.reel",
-                "name": "HotText",
+                "prototype": "js/components/hottext.reel[HotText]",
                 "properties": {
                     "element": {"#": "hottext"}
                 }
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html
index cc0835fb..3f946f9b 100755
--- a/js/components/hottextunit.reel/hottextunit.html
+++ b/js/components/hottextunit.reel/hottextunit.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "hottextunit"}
                 }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 413f588d..7e14157e 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/components/layout/bread-crumb.reel",
-                    "name": "Breadcrumb",
+                    "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]",
                     "properties": {
                         "element": {"#": "breadcrumbTrail"},
                         "breadcrumbBt": {"@": "breadCrumbButton"}
@@ -22,8 +21,7 @@
                 },
 
                 "breadCrumbButton": {
-                    "module": "montage/ui/button.reel",
-                    "name": "Button",
+                    "prototype": "montage/ui/button.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_button"}
                     },
@@ -48,8 +46,7 @@
                 },
 
                 "repetition1": {
-                    "module": "montage/ui/repetition.reel",
-                    "name": "Repetition",
+                    "prototype": "montage/ui/repetition.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_container"}
                     },
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index bd13f231..8dcaf178 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
     <script type="text/montage-serialization">
         {
             "hottext1": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "zoomControlHT"},
                     "minValue":25,
@@ -47,8 +46,7 @@
             },
 
             "owner": {
-                "module": "js/components/layout/document-bar.reel",
-                "name": "DocumentBar",
+                "prototype": "js/components/layout/document-bar.reel",
                 "properties": {
                     "element": {"#": "documentBar"},
                     "designView": {"#": "design"},
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 1cf01737..451d9cc4 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         {
             
             "owner": {
-                "module": "js/components/layout/document-entry.reel",
-                "name": "DocumentEntry",
+                "prototype": "js/components/layout/document-entry.reel",
                 "properties": {
                     "element": {"#": "documentEntry"},
                     "label":    {"#": "name"},
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 737dfbcb..1516a8ce 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,16 +14,14 @@
         {
 
             "owner": {
-                "module": "js/components/layout/documents-tab.reel",
-                "name": "DocumentsTab",
+                "prototype": "js/components/layout/documents-tab.reel",
                 "properties": {
                     "element": {"#": "openDocumentsTabComponent"}
                 }
             },
 
             "documentEntry": {
-                "module": "js/components/layout/document-entry.reel",
-                "name": "DocumentEntry",
+                "prototype": "js/components/layout/document-entry.reel",
                 "properties": {
                     "element": {"#": "document"}
                 },
@@ -52,8 +50,7 @@
             },
             
             "repetition1": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "openDocuments"}
                 },
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
index ab111136..15d4955c 100755
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ b/js/components/layout/stage-mode.reel/stage-mode.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/layout/stage-mode.reel",
-                "name": "StageMode",
+                "prototype": "js/components/layout/stage-mode.reel",
                 "properties": {
                     "element": {"#": "stageMode"}
                 }
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 24fce57c..501193d3 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/layout/subtool-button.reel",
-                "name": "SubToolButton",
+                "prototype": "js/components/layout/subtool-button.reel[SubToolButton]",
                 "properties": {
                     "element":             {"#": "toolButton"}
                 }
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 476b66f3..3980b92c 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolBarButton"}
                 }
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 5996e446..acee20b2 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
         {
             "toolbutton1": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolbutton"}
                 },
@@ -26,8 +25,7 @@
             },
 
             "groupLine": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "groupLine"}
                 },
@@ -41,8 +39,7 @@
             },
 
             "repetition1": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "toolscontainer"}
                 },
@@ -56,89 +53,68 @@
             },
 
             "SelectionTool1": {
-                "module": "js/tools/SelectionTool",
-                "name": "SelectionTool"
+                "prototype": "js/tools/SelectionTool"
             },
             "SubselectionTool1": {
-                "module": "js/tools/SubSelectTool",
-                "name": "SubSelectTool"
+                "prototype": "js/tools/SubSelectTool"
             },
             "Rotate3DTool1": {
-                "module": "js/tools/RotateObject3DTool",
-                "name": "RotateObject3DTool"
+                "prototype": "js/tools/RotateObject3DTool"
             },
             "Translate3DTool1": {
-                "module": "js/tools/TranslateObject3DTool",
-                "name": "TranslateObject3DTool"
+                "prototype": "js/tools/TranslateObject3DTool"
             },
             "TagTool1": {
-                "module": "js/tools/TagTool",
-                "name": "TagTool"
+                "prototype": "js/tools/TagTool"
             },
             "PenTool1": {
-                "module": "js/tools/PenTool",
-                "name": "PenTool"
+                "prototype": "js/tools/PenTool"
             },
             "TextTool1": {
-                "module": "js/tools/TextTool",
-                "name": "TextTool"
+                "prototype": "js/tools/TextTool"
             },
             "ShapeTool1": {
-                "module": "js/tools/ShapeTool",
-                "name": "ShapeTool"
+                "prototype": "js/tools/ShapeTool"
             },
             "OvalTool1": {
-                "module": "js/tools/OvalTool",
-                "name": "OvalTool"
+                "prototype": "js/tools/OvalTool"
             },
             "RectTool1": {
-                "module": "js/tools/RectTool",
-                "name": "RectTool"
+                "prototype": "js/tools/RectTool"
             },
             "LineTool1": {
-                "module": "js/tools/LineTool",
-                "name": "LineTool"
+                "prototype": "js/tools/LineTool"
             },
             "PencilTool1": {
-                "module": "js/tools/PencilTool",
-                "name": "PencilTool"
+                "prototype": "js/tools/PencilTool"
             },
             "BrushTool1": {
-                "module": "js/tools/BrushTool",
-                "name": "BrushTool"
+                "prototype": "js/tools/BrushTool"
             },
             "FillTool1": {
-                "module": "js/tools/FillTool",
-                "name": "FillTool"
+                "prototype": "js/tools/FillTool"
             },
             "InkBottleTool1": {
-                "module": "js/tools/InkBottleTool",
-                "name": "InkBottleTool"
+                "prototype": "js/tools/InkBottleTool"
             },
             "EyedropperTool1": {
-                "module": "js/tools/EyedropperTool",
-                "name": "EyedropperTool"
+                "prototype": "js/tools/EyedropperTool"
             },
             "EraserTool1": {
-                "module": "js/tools/EraserTool",
-                "name": "EraserTool"
+                "prototype": "js/tools/EraserTool"
             },
             "RotateStageTool3D1": {
-                "module": "js/tools/RotateStage3DTool",
-                "name": "RotateStage3DTool"
+                "prototype": "js/tools/RotateStage3DTool"
             },
             "PanTool1": {
-                "module": "js/tools/PanTool",
-                "name": "PanTool"
+                "prototype": "js/tools/PanTool"
             },
             "ZoomTool1": {
-                "module": "js/tools/ZoomTool",
-                "name": "ZoomTool"
+                "prototype": "js/tools/ZoomTool"
             },
 
             "disable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -152,8 +128,7 @@
             },
 
             "owner": {
-                "module": "js/components/layout/tools-list.reel",
-                "name": "ToolsList",
+                "prototype": "js/components/layout/tools-list.reel",
                 "properties": {
                     "element": {"#": "toolsList"},
                     "SelectionTool":          {"@": "SelectionTool1"},
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 3c7a92fa..8dd0f713 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,50 +13,43 @@
         {
 
             "selectionProperties1": {
-                "module": "js/components/tools-properties/selection-properties.reel",
-                "name": "SelectionProperties",
+                "prototype": "js/components/tools-properties/selection-properties.reel",
                 "properties": {
                     "element": {"#": "selectionProperties"}
                 }
             },
             "subSelectionProperties1": {
-                "module": "js/components/tools-properties/subselection-properties.reel",
-                "name": "SubSelectionProperties",
+                "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
                 "properties": {
                     "element": {"#": "subSelectionProperties"}
                 }
             },
             "object3DProperties1": {
-                "module": "js/components/tools-properties/object3d-properties.reel",
-                "name": "Object3DProperties",
+                "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                 "properties": {
                     "element": {"#": "object3DProperties"}
                 }
             },
             "tagProperties1": {
-                "module": "js/components/tools-properties/tag-properties.reel",
-                "name": "TagProperties",
+                "prototype": "js/components/tools-properties/tag-properties.reel",
                 "properties": {
                     "element": {"#": "tagProperties"}
                 }
             },
             "penProperties1": {
-                "module": "js/components/tools-properties/pen-properties.reel",
-                "name": "PenProperties",
+                "prototype": "js/components/tools-properties/pen-properties.reel",
                 "properties": {
                     "element": {"#": "penProperties"}
                 }
             },
             "textProperties1": {
-                "module": "js/components/tools-properties/text-properties.reel",
-                "name": "TextProperties",
+                "prototype": "js/components/tools-properties/text-properties.reel",
                 "properties": {
                     "element": {"#": "textProperties"}
                 }
             },
             "shapeProperties1": {
-                "module": "js/components/tools-properties/shape-properties.reel",
-                "name": "ShapeProperties",
+                "prototype": "js/components/tools-properties/shape-properties.reel",
                 "properties": {
                     "element": {"#": "shapeProperties"}
                 },
@@ -74,72 +67,62 @@
                 }
             },
             "pencilProperties1": {
-                "module": "js/components/tools-properties/pencil-properties.reel",
-                "name": "PencilProperties",
+                "prototype": "js/components/tools-properties/pencil-properties.reel",
                 "properties": {
                     "element": {"#": "pencilProperties"}
                 }
             },
             "brushProperties1": {
-                "module": "js/components/tools-properties/brush-properties.reel",
-                "name": "BrushProperties",
+                "prototype": "js/components/tools-properties/brush-properties.reel",
                 "properties": {
                     "element": {"#": "brushProperties"}
                 }
             },
             "fillProperties1": {
-                "module": "js/components/tools-properties/fill-properties.reel",
-                "name": "FillProperties",
+                "prototype": "js/components/tools-properties/fill-properties.reel",
                 "properties": {
                     "element": {"#": "fillProperties"}
                 }
             },
             "inkbottleProperties1": {
-                "module": "js/components/tools-properties/ink-bottle-properties.reel",
-                "name": "InkBottleProperties",
+                "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
                 "properties": {
                     "element": {"#": "inkbottleProperties"}
                 }
             },
             "eyedropperProperties1": {
-                "module": "js/components/tools-properties/eyedropper-properties.reel",
-                "name": "EyedropperProperties",
+                "prototype": "js/components/tools-properties/eyedropper-properties.reel",
                 "properties": {
                     "element": {"#": "eyedropperProperties"}
                 }
             },
             "eraserProperties1": {
-                "module": "js/components/tools-properties/eraser-properties.reel",
-                "name": "EraserProperties",
+                "prototype": "js/components/tools-properties/eraser-properties.reel",
                 "properties": {
                     "element": {"#": "eraserProperties"}
                 }
             },
             "rotateStageProperties1": {
-                "module": "js/components/tools-properties/rotate-stage-properties.reel",
-                "name": "RotateStageProperties",
+                "prototype": "js/components/tools-properties/rotate-stage-properties.reel",
                 "properties": {
                     "element": {"#": "rotateStageProperties"}
                 }
             },
             "panProperties1": {
-                "module": "js/components/tools-properties/pan-properties.reel",
-                "name": "PanProperties",
+                "prototype": "js/components/tools-properties/pan-properties.reel",
                 "properties": {
                     "element": {"#": "panProperties"}
                 }
             },
             "zoomProperties1": {
-                "module": "js/components/tools-properties/zoom-properties.reel",
-                "name": "ZoomProperties",
+                "prototype": "js/components/tools-properties/zoom-properties.reel",
                 "properties": {
                     "element": {"#": "zoomProperties"}
                 }
             },
 
             "disable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -153,8 +136,7 @@
             },
             
             "owner": {
-                "module": "js/components/layout/tools-properties.reel",
-                "name": "ToolsProperties",
+                "prototype": "js/components/layout/tools-properties.reel",
                 "properties": {
                     "element": {"#": "toolsProperties"},
                     "selectionProperties":          {"@": "selectionProperties1"},
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html
index bba5e65d..7ebbcec8 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.html
+++ b/js/components/menu/menu-entry.reel/menu-entry.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
         {
             "entriesController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -27,8 +26,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": { "#": "subEntries" },
                     "contentController": {"@": "entriesController"}
@@ -36,8 +34,7 @@
             },
 
             "menuItem": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element": { "#": "menuEntryItem" }
                 },
@@ -51,8 +48,7 @@
             },
 
             "owner": {
-                "module": "js/components/menu/menu-entry.reel",
-                "name": "MenuEntry",
+                "prototype": "js/components/menu/menu-entry.reel",
                 "properties": {
                     "element":              {"#": "menuItem"},
                     "topHeader":            {"#": "topHeaderBackground"},
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index d199a440..92e9aafc 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
         {
             "entriesController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -27,8 +26,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "subEntries"},
                     "contentController": {"@": "entriesController"}
@@ -36,8 +34,7 @@
             },
 
             "menuItem": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element": {"#": "menuEntryItem" }
                 },
@@ -51,8 +48,7 @@
             },
 
             "owner": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element":          {"#": "menuItem"},
                     "itemBackground":   {"#": "menuItemBackground"},
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index 2cc6bf9b..adaf68ea 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,13 +12,11 @@
     <script type="text/montage-serialization">
         {
             "menudata": {
-                "name": "MenuData",
-                "module": "js/data/menu-data"
+                "prototype": "js/data/menu-data"
             },
 
             "menuController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -32,8 +30,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": { "#": "topMenu" },
                     "contentController": {"@": "menuController"},
@@ -42,8 +39,7 @@
             },
 
             "menuEntry": {
-                "module": "js/components/menu/menu-entry.reel",
-                "name": "MenuEntry",
+                "prototype": "js/components/menu/menu-entry.reel",
                 "properties": {
                     "element": { "#": "menuItem" }
                 },
@@ -64,8 +60,7 @@
             },
             
             "owner": {
-                "module": "js/components/menu/menu.reel",
-                "name": "Menu",
+                "prototype": "js/components/menu/menu.reel",
                 "properties": {
                     "element":  {"#": "mainMenuBar"},
                     "controller": {"@": "menuController"},
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 7fbbc86e..1ae93e15 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- 
 <copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -14,8 +14,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/popup-manager.reel",
-                "name": "PopupMananger",
+                "prototype": "js/components/popup-manager.reel",
                 "properties": {
                     "element": {"#": "popupWindows"}
                 }
diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index fbcd5035..cf818b4e 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -10,8 +10,8 @@ var Montage = 			require("montage/core/core").Montage,
 	Component = 		require("montage/ui/component").Component,
 	Popup =				require("js/components/popup.reel").Popup;
 ////////////////////////////////////////////////////////////////////////
-//Exporting as PopupMananger
-exports.PopupMananger = Montage.create(Component, {
+//Exporting as PopupManager
+exports.PopupManager = Montage.create(Component, {
 	////////////////////////////////////////////////////////////////////
 	//
     deserializedFromTemplate: {
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index b6f147aa..212a681f 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/Popup.reel",
-                "name": "Popup",
+                "prototype": "js/components/Popup.reel",
                 "properties": {
                     "element": {"#": "default_popup"}
                 }
diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html
index 3736ded3..2a8ba3dd 100755
--- a/js/components/radio.reel/radio.html
+++ b/js/components/radio.reel/radio.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/radio.reel",
-            "name": "Radio",
+            "prototype": "js/components/radio.reel",
             "properties": {
                 "element": {"#": "ch_comp"}
             }
diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html
index b30d20a2..ecfb6ca4 100755
--- a/js/components/slider.reel/slider.html
+++ b/js/components/slider.reel/slider.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/slider.reel",
-                "name": "Slider",
+                "prototype": "js/components/slider.reel",
                 "properties": {
                     "element": {"#": "slider"},
                     "parentDiv": {"#": "parentDiv"},
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html
index 89adf776..22f487ac 100755
--- a/js/components/textfield.reel/textfield.html
+++ b/js/components/textfield.reel/textfield.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/textfield.reel",
-            "name": "TextField",
+            "prototype": "js/components/textfield.reel[TextField]",
             "properties": {
                 "element": {"#": "textfield"}
             }
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index d9c35dc2..b0c02734 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "strokeSizeHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeSize"},
                     "minValue": 1,
@@ -25,8 +24,7 @@
             },
 
             "strokeHardnessHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeHardness"},
                     "minValue": 0,
@@ -39,8 +37,7 @@
             },
 
             "strokeAngleHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeAngle"},
                     "minValue": -90,
@@ -53,8 +50,7 @@
             },
 
             "smoothingAmountHT": {
-                "module": "js/components/hottext.reel",
-                "name": "HotText",
+                "prototype": "js/components/hottext.reel[HotText]",
                 "properties": {
                     "element": {"#": "smoothingAmount"},
                     "minValue": 0,
@@ -65,8 +61,7 @@
             },
 
             "owner": {
-                "module": "js/components/tools-properties/brush-properties.reel",
-                "name": "BrushProperties",
+                "prototype": "js/components/tools-properties/brush-properties.reel",
                 "properties": {
                     "element": {"#": "brushProperties"},
                     "_strokeSize": {"@": "strokeSizeHT"},
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index f6a58a10..7585bbb4 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/eraser-properties.reel",
-                "name": "EraserProperties",
+                "prototype": "js/components/tools-properties/eraser-properties.reel",
                 "properties": {
                     "element": {"#": "eraserProperties"}
                 }
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 3718c5c5..1cde7a3e 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/eyedropper-properties.reel",
-                "name": "EyedropperProperties",
+                "prototype": "js/components/tools-properties/eyedropper-properties.reel",
                 "properties": {
                     "element": {"#": "eyedropperProperties"}
                 }
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index a35f9b15..b81b09ba 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "_fillMaterialCB": {
-                "module": "js/components/combobox.reel",
-                "name": "Combobox",
+                "prototype": "js/components/combobox.reel",
                 "properties": {
                     "element": {"#": "fillMaterialCB"},
                     "labelField": "_name",
@@ -21,8 +20,7 @@
                 }
             },
             "owner": {
-                "module": "js/components/tools-properties/fill-properties.reel",
-                "name": "FillProperties",
+                "prototype": "js/components/tools-properties/fill-properties.reel",
                 "properties": {
                     "element": {"#": "fillProperties"},
                     "_useWebGL": {"#": "useWebGLCH"},
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 81facc49..010e77b2 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -36,8 +36,7 @@
             },
 
             "borderWidthHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "borderWidth"},
                     "minValue": 1,
@@ -96,8 +95,7 @@
             },
 
             "strokeSizeHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeSize"},
                     "minValue": 1,
@@ -125,8 +123,7 @@
             },
 
             "_strokeMaterialCB": {
-                "module": "js/components/combobox.reel",
-                "name": "Combobox",
+                "prototype": "js/components/combobox.reel",
                 "properties": {
                     "element": {"#": "strokeMaterialIBCB"},
                     "labelField": "_name",
@@ -135,8 +132,7 @@
             },
 
             "owner": {
-                "module": "js/components/tools-properties/ink-bottle-properties.reel",
-                "name": "InkBottleProperties",
+                "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
                 "properties": {
                     "element": {"#": "inkBottleProperties"},
 
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html
index 1ec14cca..a8fc194e 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.html
+++ b/js/components/tools-properties/line-properties.reel/line-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/tools-properties/line-properties.reel",
-                "name": "LineProperties",
+                "prototype": "js/components/tools-properties/line-properties.reel",
                 "properties": {
                     "element": {"#": "lineProperties"}
                 }
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 3f882850..58c29db5 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/object3d-properties.reel",
-                "name": "Object3DProperties",
+                "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                 "properties": {
                     "element": {"#": "object3DProperties"},
 
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index 942ba9b0..e460f7ea 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "hottext1": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "innerRadiusControl"},
                     "minValue":0,
@@ -25,8 +24,7 @@
             },
 
             "owner": {
-                "module": "js/components/tools-properties/oval-properties.reel",
-                "name": "OvalProperties",
+                "prototype": "js/components/tools-properties/oval-properties.reel",
                 "properties": {
                     "element": {"#": "ovalProperties"},
                     "innerRadius": {"@": "hottext1"}
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html
index d8c3281a..54dbcda7 100755
--- a/js/components/tools-properties/pan-properties.reel/pan-properties.html
+++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/pan-properties.reel",
-                "name": "PanProperties",
+                "prototype": "js/components/tools-properties/pan-properties.reel",
                 "properties": {
                     "element": {"#": "panProperties"}
                 }
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index acbedcac..e835f69d 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "strokeSizeHT": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeSize"},
                     "minValue": 1,
@@ -26,8 +25,7 @@
             },
 
             "owner": {
-                "module": "js/components/tools-properties/pen-properties.reel",
-                "name": "PenProperties",
+                "prototype": "js/components/tools-properties/pen-properties.reel",
                 "properties": {
                     "element": {"#": "penProperties"},
                     "_strokeSize": {"@": "strokeSizeHT"}
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
index 964cdd0e..fc5f541e 100755
--- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
+++ b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/pencil-properties.reel",
-                "name": "PencilProperties",
+                "prototype": "js/components/tools-properties/pencil-properties.reel",
                 "properties": {
                     "element": {"#": "pencilProperties"}
                 }
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index ceb761b9..47eff533 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "hottext1": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "TLRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"]
@@ -21,8 +20,7 @@
             },
 
             "hottext2": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "TRRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
@@ -31,8 +29,7 @@
             },
 
             "hottext3": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "BLRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
@@ -41,8 +38,7 @@
             },
 
             "hottext4": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "BRRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
@@ -62,8 +58,7 @@
             },
 
             "owner": {
-                "module": "js/components/tools-properties/rect-properties.reel",
-                "name": "RectProperties",
+                "prototype": "js/components/tools-properties/rect-properties.reel",
                 "properties": {
                     "element": {"#": "rectProperties"},
                     "lockButton": {"@": "lockButton"},
diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
index 321e9a5c..55af6b54 100755
--- a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
+++ b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/rotate-stage-properties.reel",
-                "name": "RotateStageProperties",
+                "prototype": "js/components/tools-properties/rotate-stage-properties.reel",
                 "properties": {
                     "element": {"#": "rotateStageProperties"}
                 }
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index 261a0177..f0b907af 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -13,8 +13,7 @@
         {
 
             "owner": {
-                "module": "js/components/tools-properties/selection-properties.reel",
-                "name": "SelectionProperties",
+                "prototype": "js/components/tools-properties/selection-properties.reel",
                 "properties": {
                     "element": {"#": "selectionProperties"},
                     "transform": {"#": "transformCheck"}
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 64840b17..117664a3 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -13,8 +13,7 @@
         {
 
             "ovalProperties1": {
-                "module": "js/components/tools-properties/oval-properties.reel",
-                "name": "OvalProperties",
+                "prototype": "js/components/tools-properties/oval-properties.reel",
                 "properties": {
                     "element": {"#": "ovalProperties"},
                     "base": {"@": "owner"}
@@ -22,8 +21,7 @@
             },
 
             "rectProperties1": {
-                "module": "js/components/tools-properties/rect-properties.reel",
-                "name": "RectProperties",
+                "prototype": "js/components/tools-properties/rect-properties.reel",
                 "properties": {
                     "element": {"#": "rectProperties"},
                     "base": {"@": "owner"}
@@ -31,8 +29,7 @@
             },
 
             "lineProperties1": {
-                "module": "js/components/tools-properties/line-properties.reel",
-                "name": "LineProperties",
+                "prototype": "js/components/tools-properties/line-properties.reel",
                 "properties": {
                     "element": {"#": "line