diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index be11bee8..6ab721ae 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -156,17 +156,17 @@
                                     <filelist dir="${basedir}/src/main/javascript/"
                                               files="collaboration/CollaborationManager.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/AbstractCollaborativeFramework.js"/>
+                                              files="collaboration/framework/AbstractCollaborativeFramework.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/AbstractCollaborativeModelFactory.js"/>
+                                              files="collaboration/framework/AbstractCollaborativeModelFactory.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/brix/model/NodeModel.js"/>
+                                              files="collaboration/framework/brix/model/NodeModel.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/brix/model/Mindmap.js"/>
+                                              files="collaboration/framework/brix/model/Mindmap.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/brix/BrixCollaborativeModelFactory.js"/>
+                                              files="collaboration/framework/brix/BrixCollaborativeModelFactory.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
-                                              files="collaboration/frameworks/brix/BrixFramework.js"/>
+                                              files="collaboration/framework/brix/BrixFramework.js"/>
 
                                     <filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarItem.js"/>
 
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeFramework.js b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeFramework.js
similarity index 97%
rename from mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeFramework.js
rename to mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeFramework.js
index baaf401c..44c9aee6 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeFramework.js
+++ b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeFramework.js
@@ -1,4 +1,4 @@
-mindplot.collaboration.frameworks.AbstractCollaborativeFramework = new Class({
+mindplot.collaboration.framework.AbstractCollaborativeFramework = new Class({
     initialize: function(model, collaborativeModelFactory) {
         this._collaborativeModelFactory = collaborativeModelFactory;
         if (!$defined(model)) {
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeModelFactory.js b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js
similarity index 91%
rename from mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeModelFactory.js
rename to mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js
index 233585f5..fc2786fc 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/AbstractCollaborativeModelFactory.js
+++ b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-mindplot.collaboration.frameworks.AbstractCollaborativeModelFactory = new Class({
+mindplot.collaboration.framework.AbstractCollaborativeModelFactory = new Class({
     initialize:function() {
     },
     buildMindMap:function() {
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/brix/BrixCollaborativeModelFactory.js b/mindplot/src/main/javascript/collaboration/framework/brix/BrixCollaborativeModelFactory.js
similarity index 72%
rename from mindplot/src/main/javascript/collaboration/frameworks/brix/BrixCollaborativeModelFactory.js
rename to mindplot/src/main/javascript/collaboration/framework/brix/BrixCollaborativeModelFactory.js
index d9a71b65..5e0f10a7 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/brix/BrixCollaborativeModelFactory.js
+++ b/mindplot/src/main/javascript/collaboration/framework/brix/BrixCollaborativeModelFactory.js
@@ -16,15 +16,15 @@
  *   limitations under the License.
  */
 
-mindplot.collaboration.frameworks.brix.BrixCollaborativeModelFactory = new Class({
-    Extends:mindplot.collaboration.frameworks.AbstractCollaborativeModelFactory,
+mindplot.collaboration.framework.brix.BrixCollaborativeModelFactory = new Class({
+    Extends:mindplot.collaboration.framework.AbstractCollaborativeModelFactory,
     initialize:function(brixFramework) {
         this._brixFramework = brixFramework;
     },
     buildMindMap:function() {
-        return new mindplot.collaboration.frameworks.brix.model.Mindmap(null, this._brixFramework);
+        return new mindplot.collaboration.framework.brix.model.Mindmap(null, this._brixFramework);
     },
     buildCollaborativeModelFor:function(model) {
-        return new mindplot.collaboration.frameworks.brix.model.Mindmap(model, this._brixFramework);
+        return new mindplot.collaboration.framework.brix.model.Mindmap(model, this._brixFramework);
     }
 });
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/brix/BrixFramework.js b/mindplot/src/main/javascript/collaboration/framework/brix/BrixFramework.js
similarity index 82%
rename from mindplot/src/main/javascript/collaboration/frameworks/brix/BrixFramework.js
rename to mindplot/src/main/javascript/collaboration/framework/brix/BrixFramework.js
index 9331d678..31d61202 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/brix/BrixFramework.js
+++ b/mindplot/src/main/javascript/collaboration/framework/brix/BrixFramework.js
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-mindplot.collaboration.frameworks.brix.BrixFramework = new Class({
-    Extends: mindplot.collaboration.frameworks.AbstractCollaborativeFramework,
+mindplot.collaboration.framework.brix.BrixFramework = new Class({
+    Extends: mindplot.collaboration.framework.AbstractCollaborativeFramework,
     initialize: function(model, app) {
         this._app = app;
-        var collaborativeModelFactory = new mindplot.collaboration.frameworks.brix.BrixCollaborativeModelFactory(this);
+        var collaborativeModelFactory = new mindplot.collaboration.framework.brix.BrixCollaborativeModelFactory(this);
         var cModel = null;
         var root = this.getBrixModel().getRoot();
         if (!root.isEmpty()) {
@@ -41,20 +41,20 @@ mindplot.collaboration.frameworks.brix.BrixFramework = new Class({
 });
 
 instanciated = false;
-mindplot.collaboration.frameworks.brix.BrixFramework.instanciate = function() {
+mindplot.collaboration.framework.brix.BrixFramework.instanciate = function() {
     if ((typeof isGoogleBrix != "undefined") && !instanciated) {
         instanciated = true;
         var app = new goog.collab.CollaborativeApp();
-        mindplot.collaboration.frameworks.brix.BrixFramework.buildMenu(app);
+        mindplot.collaboration.framework.brix.BrixFramework.buildMenu(app);
         app.start();
         app.addListener('modelLoad', function(model) {
-            var framework = new mindplot.collaboration.frameworks.brix.BrixFramework(model, app);
+            var framework = new mindplot.collaboration.framework.brix.BrixFramework(model, app);
             mindplot.collaboration.CollaborationManager.getInstance().setCollaborativeFramework(framework);
         }.bind(this));
     }
 };
 
-mindplot.collaboration.frameworks.brix.BrixFramework.buildMenu = function(app) {
+mindplot.collaboration.framework.brix.BrixFramework.buildMenu = function(app) {
     var menuBar = new goog.collab.ui.MenuBar();
 
     // Configure toolbar menu ...
@@ -80,6 +80,6 @@ mindplot.collaboration.frameworks.brix.BrixFramework.buildMenu = function(app) {
 
     app.setMenuBar(menuBar);
 };
-mindplot.collaboration.frameworks.brix.BrixFramework.instanciate();
+mindplot.collaboration.framework.brix.BrixFramework.instanciate();
 
 
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/brix/model/Mindmap.js b/mindplot/src/main/javascript/collaboration/framework/brix/model/Mindmap.js
similarity index 93%
rename from mindplot/src/main/javascript/collaboration/frameworks/brix/model/Mindmap.js
rename to mindplot/src/main/javascript/collaboration/framework/brix/model/Mindmap.js
index e0ee2372..7c8694ae 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/brix/model/Mindmap.js
+++ b/mindplot/src/main/javascript/collaboration/framework/brix/model/Mindmap.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-mindplot.collaboration.frameworks.brix.model.Mindmap = new Class({
+mindplot.collaboration.framework.brix.model.Mindmap = new Class({
         Extends:mindplot.model.Mindmap,
         initialize:function(brixModel, brixFramework){
             this.parent();
@@ -27,7 +27,7 @@ mindplot.collaboration.frameworks.brix.model.Mindmap = new Class({
                 var branches = this._brixModel.get("branches");
                 for(var i=0; i<branches.size(); i++){
                     var node = branches.get(i);
-                    var nodeModel = new mindplot.collaboration.frameworks.brix.model.NodeModel(node, this._brixFramework, null, this);
+                    var nodeModel = new mindplot.collaboration.framework.brix.model.NodeModel(node, this._brixFramework, null, this);
                     this.addBranch(nodeModel, false);
                 }
             }
@@ -85,7 +85,7 @@ mindplot.collaboration.frameworks.brix.model.Mindmap = new Class({
         },
         _createNode : function(type, id) {
             $assert(type, 'Node type must be specified.');
-            var result = new mindplot.collaboration.frameworks.brix.model.NodeModel(null, this._brixFramework, type, this, id);
+            var result = new mindplot.collaboration.framework.brix.model.NodeModel(null, this._brixFramework, type, this, id);
             return result;
         },
 
diff --git a/mindplot/src/main/javascript/collaboration/frameworks/brix/model/NodeModel.js b/mindplot/src/main/javascript/collaboration/framework/brix/model/NodeModel.js
similarity index 96%
rename from mindplot/src/main/javascript/collaboration/frameworks/brix/model/NodeModel.js
rename to mindplot/src/main/javascript/collaboration/framework/brix/model/NodeModel.js
index 1941a8fd..737bb23b 100644
--- a/mindplot/src/main/javascript/collaboration/frameworks/brix/model/NodeModel.js
+++ b/mindplot/src/main/javascript/collaboration/framework/brix/model/NodeModel.js
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
+mindplot.collaboration.framework.brix.model.NodeModel = new Class({
     Extends: mindplot.model.NodeModel,
     Attributes: ['text','fontSize','fontFamily','fontStyle','fontColor','fontWeight','borderColor','backgroundColor','shapeType'],
     initialize : function(brixModel, brixFramework, type, mindmap, id) {
@@ -36,7 +36,7 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
         } else {
 
             // Call all the required setters for simple properties ...
-            var keys = mindplot.collaboration.frameworks.brix.model.NodeModel.prototype.Attributes;
+            var keys = mindplot.collaboration.framework.brix.model.NodeModel.prototype.Attributes;
             keys.forEach(function(key) {
 
                 // Call setters ...
@@ -53,7 +53,7 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
             var children = this._brixModel.get("children");
             for (var i = 0; i < children.size(); i++) {
                 var bChild = children.get(i);
-                var child = new mindplot.collaboration.frameworks.brix.model.NodeModel(bChild, this._brixFramework, null, mindmap);
+                var child = new mindplot.collaboration.framework.brix.model.NodeModel(bChild, this._brixFramework, null, mindmap);
                 this._appendChild(child, false);
             }
         }
@@ -61,7 +61,7 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
     },
 
     _injectSetAndGet : function() {
-        var keys = mindplot.collaboration.frameworks.brix.model.NodeModel.prototype.Attributes;
+        var keys = mindplot.collaboration.framework.brix.model.NodeModel.prototype.Attributes;
 
         keys.forEach(function(key) {
             // Create setters ...
@@ -101,7 +101,7 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
 
     _childAddedListener:function(event) {
         var newValue = event.getValues().get(0);
-        var cmodel = new mindplot.collaboration.frameworks.brix.model.NodeModel(newValue, this._brixFramework, null, this.getMindmap());
+        var cmodel = new mindplot.collaboration.framework.brix.model.NodeModel(newValue, this._brixFramework, null, this.getMindmap());
         this._appendChild(cmodel, false);
 
         var model = new mindplot.model.NodeModel(newValue.get("type"), designer.getMindmap(), newValue.get("id"));
diff --git a/mindplot/src/main/javascript/header.js b/mindplot/src/main/javascript/header.js
index 8bc6dd46..c4a32396 100644
--- a/mindplot/src/main/javascript/header.js
+++ b/mindplot/src/main/javascript/header.js
@@ -23,6 +23,6 @@ mindplot.layout = {};
 mindplot.widget = {};
 mindplot.model = {};
 mindplot.collaboration = {};
-mindplot.collaboration.frameworks = {};
-mindplot.collaboration.frameworks.brix = {};
-mindplot.collaboration.frameworks.brix.model = {};
\ No newline at end of file
+mindplot.collaboration.framework = {};
+mindplot.collaboration.framework.brix = {};
+mindplot.collaboration.framework.brix.model = {};
\ No newline at end of file
diff --git a/wise-doc/src/main/webapp/html/editor.html b/wise-doc/src/main/webapp/html/editor.html
index e89ca572..3d4b5429 100644
--- a/wise-doc/src/main/webapp/html/editor.html
+++ b/wise-doc/src/main/webapp/html/editor.html
@@ -33,8 +33,8 @@
         //Google-Brix framework load callback function
         collabOnLoad = function() {
             isGoogleBrix = true;
-            if (typeof mindplot != "undefined") {
-                mindplot.collaboration.frameworks.brix.BrixFramework.instanciate();
+            if ($defined(mindplot) && $defined(mindplot.collaboration) && $defined(mindplot.collaboration.framework)) {
+                mindplot.collaboration.framework.brix.BrixFramework.instanciate();
             }
         };
     </script>