diff --git a/extensions/enabled/_50_add_mistral_panel.py b/extensions/enabled/_50_add_mistral_panel.py
index 64f3ddb..f8d8a1a 100644
--- a/extensions/enabled/_50_add_mistral_panel.py
+++ b/extensions/enabled/_50_add_mistral_panel.py
@@ -10,5 +10,7 @@ ADD_INSTALLED_APPS = ['merlin', 'mistral']
 # Python panel class of the PANEL to be added.
 ADD_PANEL = 'mistral.panel.MistralPanel'
 
-ADD_ANGULAR_MODULES = ['angular.filter']
-ADD_JS_FILES = ['merlin/lib/angular-filter.js']
\ No newline at end of file
+ADD_ANGULAR_MODULES = ['angular.filter', 'merlin', 'mistral']
+ADD_JS_FILES = ['merlin/js/lib/angular-filter.js',
+                'merlin/js/merlin.init.js',
+                'mistral/js/mistral.init.js']
diff --git a/extensions/mistral/static/mistral/css/mistral.css b/extensions/mistral/static/mistral/css/mistral.css
deleted file mode 100644
index abbd675..0000000
--- a/extensions/mistral/static/mistral/css/mistral.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*    Copyright (c) 2014 Mirantis, Inc.
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may
-    not use this file except in compliance with the License. You may obtain
-    a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-    License for the specific language governing permissions and limitations
-    under the License.
-*/
-
-.expandable:before {
-    content: '+';
-}
-.expandable.expanded:before {
-    content: '-';
-}
-.container-action {
-    padding-left: 5px;
-}
-.inner-node {
-    padding-left: 5px;
-    border-left: 1px solid green;
-}
-
-div#create-workbook {
-    padding-left: 15px;
-    padding-right: 15px;
-}
-
diff --git a/extensions/mistral/static/mistral/js/mistral.init.js b/extensions/mistral/static/mistral/js/mistral.init.js
index 0b90c45..c8d2350 100644
--- a/extensions/mistral/static/mistral/js/mistral.init.js
+++ b/extensions/mistral/static/mistral/js/mistral.init.js
@@ -2,8 +2,9 @@
  * Created by tsufiev on 2/24/15.
  */
 (function() {
-  angular.module('hz')
+  'use strict';
 
+  var mistralApp = angular.module('mistral', ['merlin'])
     .run(function($http, $templateCache) {
       var fields = ['varlist', 'yaqllist'];
       fields.forEach(function(field) {
diff --git a/extensions/mistral/static/mistral/js/mistral.workbook.controllers.js b/extensions/mistral/static/mistral/js/mistral.workbook.controllers.js
index 194c871..e81b1b9 100644
--- a/extensions/mistral/static/mistral/js/mistral.workbook.controllers.js
+++ b/extensions/mistral/static/mistral/js/mistral.workbook.controllers.js
@@ -2,8 +2,9 @@
  * Created by tsufiev on 2/24/15.
  */
 (function() {
-  angular.module('hz')
+  'use strict';
 
+  angular.module('mistral')
     .controller('workbookCtrl',
     ['$scope', 'mistral.workbook.models', function($scope, models) {
       var workbook = models.Workbook.create({name: 'My Workbook'});
diff --git a/extensions/mistral/static/mistral/js/mistral.workbook.models.js b/extensions/mistral/static/mistral/js/mistral.workbook.models.js
index 8d2b810..a20d0e9 100644
--- a/extensions/mistral/static/mistral/js/mistral.workbook.models.js
+++ b/extensions/mistral/static/mistral/js/mistral.workbook.models.js
@@ -1,9 +1,10 @@
 /**
  * Created by tsufiev on 2/24/15.
  */
-(function(){
-  angular.module('hz')
+(function() {
+  'use strict';
 
+  angular.module('mistral')
     .factory('mistral.workbook.models',
     ['merlin.field.models', 'merlin.panel.models', function(fields, panel) {
       var models = {};
diff --git a/extensions/mistral/templates/mistral/_create.html b/extensions/mistral/templates/mistral/_create.html
deleted file mode 100644
index c49311a..0000000
--- a/extensions/mistral/templates/mistral/_create.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "horizon/common/_modal_form.html" %}
-{% load i18n %}
-{% load url from future %}
-
-{% block form_id %}create_workbook{% endblock %}
-{% block form_action %}
-  {% if form.initial.workbook_id %}
-    {% url 'horizon:project:mistral:edit' form.initial.workbook_id %}
-  {% else %}
-    {% url 'horizon:project:mistral:create' %}
-  {% endif %}
-{% endblock %}
-
-{% block modal-header %}
-  {% if form.initial.workbook_id %}
-    {% trans "Edit Workbook" %}
-  {% else %}
-    {% trans "Create Workbook" %}
-  {% endif %}
-{% endblock %}
-{% block modal_id %}create_workbook_modal{% endblock %}
-
-{% block modal-body %}
-<div class="left">
-  <div id="toolbar">
-    <button id="create-workbook">Reset Workbook</button>
-    <button id="save-workbook">Update YAML presentation</button>
-    <div id="controls"></div>
-  </div>
-</div>
-<div class="right">
-  <pre></pre>
-  <input name="workbook" id="json-output" type="hidden" value="{{ form.initial.workbook }}"/>
-</div>
-{% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit"
-         value="{% if form.initial.workbook_id %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}" />
-  <a href="{% url 'horizon:project:mistral:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
-
-{% block modal-js %}
-  <script src="{{ STATIC_URL }}mistral/js/schema.js"></script>
-  <script src="{{ STATIC_URL }}mistral/js/workbook.js"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/extensions/mistral/templates/mistral/create.html b/extensions/mistral/templates/mistral/create.html
index 03ea6c9..1170f6c 100644
--- a/extensions/mistral/templates/mistral/create.html
+++ b/extensions/mistral/templates/mistral/create.html
@@ -13,9 +13,9 @@
 {% include "horizon/_scripts.html" %}
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/lib/barricade.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/lib/js-yaml.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.directives.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.field.models.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.panel.models.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.utils.js"></script>
 
@@ -28,8 +28,7 @@
 {% block css %}
   {% include "_stylesheets.html" %}
   {% compress css %}
-    <link rel="stylesheet" href="{{ STATIC_URL }}mistral/css/mistral.css">
-    <link href='{{ STATIC_URL }}mistral/css/mistral.scss' type='text/scss' media='screen' rel='stylesheet' />
+    <link href='{{ STATIC_URL }}merlin/scss/merlin.scss' type='text/scss' media='screen' rel='stylesheet' />
   {% endcompress %}
   {% block merlin-css %}{% endblock %}
 {% endblock %}
diff --git a/extensions/mistral/templates/mistral/index.html b/extensions/mistral/templates/mistral/index.html
index 810a121..9f140e4 100644
--- a/extensions/mistral/templates/mistral/index.html
+++ b/extensions/mistral/templates/mistral/index.html
@@ -1,4 +1,4 @@
-{% extends 'merlin/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block title %}{% trans "Workbooks" %}{% endblock %}
 
diff --git a/merlin/static/merlin/js/merlin.directives.js b/merlin/static/merlin/js/merlin.directives.js
index 2e51599..404653d 100644
--- a/merlin/static/merlin/js/merlin.directives.js
+++ b/merlin/static/merlin/js/merlin.directives.js
@@ -2,6 +2,8 @@
  * Created by tsufiev on 2/24/15.
  */
 (function() {
+  'use strict';
+
   function disableClickDefaultBehaviour(element) {
     element.find('a[data-toggle="collapse"]')
       .on('click', function(e) {
@@ -10,8 +12,7 @@
       });
   }
 
-  angular.module('hz')
-
+  angular.module('merlin')
     .directive('editable', function() {
       return {
         restrict: 'E',
@@ -30,7 +31,6 @@
         }
       };
     })
-
     .directive('panel', function($parse) {
       return {
         restrict: 'E',
@@ -46,7 +46,6 @@
         }
       }
     })
-
     .directive('collapsibleGroup', function() {
       return {
         restrict: 'E',
@@ -68,7 +67,6 @@
         }
       }
     })
-
     .directive('typedField', function($http, $templateCache, $compile) {
       return {
         restrict: 'E',
diff --git a/merlin/static/merlin/js/merlin.field.models.js b/merlin/static/merlin/js/merlin.field.models.js
index 7b4f81d..f823d05 100644
--- a/merlin/static/merlin/js/merlin.field.models.js
+++ b/merlin/static/merlin/js/merlin.field.models.js
@@ -1,7 +1,8 @@
 
 (function() {
-  angular.module('hz')
+  'use strict';
 
+  angular.module('merlin')
     .factory('merlin.field.models',
     ['merlin.utils', 'merlin.panel.models', function(utils, panels) {
 
@@ -195,4 +196,5 @@
         wildcard: wildcardMixin // use for most general type-checks
       };
     }])
+
 })();
\ No newline at end of file
diff --git a/merlin/static/merlin/js/merlin.init.js b/merlin/static/merlin/js/merlin.init.js
index ec77095..742d9f2 100644
--- a/merlin/static/merlin/js/merlin.init.js
+++ b/merlin/static/merlin/js/merlin.init.js
@@ -2,8 +2,9 @@
  * Created by tsufiev on 2/24/15.
  */
 (function() {
-  angular.module('hz')
+  'use strict';
 
+  var merlinApp = angular.module('merlin', [])
     .run(function($http, $templateCache) {
       var fields = ['dictionary', 'frozendict', 'list', 'string',
         'text', 'group', 'number', 'choices'
diff --git a/merlin/static/merlin/js/merlin.panel.models.js b/merlin/static/merlin/js/merlin.panel.models.js
index 1ce06fc..521cf88 100644
--- a/merlin/static/merlin/js/merlin.panel.models.js
+++ b/merlin/static/merlin/js/merlin.panel.models.js
@@ -1,9 +1,10 @@
 /**
  * Created by tsufiev on 2/24/15.
  */
-(function(){
-  angular.module('hz')
+(function() {
+  'use strict';
 
+  angular.module('merlin')
     .factory('merlin.panel.models', ['merlin.utils', function(utils) {
       var rowProto = {
         create: function(items) {
@@ -148,4 +149,5 @@
         rowmixin: rowMixin
       }
     }])
+
 })();
\ No newline at end of file
diff --git a/merlin/static/merlin/js/merlin.utils.js b/merlin/static/merlin/js/merlin.utils.js
index cb4a829..efd3e11 100644
--- a/merlin/static/merlin/js/merlin.utils.js
+++ b/merlin/static/merlin/js/merlin.utils.js
@@ -1,9 +1,10 @@
 /**
  * Created by tsufiev on 2/24/15.
  */
-(function(){
-  angular.module('hz')
+(function() {
+  'use strict';
 
+  angular.module('merlin')
     .factory('merlin.utils', function() {
       Array.prototype.condense = function() {
         return this.filter(function(el) {
@@ -80,4 +81,5 @@
         enhanceItemWithID: enhanceItemWithID
       }
     })
+
 })();
\ No newline at end of file
diff --git a/extensions/mistral/static/mistral/css/mistral.scss b/merlin/static/merlin/scss/merlin.scss
similarity index 100%
rename from extensions/mistral/static/mistral/css/mistral.scss
rename to merlin/static/merlin/scss/merlin.scss
diff --git a/merlin/templates/merlin/_modal_form.html b/merlin/templates/merlin/_modal_form.html
deleted file mode 100644
index 8d71a53..0000000
--- a/merlin/templates/merlin/_modal_form.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "horizon/common/_modal_form.html" %}
diff --git a/merlin/templates/merlin/base.html b/merlin/templates/merlin/base.html
deleted file mode 100644
index 52bc9f3..0000000
--- a/merlin/templates/merlin/base.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block js %}
-  {% include "horizon/_scripts.html" %}
-  <script src="{{ STATIC_URL }}merlin/lib/barricade.js" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ STATIC_URL }}merlin/lib/js-yaml.js" type="text/javascript" charset="utf-8"></script>
-  {% block merlin-js-scripts %}{% endblock %}
-{% endblock %}
-
-{% block css %}
-  {% include "_stylesheets.html" %}
-  {% block merlin-css %}{% endblock %}
-{% endblock %}
\ No newline at end of file