diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js
index ecc9f9f8a1..8e810aec20 100644
--- a/platform/commonUI/general/bundle.js
+++ b/platform/commonUI/general/bundle.js
@@ -49,6 +49,7 @@ define([
     "./src/directives/MCTScroll",
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
+    "./src/directives/MCTTree",
     "text!./res/templates/bottombar.html",
     "text!./res/templates/controls/action-button.html",
     "text!./res/templates/controls/input-filter.html",
@@ -97,6 +98,7 @@ define([
     MCTScroll,
     MCTSplitPane,
     MCTSplitter,
+    MCTTree,
     bottombarTemplate,
     actionButtonTemplate,
     inputFilterTemplate,
@@ -389,6 +391,10 @@ define([
                 {
                     "key": "mctSplitter",
                     "implementation": MCTSplitter
+                },
+                {
+                    "key": "mctTree",
+                    "implementation": MCTTree
                 }
             ],
             "constants": [
diff --git a/platform/commonUI/general/res/templates/subtree.html b/platform/commonUI/general/res/templates/subtree.html
index 637b73a8c4..df16327e8c 100644
--- a/platform/commonUI/general/res/templates/subtree.html
+++ b/platform/commonUI/general/res/templates/subtree.html
@@ -19,18 +19,6 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<ul class="tree">
-    <li ng-if="!composition">
-        <span class="tree-item">
-            <span class="icon wait-spinner"></span>
-            <span class="title-label">Loading...</span>
-        </span>
-    </li>
-    <li ng-repeat="child in composition">
-        <mct-representation key="'tree-node'"
-                            mct-object="child"
-                            parameters="parameters"
-                            ng-model="ngModel">
-        </mct-representation>
-    </li>
-</ul>
+<mct-tree mct-object="domainObject">
+</mct-tree>
+
diff --git a/platform/commonUI/general/src/directives/MCTTree.js b/platform/commonUI/general/src/directives/MCTTree.js
index 473511cc96..fb0f63f956 100644
--- a/platform/commonUI/general/src/directives/MCTTree.js
+++ b/platform/commonUI/general/src/directives/MCTTree.js
@@ -37,9 +37,7 @@ define([
         return {
             restrict: "E",
             link: link,
-            require: [ "mctTree" ],
-            scope: { mctObject: "=" },
-            template: ""
+            scope: { mctObject: "=" }
         };
     }
 
diff --git a/platform/commonUI/general/src/ui/ToggleView.js b/platform/commonUI/general/src/ui/ToggleView.js
index 346df43e73..030ac5b416 100644
--- a/platform/commonUI/general/src/ui/ToggleView.js
+++ b/platform/commonUI/general/src/ui/ToggleView.js
@@ -23,7 +23,7 @@
 
 define([
     'angular',
-    'text!../../res/templates/ui/toggle.html'
+    'text!../../res/templates/tree/toggle.html'
 ], function (angular, toggleTemplate) {
     function ToggleView(state) {
         this.expanded = !!state;
diff --git a/platform/commonUI/general/src/ui/TreeLabelView.js b/platform/commonUI/general/src/ui/TreeLabelView.js
index f60aad5369..33db6115f0 100644
--- a/platform/commonUI/general/src/ui/TreeLabelView.js
+++ b/platform/commonUI/general/src/ui/TreeLabelView.js
@@ -23,7 +23,7 @@
 
 define([
     'zepto',
-    'text!../../res/templates/ui/tree-label.html'
+    'text!../../res/templates/tree/tree-label.html'
 ], function ($, labelTemplate) {
     'use strict';
 
diff --git a/platform/commonUI/general/src/ui/TreeNodeView.js b/platform/commonUI/general/src/ui/TreeNodeView.js
index 3867d057c5..e84149834f 100644
--- a/platform/commonUI/general/src/ui/TreeNodeView.js
+++ b/platform/commonUI/general/src/ui/TreeNodeView.js
@@ -23,7 +23,7 @@
 
 define([
     'angular',
-    'text!../../res/templates/ui/node.html',
+    'text!../../res/templates/tree/node.html',
     './ToggleView'
 ], function (angular, nodeTemplate, ToggleView) {
     'use strict';
diff --git a/platform/commonUI/general/src/ui/TreeView.js b/platform/commonUI/general/src/ui/TreeView.js
index 5e2f0b0877..4e73c45071 100644
--- a/platform/commonUI/general/src/ui/TreeView.js
+++ b/platform/commonUI/general/src/ui/TreeView.js
@@ -30,8 +30,7 @@ define([
     var $ = angular.element.bind(angular);
 
     function TreeView() {
-        this.ul = $('<ul>');
-        this.ul.addClass('tree');
+        this.ul = $('<ul class="tree"></ul>');
         this.nodeViews = [];
     }