6 files changed, 43 insertions, 28 deletions

diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html
index 5046d78f..2f35ff30 100755
--- a/node_modules/montage/ui/popup/alert.reel/alert.html
+++ b/node_modules/montage/ui/popup/alert.reel/alert.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">{
 
     "dynamictext1": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {
                 "#": "title"
@@ -22,7 +22,7 @@
         }
     },
     "dynamictext2": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {
                 "#": "msg"
@@ -33,7 +33,7 @@
         }
     },
     "dynamictext3": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {
                 "#": "msg-detail"
@@ -44,7 +44,7 @@
         }
     },
     "button1": {
-        "prototype": "montage/ui/bluemoon/button.reel",
+        "prototype": "ui/bluemoon/button.reel",
         "properties": {
             "identifier": "Ok",
             "element": {
@@ -61,7 +61,7 @@
         ]
     },
     "owner": {
-        "prototype": "montage/ui/popup/alert.reel",
+        "prototype": "ui/popup/alert.reel",
         "properties": {
             "element": {
                 "#": "alert-container"
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html
index 3e256b0e..1c9b7caf 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.html
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">{
 
     "dynamictext1": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {
                 "#": "msg"
@@ -22,7 +22,7 @@
         }
     },
     "button1": {
-        "prototype": "montage/ui/bluemoon/button.reel",
+        "prototype": "ui/bluemoon/button.reel",
         "properties": {
             "identifier": "Ok",
             "element": {
@@ -42,7 +42,7 @@
         ]
     },
     "button2": {
-        "prototype": "montage/ui/bluemoon/button.reel",
+        "prototype": "ui/bluemoon/button.reel",
         "properties": {
             "identifier": "Cancel",
             "element": {
@@ -62,7 +62,7 @@
         ]
     },
     "owner": {
-        "prototype": "montage/ui/popup/confirm.reel",
+        "prototype": "ui/popup/confirm.reel",
         "properties": {
             "element": {
                 "#": "confirm-container"
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html
index 3dfca6f6..09fe57ac 100755
--- a/node_modules/montage/ui/popup/notifier.reel/notifier.html
+++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">
 {
     "owner": {
-        "prototype": "montage/ui/popup/notifier.reel",
+        "prototype": "ui/popup/notifier.reel",
         "properties": {
             "element": {
                 "#": "notifier-main"
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js
index ac3dcff9..c0878e65 100755
--- a/node_modules/montage/ui/popup/notifier.reel/notifier.js
+++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js
@@ -20,9 +20,11 @@ var Popup = require("ui/popup/popup.reel").Popup;
  */
 
 var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ {
-    hasTemplate: {value: true},
 
-    _msgEl: {value: null},
+    _msgEl: {
+        value: null,
+        serializable: true
+    },
 /**
   Description TODO
   @private
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html
index 5bc74dae..140d7850 100755
--- a/node_modules/montage/ui/popup/popup.reel/popup.html
+++ b/node_modules/montage/ui/popup/popup.reel/popup.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">
 {
     "slot1": {
-        "prototype": "montage/ui/slot.reel",
+        "prototype": "ui/slot.reel",
         "properties": {
             "element": {
                 "#": "popup-content"
@@ -19,7 +19,7 @@
         }
     },
     "owner": {
-        "prototype": "montage/ui/popup/popup.reel",
+        "prototype": "ui/popup/popup.reel",
         "properties": {
             "element": {
                 "#": "popup-container"
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.js b/node_modules/montage/ui/popup/popup.reel/popup.js
index 84f845db..0ed1a452 100755
--- a/node_modules/montage/ui/popup/popup.reel/popup.js
+++ b/node_modules/montage/ui/popup/popup.reel/popup.js
@@ -22,9 +22,14 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul
     hasTemplate: {value: true},
 
     // the HTML Element to which the popup must be anchored to
-    anchorElement: {value: null},
+    anchorElement: {
+        value: null
+    },
+
+    _anchor: {
+        value: null
+    },
 
-    _anchor: {value: null},
     /**
     * The HTMLElement or Montage Component that the popup must be anchored to
     */
@@ -42,7 +47,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul
                     this.anchorElement = value.element;
                 }
             }
-        }
+        },
+        serializable: true
     },
 
     // A Delegate to control positioning (and other features, in future) of the popup in a custom manner
@@ -53,7 +59,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul
         @private
     */
     contentEl: {
-        value: null
+        value: null,
+        serializable: true
     },
 /**
         Description TODO
@@ -62,7 +69,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul
         @private
     */